From 521a0b06628932c585ff02f81bcbe58ece9062f3 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Wed, 4 Dec 2024 20:08:31 +0800
Subject: [PATCH] fix : fixbug

---
 .../java/com/chwl/app/common/widget/dialog/DialogManager.java | 4 ++--
 app/src/main/res/layout/fragment_chatroom_game_main.xml       | 2 +-
 .../nim/uikit/business/session/actions/PickImageActionNew.kt  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java b/app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java
index 0fa57e5c2..8cda32c02 100644
--- a/app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java
+++ b/app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java
@@ -1006,7 +1006,7 @@ public class DialogManager {
             return;
         }
         if (mDialog.isShowing()) {
-            startTimeOutJob(mDialog);
+//            startTimeOutJob(mDialog);
             return;
         }
         if (mReCreate) {
@@ -1027,7 +1027,7 @@ public class DialogManager {
             }
         });
 
-        startTimeOutJob(mDialog);
+//        startTimeOutJob(mDialog);
 
     }
 
diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml
index be86551b2..34ed61f62 100644
--- a/app/src/main/res/layout/fragment_chatroom_game_main.xml
+++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml
@@ -187,7 +187,7 @@
             tools:layout_height="50dp"
             tools:layout_width="100dp"
             android:paddingStart="16dp"
-            android:paddingBottom="66dp"
+            android:paddingBottom="@dimen/dp_10"
             tools:visibility="visible" />
 
         <com.chwl.app.ui.widget.BonsellaJoinAttackButtonView
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt b/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt
index dbbdac056..4b9a19903 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt
@@ -47,7 +47,7 @@ abstract class PickImageActionNew protected constructor(
                         val uri = data.data
                         if (uri != null) {
                             val file = copyFile(activity, uri)
-                            if (file == null) {
+                            if (file != null) {
                                 file?.path?.let { path ->
                                     val paths = mutableListOf(path)
                                     PhotoCompressUtil.compress(BaseApp.getContext(),