This is an automated email from the ASF dual-hosted git repository.
luckychen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new d3f7560 Revert "[iOS] Update iOS error code. (#2522)" (#2532)
d3f7560 is described below
commit d3f756075108eb836c004f7ec7bba74935da173d
Author: wqyfavor <[email protected]>
AuthorDate: Wed Jun 12 13:17:01 2019 +0800
Revert "[iOS] Update iOS error code. (#2522)" (#2532)
This reverts commit 223d05f31890cdf3d55ee5fcf62559667bcec26d.
---
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m | 2 ++
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 +
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 17 +++++++++++------
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m | 9 ++++++++-
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
index e01f535..1e4fb54 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -838,6 +838,7 @@ _Pragma("clang diagnostic pop") \
NSString *exception = [[self.jsBridge exception] toString];
NSMutableString *errMsg = [NSMutableString
stringWithFormat:@"[WX_KEY_EXCEPTION_SDK_INIT_JSFM_INIT_FAILED] %@",exception];
[WXExceptionUtils
commitCriticalExceptionRT:@"WX_KEY_EXCEPTION_SDK_INIT" errCode:[NSString
stringWithFormat:@"%d", WX_KEY_EXCEPTION_SDK_INIT] function:@""
exception:errMsg extParams:nil];
+ WX_MONITOR_FAIL(WXMTJSFramework, WX_ERR_JSFRAMEWORK_EXECUTE, errMsg);
} else {
WX_MONITOR_SUCCESS(WXMTJSFramework);
//the JSFramework has been load successfully.
@@ -951,6 +952,7 @@ _Pragma("clang diagnostic pop") \
NSString *exception = [[self.jsBridge exception] toString];
NSMutableString *errMsg = [NSMutableString
stringWithFormat:@"[WX_KEY_EXCEPTION_INVOKE_JSSERVICE_EXECUTE]
name:%@,arg:%@,exception :$@",name,exception];
[WXExceptionUtils
commitCriticalExceptionRT:@"WX_KEY_EXCEPTION_INVOKE" errCode:[NSString
stringWithFormat:@"%d", WX_KEY_EXCEPTION_INVOKE] function:@"executeJsService"
exception:errMsg extParams:nil];
+ WX_MONITOR_FAIL(WXMTJSService, WX_ERR_JSFRAMEWORK_EXECUTE, errMsg);
} else {
// success
}
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index c498cc1..bdc6a3b 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -266,6 +266,7 @@
if (!script || script.length <= 0) {
NSMutableString *errMsg = [NSMutableString
stringWithFormat:@"[WX_KEY_EXCEPTION_SDK_INIT_JSFM_INIT_FAILED] script don't
exist:%@",script];
[WXExceptionUtils
commitCriticalExceptionRT:@"WX_KEY_EXCEPTION_SDK_INIT" errCode:[NSString
stringWithFormat:@"%d", WX_KEY_EXCEPTION_SDK_INIT]
function:@"initSDKEnvironment" exception:errMsg extParams:nil];
+ WX_MONITOR_FAIL(WXMTJSFramework, WX_ERR_JSFRAMEWORK_LOAD, errMsg);
return;
}
static dispatch_once_t onceToken;
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
index bfe56d6..0909ab6 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
@@ -33,12 +33,10 @@
typedef NS_ENUM(int, WXSDKErrCode)
{
- WX_KEY_EXCEPTION_DEGRADE = -1000,
- WX_KEY_EXCEPTION_DEGRADE_CHECK_CONTENT_LENGTH_FAILED = -1003,
- WX_KEY_EXCEPTION_DEGRADE_BUNDLE_CONTENTTYPE_ERROR = -1004,
- WX_KEY_EXCEPTION_DEGRADE_OTHER_CAUSE = -1005,
- WX_KEY_EXCEPTION_DEGRADE_EAGLE_RENDER_ERROR = -1007,
- WX_KEY_EXCEPTION_DEGRADE_NET_CODE_CAUSE = -1008,
+ WX_ERR_JSFRAMEWORK_START = -1001,
+ WX_ERR_JSFRAMEWORK_LOAD = -1002,
+ WX_ERR_JSFRAMEWORK_EXECUTE = -1003,
+ WX_ERR_JSFRAMEWORK_END = -1099,
WX_ERR_JSBRIDGE_START = -2001,
WX_ERR_JSFUNC_PARAM = -2009,
@@ -72,6 +70,13 @@ typedef NS_ENUM(int, WXSDKErrCode)
WX_KEY_EXCEPTION_DOM = -9300,
WX_KEY_EXCEPTION_WXBRIDGE=-9400,
+ WX_KEY_EXCEPTION_DEGRADE = -9500,
+ WX_KEY_EXCEPTION_DEGRADE_CHECK_CONTENT_LENGTH_FAILED = -9501,
+ WX_KEY_EXCEPTION_DEGRADE_BUNDLE_CONTENTTYPE_ERROR = -9502,
+ WX_KEY_EXCEPTION_DEGRADE_OTHER_CAUSE = -9503,
+ WX_KEY_EXCEPTION_DEGRADE_NET_CODE_CAUSE = -9504,
+ WX_KEY_EXCEPTION_DEGRADE_EAGLE_RENDER_ERROR = -9505,
+
WX_KEY_EXCEPTION_ABILITY_DOWN = -9600,
WX_KEY_EXCEPTION_ABILITY_DOWN_IMAGE = -9601,
WX_KEY_EXCEPTION_ABILITY_DOWN_TOH5 = -9602,
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m
b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m
index a26f767..9db1895 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m
@@ -51,7 +51,12 @@
dispatch_once(&onceToken, ^{
- codeMap=@{
+ codeMap=@{
+
@(WX_ERR_JSFRAMEWORK_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
+
@(WX_ERR_JSFRAMEWORK_LOAD):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
+
@(WX_ERR_JSFRAMEWORK_EXECUTE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
+
@(WX_ERR_JSFRAMEWORK_END):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
+
@(WX_ERR_JSBRIDGE_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_ERR_RENDER_CREATEBODY):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_ERR_INVOKE_NATIVE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@@ -59,6 +64,7 @@
@(WX_ERR_JSBRIDGE_END):@{ERROR_TYPE:@(WX_JS_ERROR),ERROR_GROUP:@(WX_JS)},
@(WX_ERR_RENDER_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
+
@(WX_ERR_JSFRAMEWORK_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_ERR_RENDER_UPDATTR):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_ERR_RENDER_UPDSTYLE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_ERR_RENDER_ADDELEMENT):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@@ -93,6 +99,7 @@
@(WX_KEY_EXCEPTION_ABILITY_DOWN):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_KEY_EXCEPTION_ABILITY_DOWN_IMAGE):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_KEY_EXCEPTION_ABILITY_DOWN_TOH5):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
+
@(WX_ERR_JSFRAMEWORK_START):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_KEY_EXCEPTION_ABILITY_DOWN_):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
@(WX_KEY_EXCEPTION_EMPTY_SCREEN_JS):@{ERROR_TYPE:@(WX_RENDER_ERROR),ERROR_GROUP:@(WX_JS)},
@(WX_KEY_EXCEPTION_EMPTY_SCREEN_NATIVE):@{ERROR_TYPE:@(WX_RENDER_ERROR),ERROR_GROUP:@(WX_NATIVE)},
