Merge branch 'private_beta'

# Conflicts: # OpenIM-SDK/libs/v3.5.1-alpha.5-e-v1.1.4.aar
openimsdk · Jan 25, 2024 · 7fc6b97 · 7fc6b97
2 parents 05ec9b9 + 5df0633
commit 7fc6b97
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/MessageManager.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/MessageManager.java
@@ -125,6 +125,7 @@ public void insertGroupMessageToLocalStorage(OnBase<String> base, Message messag
      * @param clientMsgIDs   消息ids
      * @param callBack
      */
+    @Deprecated
     public void markMessagesAsReadByMsgID(String conversationID, List<String> clientMsgIDs, OnBase<String> callBack) {
         Open_im_sdk.markMessagesAsReadByMsgID(BaseImpl.stringBase(callBack), ParamsUtil.buildOperationID(), conversationID, JsonUtil.toString(clientMsgIDs));
     }

diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtTextElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtTextElem.java
@@ -19,6 +19,10 @@ public class AtTextElem {
      * 自己是否被@了
      */
     private boolean isAtSelf;
+    /**
+     * 引用消息
+     */
+    private Message quoteMessage;
 
 
     public String getText() {
@@ -44,4 +48,12 @@ public boolean isAtSelf() {
     public void setAtSelf(boolean atSelf) {
         isAtSelf = atSelf;
     }
+
+    public Message getQuoteMessage() {
+        return quoteMessage;
+    }
+
+    public void setQuoteMessage(Message quoteMessage) {
+        this.quoteMessage = quoteMessage;
+    }
 }