From ff7196b21ad2cbb152fc509d9e67c231d9bc014c Mon Sep 17 00:00:00 2001
From: SL <No8blackball@163.com>
Date: Sun, 29 Dec 2024 18:55:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/inspectionProfiles/Project_Default.xml      |  1 +
 wkim/src/main/java/com/xinbida/wukongim/WKIM.java | 11 +++++++++--
 .../com/xinbida/wukongim/manager/MsgManager.java  | 15 ++++++++++-----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 7e6ea54..970fe8b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintUnsafeImplicitIntentLaunch" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,com.wukong.im.db.WKDBHelper,rawQuery" />
     </inspection_tool>
diff --git a/wkim/src/main/java/com/xinbida/wukongim/WKIM.java b/wkim/src/main/java/com/xinbida/wukongim/WKIM.java
index 3db5442..2299a22 100644
--- a/wkim/src/main/java/com/xinbida/wukongim/WKIM.java
+++ b/wkim/src/main/java/com/xinbida/wukongim/WKIM.java
@@ -18,7 +18,7 @@ import com.xinbida.wukongim.utils.CryptoUtils;
  * 5/20/21 5:25 PM
  */
 public class WKIM {
-    private final String Version = "V1.2.3";
+    private final String Version = "V1.3.3";
 
     private WKIM() {
 
@@ -34,6 +34,7 @@ public class WKIM {
 
     private boolean isDebug = false;
     private boolean isWriteLog = false;
+    private String deviceId = "";
 
     public boolean isDebug() {
         return isDebug;
@@ -43,6 +44,10 @@ public class WKIM {
         return isWriteLog;
     }
 
+    public String getDeviceID(){
+        return deviceId;
+    }
+
     public void setWriteLog(boolean isWriteLog) {
         this.isWriteLog = isWriteLog;
     }
@@ -60,7 +65,9 @@ public class WKIM {
     public String getVersion() {
         return Version;
     }
-
+    public void setDeviceId(String deviceID){
+        this.deviceId = deviceID;
+    }
     /**
      * 初始化IM
      *
diff --git a/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java
index 36b4f50..7212529 100644
--- a/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java
+++ b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java
@@ -180,8 +180,8 @@ public class MsgManager extends BaseManager {
     public WKMessageContent getMsgContentModel(int contentType, JSONObject jsonObject) {
         if (jsonObject == null) jsonObject = new JSONObject();
         WKMessageContent baseContentMsgModel = getContentMsgModel(contentType, jsonObject);
-        if (baseContentMsgModel == null){
-            baseContentMsgModel  = new WKMessageContent();
+        if (baseContentMsgModel == null) {
+            baseContentMsgModel = new WKMessageContent();
         }
         //解析@成员列表
         if (jsonObject.has("mention")) {
@@ -278,7 +278,7 @@ public class MsgManager extends BaseManager {
             }
         } catch (IllegalAccessException | InstantiationException e) {
             WKLoggerUtils.getInstance().e(TAG, "getContentMsgModel decodeMsg error");
-            return  null;
+            return null;
         }
         return null;
     }
@@ -953,7 +953,7 @@ public class MsgManager extends BaseManager {
         List<String> msgIds = new ArrayList<>();
         for (int j = 0, len = list.size(); j < len; j++) {
             WKMsg wkMsg = WKSyncRecent2WKMsg(list.get(j));
-            if (wkMsg.type == WKMsgContentType.WK_INSIDE_MSG){
+            if (wkMsg.type == WKMsgContentType.WK_INSIDE_MSG) {
                 continue;
             }
             msgList.add(wkMsg);
@@ -1330,6 +1330,11 @@ public class MsgManager extends BaseManager {
     }
 
     public String createClientMsgNO() {
-        return UUID.randomUUID().toString().replaceAll("-", "") + "1";
+        String deviceId = WKIM.getInstance().getDeviceID();
+        if (TextUtils.isEmpty(deviceId)) {
+            deviceId = "unknown";
+        }
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+        return uuid + "_" + deviceId + "_1";
     }
 }