Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit 223d05f

Browse files
wqyfavorjianhan-he
authored andcommitted
[iOS] Update iOS error code. (#2522)
1 parent 4553f0f commit 223d05f

File tree

4 files changed

+7
-22
lines changed

4 files changed

+7
-22
lines changed

ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,6 @@ - (void)executeJsFramework:(NSString *)script
838838
NSString *exception = [[self.jsBridge exception] toString];
839839
NSMutableString *errMsg = [NSMutableString stringWithFormat:@"[WX_KEY_EXCEPTION_SDK_INIT_JSFM_INIT_FAILED] %@",exception];
840840
[WXExceptionUtils commitCriticalExceptionRT:@"WX_KEY_EXCEPTION_SDK_INIT" errCode:[NSString stringWithFormat:@"%d", WX_KEY_EXCEPTION_SDK_INIT] function:@"" exception:errMsg extParams:nil];
841-
WX_MONITOR_FAIL(WXMTJSFramework, WX_ERR_JSFRAMEWORK_EXECUTE, errMsg);
842841
} else {
843842
WX_MONITOR_SUCCESS(WXMTJSFramework);
844843
//the JSFramework has been load successfully.
@@ -952,7 +951,6 @@ - (void)executeJsService:(NSString *)script withName:(NSString *)name
952951
NSString *exception = [[self.jsBridge exception] toString];
953952
NSMutableString *errMsg = [NSMutableString stringWithFormat:@"[WX_KEY_EXCEPTION_INVOKE_JSSERVICE_EXECUTE] name:%@,arg:%@,exception :$@",name,exception];
954953
[WXExceptionUtils commitCriticalExceptionRT:@"WX_KEY_EXCEPTION_INVOKE" errCode:[NSString stringWithFormat:@"%d", WX_KEY_EXCEPTION_INVOKE] function:@"executeJsService" exception:errMsg extParams:nil];
955-
WX_MONITOR_FAIL(WXMTJSService, WX_ERR_JSFRAMEWORK_EXECUTE, errMsg);
956954
} else {
957955
// success
958956
}

ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ + (void)initSDKEnvironment:(NSString *)script
265265
if (!script || script.length <= 0) {
266266
NSMutableString *errMsg = [NSMutableString stringWithFormat:@"[WX_KEY_EXCEPTION_SDK_INIT_JSFM_INIT_FAILED] script don't exist:%@",script];
267267
[WXExceptionUtils commitCriticalExceptionRT:@"WX_KEY_EXCEPTION_SDK_INIT" errCode:[NSString stringWithFormat:@"%d", WX_KEY_EXCEPTION_SDK_INIT] function:@"initSDKEnvironment" exception:errMsg extParams:nil];
268-
WX_MONITOR_FAIL(WXMTJSFramework, WX_ERR_JSFRAMEWORK_LOAD, errMsg);
269268
return;
270269
}
271270
static dispatch_once_t onceToken;

ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333

3434
typedef NS_ENUM(int, WXSDKErrCode)
3535
{
36-
WX_ERR_JSFRAMEWORK_START = -1001,
37-
WX_ERR_JSFRAMEWORK_LOAD = -1002,
38-
WX_ERR_JSFRAMEWORK_EXECUTE = -1003,
39-
WX_ERR_JSFRAMEWORK_END = -1099,
36+
WX_KEY_EXCEPTION_DEGRADE = -1000,
37+
WX_KEY_EXCEPTION_DEGRADE_CHECK_CONTENT_LENGTH_FAILED = -1003,
38+
WX_KEY_EXCEPTION_DEGRADE_BUNDLE_CONTENTTYPE_ERROR = -1004,
39+
WX_KEY_EXCEPTION_DEGRADE_OTHER_CAUSE = -1005,
40+
WX_KEY_EXCEPTION_DEGRADE_EAGLE_RENDER_ERROR = -1007,
41+
WX_KEY_EXCEPTION_DEGRADE_NET_CODE_CAUSE = -1008,
4042

4143
WX_ERR_JSBRIDGE_START = -2001,
4244
WX_ERR_JSFUNC_PARAM = -2009,
@@ -70,13 +72,6 @@ typedef NS_ENUM(int, WXSDKErrCode)
7072
WX_KEY_EXCEPTION_DOM = -9300,
7173
WX_KEY_EXCEPTION_WXBRIDGE=-9400,
7274

73-
WX_KEY_EXCEPTION_DEGRADE = -9500,
74-
WX_KEY_EXCEPTION_DEGRADE_CHECK_CONTENT_LENGTH_FAILED = -9501,
75-
WX_KEY_EXCEPTION_DEGRADE_BUNDLE_CONTENTTYPE_ERROR = -9502,
76-
WX_KEY_EXCEPTION_DEGRADE_OTHER_CAUSE = -9503,
77-
WX_KEY_EXCEPTION_DEGRADE_NET_CODE_CAUSE = -9504,
78-
WX_KEY_EXCEPTION_DEGRADE_EAGLE_RENDER_ERROR = -9505,
79-
8075
WX_KEY_EXCEPTION_ABILITY_DOWN = -9600,
8176
WX_KEY_EXCEPTION_ABILITY_DOWN_IMAGE = -9601,
8277
WX_KEY_EXCEPTION_ABILITY_DOWN_TOH5 = -9602,

ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,14 @@ +(NSDictionary *) getMap
5151

5252
dispatch_once(&onceToken, ^{
5353

54-
codeMap=@{
55-
@(WX_ERR_JSFRAMEWORK_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
56-
@(WX_ERR_JSFRAMEWORK_LOAD):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
57-
@(WX_ERR_JSFRAMEWORK_EXECUTE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
58-
@(WX_ERR_JSFRAMEWORK_END):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
59-
54+
codeMap=@{
6055
@(WX_ERR_JSBRIDGE_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
6156
@(WX_ERR_RENDER_CREATEBODY):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
6257
@(WX_ERR_INVOKE_NATIVE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
6358
@(WX_ERR_JS_EXECUTE):@{ERROR_TYPE:@(WX_JS_ERROR),ERROR_GROUP:@(WX_JS)},
6459
@(WX_ERR_JSBRIDGE_END):@{ERROR_TYPE:@(WX_JS_ERROR),ERROR_GROUP:@(WX_JS)},
6560

6661
@(WX_ERR_RENDER_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
67-
@(WX_ERR_JSFRAMEWORK_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
6862
@(WX_ERR_RENDER_UPDATTR):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
6963
@(WX_ERR_RENDER_UPDSTYLE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
7064
@(WX_ERR_RENDER_ADDELEMENT):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@@ -99,7 +93,6 @@ +(NSDictionary *) getMap
9993
@(WX_KEY_EXCEPTION_ABILITY_DOWN):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
10094
@(WX_KEY_EXCEPTION_ABILITY_DOWN_IMAGE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
10195
@(WX_KEY_EXCEPTION_ABILITY_DOWN_TOH5):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
102-
@(WX_ERR_JSFRAMEWORK_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
10396
@(WX_KEY_EXCEPTION_ABILITY_DOWN_):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
10497
@(WX_KEY_EXCEPTION_EMPTY_SCREEN_JS):@{ERROR_TYPE:@(WX_RENDER_ERROR),ERROR_GROUP:@(WX_JS)},
10598
@(WX_KEY_EXCEPTION_EMPTY_SCREEN_NATIVE):@{ERROR_TYPE:@(WX_RENDER_ERROR),ERROR_GROUP:@(WX_NATIVE)},

0 commit comments

Comments
 (0)