diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar index 4812756..a94bd09 100644 Binary files a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar and b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar differ diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 index 54d1a1a..0fd0eaf 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 @@ -1 +1 @@ -6baeb9fad6af00e32a33d578e0e5f673 \ No newline at end of file +ba3da42c631a8f1da07c6d50a61fc4cc \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 index fe228f2..b3ffc3f 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 @@ -1 +1 @@ -6b2e555aa608be92695e95399ec3b082ebeb2889 \ No newline at end of file +5bf4fac6da79c9e3e6d7c5eeacd1608bb2fe643f \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 index fbf582a..4faf5b6 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 @@ -1 +1 @@ -b6b6b45fc4e3bc01ffb72ef6c708c24a5db8ccc9e57c402c4b63de80554db726 \ No newline at end of file +a8fb0c37de52d4c533b511a742272c4cb7ba9b6bd2b62867fa5c1475429baf08 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 index 72c5d15..f8e7957 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 @@ -1 +1 @@ -f32564063c4f339ed7128615a4b98cbe6b2bab2a2a4e071321708b04f4752ed1adfd37dc2f0831606d0665ae702a5fd57a700e3966dc6027ffdeca05988bdb03 \ No newline at end of file +f82ad34ba5827c7fa14d4cd66f71523e6ea3573ae0f26eb7fdc2df039d05643a49a84d54fa8e1590f81978fca3a5604c6ba6d56fe47f3983134ae07e83d86962 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml index 61f499c..b07295d 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml @@ -8,6 +8,6 @@ 1.0.1 - 20230703081256 + 20230718150400 diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 index 4fd74b8..9fb4b38 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 @@ -1 +1 @@ -80988731b98a41a29b2a67e4b1d6b535 \ No newline at end of file +03bdbc77fb87f493473e479111bcdeda \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 index ab524fe..1a74956 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 @@ -1 +1 @@ -a35dbface90a4442e26990d51114921df64d7f02 \ No newline at end of file +c9a474c48960e99c6818ccf85b7fe4cb6bcdda33 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 index dbcfea1..b7393d4 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 @@ -1 +1 @@ -7113cbf96f7a26d92df5ca77f12ed70157f18db9a3a4e9b10857d3a66b693950 \ No newline at end of file +66e1cbf46da62821fb97f857fd275ad1d6f494e8b5ef6a1fb2cbe7bc05e94b94 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 index aa90fac..f7a7b0a 100644 --- a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 @@ -1 +1 @@ -96f1a9709afd4771358c28da9c2443f5a7cc8c6c28b455eb5dc7b9b0e8dcf5fc2f8b2bad76b802ad5af7fecb76f7b3cd580083adb79028a1413761a28e6368a3 \ No newline at end of file +d84c337a857429c67c667ae7e86b20397f4b6188e109a23e751c6fb200a202f3175de0ed1cbd61007425ed4c18ae81cd54ba026f4e3ef61b6093b7883b9b865e \ No newline at end of file diff --git a/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java index c47ae0e..6989bb8 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java @@ -27,7 +27,7 @@ public class WKChannelExtras { // 是否被拉入黑名单 public final static String beBlacklist = "be_blacklist"; // 是否允许新成员查看历史消息 - public final static String allowNewMemberViewHistoryMsg = "allow_new_member_view_history_msg"; + public final static String allowViewHistoryMsg = "allow_view_history_msg"; // 群类型 public final static String groupType = "group_type"; } diff --git a/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java index 63a9785..1a33c67 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java @@ -153,7 +153,7 @@ public class MessageHandler { //是否只同步一次 int sync_once = WKTypeUtils.getInstance().getBit(lastMsgBytes[0], 2); WKLoggerUtils.getInstance().e("是否不存储:" + no_persist + "是否显示红点:" + red_dot + "是否只同步一次:" + sync_once); - WKLoggerUtils.getInstance().e("消息类型" + packetType); + WKLoggerUtils.getInstance().e("消息包类型" + packetType); if (packetType == WKMsgType.PONG) { //心跳ack mIReceivedMsgListener.heartbeatMsg(new WKPongMsg()); @@ -312,14 +312,16 @@ public class MessageHandler { */ public synchronized void saveSyncMsg(List list) { List saveMsgList = new ArrayList<>(); + List allList = new ArrayList<>(); for (WKSyncMsg mMsg : list) { if (mMsg.no_persist == 0 && mMsg.sync_once == 0) { saveMsgList.add(mMsg.wkMsg); } + allList.add(mMsg.wkMsg); } MsgDbManager.getInstance().insertMsgList1(saveMsgList); //将消息push给UI - WKIM.getInstance().getMsgManager().pushNewMsg(saveMsgList); + WKIM.getInstance().getMsgManager().pushNewMsg(allList); groupMsg(list); }