更新云信和公益咨询相关代码

chatkit_ui/src/main/ets/model/ChatInfo.ets

@@ -5,6 +5,7 @@
  *
  */
 
+import { authStore, BasicConstant, patientDbManager } from '@itcast/basic';
 import { ChatKitClient } from '@nimkit/chatkit';
 import { V2NIMMessagePin } from '@nimsdk/base';
 import { V2NIMMessage, V2NIMMessageSendingState } from '@nimsdk/base/src/main/ets/nim/sdk/V2NIMMessageService';
@@ -67,7 +68,12 @@ export class ChatInfo {
   };
 
   getCurrentUserAvatarUrl(message?: V2NIMMessage): string {
-    return '';
+
+
+      return BasicConstant.urlHtml+authStore.getUser().photo;
+
+
+
   };
 
   getCurrentUserAvatarName(): string {

chatkit_ui/src/main/ets/pages/ChatP2PPage.ets

@@ -23,6 +23,7 @@ import {
   NECommonUtils,
   NetworkBrokenBuilder,
   PermissionsUtils,
+  UserUtils,
   VideoViewerDialog
 } from '@nimkit/common';
 import { NECameraSelectView } from '../view/NECameraSelectView';
@@ -179,6 +180,7 @@ export struct ChatP2PPage {
     cornerRadius: 4,
     width: '70%',
   })
+  @Local showName:string=String(this.chatUserInfo.conversationName)
   waDialog: CustomDialogController = new CustomDialogController({
     builder: NewWaDialog({
       firstCallBack:()=>{
@@ -401,7 +403,7 @@ export struct ChatP2PPage {
     })
   }
 
-  patientDetail()
+   patientDetail()
   {
     this.sessionId = ChatKitClient.nim.conversationIdUtil.parseConversationTargetId(this.conversationId)
     this.patientUuid=this.sessionId
@@ -411,14 +413,13 @@ export struct ChatP2PPage {
       let json = JSON.parse(res+'') as Record<string, object>;
       let datas=json.data as Record<string, string>;
       this.patientUuid=datas.uuid
+      this.showName=await UserUtils.getAvatarName(this.patientUuid,String(this.chatUserInfo.conversationName))
     }).catch((err: BusinessError) => {
 
     })
   }
 
-
-  aboutToAppear(): void {
-
+   aboutToAppear() {
     NEEmojiManager.instance.setup();
     DeviceUtils.rootDirPath = getContext(this).filesDir
     this.operationMoreDataList = setupMoreOperationData()
@@ -455,7 +456,7 @@ export struct ChatP2PPage {
     })
     this.initDialog()
     this. getOutList()
-    this.patientDetail()
+
   }
 
   computeScrollHeight() {
@@ -522,6 +523,7 @@ export struct ChatP2PPage {
     this.chatUserInfo.setConversationId(this.conversationId)
     this.chatViewModel.init(this.conversationId, this.chatUserInfo);
     this.chatViewModel.loadData();
+    this.patientDetail()
   }
 
   async showImageDetail(msg?: NIMMessageInfo, onlyMsg?: boolean) {
@@ -571,7 +573,7 @@ export struct ChatP2PPage {
   build() {
     NavDestination() {
       NavigationBackBuilder({
-        title: this.chatUserInfo.conversationName,
+        title:this.showName ,
         rightButtonIcon: this.showMultiSelect ? undefined : $r('app.media.ic_public_more_dot'),
         rightButtonTitle: this.showMultiSelect ? $r('app.string.chat_msg_dialog_cancel') : undefined,
         top:this.statusBarHeight,

chatkit_ui/src/main/ets/view/MessageComponent.ets

@@ -13,6 +13,7 @@ import { AvatarColorUntil, AvatarItem, CommonAvatar } from '@nimkit/common';
 import { messageContent } from './MessageComponentBuilder';
 import { MessageItemClick } from './MessageItemClick';
 import { ChatKitConfig } from '../ChatKitConfig';
+import { authStore, BasicConstant } from '@itcast/basic';
 
 /**
  * 消息组件按照UI样式，划分为发送消息组件、接收消息组件、通知消息组件和提示消息组件
@@ -243,7 +244,7 @@ export struct SenderMessageComponent {
 
           CommonAvatar({
             item: new AvatarItem(this.chatUserInfo != null ?
-            this.chatUserInfo?.getCurrentUserAvatarUrl() : '',
+            this.chatUserInfo?.getCurrentUserAvatarUrl() : BasicConstant.urlHtml+authStore.getUser().photo,
               this.chatUserInfo?.getCurrentUserAvatarName() ?? '',
               AvatarColorUntil.getBackgroundColorById(this.message.message.senderId),
             ),

chatkit_ui/src/main/ets/viewmodel/ChatBaseViewModel.ets

@@ -60,6 +60,7 @@ import { instanceToPlain } from 'class-transformer';
 import { NECommonUtils } from '@nimkit/common';
 import { HashMap, JSON } from '@kit.ArkTS';
 import { assign } from '@nimsdk/vendor';
+import { BasicConstant, ChatExtModel } from '@itcast/basic';
 
 @ObservedV2
 export class ChatBaseViewModel {
@@ -681,13 +682,20 @@ export class ChatBaseViewModel {
   async sendTextMessage(text: string, replyMsg?: NIMMessageInfo, aitModel?: AitModel, pushList?: string[]) {
     const message = ChatRepo.createTextMessage(text)
     //设置Ait
-    if (aitModel && aitModel.aitBlocks.size > 0) {
-      let extensionMap: YxAitMsg = {
-        yxAitMsg: aitModel.aitBlocks
-      }
-      let extension = JSON.stringify(instanceToPlain(extensionMap))
-      message.serverExtension = extension
+    // if (aitModel && aitModel.aitBlocks.size > 0) {
+    //   let extensionMap: YxAitMsg = {
+    //     yxAitMsg: aitModel.aitBlocks
+    //   }
+    //   let extension = JSON.stringify(instanceToPlain(extensionMap))
+    //   message.serverExtension = extension
+    // }
+    let extension:ChatExtModel= {
+      gdxz_sessionType: '',
+      gdxz_consult_uuid: '',
+      gdxz_nickName: ''
     }
+    message.serverExtension =JSON.stringify(extension)
+
 
     //设置推送
     let params: V2NIMSendMessageParams | undefined = undefined
@@ -742,6 +750,7 @@ export class ChatBaseViewModel {
       }
       params.aiConfig = aiParams
     }
+
     this.sendMessage(message, params)
   }