Merge branch 'fix/sendGroupMsg' into 'master'

feat:Support for excluding group messages from unread counts.

See merge request public-server/server-sdk-java!31

Author: rchht

.gitignore

@@ -13,3 +13,4 @@ src/com.fcloud.connectmanager/build.xml
 .fuse*
 src/out/
 *.pyc
+.DS_Store

README-CN.md

@@ -11,12 +11,12 @@ RongCloud IM Server SDK in Java.
     <dependency>
         <groupId>cn.rongcloud.im</groupId>
         <artifactId>server-sdk-java</artifactId>
-        <version>4.0.9</version>
+        <version>4.0.10</version>
     </dependency>
 ```
    * Gradle
 ```
-    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.9'
+    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.10'
    
 ```
    * 基于源码 Meavn 打包构建

README.md

@@ -10,12 +10,12 @@ RongCloud IM Server SDK in Java.
     <dependency>
         <groupId>cn.rongcloud.im</groupId>
         <artifactId>server-sdk-java</artifactId>
-        <version>4.0.9</version>
+        <version>4.0.10</version>
     </dependency>
 ```
 * Gradle
 ```
-    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.9'
+    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.10'
 ```
 * Build from source
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.rongcloud.im</groupId>
     <artifactId>server-sdk-java</artifactId>
-    <version>4.0.9</version>
+    <version>4.0.10</version>
     <packaging>jar</packaging>
     <name>RongCloud IM Server SDK</name>
     <description>

src/main/java/io/rong/methods/message/group/Group.java

@@ -123,6 +123,10 @@ public MessageResult send(GroupMessage message) throws Exception {
             sb.append("&needReadReceipt=").append(message.getNeedReadReceipt());
         }
 
+        if (message.getIsCounted() != null) {
+            sb.append("&isCounted=").append(URLEncoder.encode(message.getIsCounted().toString(), UTF8));
+        }
+
         if (message.getToUserId() != null && message.getToUserId().length > 0) {
             for (int i = 0; i < message.getToUserId().length; i++) {
                 String toId = message.getToUserId()[i];

src/main/java/io/rong/models/message/GroupMessage.java

@@ -61,6 +61,10 @@ public class GroupMessage extends MessageModel {
      */
     public Integer needReadReceipt;
 
+    /**
+     * When a new custom message is introduced in the current version and the older version does not support it, this parameter determines whether the older client counts the message as unread. 0 means not counted, 1 means counted. Default is 1, increasing the unread message count by 1. (Optional)
+     */
+    public Integer isCounted;
 
     public GroupMessage() {
     }
@@ -280,4 +284,13 @@ public GroupMessage setNeedReadReceipt(Integer needReadReceipt) {
         this.needReadReceipt = needReadReceipt;
         return this;
     }
+
+    public Integer getIsCounted() {
+        return isCounted;
+    }
+
+    public GroupMessage setIsCounted(Integer isCounted) {
+        this.isCounted = isCounted;
+        return this;
+    }
 }

src/test/java/io/rong/example/Example.java

@@ -634,6 +634,7 @@ public void testSendGroup() throws Exception {
                 .setPushExt("{\"forceShowPushContent\":0,\"title\":\"11234\", \"pushId\":\"\",\"pushConfigs\": [{ \"HW\": {\"channelId\": \"NotificationKanong\"}},{\"MI\": {\"channelId\": \"rongcloud_kanong\"}},{\"OPPO\": {\"channelId\": \"rc_notification_id\"}}, {\"VIVO\" : {\"classification\": \"0\"}}, {\"APNs\": {\"thread-id\": \"1\",\"apns-collapse-id\":\"1\"}}]}")
 //            .setPushExt(pe)
                 .setIsPersisted(0)
+                .setIsCounted(0)
                 .setIsIncludeSender(0)
                 .setContentAvailable(0)
                 .setNeedReadReceipt(1);