incubator-weex git commit: *[android] weekly release 0.18.0-beta-3
Repository: incubator-weex Updated Branches: refs/heads/master 069fea2a1 -> 28d776877 *[android] weekly release 0.18.0-beta-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/28d77687 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28d77687 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28d77687 Branch: refs/heads/master Commit: 28d776877362b951a1337335d20d5e7f88cb5c46 Parents: 069fea2 Author: misakuoAuthored: Fri Mar 30 11:35:30 2018 +0800 Committer: misakuo Committed: Fri Mar 30 11:35:30 2018 +0800 -- android/playground/app/build.gradle | 4 ++-- android/sdk/build.gradle| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28d77687/android/playground/app/build.gradle -- diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle index bae43ca..422dd25 100755 --- a/android/playground/app/build.gradle +++ b/android/playground/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.alibaba.weex" minSdkVersion project.appMinSdkVersion targetSdkVersion project.targetSdkVersion -versionCode 16 -versionName "0.18.0-beta-2" +versionCode 17 +versionName "0.18.0-beta-3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" ndk{ abiFilters "x86" http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28d77687/android/sdk/build.gradle -- diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index ecb40c2..7e05943 100755 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -40,7 +40,7 @@ checkstyle { toolVersion = '6.9' } -version = "0.18.0-beta-2" +version = "0.18.0-beta-3" android { compileSdkVersion project.compileSdkVersion
[GitHub] incubator-weex issue #1095: [WEEX-270][iOS]WXListComponent should add reload...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1095 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #1095: [WEEX-270][iOS]WXListComponent should add...
GitHub user bbmjja8123 opened a pull request: https://github.com/apache/incubator-weex/pull/1095 [WEEX-270][iOS]WXListComponent should add reload type of data update Currently WXListComponent data update only supports insertRows. This can't be satisfied under some drop-down loading scenes. For example, the pulldown load needs to be positioned to the original position. When the tableView is still decaling and inserts and tries to fix the position, the cell will blink. Because when deceiring, the externally modified contentOffset will be re-edited by the internal implementation of tableView, altering contentOffset alternately will cause flicker problems. If you use the tableView reloadData this is not a problem, so you need to support the WXListComponent in the drop-down restore location scene to add the reload attribute. featï¼270 First of all, thank you for your contribution! Please makes sure that these checkboxes are checked before submitting your PR, thank you! CheckList: **if** *isBugFix* **:** * [ ] Make sure that you add at least one unit test for the bug which you had fixed. **elif** *isNewFeature* **:** * [ ] Update API docs for the component. * [ ] Update/Add demo to demonstrate new feature. * [ ] Update test scripts for the feature. * [ ] Add unit tests for the feature. You can merge this pull request into a Git repository by running: $ git pull https://github.com/bbmjja8123/incubator-weex im_drop_down Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1095.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1095 commit 9f75e24ef14810d5a0fa47b8c10fe7018b35ffc5 Author: jianjun.mjjDate: 2018-03-30T01:55:52Z [WEEX-270][iOS]WXListComponent should add reload type of data update Currently WXListComponent data update only supports insertRows. This can't be satisfied under some drop-down loading scenes. For example, the pulldown load needs to be positioned to the original position. When the tableView is still decaling and inserts and tries to fix the position, the cell will blink. Because when deceiring, the externally modified contentOffset will be re-edited by the internal implementation of tableView, altering contentOffset alternately will cause flicker problems. If you use the tableView reloadData this is not a problem, so you need to support the WXListComponent in the drop-down restore location scene to add the reload attribute. featï¼270 ---
[GitHub] incubator-weex pull request #1092: [Android] rm useless code
Github user lucky-chen closed the pull request at: https://github.com/apache/incubator-weex/pull/1092 ---
[GitHub] incubator-weex pull request #1072: [WEEX-249][iOS]fix WXRuleManager multi-th...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/1072 ---
incubator-weex git commit: [WEEX-249][iOS]fix WXRuleManager multi-thread crash
Repository: incubator-weex Updated Branches: refs/heads/master 0bc243d95 -> 069fea2a1 [WEEX-249][iOS]fix WXRuleManager multi-thread crash [WEEX-249][iOS]fix WXRuleManager multi-thread crash close #1072 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/069fea2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/069fea2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/069fea2a Branch: refs/heads/master Commit: 069fea2a178f63cbdf2503fb3260d2a8522d641c Parents: 0bc243d Author: xuyouyangAuthored: Thu Mar 15 13:37:27 2018 +0800 Committer: acton393 Committed: Thu Mar 29 19:34:27 2018 +0800 -- ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/069fea2a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m -- diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m index 5125194..b72d11b 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m @@ -83,13 +83,13 @@ static WXRuleManager *_sharedInstance = nil; } fontSrc = newURL; -NSMutableDictionary * fontFamily = [self.fontStorage objectForKey:rule[@"fontFamily"]]; +WXThreadSafeMutableDictionary * fontFamily = [self.fontStorage objectForKey:rule[@"fontFamily"]]; if (fontFamily && [fontFamily[@"tempSrc"] isEqualToString:fontSrc]) { // if the new src is same as src in dictionary , ignore it, or update it return; } if (!fontFamily) { -fontFamily = [NSMutableDictionary dictionary]; +fontFamily = [[WXThreadSafeMutableDictionary alloc] init]; } NSURL *fontURL = [NSURL URLWithString:fontSrc]; if (!fontURL) { @@ -114,7 +114,7 @@ static WXRuleManager *_sharedInstance = nil; [WXUtility getIconfont:fontURL completion:^(NSURL * _Nonnull url, NSError * _Nullable error) { if (!error && url) { // load success -NSMutableDictionary * dictForFontFamily = [weakSelf.fontStorage objectForKey:rule[@"fontFamily"]]; +WXThreadSafeMutableDictionary * dictForFontFamily = [weakSelf.fontStorage objectForKey:rule[@"fontFamily"]]; NSString *fontSrc = [dictForFontFamily objectForKey:@"tempSrc"]; if (fontSrc) { // only remote font will be mark as tempSrc
[GitHub] incubator-weex issue #1085: [Weex-260][android]switch supports setting color
Github user whn9527 commented on the issue: https://github.com/apache/incubator-weex/pull/1085 demo link please look at http://dotwe.org/vue/e9d87730e016bec01225e546ff10ef0d ---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
Github user acton393 commented on a diff in the pull request: https://github.com/apache/incubator-weex/pull/1093#discussion_r177999835 --- Diff: ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m --- @@ -698,10 +732,41 @@ - (void)checkRemoveTouchGesture } } -#pragma mark - UIGestureRecognizerDelegate +- (void)gestureShouldStopPropagation:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch +{ +NSString *ref = _templateComponent ? _templateComponent.ref : self.ref; +CGPoint screenLocation = [touch locationInView:touch.window]; +CGPoint pageLocation = [touch locationInView:self.weexInstance.rootView]; +NSDictionary *resultTouch = [self touchResultWithScreenLocation:screenLocation pageLocation:pageLocation identifier:touch.wx_identifier]; +NSString *touchState; +if (touch.phase == UITouchPhaseBegan) { +touchState = @"start"; +} +else if (touch.phase == UITouchPhaseMoved){ +touchState = @"move"; +} +else{ +touchState = @"end"; +} +BOOL stopPropagation = [[WXEventManager sharedManager]stopPropagation:self.weexInstance.instanceId ref:ref type:@"stopPropagation" params:@{@"changedTouches":resultTouch ? @[resultTouch] : @[],@"action":touchState}]; +touch.wx_stopPropagation = stopPropagation ? @1 : @0; +} +#pragma mark - UIGestureRecognizerDelegate - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { +CGPoint screenLocation = [touch locationInView:touch.window]; +NSLog(@"%@",NSStringFromCGPoint(screenLocation)); --- End diff -- NSLog is not recommended here, you can use WXLog combined with its loglevel ---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
Github user acton393 commented on a diff in the pull request: https://github.com/apache/incubator-weex/pull/1093#discussion_r177977039 --- Diff: ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m --- @@ -35,6 +35,35 @@ @interface WXScrollerComponnetView:UIScrollView @implementation WXScrollerComponnetView @end +@interface UIScrollView (Events) --- End diff -- I think that the name of Events category for UIScrollview is not long enough avoiding conflict later. ---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
Github user acton393 commented on a diff in the pull request: https://github.com/apache/incubator-weex/pull/1093#discussion_r177976635 --- Diff: ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m --- @@ -584,6 +583,12 @@ - (void)callJSMethod:(NSString *)method args:(NSArray *)args onContext:(JSContex } } +- (JSValue *)excuteJsMethodWithResult:(WXCallJSMethod *)method --- End diff -- `executeJSMethod...` maybe `JS` should be capital ---
[2/2] incubator-weex git commit: * [Android] rm useless code
* [Android] rm useless code Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e69a0d2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e69a0d2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e69a0d2a Branch: refs/heads/master Commit: e69a0d2ad69f59b88fc00c99f01eb4b229abd035 Parents: 1ab83cd Author: zhongcangAuthored: Thu Mar 29 14:27:05 2018 +0800 Committer: wentao.swt Committed: Thu Mar 29 15:24:34 2018 +0800 -- .../main/java/com/taobao/weex/WXSDKEngine.java | 1 - .../com/taobao/weex/common/WXPerformance.java | 72 +--- .../taobao/weex/performance/FpsCollector.java | 113 --- .../com/taobao/weex/performance/MemUtils.java | 80 - 4 files changed, 2 insertions(+), 264 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e69a0d2a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java index cbcac83..ef87679 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java @@ -59,7 +59,6 @@ import com.taobao.weex.dom.WXScrollerDomObject; import com.taobao.weex.dom.WXSwitchDomObject; import com.taobao.weex.dom.WXTextDomObject; import com.taobao.weex.http.WXStreamModule; -import com.taobao.weex.performance.FpsCollector; import com.taobao.weex.ui.ExternalLoaderComponentHolder; import com.taobao.weex.ui.IExternalComponentGetter; import com.taobao.weex.ui.IExternalModuleGetter; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e69a0d2a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java b/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java index 8af7d85..77e43e9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java @@ -18,14 +18,10 @@ */ package com.taobao.weex.common; -import android.os.Debug; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; -import android.text.TextUtils; import com.taobao.weex.WXEnvironment; -import com.taobao.weex.performance.FpsCollector; -import com.taobao.weex.performance.MemUtils; import com.taobao.weex.utils.WXViewUtils; import java.util.HashMap; @@ -63,8 +59,8 @@ public class WXPerformance { */ JSLibSize(0D, Double.MAX_VALUE), //normal 300ms.. first install apk 30s ? -JSLibInitTime(0D, 5D), -SDKInitTime(0D, 5000D), +JSLibInitTime(0D, 8D), +SDKInitTime(0D, 12D), SDKInitInvokeTime(0D, 5000D), SDKInitExecuteTime(0D, 5000D), JSTemplateSize(0D, 5000D), @@ -186,19 +182,10 @@ public class WXPerformance { public int fsCallEventTotalNum; public long avgFPS; - public long frameSum; - public long frameStartTime; - public long frameEndTime; public double fluency = 100D; - public long maxImproveMemory; - public long backImproveMemory; - public long pushImproveMemory; - - public long memTotalBeforeRender; - /** * Time spent for reading, time unit is ms. @@ -369,9 +356,6 @@ public class WXPerformance { } public static void init() { -if (WXPerformance.TRACE_DATA) { - FpsCollector.getInstance().init(); -} } public Map getMeasureMap() { @@ -533,63 +517,11 @@ public class WXPerformance { } - private FpsRecorder mFpsRecorder = new FpsRecorder(); - public void beforeInstanceRender(String instanceId) { renderTimeOrigin = System.currentTimeMillis(); -if (WXPerformance.TRACE_DATA) { - if (TextUtils.isEmpty(instanceId)) { -return; - } - Debug.MemoryInfo mem = MemUtils.getMemoryInfo(WXEnvironment.getApplication()); - if (null != mem) { -memTotalBeforeRender = mem.getTotalPss(); - } - FpsCollector.getInstance().registerListener(instanceId, mFpsRecorder); -} } - // public void onInstanceEndRender(String instanceId,boolean isFirstScreen){ - // - // } - - public void afterInstanceDestroy(String instanceId) { -if (WXPerformance.TRACE_DATA) { - if (TextUtils.isEmpty(instanceId)) { -return; - } - FpsCollector.getInstance().unRegister(instanceId); - Debug.MemoryInfo mem = MemUtils.getMemoryInfo(WXEnvironment.getApplication()); - if (null != mem) { -
[1/2] incubator-weex git commit: [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime
Repository: incubator-weex Updated Branches: refs/heads/master 1ab83cdcf -> 0bc243d95 [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0bc243d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0bc243d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0bc243d9 Branch: refs/heads/master Commit: 0bc243d95812d2e1d19922ec8480278cad6ca11e Parents: e69a0d2 Author: yuhun-alibabaAuthored: Thu Mar 29 14:57:35 2018 +0800 Committer: wentao.swt Committed: Thu Mar 29 15:24:34 2018 +0800 -- android/playground/app/build.gradle | 2 +- android/sdk/libs/armeabi/libweexjsc.so | Bin 276000 -> 276000 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 2965560 -> 2965608 bytes .../com/taobao/weex/bridge/WXBridgeManager.java | 13 +++-- 4 files changed, 12 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bc243d9/android/playground/app/build.gradle -- diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle index ede9c84..bae43ca 100755 --- a/android/playground/app/build.gradle +++ b/android/playground/app/build.gradle @@ -104,5 +104,5 @@ dependencies { compile 'com.jakewharton.scalpel:scalpel:1.1.2' compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0' compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2' -compile 'com.taobao.android:weex_inspector:0.13.4' +compile 'com.taobao.android:weex_inspector:0.13.5-multicontext' } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bc243d9/android/sdk/libs/armeabi/libweexjsc.so -- diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so index f45aee4..96fe1c2 100755 Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bc243d9/android/sdk/libs/armeabi/libweexjss.so -- diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so index 94d4478..f91f45a 100755 Binary files a/android/sdk/libs/armeabi/libweexjss.so and b/android/sdk/libs/armeabi/libweexjss.so differ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bc243d9/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java index aed1c53..ffede54 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java @@ -117,6 +117,7 @@ import static com.taobao.weex.bridge.WXModuleManager.createDomModule; public class WXBridgeManager implements Callback, BactchExecutor { public static final String METHOD_CREATE_INSTANCE = "createInstance"; + public static final String METHOD_CREATE_INSTANCE_CONTEXT = "createInstanceContext"; public static final String METHOD_DESTROY_INSTANCE = "destroyInstance"; public static final String METHOD_CALL_JS = "callJS"; public static final String METHOD_SET_TIMEOUT = "setTimeoutCallback"; @@ -1175,6 +1176,14 @@ public class WXBridgeManager implements Callback, BactchExecutor { public String syncExecJsOnInstanceWithResult(final String instanceId, final String js, final int type) { +try { + if (isJSThread()) { +return invokeExecJSOnInstance(instanceId, js, type); + } +} catch (Throwable e) { + WXLogUtils.e("[WXBridgeManager] syncExecJsOnInstanceWithResult on jsThread Exception"); + return ""; +} final CountDownLatch waitLatch = new CountDownLatch(1); EventResult callback = new EventResult(){ @Override @@ -1746,7 +1755,7 @@ public class WXBridgeManager implements Callback, BactchExecutor { return; } if (type == BundType.Vue || type == BundType.Rax) { - invokeCreateInstanceContext(instance.getInstanceId(), null, METHOD_CREATE_INSTANCE, args, false); + invokeCreateInstanceContext(instance.getInstanceId(), null, METHOD_CREATE_INSTANCE_CONTEXT, args, false); return; } else { invokeExecJS(instance.getInstanceId(), null,
[GitHub] incubator-weex issue #1094: [WEEX-269] [android] add T3D api support
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1094 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex issue #1092: [Android] rm useless code
Github user yuhun-alibaba commented on the issue: https://github.com/apache/incubator-weex/pull/1092 +1 ---
[GitHub] incubator-weex pull request #1094: [WEEX-269] [android] add T3D api support
GitHub user yuhun-alibaba opened a pull request: https://github.com/apache/incubator-weex/pull/1094 [WEEX-269] [android] add T3D api support [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime You can merge this pull request into a Git repository by running: $ git pull https://github.com/yuhun-alibaba/incubator-weex master_0329 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1094.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1094 commit 139bbf9962acf8e3b62a7a822f269073c8ed9f0b Author: yuhun-alibabaDate: 2018-03-29T06:57:35Z [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime ---
[GitHub] incubator-weex issue #1093: [WEEX-113] [iOS] New Touch Dispatch Mechanism An...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1093 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
GitHub user doumafang opened a pull request: https://github.com/apache/incubator-weex/pull/1093 [WEEX-113] [iOS] New Touch Dispatch Mechanism And Bubble Sync Method Now iOS support new events dispatch by stopPropagation. You can use @stopPropagation to decide if touch event or other advanced gesture events to pass down. You can try this feature by http://dotwe.org/vue/10a573183dfe3ba172c818e6d285f729 or http://dotwe.org/vue/359e12259ab86d410cb32cda9264e62c. You can merge this pull request into a Git repository by running: $ git pull https://github.com/doumafang/incubator-weex master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1093.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1093 commit a8427ff31d033901796a9a8ee1aff39b5eb3d63c Author: doumafangDate: 2018-03-29T06:45:39Z [WEEX-113] [iOS] New Touch Dispatch Mechanism And Bubble Sync Method Now iOS support new events dispatch by stopPropagation. You can use @stopPropagation to decide if touch event or other advanced gesture events to pass down. You can try this feature by http://dotwe.org/vue/10a573183dfe3ba172c818e6d285f729 or http://dotwe.org/vue/359e12259ab86d410cb32cda9264e62c. ---
[GitHub] incubator-weex issue #1092: * [Android] rm useless code
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1092 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #1092: * [Android] rm useless code
GitHub user lucky-chen opened a pull request: https://github.com/apache/incubator-weex/pull/1092 * [Android] rm useless code rm useless code - MemUtils.java - FpsCollector.java You can merge this pull request into a Git repository by running: $ git pull https://github.com/lucky-chen/incubator-weex mastr_performance Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1092.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1092 commit 74f2571213ba65ec419080e16cd2601ab144af22 Author: zhongcangDate: 2018-03-29T06:27:05Z * [Android] rm useless code ---
[GitHub] incubator-weex issue #1091: [Android] Module invoke authentication
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1091 Fails :no_entry_sign: Code file android/playground/app/src/main/java/com/alibaba/weex/extend/module/GeolocationModule.java has cn source code. :no_entry_sign: Code file android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXTitleBar.java does not have the copyright header. :no_entry_sign: Code file android/playground/app/src/main/java/com/alibaba/weex/extend/module/WXWsonTestModule.java does not have the copyright header. :no_entry_sign: Code file android/playground/app/src/main/java/com/alibaba/weex/extend/adapter/DefaultModuleInvokeGateway.java does not have the copyright header. :no_entry_sign: Code file android/playground/app/src/main/java/com/alibaba/weex/extend/module/PrivateModule.java does not have the copyright header. Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #1091: [Android] Module invoke authentication
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/1091 [Android] Module invoke authentication You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex feature-module-invoke-auth Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1091.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1091 commit c0a98560cf88b09c36a8f5918cf562573ee2fa19 Author: misakuoDate: 2018-03-26T09:34:05Z *[android] add access restriction to module invoke commit 464b830c9156cf4fcc942428e97b98d2c24d6978 Author: misakuo Date: 2018-03-27T02:21:28Z *[android] set bundle url commit 7113757e4b2b7b9c5d28ae9dc71b9a97329a85d0 Author: misakuo Date: 2018-03-27T02:59:52Z *[android] allow access module class commit ef637b922f8e7f2409260f9c1583201659470278 Author: misakuo Date: 2018-03-27T03:17:55Z *[android] made method static commit 4f0c0d439b708d9b0368df0f9b4d0437869cc681 Author: misakuo Date: 2018-03-27T03:41:41Z Merge remote-tracking branch 'remotes/apache/master' into feature-module-invoke-auth commit b673ff34aa1dbe01c2d23021e57fea089f4b1fa0 Author: misakuo Date: 2018-03-27T09:38:44Z *[android] default access restriction commit ef9c005685d1a0bf50e29dd749e1bdc07545722b Author: misakuo Date: 2018-03-27T09:53:31Z Merge remote-tracking branch 'remotes/apache/master' into feature-module-invoke-auth # Conflicts: # android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java commit 85956108cfefea318ccf71004bbd0d64dbc3f51b Author: misakuo Date: 2018-03-27T09:54:03Z Merge remote-tracking branch 'remotes/apache/master' into feature-module-invoke-auth # Conflicts: # android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java commit 2809fd23d841150c5f0eb333b4544c2686188fdf Author: misakuo Date: 2018-03-27T09:59:42Z *[android] adaptive commit e1eb47ac9c4bec8bf83e5cf634a55046b4c62164 Author: misakuo Date: 2018-03-29T06:14:27Z *[android] trust dotwe.org ---
[GitHub] incubator-weex pull request #1060: [WEEX-244][android]Weex Android Support W...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/1060 ---
[6/6] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr1086' into apache-master
Merge remote-tracking branch 'upstream/pr1086' into apache-master Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1ab83cdc Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1ab83cdc Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1ab83cdc Branch: refs/heads/master Commit: 1ab83cdcf70d4a070c5ef7c5850b68361b23deef Parents: 7a65877 721174d Author: misakuoAuthored: Thu Mar 29 14:16:20 2018 +0800 Committer: misakuo Committed: Thu Mar 29 14:16:20 2018 +0800 -- .../com/taobao/weex/dom/WXTextDomObject.java| 38 +++--- .../weex/dom/text/FontBroadcastReceiver.java| 79 2 files changed, 89 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ab83cdc/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java --
[1/6] incubator-weex git commit: [WEEX-224][android] WXDomObject Destory Method Should Be Called avoid Memory Leak
Repository: incubator-weex Updated Branches: refs/heads/master 9b5f3bea8 -> 1ab83cdcf [WEEX-224][android] WXDomObject Destory Method Should Be Called avoid Memory Leak Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4d25fa32 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4d25fa32 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4d25fa32 Branch: refs/heads/master Commit: 4d25fa3214d0a5a870fd1b1c024d2d48e10c794b Parents: 95e16d8 Author: jianbai.gbjAuthored: Sat Feb 24 17:16:56 2018 +0800 Committer: jianbai.gbj Committed: Sat Feb 24 17:16:56 2018 +0800 -- .../com/taobao/weex/dom/WXTextDomObject.java| 38 .../weex/dom/text/FontBroadcastReceiver.java| 61 2 files changed, 71 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d25fa32/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java index 6bb1feb..95036e6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java @@ -50,6 +50,7 @@ import com.taobao.weex.dom.flex.CSSConstants; import com.taobao.weex.dom.flex.CSSNode; import com.taobao.weex.dom.flex.FloatUtil; import com.taobao.weex.dom.flex.MeasureOutput; +import com.taobao.weex.dom.text.FontBroadcastReceiver; import com.taobao.weex.ui.component.WXText; import com.taobao.weex.ui.component.WXTextDecoration; import com.taobao.weex.utils.StaticLayoutProxy; @@ -566,6 +567,14 @@ public class WXTextDomObject extends WXDomObject { super.destroy(); } + @Override + protected void finalize() throws Throwable { +if(!isDestroy()){ + destroy(); +} +super.finalize(); + } + private void registerTypefaceObserverIfNeed(String desiredFontFamily) { if(TextUtils.isEmpty(desiredFontFamily)){ return; @@ -578,34 +587,7 @@ public class WXTextDomObject extends WXDomObject { if (mTypefaceObserver != null) { return; } - -mTypefaceObserver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { -String fontFamily = intent.getStringExtra("fontFamily"); -if (!mFontFamily.equals(fontFamily)) { - return; -} -if(isDestroy() || getDomContext() == null){ - return; -} - -DOMActionContext domActionContext = WXSDKManager.getInstance().getWXDomManager().getDomContext(getDomContext().getInstanceId()); -if(domActionContext == null){ - return; -} -WXDomObject domObject = domActionContext.getDomByRef(getRef()); -if(domObject == null){ - return; -} -domObject.markDirty(); -domActionContext.markDirty(); - WXSDKManager.getInstance().getWXDomManager().sendEmptyMessageDelayed(WXDomHandler.MsgType.WX_DOM_START_BATCH, 2); -if(WXEnvironment.isApkDebugable()) { - WXLogUtils.d("WXText", "Font family " + fontFamily + " is available"); -} - } -}; +mTypefaceObserver = new FontBroadcastReceiver(this, mFontFamily); if(WXEnvironment.isApkDebugable()) { WXLogUtils.d("WXText", "Font family register " + desiredFontFamily + " is available" + getRef()); } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d25fa32/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java b/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java new file mode 100644 index 000..81552f2 --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java @@ -0,0 +1,61 @@ +package com.taobao.weex.dom.text; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import com.taobao.weex.WXEnvironment; +import com.taobao.weex.WXSDKManager; +import com.taobao.weex.dom.DOMActionContext; +import com.taobao.weex.dom.WXDomHandler; +import com.taobao.weex.dom.WXDomObject; +import com.taobao.weex.dom.WXTextDomObject; +import com.taobao.weex.utils.WXLogUtils; + +import java.lang.ref.WeakReference; + +/** + * Created by furture on 2018/2/24. + */ + +public class FontBroadcastReceiver extends BroadcastReceiver { + +private WeakReference
[2/6] incubator-weex git commit: [WEEX-224][android] WXDomObject Destory Method Should Be Called avoid Memory Leak
[WEEX-224][android] WXDomObject Destory Method Should Be Called avoid Memory Leak Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/721174de Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/721174de Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/721174de Branch: refs/heads/master Commit: 721174dec713441f4e56ad5d598739e14cac81eb Parents: 4d25fa3 Author: jianbai.gbjAuthored: Mon Feb 26 14:31:33 2018 +0800 Committer: jianbai.gbj Committed: Mon Feb 26 14:31:33 2018 +0800 -- .../weex/dom/text/FontBroadcastReceiver.java | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/721174de/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java b/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java index 81552f2..8d1d556 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/text/FontBroadcastReceiver.java @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.taobao.weex.dom.text; import android.content.BroadcastReceiver;
[4/6] incubator-weex git commit: [WEEX-244][android]Weex Android Support W3c Force Api & wson improve for JSONField
[WEEX-244][android]Weex Android Support W3c Force Api & wson improve for JSONField Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ee195d57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee195d57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee195d57 Branch: refs/heads/master Commit: ee195d57565c9d518de44fb0f1137d9d502b08fa Parents: db3895a Author: jianbai.gbjAuthored: Fri Mar 9 16:23:44 2018 +0800 Committer: jianbai.gbj Committed: Fri Mar 9 16:48:10 2018 +0800 -- .../main/java/com/taobao/weex/wson/Wson.java| 29 +- .../java/com/taobao/weex/wson/AnnoTest.java | 41 .../test/java/com/taobao/weex/wson/Person.java | 30 ++ 3 files changed, 98 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee195d57/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java b/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java index 5741f8a..85d740f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java +++ b/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java @@ -24,6 +24,7 @@ import android.support.v4.util.LruCache; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; import com.taobao.weex.utils.WXLogUtils; import java.lang.reflect.Array; @@ -499,7 +500,7 @@ public class Wson { if(object.getClass().isEnum()){ writeObject(JSON.toJSONString(object)); }else{ -writeMap(toMap(object)); +writeAdapterObject(object); } refs.remove(refs.size()-1); } @@ -600,6 +601,19 @@ public class Wson { position++; } +private final void writeAdapterObject(Object object){ +if(specialClass.get(object.getClass().getName()) != null){ +writeObject(JSON.toJSON(object)); +return; +} +try{ +writeMap(toMap(object)); +}catch (Exception e){ +specialClass.put(object.getClass().getName(), true); +writeObject(JSON.toJSON(object)); +} +} + private final Map toMap(Object object){ Map map = new JSONObject(); try { @@ -637,7 +651,11 @@ public class Wson { map.put(fieldName, value); } }catch (Exception e){ -throw new RuntimeException(e); +if(e instanceof RuntimeException){ +throw (RuntimeException)e; +}else{ +throw new RuntimeException(e); +} } return map; } @@ -749,6 +767,7 @@ public class Wson { private static final String METHOD_PREFIX_IS = "is"; private static LruCache methodsCache = new LruCache<>(128); private static LruCache fieldsCache = new LruCache<>(128); +private static LruCache specialClass = new LruCache<>(16); private static final List getBeanMethod(String key, Class targetClass){ @@ -766,6 +785,9 @@ public class Wson { String methodName = method.getName(); if(methodName.startsWith(METHOD_PREFIX_GET) || methodName.startsWith(METHOD_PREFIX_IS)) { +if(method.getAnnotation(JSONField.class) != null){ +throw new UnsupportedOperationException("getBeanMethod JSONField Annotation Not Handled, Use toJSON"); +} methods.add(method); } } @@ -785,6 +807,9 @@ public class Wson { if((field.getModifiers() & Modifier.STATIC) != 0){ continue; } +if(field.getAnnotation(JSONField.class) != null){ +throw new UnsupportedOperationException("getBeanMethod JSONField Annotation Not Handled, Use toJSON"); +} fieldList.add(field); } fieldsCache.put(key, fieldList); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee195d57/android/sdk/src/test/java/com/taobao/weex/wson/AnnoTest.java -- diff --git
[3/6] incubator-weex git commit: [WEEX-244][android]Weex Android Support W3c Force Api
[WEEX-244][android]Weex Android Support W3c Force Api Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/db3895a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/db3895a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/db3895a1 Branch: refs/heads/master Commit: db3895a16a9376b22231c324683910b37d8d7887 Parents: 5b901c0 Author: jianbai.gbjAuthored: Fri Mar 9 11:19:47 2018 +0800 Committer: jianbai.gbj Committed: Fri Mar 9 11:19:47 2018 +0800 -- .../main/java/com/taobao/weex/ui/view/gesture/WXGesture.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/db3895a1/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java index 1bac140..3335d9e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java @@ -383,7 +383,12 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement pageXY = getEventLocInPageCoordinate(motionEvent, pointerIndex, pos); screenXY = getEventLocInScreenCoordinate(motionEvent, pointerIndex, pos); } -return createJSONObject(screenXY, pageXY, (float) motionEvent.getPointerId(pointerIndex)); +JSONObject map = createJSONObject(screenXY, pageXY, (float) motionEvent.getPointerId(pointerIndex)); +float force = motionEvent.getPressure(); +if(force > 0 && force < 1) { + map.put("force", motionEvent.getPressure()); +} +return map; } /**
[5/6] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr1060' into apache-master
Merge remote-tracking branch 'upstream/pr1060' into apache-master Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7a65877f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7a65877f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7a65877f Branch: refs/heads/master Commit: 7a65877fbf3c9c105503da7e7180ff80a31ae9d9 Parents: 9b5f3be ee195d5 Author: misakuoAuthored: Thu Mar 29 14:16:06 2018 +0800 Committer: misakuo Committed: Thu Mar 29 14:16:06 2018 +0800 -- --
[GitHub] incubator-weex issue #1085: [Weex-260][android]switch supports setting color
Github user gubaojian commented on the issue: https://github.com/apache/incubator-weex/pull/1085 switch great support, please attach dotwe.org example link ---