From ee47bba29a31d8d4d48981a3e2d0489198d4be14 Mon Sep 17 00:00:00 2001
From: jiayangyang <534955398@qq.com>
Date: Tue, 4 Aug 2026 16:29:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(sos):=20isLiaisonUser=E7=A7=BB=E8=87=B3view?=
 =?UTF-8?q?WillAppear=EF=BC=8C=E6=80=A5=E6=95=91=E5=91=98=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=B7=A5=E5=85=B7=E6=A0=8F=E9=9A=90=E8=97=8F=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=92=A8=E8=AF=A2=E5=92=8C=E6=A1=A3=E6=A1=88=EF=BC=8C?=
 =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E5=8A=A0=E8=BD=BD=E5=8A=A0=E8=8F=8A?=
 =?UTF-8?q?=E8=8A=B1=EF=BC=8C=E8=A7=86=E9=A2=91=E5=8A=A0=E5=8F=B7=E8=B5=B0?=
 =?UTF-8?q?IM=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../SOS/Controller/XJSosCenterViewController.m |  9 ++++++---
 .../Project/TUIChat/ChatViewController.m       | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m
index f876aaa..57cfebb 100644
--- a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m
+++ b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m
@@ -364,9 +364,8 @@
     zoomPannelView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin;
     [self.grapView addSubview:zoomPannelView];
 
-    // 判断是否是联络员，决定是否展示急救员按钮
-    XJPNetAPI *api = [[XJPNetAPI alloc] init:self tag:@"isLiaisonUser" NeedToken:@""];
-    [api getIsLiaisonUser:nil];
+    // 首次布局底部按钮（接口返回前先按 2 个按钮布局）
+    [self layoutBottomButtons];
 }
 
 /// 底部按钮均分布局（宽度三等分，各区域内居中）
@@ -621,6 +620,10 @@
     CGFloat longitude =  [[user objectForKey:USERDEFAULLONG] floatValue];
     CGFloat latitude =  [[user objectForKey:USERDEFAULLATITUDE] floatValue];
     [self getResourceDataWithType:@"1" Longitude:longitude  withLatitude:latitude];
+
+    // 每次页面出现时重新判断联络员身份，决定是否展示急救员按钮
+    XJPNetAPI *api = [[XJPNetAPI alloc] init:self tag:@"isLiaisonUser" NeedToken:@""];
+    [api getIsLiaisonUser:nil];
 }
 
 - (void)viewDidAppear:(BOOL)animated
diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m
index 07875f5..e165cf6 100644
--- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m
+++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m
@@ -20,6 +20,7 @@
 #import "CurrentLocationViewController.h"
 #import "CustomMapMessageCell.h"
 #import "TUIGroupMemberCellData.h"
+#import <TUICallKit/TUICallKit.h>
 #import "XJSelectContactViewController.h"
 #import "TUITextMessageCellData.h"
 #import "QuestionViewController.h"
@@ -143,6 +144,12 @@
     [TUIChatConfig defaultConfig].enableMapCall = self.eableMapTools;
     [TUIChatConfig defaultConfig].isEvealCell = self.isEveal; // YES：开启，NO：关闭
 
+    // 急救员入口隐藏结束咨询和档案
+    [TUIChatConfig defaultConfig].enableEndConsultation = !self.isFromFirstAid;
+    if (self.isFromFirstAid) {
+        [TUIChatConfig defaultConfig].enableSendHealthDataCall = YES;
+    }
+
 
     TUIConfig *config = [TUIConfig defaultConfig];
     config.avatarType = TAvatarTypeRounded;
@@ -213,11 +220,13 @@
 
     }
 //    self.view.backgroundColor =  UIColorHex(#EEEEEE);
-    if ([self.tfNew integerValue] == 1) {
-        [ESCTUIManager sendGroupVideo:self.chatID withUserIdList:self.member];
+    if (self.isFromFirstAid) {
         TUICallingViewManager *manager = [[TUICallKit createInstance] valueForKey:@"callingViewManager"];
         manager.addUserDelegate = self;
     }
+    if ([self.tfNew integerValue] == 1) {
+        [ESCTUIManager sendGroupVideo:self.chatID withUserIdList:self.member];
+    }
     //主动发送一条消息
     //如果点击跳过进入 不操作  非跳过 发送健康档案  2=非跳过
     if (self.JumpType == 2 && self.questionType == 2) {
@@ -313,8 +322,7 @@
 #pragma mark - TUICallingViewManagerDelegate
 
 - (BOOL)callingViewManagerDidTapAddUser:(TUICallingViewManager *)manager {
-    [self moreAction];
-    return YES;
+    return NO;
 }
 
 #pragma mark: 右上角更多（群成员侧滑面板）
@@ -454,6 +462,7 @@
 }
 
 - (void)loadGroupMembers {
+    [self showMBProgressHUDWithString:@"加载中..." autoHidden:NO];
     self.memberList = [NSMutableArray array];
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
     [params setObject:self.chatID forKey:@"sessionId"];
@@ -941,6 +950,7 @@
         }
     }
     if ([tag isEqualToString:@"GROUPMEMBERLIST"]) {
+        [self hiddenAllMBProgressHUD];
         [self.memberList removeAllObjects];
         NSArray *list = [response isKindOfClass:[NSDictionary class]] ? response[@"result"] : response;
         if ([list isKindOfClass:[NSArray class]]) {