group member和friend request中添加extra字段

common/src/main/java/cn/wildfirechat/common/ErrorCode.java

@@ -40,7 +40,8 @@ public enum ErrorCode {
 
     ERROR_CODE_ALREADY_FRIENDS(23, "already friends"),
 
-    ERROR_CODE_RECALL_TIME_EXPIRED(24, "recall time expired"),
+    ERROR_CODE_RECALL_TIME_EXPIRED(24, "time expired"),
+    ERROR_CODE_CONFERENCE_ROOM_NOT_EXIST(60, "conference room not exist"),
 
     ERROR_CODE_API_NOT_SIGNED(239, "api not signed or sign parameter not completion"),
     ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT(240, "group exceed max member count"),

common/src/main/java/cn/wildfirechat/pojos/InputAddGroupMember.java

@@ -47,6 +47,9 @@ public class InputAddGroupMember extends InputGroupBase {
                 groupMemberBuilder.setAlias(pojoGroupMember.getAlias());
             }
             groupMemberBuilder.setType(pojoGroupMember.getType());
+            if(!StringUtil.isNullOrEmpty(pojoGroupMember.getExtra())) {
+                groupMemberBuilder.setExtra(pojoGroupMember.getExtra());
+            }
             addGroupBuilder.addAddedMember(groupMemberBuilder);
         }
 

common/src/main/java/cn/wildfirechat/pojos/InputCreateGroup.java

@@ -67,6 +67,9 @@ public class InputCreateGroup extends InputGroupBase {
                 groupMemberBuilder.setAlias(pojoGroupMember.getAlias());
             }
             groupMemberBuilder.setType(pojoGroupMember.getType());
+            if(!StringUtil.isNullOrEmpty(pojoGroupMember.getExtra())) {
+                groupMemberBuilder.setExtra(pojoGroupMember.extra);
+            }
             groupBuilder.addMembers(groupMemberBuilder);
         }
 

common/src/main/java/cn/wildfirechat/pojos/PojoGroupMember.java

@@ -12,6 +12,7 @@ public class PojoGroupMember {
     String member_id;
     String alias;
     int type;
+    String extra;
 
     public String getMember_id() {
         return member_id;
@@ -36,4 +37,12 @@ public class PojoGroupMember {
     public void setType(int type) {
         this.type = type;
     }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
 }

common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java

@@ -94,6 +94,10 @@ public class ProtoConstants {
         int Modify_Group_JoinType = 4;
         int Modify_Group_PrivateChat = 5;
         int Modify_Group_Searchable = 6;
+        //仅专业版支持
+        int Modify_Group_History_Message = 7;
+        //仅专业版的server api支持
+        int Modify_Group_Max_Member_Count = 8;
     }
 
     //ModifyGroupInfoRequest -> type