Merge pull request #79 from JauneQ/main

update core sdk to 3.8.2

Author: JauneQ

OpenIM-SDK/build.gradle

@@ -52,8 +52,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
     implementation 'androidx.annotation:annotation:1.6.0'
 
-    compileOnly fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     compileOnly 'com.google.code.gson:gson:2.9.1'
-    compileOnly 'io.openim:core-sdk:3.5.1@aar'
+    implementation 'io.openim:core-sdk:3.8.2'
 
 }

OpenIM-SDK/src/main/java/io/openim/android/sdk/listener/OnConnListener.java

@@ -11,7 +11,7 @@ public interface OnConnListener {
      * 连接服务器失败
      * 可以提示用户当前网络连接不可用
      */
-    default void onConnectFailed(long code, String error){}
+    default void onConnectFailed(int code, String error){}
 
     /**
      * 已经成功连接到服务器

OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationReq.java

@@ -28,10 +28,6 @@ public class ConversationReq {
      * 是否置顶，1置顶
      */
     private Boolean isPinned;
-    /**
-     *
-     */
-    private String attachedInfo;
     /**
      * 是否开启私聊
      */
@@ -44,26 +40,10 @@ public class ConversationReq {
      * 阅读时长 s，即超过了burnDuration秒触发销毁
      */
     private Integer burnDuration;
-    /**
-     *
-     */
-    private Long minSeq;
-    /**
-     *
-     */
-    private Long maxSeq;
     /**
      * 强提示 如at消息，公告 {@link io.openim.android.sdk.enums.GroupAtType}
      */
     private Integer groupAtType;
-    /**
-     *  定期删除时间
-     */
-    private Long msgDestructTime;
-    /**
-     *  开启定期删除时间
-     */
-    private Boolean isMsgDestruct;
 
     public String getConversationID() {
         return conversationID;
@@ -97,22 +77,6 @@ public void setEx(String ex) {
         this.ex = ex;
     }
 
-    public String getAttachedInfo() {
-        return attachedInfo;
-    }
-
-    protected void setAttachedInfo(String attachedInfo) {
-        this.attachedInfo = attachedInfo;
-    }
-
-    public Boolean getMsgDestruct() {
-        return isMsgDestruct;
-    }
-
-    protected void setMsgDestruct(boolean msgDestruct) {
-        isMsgDestruct = msgDestruct;
-    }
-
     public Boolean getPrivateChat() {
         return isPrivateChat;
     }
@@ -160,28 +124,4 @@ public Integer getGroupAtType() {
     public void setGroupAtType(int groupAtType) {
         this.groupAtType = groupAtType;
     }
-
-    public Long getMinSeq() {
-        return minSeq;
-    }
-
-    protected void setMinSeq(long minSeq) {
-        this.minSeq = minSeq;
-    }
-
-    public Long getMaxSeq() {
-        return maxSeq;
-    }
-
-    protected void setMaxSeq(long maxSeq) {
-        this.maxSeq = maxSeq;
-    }
-
-    public Long getMsgDestructTime() {
-        return msgDestructTime;
-    }
-
-    protected void setMsgDestructTime(long msgDestructTime) {
-        this.msgDestructTime = msgDestructTime;
-    }
 }

OpenIM-SDK/src/main/java/io/openim/android/sdk/models/UserInfo.java

@@ -123,7 +123,7 @@ public void setFaceURL(String faceURL) {
         this.faceURL = faceURL;
     }
 
-    public int getGender() {
+    public Integer getGender() {
         if ((isFriendship())) {
             return friendInfo.getGender();
         } else if (isBlacklist()) {
@@ -149,7 +149,7 @@ public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
-    public long getBirth() {
+    public Long getBirth() {
         if ((isFriendship())) {
             return friendInfo.getBirth();
         }
@@ -239,47 +239,47 @@ public boolean isFriendship() {
         return null != friendInfo;
     }
 
-    public int getGlobalRecvMsgOpt() {
+    public Integer getGlobalRecvMsgOpt() {
         return globalRecvMsgOpt;
     }
 
     public void setGlobalRecvMsgOpt(int globalRecvMsgOpt) {
         this.globalRecvMsgOpt = globalRecvMsgOpt;
     }
 
-    public int getAllowAddFriend() {
+    public Integer getAllowAddFriend() {
         return allowAddFriend;
     }
 
     public void setAllowAddFriend(int allowAddFriend) {
         this.allowAddFriend = allowAddFriend;
     }
 
-    public int getAllowBeep() {
+    public Integer getAllowBeep() {
         return allowBeep;
     }
 
     public void setAllowBeep(int allowBeep) {
         this.allowBeep = allowBeep;
     }
 
-    public int getAllowVibration() {
+    public Integer getAllowVibration() {
         return allowVibration;
     }
 
     public void setAllowVibration(int allowVibration) {
         this.allowVibration = allowVibration;
     }
 
-    public int getForbidden() {
+    public Integer getForbidden() {
         return forbidden;
     }
 
     public void setForbidden(int forbidden) {
         this.forbidden = forbidden;
     }
 
-    public long getCreateTime() {
+    public Long getCreateTime() {
         return createTime;
     }