WuKongIM/WuKongIMAndroidSDK
1
0
Fork 0
mirror of https://github.com/WuKongIM/WuKongIMAndroidSDK synced 2025-06-05 00:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:修改获取频道资料卡的问题

Browse Source
This commit is contained in:
SL 2025-01-14 15:52:12 +08:00
parent 25caa7a067
commit 35b2d6c019
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wkim/src/main/java/com/xinbida/wukongim/manager/ChannelManager.java
View File

@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* 5/20/21 5:49 PM
@ -43,7 +44,7 @@ public class ChannelManager extends BaseManager {
private IRefreshChannelAvatar iRefreshChannelAvatar;
private IGetChannelInfo iGetChannelInfo;
private final List<WKChannel> wkChannelList = Collections.synchronizedList(new ArrayList<>());
private final CopyOnWriteArrayList<WKChannel> wkChannelList = new CopyOnWriteArrayList<>();
//监听刷新频道
private ConcurrentHashMap<String, IRefreshChannel> refreshChannelMap;

5
wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java
View File

@ -24,6 +24,7 @@ import com.xinbida.wukongim.interfaces.ISyncConversationChat;
import com.xinbida.wukongim.interfaces.ISyncConversationChatBack;
import com.xinbida.wukongim.message.type.WKConnectStatus;
import com.xinbida.wukongim.message.type.WKMsgContentType;
import com.xinbida.wukongim.utils.DispatchQueuePool;
import com.xinbida.wukongim.utils.WKCommonUtils;
import com.xinbida.wukongim.utils.WKLoggerUtils;
@ -41,6 +42,8 @@ import java.util.concurrent.ConcurrentHashMap;
* 最近会话管理
*/
public class ConversationManager extends BaseManager {
private final DispatchQueuePool dispatchQueuePool = new DispatchQueuePool(3);
private final String TAG = "ConversationManager";
private ConversationManager() {
@ -238,7 +241,7 @@ public class ConversationManager extends BaseManager {
long version = ConversationDbManager.getInstance().queryMaxVersion();
String lastMsgSeqStr = ConversationDbManager.getInstance().queryLastMsgSeqs();
runOnMainThread(() -> iSyncConversationChat.syncConversationChat(lastMsgSeqStr, 20, version, syncChat -> {
new Thread(() -> saveSyncChat(syncChat, () -> iSyncConversationChatBack.onBack(syncChat))).start();
dispatchQueuePool.execute(() -> saveSyncChat(syncChat, () -> iSyncConversationChatBack.onBack(syncChat)));
}));
}
}

9
wkim/src/main/java/com/xinbida/wukongim/message/WKProto.java
View File

@ -220,11 +220,6 @@ class WKProto {
receivedMsg.topicID = wkRead.readString();
}
String content = wkRead.readPayload();
<<<<<<< HEAD
=======
WKLoggerUtils.getInstance().e(TAG, "消息payload:" + content);
receivedMsg.payload = CryptoUtils.getInstance().aesDecrypt(CryptoUtils.getInstance().base64Decode(content));
>>>>>>> 9978523a9a818731b66c2409ff4c0cba70fab46f
String msgKey = receivedMsg.messageID
+ receivedMsg.messageSeq
+ receivedMsg.clientMsgNo
@ -239,13 +234,13 @@ class WKProto {
}
String base64Result = CryptoUtils.getInstance().base64Encode(result);
String localMsgKey = CryptoUtils.getInstance().digestMD5(base64Result);
WKLoggerUtils.getInstance().e("Receive message:");
WKLoggerUtils.getInstance().e(receivedMsg.toString());
if (!localMsgKey.equals(receivedMsg.msgKey)) {
WKLoggerUtils.getInstance().e("Illegal messages,localMsgKey:" + localMsgKey + ",msgKey:" + msgKey);
return null;
}
receivedMsg.payload = CryptoUtils.getInstance().aesDecrypt(CryptoUtils.getInstance().base64Decode(content));
WKLoggerUtils.getInstance().e("Receive message:");
WKLoggerUtils.getInstance().e(receivedMsg.toString());
} catch (IOException e) {
WKLoggerUtils.getInstance().e(TAG, "deReceivedMsg Decoding received message error");
}

10
wkim/src/main/java/com/xinbida/wukongim/utils/CryptoUtils.java
View File

@ -102,12 +102,8 @@ public class CryptoUtils {
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
InvalidAlgorithmParameterException | IllegalBlockSizeException |
BadPaddingException e) {
<<<<<<< HEAD
WKLoggerUtils.getInstance().e(TAG,"aesEncrypt encrypt error");
return null;
=======
WKLoggerUtils.getInstance().e(TAG, "aesEncrypt encrypt error");
>>>>>>> 9978523a9a818731b66c2409ff4c0cba70fab46f
WKLoggerUtils.getInstance().e(TAG,"aesEncrypt encrypt error");
return null;
}
if (encrypted == null) {
WKLoggerUtils.getInstance().e(TAG, "aesEncrypt The encrypted data is empty");
@ -143,7 +139,7 @@ public class CryptoUtils {
public byte[] base64Decode(String data) {
return Base64.decode(data, Base64.NO_WRAP);
return Base64.decode(data, Base64.NO_WRAP);
}
/**