From cd38f3bb34d007218ae24629b833418dfc41903e Mon Sep 17 00:00:00 2001 From: gurisxie <279483595@qq.com> Date: Thu, 16 Nov 2017 18:34:04 +0800 Subject: [PATCH] =?UTF-8?q?[WEEX-126][iOS]=20scripturl=20will=20have=20no?= =?UTF-8?q?=20value=20in=20some=20way,we=20need=20use=20pageName=20instead?= =?UTF-8?q?=EF=BC=9A=201.=20compatible=20old=20logic;=202.=20use=20instanc?= =?UTF-8?q?e.pageName=20as=20default=20for=20front=20user.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- ios/sdk/WeexSDK/Sources/Monitor/WXExceptionUtils.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m index d14cd922b0..a89a0ac0d8 100644 --- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m @@ -157,7 +157,7 @@ - (instancetype)init context.exception = exception; WXSDKInstance *instance = [WXSDKEngine topInstance]; - NSString *bundleUrl = [instance.scriptURL absoluteString]?:@"WX_KEY_EXCEPTION_WXBRIDGE"; + NSString *bundleUrl = instance.pageName?:([instance.scriptURL absoluteString]?:@"WX_KEY_EXCEPTION_WXBRIDGE"); NSString *errorCode = [NSString stringWithFormat:@"%d", WX_KEY_EXCEPTION_WXBRIDGE]; NSString *message = [NSString stringWithFormat:@"[WX_KEY_EXCEPTION_WXBRIDGE] [%@:%@:%@] %@\n%@", exception[@"sourceURL"], exception[@"line"], exception[@"column"], [exception toString], [exception[@"stack"] toObject]]; NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys: diff --git a/ios/sdk/WeexSDK/Sources/Monitor/WXExceptionUtils.m b/ios/sdk/WeexSDK/Sources/Monitor/WXExceptionUtils.m index 0ed7297282..de784fdb51 100644 --- a/ios/sdk/WeexSDK/Sources/Monitor/WXExceptionUtils.m +++ b/ios/sdk/WeexSDK/Sources/Monitor/WXExceptionUtils.m @@ -37,7 +37,7 @@ + (void)commitCriticalExceptionRT:(NSString *)instanceId errCode:(NSString *)err instanceIdCommit = instanceId; WXSDKInstance * instance = [WXSDKManager instanceForID:instanceId]; if(instance){ - bundleUrlCommit = [instance.scriptURL absoluteString]?:bundleUrlCommit; + bundleUrlCommit = instance.pageName?:([instance.scriptURL absoluteString]?:bundleUrlCommit); }else if([instanceIdCommit hasPrefix:@"WX_KEY_EXCEPTION"]){ bundleUrlCommit = instanceId; }