From cb05dda558b92674f27917f1185cc71d3a1e7a2d Mon Sep 17 00:00:00 2001
From: guozhen <878631970@qq.com>
Date: Tue, 10 Dec 2024 17:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3web=E6=AE=B5=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=9A=84=E6=B6=88=E6=81=AF=E8=BD=AC=E5=8F=91=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                  |  8 ++++----
 .../yunxin/kit/chatkit/ui/network/ApiService.java     |  4 ++--
 .../chatkit/ui/page/viewmodel/ChatBaseViewModel.java  | 11 ++++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c1eb7ce..4a3ca9f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         applicationId = "com.dskj.rbchat"
         minSdk = 24
         targetSdk = 34
-        versionCode = 191
-        versionName = "1.9.1"
+        versionCode = 192
+        versionName = "1.9.2"
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 //         manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"  //正式
@@ -126,8 +126,8 @@ android {
                 "\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\""
             )
             //测试APPKEY
-            manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
-            //manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"
+           manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
+           // manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"
 
 
         }
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
index 998b53b..5a4c656 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
@@ -49,12 +49,12 @@ public interface ApiService {
     /**
      * 正式环境
      */
-    // String URL = "https://api.letschat2023.com/";
+     String URL = "https://api.letschat2023.com/";
 
     /**
      * 测试环境
      */
-    String URL = "https://api-test.letschat2023.com/";
+    //String URL = "https://api-test.letschat2023.com/";
 
 
     String SUBSTATIONID = "1703655363476242434";
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/viewmodel/ChatBaseViewModel.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/viewmodel/ChatBaseViewModel.java
index db75fff..3e9755b 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/viewmodel/ChatBaseViewModel.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/viewmodel/ChatBaseViewModel.java
@@ -672,7 +672,7 @@ public abstract class ChatBaseViewModel extends BaseViewModel {
             String attachStr = forwardMessage.getAttachStr();
             CustomMessageBean customMessageBean = GsonUtils.getObjFromJSON(attachStr, CustomMessageBean.class);
             String data = GsonUtils.beanToJSONString(customMessageBean.getData());
-            if (TextUtils.isEmpty(customMessageBean.getType())) {
+            if (TextUtils.isEmpty(customMessageBean.getType()) || !isInteger(customMessageBean.getType())) {
                 return forwardMessage;
             }
             if (Integer.parseInt(customMessageBean.getType()) == ChatMessageType.CUSTOM_STICKER_ALBUMS) {
@@ -711,6 +711,15 @@ public abstract class ChatBaseViewModel extends BaseViewModel {
         return forwardMessage;
     }
 
+    private boolean isInteger(String type) {
+        try {
+            Integer.parseInt(type);
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
 
     public void sendLocationMessage(ChatLocationBean locationBean) {
         ALog.d(LIB_TAG, TAG, "sendLocationMessage:" + locationBean);