From 5212bfee2cc2efd408099e180b6c5d5eacab9cf2 Mon Sep 17 00:00:00 2001
From: XiuYun CHEN <ChenXiuYun@igandan.org>
Date: Mon, 11 Aug 2025 15:01:18 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chatkit/src/main/ets/ChatKitClient.ets                      | 3 ++-
 chatkit_ui/src/main/ets/pages/ChatP2PPage.ets               | 5 ++---
 chatkit_ui/src/main/ets/view/MessageComponentBuilder.ets    | 6 +++---
 features/netease/src/main/ets/view/PatientListComp.ets      | 3 ++-
 products/expert/src/main/ets/pages/MinePage/SettingPage.ets | 4 +++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/chatkit/src/main/ets/ChatKitClient.ets b/chatkit/src/main/ets/ChatKitClient.ets
index b37b321..6895fbf 100644
--- a/chatkit/src/main/ets/ChatKitClient.ets
+++ b/chatkit/src/main/ets/ChatKitClient.ets
@@ -173,7 +173,7 @@ export class ChatKitClient {
       return
     }
     console.info("netease ChatKitClient initListener ");
-    ChatKitClient.nim.loginService.on("onKickedOffline", (detail: V2NIMKickedOfflineDetail) => {
+    ChatKitClient.nim.loginService.on("onKickedOffline", async (detail: V2NIMKickedOfflineDetail) => {
       // const detail = ChatKitClient.nim.loginService.getKickedOfflineDetail()
       // console.log('Response onKickedOffline'+detail.clientType+'      22    '+detail.customClientType)
       if(HMRouterMgr.getCurrentPathStack()!=null)
@@ -197,6 +197,7 @@ export class ChatKitClient {
           break;
 
       }
+      await ChatKitClient.nim.loginService.logout()
       ChangeUtil.Logout(phone)
       // router.replaceUrl({
       //   url: 'pages/LoginPage/LoginPage', // 目标url
diff --git a/chatkit_ui/src/main/ets/pages/ChatP2PPage.ets b/chatkit_ui/src/main/ets/pages/ChatP2PPage.ets
index eb7319a..fede80a 100644
--- a/chatkit_ui/src/main/ets/pages/ChatP2PPage.ets
+++ b/chatkit_ui/src/main/ets/pages/ChatP2PPage.ets
@@ -847,8 +847,6 @@ export struct ChatP2PPage {
 
         Column()
           .height(this.bottomHeight)
-          .backgroundColor(Color.Transparent)
-          .backgroundColor($r('app.color.chat_input_background'))
           .id("chat_input")
           .alignRules({
             left: { anchor: "__container__", align: HorizontalAlign.Start },
@@ -942,6 +940,7 @@ export struct ChatP2PPage {
           })
 
             .backgroundColor($r('app.color.chat_input_background'))
+
         } else if (this.showMultiSelect) {
           ChatMultiSelectView({
             isEnable: this.multiSelectCount > 0,
@@ -1242,7 +1241,7 @@ export struct ChatP2PPage {
       this.controller.deleteSpans()
     }
     this.replyMsg = undefined
-    this.bottomHeight = 105
+    // this.bottomHeight = 105
     this.computeScrollHeight()
   }
 
diff --git a/chatkit_ui/src/main/ets/view/MessageComponentBuilder.ets b/chatkit_ui/src/main/ets/view/MessageComponentBuilder.ets
index 9d33cfc..3cea1e3 100644
--- a/chatkit_ui/src/main/ets/view/MessageComponentBuilder.ets
+++ b/chatkit_ui/src/main/ets/view/MessageComponentBuilder.ets
@@ -405,8 +405,8 @@ export struct imageBuilder {
     Column() {
       Image(this.thumbUrl ?? this.url)
         .objectFit(ImageFit.Cover)
-        .width(getImageWidth(this.message))
-        .height(getImageHeight(this.message))
+        .width(getImageWidth(this.message)*0.7)
+        .height(getImageHeight(this.message)*0.7)
         .borderRadius(8)
         .gesture(LongPressGesture().onAction((event: GestureEvent) => {
           this.onMessageClick?.onItemLongClick?.(event, this.message)
@@ -446,7 +446,7 @@ export struct videoBuilder {
   build() {
     Stack() {
       Image(this.videoMessageThumbnail ?? getVideoMessageUrl(this.message)).objectFit(ImageFit.Auto)
-        .width(getImageWidth(this.message)).height(getImageHeight(this.message))
+        .width(getImageWidth(this.message)*0.7).height(getImageHeight(this.message)*0.7)
         .borderRadius(8)
       Image($r('app.media.ic_chat_message_video')).objectFit(ImageFit.Auto)
         .width(60).height(60)
diff --git a/features/netease/src/main/ets/view/PatientListComp.ets b/features/netease/src/main/ets/view/PatientListComp.ets
index 8a2e812..69ec225 100644
--- a/features/netease/src/main/ets/view/PatientListComp.ets
+++ b/features/netease/src/main/ets/view/PatientListComp.ets
@@ -618,7 +618,7 @@ export struct PatientListComp {
                 weight: FontWeight.Bolder
               })
               .position({ x: this.displayClass.width / this.displayClass.densityPixels - 30 })
-              .zIndex(999) // 确保在最上层
+              .zIndex(998) // 确保在最上层
 
           Column()
           {
@@ -636,6 +636,7 @@ export struct PatientListComp {
           .backgroundImagePosition(Alignment.Center)
           .backgroundImage($r('app.media.patientgif'))
           .backgroundColor('#44444444')
+          .zIndex(999) // 确保在最上层
         }
         .layoutWeight(1)
         .width('100%')
diff --git a/products/expert/src/main/ets/pages/MinePage/SettingPage.ets b/products/expert/src/main/ets/pages/MinePage/SettingPage.ets
index 7c30f97..8385810 100644
--- a/products/expert/src/main/ets/pages/MinePage/SettingPage.ets
+++ b/products/expert/src/main/ets/pages/MinePage/SettingPage.ets
@@ -5,6 +5,7 @@ import { bundleManager, common, ConfigurationConstant, Want } from '@kit.Ability
 import { fileIo, storageStatistics } from '@kit.CoreFileKit';
 import { promptAction, router } from '@kit.ArkUI';
 import call from '@ohos.telephony.call';
+import { ChatKitClient } from '@nimkit/chatkit';
 
 @Entry
 @Preview
@@ -200,7 +201,8 @@ struct SettingPage {
       .borderColor($r('app.color.main_color'))
       .backgroundColor(Color.White)
       .margin({top:10,left:10,right:10})
-      .onClick(()=>{
+      .onClick(async ()=>{
+        await ChatKitClient.nim.loginService.logout()
         ChangeUtil.Logout('')
         // authStore.delUser();
         // preferenceStore.setItemBoolean('isLogin',false)