Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

4 years ago · 1d0ca5f11e
parent d22935703d 34695f2aa3
commit 1d0ca5f11e
1 changed files with 11 additions and 5 deletions
--- a/pkg/common/constant/constant.go
+++ b/pkg/common/constant/constant.go
@ -54,10 +54,16 @@ const (
 	FriendRemarkSetNotification           = 1206 //set_friend_remark?
 	BlackAddedNotification                = 1207 //add_black
 	BlackDeletedNotification              = 1208 //remove_black
+	ConversationOptChangeNotification     = 1300 // change conversation opt

+	UserNotificationBegin       = 1301
 	UserInfoUpdatedNotification = 1303 //SetSelfInfoTip             = 204
+	ConversationNotification    = 1307
+	ConversationNotNotification = 1308
+	ConversationDefault         = 0
+	UserNotificationEnd         = 1399

-	ConversationOptChangeNotification    = 1300 // change conversation opt
+	GroupNotificationBegin = 1500

 	GroupCreatedNotification             = 1501
 	GroupInfoSetNotification             = 1502