Refactor code

pkg/common/constant/constant.go

@@ -46,35 +46,27 @@ const (
 
 	//SysRelated
 
-	FriendApplicationApprovedNotification = 1201
-	FriendApplicationRejectedNotification = 1202
-	FriendApplicationAddedNotification    = 1203 //AddFriendTip               = 202
+	FriendApplicationApprovedNotification = 1201 //add_friend_response
+	FriendApplicationRejectedNotification = 1202 //add_friend_response
+	FriendApplicationNotification         = 1203 //add_friend
 	FriendAddedNotification               = 1204
-	FriendDeletedNotification             = 1205
-	FriendInfoChangedNotification         = 1206
-	BlackAddedNotification                = 1207
-	BlackDeletedNotification              = 1208
+	FriendDeletedNotification             = 1205 //delete_friend
+	FriendRemarkSetNotification           = 1206 //set_friend_remark?
+	BlackAddedNotification                = 1207 //add_black
+	BlackDeletedNotification              = 1208 //remove_black
 
 	SelfInfoUpdatedNotification = 1303 //SetSelfInfoTip             = 204
 
 	GroupCreatedNotification             = 1501
-	MemberInfoSetNotification            = 1501
-	JoinGroupApplicationNotification     = 1501
-	MemberQuitNotification               = 1501
-	GroupApplicationAcceptedNotification = 1501
-	GroupApplicationRejectedNotification = 1501
-	GroupOwnerTransferredNotification    = 1501
-	MemberKickedNotification             = 1501
-	MemberInvitedNotification            = 1501
-
-	//GroupCreatedNotification         = 1501
-	//JoinApplicationNotification      = 1502
-	//ApplicationProcessedNotification = 1503
-	//MemberInvitedNotification        = 1504
-	//MemberKickedNotification         = 1505
-	//GroupInfoChangedNotification     = 1506
-	//MemberLeaveNotification          = 1507
-	//MemberEnterNotification          = 1508
+	GroupInfoSetNotification             = 1502
+	JoinGroupApplicationNotification     = 1503
+	MemberQuitNotification               = 1504
+	GroupApplicationAcceptedNotification = 1505
+	GroupApplicationRejectedNotification = 1506
+	GroupOwnerTransferredNotification    = 1507
+	MemberKickedNotification             = 1508
+	MemberInvitedNotification            = 1509
+	MemberEnterNotification              = 1510
 
 	//MsgFrom
 	UserMsgType = 100
@@ -140,6 +132,9 @@ const (
 	GroupResponseAgree  = 1
 	GroupResponseRefuse = -1
 
+	FriendResponseAgree  = 1
+	FriendResponseRefuse = -1
+
 	Male   = 1
 	Female = 2
 )

pkg/proto/sdk_ws/ws.proto

@@ -228,13 +228,14 @@ message TipsComm{
 //	OnGroupCreated()
 message GroupCreatedTips{
   GroupInfo group = 1;
-  GroupMemberFullInfo creator = 2;
+  GroupMemberFullInfo opUser = 2;
   repeated GroupMemberFullInfo memberList = 3;
   int64 operationTime = 4;
+  GroupMemberFullInfo groupOwnerUser = 5;
 }
 
 //	OnGroupInfoSet()
-message MemberInfoSetTips{
+message GroupInfoSetTips{
   GroupMemberFullInfo opUser = 1; //who do this
   int64 muteTime = 2;
   GroupInfo group = 3;
@@ -244,7 +245,7 @@ message MemberInfoSetTips{
 message JoinGroupApplicationTips{
   GroupInfo group = 1;
   PublicUserInfo applicant = 2;
-  string  reason = 3;
+  string  reqMsg = 3;
 }
 
 //	OnQuitGroup()
@@ -296,29 +297,10 @@ message MemberInvitedTips{
 }
 
 //Actively join the group
-//message MemberEnterTips{
-//  GroupInfo group = 1;
-//  GroupMemberFullInfo entrantUser = 2;
-//  int64 operationTime = 3;
-//}
-
-
-
-
-
-
-
-
-message GroupInfoChangedTips{
-  int32 changedType = 1; //bitwise operators: 0001:groupName; 0010:Notification  0100:Introduction; 1000:FaceUrl
-  GroupInfo group = 2;
-  GroupMemberFullInfo opUser = 3;
-}
-
-message JoinGroupApplicationTips{
+message MemberEnterTips{
   GroupInfo group = 1;
-  PublicUserInfo applicant = 2;
-  string  reason = 3;
+  GroupMemberFullInfo entrantUser = 2;
+  int64 operationTime = 3;
 }
 
 
@@ -326,6 +308,11 @@ message JoinGroupApplicationTips{
 
 
 
+
+
+
+
+
 //////////////////////friend/////////////////////
 //message FriendInfo{
 //  UserInfo OwnerUser = 1;
@@ -351,11 +338,18 @@ message FriendApplicationAddedTips{
 }
 
 //FromUserID accept or reject ToUserID
-message FriendApplicationProcessedTips{
+message FriendApplicationApprovedTips{
   FromToUserID fromToUserID = 1;
-  int32 handleResult = 2;
+  string handleMsg = 2;
 }
 
+//FromUserID accept or reject ToUserID
+message FriendApplicationRejectedTips{
+  FromToUserID fromToUserID = 1;
+   string handleMsg = 2;
+}
+
+
 // FromUserID  Added a friend ToUserID
 message FriendAddedTips{
   FriendInfo friend = 1;