From ca7aa7f98bff72ad8c0dec5ddacf8c8429546e4b Mon Sep 17 00:00:00 2001 From: lybeen Date: Tue, 11 Apr 2017 10:50:53 +0800 Subject: [PATCH 1/3] + [ios] add not connected internet code --- ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h index 851194d11f..7f4f2dd5a4 100644 --- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h +++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h @@ -37,6 +37,7 @@ typedef NS_ENUM(int, WXSDKErrCode) WX_ERR_DOWNLOAD_START = -2201, WX_ERR_JSBUNDLE_DOWNLOAD = -2202, WX_ERR_JSBUNDLE_STRING_CONVERT = -2203, + WX_ERR_NOT_CONNECTED_TO_INTERNET = -2205, WX_ERR_CANCEL = -2204, WX_ERR_DOWNLOAD_END = -2299, }; diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index afc6c53876..440add2937 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -249,7 +249,8 @@ - (void)_renderWithRequest:(WXResourceRequest *)request options:(NSDictionary *) _mainBundleLoader.onFailed = ^(NSError *loadError) { NSString *errorMessage = [NSString stringWithFormat:@"Request to %@ occurs an error:%@", request.URL, loadError.localizedDescription]; - WX_MONITOR_FAIL_ON_PAGE(WXMTJSDownload, WX_ERR_JSBUNDLE_DOWNLOAD, errorMessage, weakSelf.pageName); + + WX_MONITOR_FAIL_ON_PAGE(WXMTJSDownload, [loadError.domain isEqualToString:NSURLErrorDomain] && loadError.code == NSURLErrorNotConnectedToInternet ? WX_ERR_NOT_CONNECTED_TO_INTERNET : WX_ERR_JSBUNDLE_DOWNLOAD, errorMessage, weakSelf.pageName); if (weakSelf.onFailed) { weakSelf.onFailed(error); From d7655b85b9b6c089b00a63df365155116fb98c99 Mon Sep 17 00:00:00 2001 From: lybeen Date: Tue, 9 May 2017 10:56:48 +0800 Subject: [PATCH 2/3] + [android] add list sticky/unSticky event --- .../ui/component/list/StickyHeaderHelper.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java index dd49a5a8e2..d046a1e3b4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java @@ -87,19 +87,19 @@ private void showSticky() { final float translationX = headerView.getTranslationX(); final float translationY = headerView.getTranslationY(); headComponent.removeSticky(); - mParent.post(WXThread.secure(new Runnable() { - @Override - public void run() { - ViewGroup existedParent; - if ((existedParent = (ViewGroup) headerView.getParent()) != null) { - existedParent.removeView(headerView); - } - mParent.addView(headerView); - //recover translation, sometimes it will be changed on fling - headerView.setTranslationX(translationX); - headerView.setTranslationY(translationY); - } - })); + + ViewGroup existedParent; + if ((existedParent = (ViewGroup) headerView.getParent()) != null) { + existedParent.removeView(headerView); + } + mParent.addView(headerView); + //recover translation, sometimes it will be changed on fling + headerView.setTranslationX(translationX); + headerView.setTranslationY(translationY); + + } + if (headComponent.getDomObject().getEvents().contains("sticky")) { + headComponent.fireEvent("sticky"); } } @@ -124,6 +124,9 @@ public void run() { component.recoverySticky(); } })); + if (component.getDomObject().getEvents().contains("unSticky")) { + component.fireEvent("unSticky"); + } } From 47af4806151cff8e7e8043f721d4af942c18271f Mon Sep 17 00:00:00 2001 From: lybeen Date: Tue, 9 May 2017 12:15:54 +0800 Subject: [PATCH 3/3] * [android] event name to lowercase --- .../com/taobao/weex/ui/component/list/StickyHeaderHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java index d046a1e3b4..c1b6539cb0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java @@ -124,8 +124,8 @@ public void run() { component.recoverySticky(); } })); - if (component.getDomObject().getEvents().contains("unSticky")) { - component.fireEvent("unSticky"); + if (component.getDomObject().getEvents().contains("unsticky")) { + component.fireEvent("unsticky"); } }