Merge pull request #57 from JauneQ/main

solve the problem of audio/video calling and update sdk to v3.8.3

Author: JauneQ

Demo/app/build.gradle

@@ -39,7 +39,7 @@ android {
         }
         //getui
         manifestPlaceholders = [
-            GETUI_APPID    : "8JYSAjPH0qAF8lPJXWR3J9",
+            GETUI_APPID    : "",
             XIAOMI_APP_ID  : "",
             XIAOMI_APP_KEY : "",
             MEIZU_APP_ID   : "",
@@ -49,7 +49,6 @@ android {
             OPPO_APP_SECRET: "",
             VIVO_APP_ID    : "",
             VIVO_APP_KEY   : "",
-            // 荣耀相关应用参数
             HONOR_APP_ID   : "",
         ]
     }

Demo/build.gradle

@@ -20,8 +20,8 @@ buildscript {
             coroutines        : "1.6.0",
             lint              : "30.0.1",
             protobuf          : "3.22.0",
-            android_sdk       : "3.8.1.2",
-            android_sdk_core  : "3.8.2",
+            android_sdk       : "3.8.3",
+            android_sdk_core  : "3.8.3",
         ]
         generated = [
             protoSrc: "$projectDir/protocol",

OUIKit/OUICalling/src/main/java/io/openim/android/ouicalling/vm/CallingVM.java

@@ -142,33 +142,28 @@ public void onSuccess(Message data) {
     };
 
     public void signalingInvite(SignalingInfo signalingInfo) {
-        if (isGroup) {
-            //TODO
-        } else {
-            sendSignaling(Constants.MsgType.callingInvite, signalingInfo, new OnMsgSendCallback() {
-                @Override
-                public void onSuccess(Message s) {
-                    getTokenAndConnectRoom(signalingInfo, new OnBase<SignalingCertificate>() {
-                        @Override
-                        public void onSuccess(SignalingCertificate data) {
-                            connectToRoom(data);
-                        }
-                    });
-                }
-            });
-        }
+        sendSignaling(Constants.MsgType.callingInvite, signalingInfo, new OnMsgSendCallback() {
+            @Override
+            public void onSuccess(Message s) {
+                getTokenAndConnectRoom(signalingInfo, new OnBase<SignalingCertificate>() {
+                    @Override
+                    public void onSuccess(SignalingCertificate data) {
+                        connectToRoom(data);
+                    }
+                });
+            }
+        });
     }
 
     private void sendSignaling(int code, SignalingInfo signalingInfo, OnMsgSendCallback onMsgSendCallback) {
         HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("customType", code);
-        hashMap.put("data", GsonHel.toJson(signalingInfo.getInvitation()));
+        hashMap.put(Constants.K_CUSTOM_TYPE, code);
+        hashMap.put(Constants.K_DATA, signalingInfo.getInvitation());
         Message message = OpenIMClient.getInstance().messageManager.createCustomMessage(GsonHel.toJson(hashMap), "", "");
 
         List<String> uidList = signalingInfo.getInvitation().getInviteeUserIDList();
         if (null != message && !uidList.isEmpty()) {
             String recvUid = signalingInfo.getInvitation().getInviterUserID().equals(BaseApp.inst().loginCertificate.userID) ? signalingInfo.getInvitation().getInviteeUserIDList().get(0) : signalingInfo.getInvitation().getInviterUserID();
-
             OpenIMClient.getInstance().messageManager.sendMessage(onMsgSendCallback, message, recvUid, null, new OfflinePushInfo(), true);
         }
     }

OUIKit/OUIConversation/src/main/java/io/openim/android/ouiconversation/vm/ChatVM.java

@@ -64,6 +64,7 @@
 import io.openim.android.sdk.enums.MessageStatus;
 import io.openim.android.sdk.enums.MessageType;
 import io.openim.android.sdk.enums.Platform;
+import io.openim.android.sdk.enums.ViewType;
 import io.openim.android.sdk.listener.OnAdvanceMsgListener;
 import io.openim.android.sdk.listener.OnBase;
 import io.openim.android.sdk.listener.OnConversationListener;
@@ -589,7 +590,7 @@ public void onError(int code, String error) {
             public void onSuccess(AdvancedMessage data) {
                 handleMessage(data.getMessageList(), false);
             }
-        }, conversationID, startMsg, count);
+        }, conversationID, startMsg, count, ViewType.History);
     }
 
     private final List<Message> fullMessages = new ArrayList<>();
@@ -614,7 +615,7 @@ public void onSuccess(AdvancedMessage data) {
                     fullMessages.clear();
                 }
             }
-        }, conversationID, startMsg, count);
+        }, conversationID, startMsg, count, ViewType.History);
     }
 
     private void handleMessage(List<Message> data, boolean isReverse) {
@@ -830,7 +831,7 @@ public void onRecvGroupMessageReadReceipt(GroupMessageReceipt receipt) {
                     hasReadInfo.setHasReadCount(messageReadInfo.getHasReadCount());
                     hasReadInfo.setUnreadCount(messageReadInfo.getUnreadCount());
                     Log.d(TAG, "onRecvGroupMessageReadReceipt unread:" + messageReadInfo.getUnreadCount() +
-                         ",read:" + messageReadInfo.getHasReadCount() + ",msgid:" + message.getClientMsgID() + "groupid:" + message.getGroupID() +
+                        ",read:" + messageReadInfo.getHasReadCount() + ",msgid:" + message.getClientMsgID() + "groupid:" + message.getGroupID() +
                         ", recvid:" + message.getRecvID() + ",nickname:" + message.getSenderNickname());
                     messageAdapter.notifyItemChanged(index);
                 }
@@ -1055,7 +1056,7 @@ public void onSuccess(AdvancedMessage data) {
                 handleMessage(messageList, true);
             }
 
-        }, conversationID, startMsg, count * 80);
+        }, conversationID, startMsg, count * 80, ViewType.History);
     }