Browse Source

1, 更新协议栈
2,添加错误码枚举值

heavyrain.lee 4 years ago
parent
commit
7f1ad12117

+ 4 - 0
wfclient/WFChatClient.xcodeproj/project.pbxproj

@@ -100,6 +100,7 @@
 		2FB87C70243EF0FE0078A199 /* WFCCFriendAddedMessageContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FB87C6C243EF0FE0078A199 /* WFCCFriendAddedMessageContent.m */; };
 		2FD9513D243ACF3600EE4F60 /* WFCCPCOnlineInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FD9513B243ACF3600EE4F60 /* WFCCPCOnlineInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2FD9513E243ACF3600EE4F60 /* WFCCPCOnlineInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FD9513C243ACF3600EE4F60 /* WFCCPCOnlineInfo.m */; };
+		2FDEEFD024A49C690032428A /* WFCCEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FDEEFCF24A49BA20032428A /* WFCCEnums.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2FEF332621BE93980087B6C2 /* WFCCChannelInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FEF332421BE93980087B6C2 /* WFCCChannelInfo.m */; };
 		2FEF332721BE93980087B6C2 /* WFCCChannelInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FEF332521BE93980087B6C2 /* WFCCChannelInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2FF2A45D22C4DBD1006A6D4C /* WFCCGroupMuteNotificationContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FF2A45B22C4DBD1006A6D4C /* WFCCGroupMuteNotificationContent.m */; };
@@ -231,6 +232,7 @@
 		2FB87C6C243EF0FE0078A199 /* WFCCFriendAddedMessageContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WFCCFriendAddedMessageContent.m; sourceTree = "<group>"; };
 		2FD9513B243ACF3600EE4F60 /* WFCCPCOnlineInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WFCCPCOnlineInfo.h; sourceTree = "<group>"; };
 		2FD9513C243ACF3600EE4F60 /* WFCCPCOnlineInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WFCCPCOnlineInfo.m; sourceTree = "<group>"; };
+		2FDEEFCF24A49BA20032428A /* WFCCEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WFCCEnums.h; sourceTree = "<group>"; };
 		2FEF332421BE93980087B6C2 /* WFCCChannelInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WFCCChannelInfo.m; sourceTree = "<group>"; };
 		2FEF332521BE93980087B6C2 /* WFCCChannelInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WFCCChannelInfo.h; sourceTree = "<group>"; };
 		2FF2A45B22C4DBD1006A6D4C /* WFCCGroupMuteNotificationContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WFCCGroupMuteNotificationContent.m; sourceTree = "<group>"; };
@@ -426,6 +428,7 @@
 			children = (
 				2E6B50E61FAE9B10006B6E31 /* WFCCUtilities.h */,
 				2E6B50E71FAE9B10006B6E31 /* WFCCUtilities.m */,
+				2FDEEFCF24A49BA20032428A /* WFCCEnums.h */,
 			);
 			path = Utility;
 			sourceTree = "<group>";
@@ -507,6 +510,7 @@
 				2B63367A2470DB7E008D6B38 /* WFCCReadReport.h in Headers */,
 				90D1F597208D65B500C2A9CA /* WFCCCallStartMessageContent.h in Headers */,
 				2B6336762470DAB2008D6B38 /* WFCCDeliveryReport.h in Headers */,
+				2FDEEFD024A49C690032428A /* WFCCEnums.h in Headers */,
 				2F77099E2453DCB10020DB77 /* WFCCThingsLostEventContent.h in Headers */,
 				2FF2A46122C4DDF5006A6D4C /* WFCCGroupPrivateChatNotificationContent.h in Headers */,
 				2E6B51131FAE9B10006B6E31 /* WFCCConversation.h in Headers */,

+ 100 - 0
wfclient/WFChatClient/Utility/WFCCEnums.h

@@ -0,0 +1,100 @@
+//
+//  WFCCEnums.h
+//  WFChatClient
+//
+//  Created by Heavyrian Lee on 2020/6/25.
+//  Copyright © 2020 WildFireChat. All rights reserved.
+//
+
+#ifndef WFCCEnums_h
+#define WFCCEnums_h
+
+typedef NS_ENUM(NSInteger, WFCCErrorCode) {
+    //0~255 server error
+    ERROR_CODE_SUCCESS = 0,  // //"success"),
+    ERROR_CODE_SECRECT_KEY_MISMATCH = 1,  //"secrect key mismatch"),
+    ERROR_CODE_INVALID_DATA = 2,  //"invalid data"),
+    ERROR_CODE_NODE_NOT_EXIST = 3,  //"node not exist"),
+    ERROR_CODE_SERVER_ERROR = 4,  //"server error"),
+    ERROR_CODE_NOT_MODIFIED = 5,  //"not modified"),
+
+    //Auth error
+    ERROR_CODE_TOKEN_ERROR = 6,  //"token error"),
+    ERROR_CODE_USER_FORBIDDEN = 8,  //"user forbidden"),
+
+    //Message error
+    ERROR_CODE_NOT_IN_GROUP = 9,  //"not in group"),
+    ERROR_CODE_INVALID_MESSAGE = 10,  //"invalid message"),
+
+    //Group error
+    ERROR_CODE_GROUP_ALREADY_EXIST = 11,  //"group aleady exist"),
+
+
+    //user error
+    ERROR_CODE_PASSWORD_INCORRECT = 15,  //"password incorrect"),
+
+    //user error
+    ERROR_CODE_FRIEND_ALREADY_REQUEST = 16,  //"already send request"),
+    ERROR_CODE_FRIEND_REQUEST_BLOCKED = 18,  //"friend request blocked"),
+    ERROR_CODE_FRIEND_REQUEST_EXPIRED = 19,  //"friend request expired"),
+
+    ERROR_CODE_NOT_IN_CHATROOM = 20,  //"not in chatroom"),
+
+    ERROR_CODE_NOT_IN_CHANNEL = 21,  //"not in channel"),
+
+    ERROR_CODE_NOT_LICENSED = 22,  //"not licensed"),
+    ERROR_CODE_ALREADY_FRIENDS = 23,  //"already friends"),
+
+    ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT = 240,  //"group exceed max member count"),
+    ERROR_CODE_GROUP_MUTED = 241,  //"group is muted"),
+    ERROR_CODE_SENSITIVE_MATCHED = 242,  //"sensitive matched"),
+    ERROR_CODE_SIGN_EXPIRED = 243,  //"sign expired"),
+    ERROR_CODE_AUTH_FAILURE = 244,  //"auth failure"),
+    ERROR_CODE_CLIENT_COUNT_OUT_OF_LIMIT = 245,  //"client count out of limit"),
+    ERROR_CODE_IN_BLACK_LIST = 246,  //"user in balck list"),
+    ERROR_CODE_FORBIDDEN_SEND_MSG = 247,  //"forbidden send msg globally"),
+    ERROR_CODE_NOT_RIGHT = 248,  //"no right to operate"),
+    ERROR_CODE_TIMEOUT = 249,  //"timeout"),
+    ERROR_CODE_OVER_FREQUENCY = 250,  //"over frequency"),
+    ERROR_CODE_INVALID_PARAMETER = 251,  //"Invalid parameter"),
+    ERROR_CODE_NOT_EXIST = 253,  //"not exist"),
+    ERROR_CODE_NOT_IMPLEMENT = 254,  //"not implement"),
+
+    //负值为mars返回错误
+    ERROR_CODE_Local_TaskTimeout = -1,
+    ERROR_CODE_Local_TaskRetry = -2,
+    ERROR_CODE_Local_StartTaskFail = -3,
+    ERROR_CODE_Local_AntiAvalanche = -4,
+    ERROR_CODE_Local_ChannelSelect = -5,
+    ERROR_CODE_Local_NoNet = -6,
+    ERROR_CODE_Local_Cancel = -7,
+    ERROR_CODE_Local_Clear = -8,
+    ERROR_CODE_Local_Reset = -9,
+    ERROR_CODE_Local_TaskParam = -12,
+    ERROR_CODE_Local_CgiFrequcencyLimit = -13,
+    ERROR_CODE_Local_ChannelID = -14,
+
+    ERROR_CODE_Long_FirstPkgTimeout = -500,
+    ERROR_CODE_Long_PkgPkgTimeout = -501,
+    ERROR_CODE_Long_ReadWriteTimeout = -502,
+    ERROR_CODE_Long_TaskTimeout = -503,
+
+    ERROR_CODE_Socket_NetworkChange = -10086,
+    ERROR_CODE_Socket_MakeSocketPrepared = -10087,
+    ERROR_CODE_Socket_WritenWithNonBlock = -10088,
+    ERROR_CODE_Socket_ReadOnce = -10089,
+    ERROR_CODE_Socket_RecvErr = -10091,
+    ERROR_CODE_Socket_SendErr = -10092,
+    ERROR_CODE_Socket_NoopTimeout = -10093,
+    ERROR_CODE_Socket_NoopAlarmTooLate = -10094,
+    ERROR_CODE_Http_SplitHttpHeadAndBody = -10194,
+    ERROR_CODE_Http_ParseStatusLine = -10195,
+    ERROR_CODE_Net_MsgXPHandleBufferErr = -10504,
+    ERROR_CODE_Dns_MakeSocketPrepared = -10606,
+
+    //proto error code
+    ERROR_CODE_Proto_CorruptData = -100001,
+    ERROR_CODE_Proto_InvalideParameter = -100002,
+};
+
+#endif /* WFCCEnums_h */

+ 2 - 0
wfclient/WFChatClient/WFCChatClient.h

@@ -65,3 +65,5 @@ FOUNDATION_EXPORT const unsigned char WFChatClientVersionString[];
 #import <WFChatClient/WFCCPCOnlineInfo.h>
 #import <WFChatClient/WFCCDeliveryReport.h>
 #import <WFChatClient/WFCCReadReport.h>
+#import <WFChatClient/WFCCEnums.h>
+

+ 5 - 1
wfuikit/WFChatUIKit/ConversationSetting/ViewController/WFCUConversationSettingViewController.m

@@ -845,7 +845,11 @@
               [[WFCCIMService sharedWFCIMService] getGroupMembers:ws.conversation.target forceUpdate:YES];
                 
             } error:^(int error_code) {
-              
+                if (error_code == ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT) {
+                    [ws.view makeToast:WFCString(@"ExceedGroupMaxMemberCount") duration:1 position:CSToastPositionCenter];
+                } else {
+                    [ws.view makeToast:WFCString(@"NetworkError") duration:1 position:CSToastPositionCenter];
+                }
             }];
         };
         pvc.disableUsersSelected = YES;

+ 1 - 0
wfuikit/WFChatUIKit/Resources/en.lproj/wfc.strings

@@ -136,6 +136,7 @@
 "InputGropNameHint"="Input group name(optional)";
 "GroupChat"="Group chat";
 "CreateGroupFailure"="Create group failure";
+"ExceedGroupMaxMemberCount"="Exceed max member count";
 "ForwardSuccess"="Forward success";
 "ForwardFailure"="Forward failure";
 "CreateNewChat"="Create new chat";

+ 1 - 0
wfuikit/WFChatUIKit/Resources/zh-Hans.lproj/wfc.strings

@@ -136,6 +136,7 @@
 "InputGropNameHint"="请输入群名称(可选)";
 "GroupChat"="群聊";
 "CreateGroupFailure"="创建群组失败";
+"ExceedGroupMaxMemberCount"="群成员数超过最大限制";
 "ForwardSuccess"="转发成功";
 "ForwardFailure"="转发失败";
 "CreateNewChat"="创建新聊天";