[GitHub] incubator-weex issue #866: [WEEX-118][Android] removing the legacy module we...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/866 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 #866: [WEEX-118][Android] removing the legacy mo...
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/866 [WEEX-118][Android] removing the legacy module weex_debug Removing the legacy `weex_debug` module, now we have better tools weex_inspector to instead it You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-feature-remove-debug Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/866.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 #866 commit b0dbdde1baa12110a59a3e9be16792a7a80637e2 Author: misakuoDate: 2017-11-15T07:18:26Z * [android] removing the legacy module weex_debug ---
[GitHub] incubator-weex issue #865: [WEEX-117][Android] Fix page in slider can not re...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/865 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #865: [WEEX-117][Android] Fix page in slider can...
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/865 [WEEX-117][Android] Fix page in slider can not receive the lifecycle callbacks You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-bugfix-slider-lifecycle Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/865.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 #865 commit f6a96e9de118a0a917fff14c7bb81044cc27f632 Author: misakuoDate: 2017-11-15T06:49:09Z * [android] fix page oin slider can not receive the lifecycle callbacks ---
[GitHub] incubator-weex issue #844: [WEEX-99][Android] fix setViewport: sometimes doe...
Github user myeveryheart commented on the issue: https://github.com/apache/incubator-weex/pull/844 @gubaojian Sorry, dotwe.org don't support entry.js. But you can try this like doc ` // entry.js import App from './app.vue' const meta = weex.requireModule('meta') // é ç½® viewport ç宽度为 640px meta.setViewport({width: 640}) App.el = '#root' new Vue(App) ` After that, you can see that width sometimes doesn't work. By the way, it was known that we should set UI on main thread, which ASYN doesn't. ---
[16/19] incubator-weex git commit: * [android] add invokeExecJS log to logwatcher
* [android] add invokeExecJS log to logwatcher Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e7eed891 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e7eed891 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e7eed891 Branch: refs/heads/master Commit: e7eed89143350abd3a6be3c2be035ee9cff240e6 Parents: ae08416 Author: atomtongAuthored: Tue Nov 14 14:47:17 2017 +0800 Committer: atomtong Committed: Tue Nov 14 14:47:17 2017 +0800 -- .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7eed891/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 97fb867..e40013c 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 @@ -1529,7 +1529,7 @@ public class WXBridgeManager implements Callback, BactchExecutor { public void invokeExecJS(String instanceId, String namespace, String function, WXJSObject[] args, boolean logTaskDetail) { - if (WXEnvironment.isApkDebugable()) { +// if (WXEnvironment.isApkDebugable()) { mLodBuilder.append("callJS instanceId:").append(instanceId) .append("function:").append(function); if (logTaskDetail) @@ -1538,7 +1538,7 @@ public class WXBridgeManager implements Callback, BactchExecutor { mLodBuilder.setLength(0); } mWXBridge.execJS(instanceId, namespace, function, args); - } +// } private void invokeInitFramework(Message msg) { String framework = "";
[12/19] incubator-weex git commit: Merge branch 'release-0.16-github-mtop-tracker' into release-0.16-gitlab
Merge branch 'release-0.16-github-mtop-tracker' into release-0.16-gitlab * release-0.16-github-mtop-tracker: * [android] change format data * [android] register dim and mes * [android] get screenreader time add mtop coume time Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9d3caa20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9d3caa20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9d3caa20 Branch: refs/heads/master Commit: 9d3caa20f34d703caba78fbe5ac3db3091ee7d04 Parents: 8b9a3a1 72f5e13 Author: atomtongAuthored: Sat Nov 11 14:26:23 2017 +0800 Committer: atomtong Committed: Sat Nov 11 14:26:23 2017 +0800 -- .../java/com/taobao/weex/WXSDKInstance.java | 11 +-- .../com/taobao/weex/common/WXPerformance.java | 32 +--- 2 files changed, 36 insertions(+), 7 deletions(-) --
[07/19] incubator-weex git commit: Merge branch 'release-0.16-github' into release-0.16-gitlab
Merge branch 'release-0.16-github' into release-0.16-gitlab * release-0.16-github: Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a87fcd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a87fcd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a87fcd1 Branch: refs/heads/master Commit: 8a87fcd1609bc26700a4ba4bce7ddf2a6d9d4174 Parents: e5c3f22 19f0f0a Author: atomtongAuthored: Thu Nov 9 11:45:26 2017 +0800 Committer: atomtong Committed: Thu Nov 9 11:45:26 2017 +0800 -- --
[02/19] incubator-weex git commit: * [android] get screenreader time add mtop coume time
* [android] get screenreader time add mtop coume time Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7857ba40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7857ba40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7857ba40 Branch: refs/heads/master Commit: 7857ba40a7692797e0fcc103e8c622c95af8446c Parents: 355800d Author: atomtongAuthored: Wed Nov 1 23:38:01 2017 +0800 Committer: atomtong Committed: Wed Nov 1 23:38:01 2017 +0800 -- .../java/com/taobao/weex/WXSDKInstance.java | 11 -- .../com/taobao/weex/common/WXPerformance.java | 21 +--- 2 files changed, 27 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7857ba40/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java index 5079cd1..14c6172 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -127,19 +127,24 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. public long mRenderStartNanos; public int mExecJSTraceId = WXTracing.nextId(); + /** + *for network tracker + */ + public String mwxDims[] = new String [5]; + public Double measureTimes[] = new Double [5]; public WeakReference templateRef; - public Map responseHeaders = new HashMap<>(); /** * Render strategy. */ private WXRenderStrategy mRenderStrategy = WXRenderStrategy.APPEND_ASYNC; + /** * Render start time */ - private long mRenderStartTime; + public long mRenderStartTime; /** * Refresh start time */ @@ -840,6 +845,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. mWXPerformance.useScroller=1; } mWXPerformance.maxDeepViewLayer=getMaxDeepLayer(); + mWXPerformance.wxDims = mwxDims; + mWXPerformance.measureTimes = measureTimes; if (mUserTrackAdapter != null) { mUserTrackAdapter.commit(mContext, null, IWXUserTrackAdapter.LOAD, mWXPerformance, getUserTrackParams()); } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7857ba40/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 229a475..04eb354 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 @@ -176,6 +176,12 @@ public class WXPerformance { public String connectionType; public String requestType; + /** + *for network tracker + */ + + public String wxDims[] = new String [5]; + public Double measureTimes[] = new Double [5]; public WXPerformance(){ mErrMsgBuilder=new StringBuilder(); @@ -203,7 +209,12 @@ public class WXPerformance { quotas.put("SDKInitTime",(double)WXEnvironment.sSDKInitTime); quotas.put("maxDeepViewLayer", (double) maxDeepViewLayer); quotas.put("useScroller", (double) useScroller); -return quotas; + quotas.put("measureTime1", measureTimes[0]); + quotas.put("measureTime2", measureTimes[1]); + quotas.put("measureTime3", measureTimes[2]); + quotas.put("measureTime4", measureTimes[3]); + quotas.put("measureTime5", measureTimes[4]); + return quotas; } public Map getDimensionMap(){ @@ -215,8 +226,12 @@ public class WXPerformance { quotas.put("WXSDKVersion", WXSDKVersion); quotas.put("connectionType",connectionType); quotas.put("requestType",requestType); - -return quotas; + quotas.put("wxdim1", wxDims[0]); + quotas.put("wxdim2", wxDims[1]); + quotas.put("wxdim3", wxDims[2]); + quotas.put("wxdim4", wxDims[3]); + quotas.put("wxdim5", wxDims[4]); + return quotas; } public static String[] getDimensions(){
[08/19] incubator-weex git commit: Merge branch 'android-bugfix-log-tlog' into release-0.16-gitlab
Merge branch 'android-bugfix-log-tlog' into release-0.16-gitlab * android-bugfix-log-tlog: * [android] android bugfixed logwatcher Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8b9a3a16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8b9a3a16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8b9a3a16 Branch: refs/heads/master Commit: 8b9a3a1644023de368d44b559427306f3cbfbfba Parents: 8a87fcd 8a19b9b Author: atomtongAuthored: Thu Nov 9 14:13:17 2017 +0800 Committer: atomtong Committed: Thu Nov 9 14:13:17 2017 +0800 -- android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java | 4 1 file changed, 4 insertions(+) --
[15/19] incubator-weex git commit: Merge branch 'release-0.16-github' into release-0.16-android-bugfixed-logtrack
Merge branch 'release-0.16-github' into release-0.16-android-bugfixed-logtrack * release-0.16-github: remove unused log edit remove unused log edit * [android] abstract transform parse code, share code * [android] weex transition support on android platform, improve batch time when layout * [android] android bugfixed logwatcher * [devtool] fix devtool network mode Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ae08416d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ae08416d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ae08416d Branch: refs/heads/master Commit: ae08416d0993d8af0c84523cf29b4217412e0144 Parents: 265d427 3c3536a Author: atomtongAuthored: Tue Nov 14 14:14:04 2017 +0800 Committer: atomtong Committed: Tue Nov 14 14:14:04 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 11 + .../com/taobao/weex/dom/DOMActionContext.java | 2 + .../taobao/weex/dom/DOMActionContextImpl.java | 17 +- .../java/com/taobao/weex/dom/WXDomHandler.java | 15 +- .../java/com/taobao/weex/dom/WXDomObject.java | 33 +- .../taobao/weex/dom/action/AnimationAction.java | 43 +- .../weex/dom/action/UpdateStyleAction.java | 20 +- .../weex/dom/transition/WXTransition.java | 626 +++ .../weex/ui/animation/TransformParser.java | 296 + .../weex/ui/animation/WXAnimationBean.java | 128 +--- .../com/taobao/weex/utils/FunctionParser.java | 2 +- .../java/com/taobao/weex/utils/WXViewUtils.java | 5 + .../weex/dom/transition/WXTransitionTest.java | 96 +++ .../weex/ui/animation/TransformParserTest.java | 38 ++ 14 files changed, 1173 insertions(+), 159 deletions(-) --
[01/19] incubator-weex git commit: Merge branch 'release-0.16-github' into release-0.16-devtool-bugfixed
Repository: incubator-weex Updated Branches: refs/heads/master 1c8b760e9 -> 4269d2479 Merge branch 'release-0.16-github' into release-0.16-devtool-bugfixed * release-0.16-github: onVisibilityChanged most sense right. but when native component custom set parent visibility, the method not paired on some platform, e.g when parent become invisible, changedView is this, visibility is invisible. * [html5] bugfix: - scroll event listenning on window. - img lazyloading. - scrollToElement on latest chrome. - rm id of a comp. - fix stream.fetch. - add statistics for components and modules. - support lazyload and appear watcher when body height set to 100% - add try catch for accessing localStorage may throw a error. - image support sprite (sprite-src, sprite-position, sprite-width). - fix indicator when there's only one slide in slider. when cell amount is big, watch appear will none changed will result too many logs when scroll, move log to appear changed Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0c20eed1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0c20eed1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0c20eed1 Branch: refs/heads/master Commit: 0c20eed10795c776156592a7e1960a8b6a8a3a8c Parents: 41221fc 355800d Author: atomtongAuthored: Wed Nov 1 19:21:06 2017 +0800 Committer: atomtong Committed: Wed Nov 1 19:21:06 2017 +0800 -- .../ui/component/list/BasicListComponent.java | 6 +- .../com/taobao/weex/ui/view/WXImageView.java| 13 +- html5/render/browser/extend/api/storage.js | 123 --- html5/render/browser/extend/api/stream.js | 9 +- html5/render/vue/README.md | 20 ++- html5/render/vue/components/a.js| 3 - html5/render/vue/components/image.js| 42 +-- html5/render/vue/components/slider/indicator.js | 4 +- html5/render/vue/env/weex.js| 34 - html5/render/vue/index.js | 2 +- html5/render/vue/mixins/base.js | 81 +++- html5/render/vue/mixins/style.js| 22 +--- html5/render/vue/modules/dom.js | 6 +- html5/render/vue/utils/component.js | 11 +- html5/render/vue/utils/lazyload.js | 24 +++- html5/test/render/vue/components/image.js | 1 - html5/test/render/vue/components/switch.js | 9 +- html5/test/render/vue/components/text.js| 2 +- html5/test/render/vue/modules/dom.js| 1 + package.json| 2 +- packages/weex-vue-render/README.md | 20 ++- packages/weex-vue-render/package.json | 2 +- 22 files changed, 317 insertions(+), 120 deletions(-) --
[19/19] incubator-weex git commit: [WEEX-115] [android]logwatcher is design to support release environment critical issuses analyzing
[WEEX-115] [android]logwatcher is design to support release environment critical issuses analyzing Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4269d247 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4269d247 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4269d247 Branch: refs/heads/master Commit: 4269d2479b3347e8fb8b2aa2a17e27a5bcad7d5c Parents: 1c8b760 fd24667 Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 12:22:13 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 12:22:33 2017 +0800 -- .../java/com/taobao/weex/WXSDKInstance.java | 14 ++-- .../com/taobao/weex/bridge/WXBridgeManager.java | 4 +- .../com/taobao/weex/common/WXPerformance.java | 32 +++-- .../java/com/taobao/weex/utils/WXLogUtils.java | 76 ++-- 4 files changed, 78 insertions(+), 48 deletions(-) --
[06/19] incubator-weex git commit: Merge branch 'release-0.16-github' into release-0.16-gitlab
Merge branch 'release-0.16-github' into release-0.16-gitlab * release-0.16-github: when header view has parent, remove it from parent remove log when app run, improve performance Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e5c3f226 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e5c3f226 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e5c3f226 Branch: refs/heads/master Commit: e5c3f226b0fee98373fee4f9d864e8ac40e2f805 Parents: 0c20eed db0ae56 Author: atomtongAuthored: Tue Nov 7 15:27:03 2017 +0800 Committer: atomtong Committed: Tue Nov 7 15:27:03 2017 +0800 -- .../main/java/com/taobao/weex/bridge/WXBridgeManager.java | 4 ++-- .../java/com/taobao/weex/ui/component/list/WXCell.java| 3 +++ .../java/com/taobao/weex/ui/module/WXTimerModule.java | 10 -- 3 files changed, 13 insertions(+), 4 deletions(-) --
[18/19] incubator-weex git commit: * [android] add NPE protection
* [android] add NPE protection Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fd246676 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fd246676 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fd246676 Branch: refs/heads/master Commit: fd246676302bdce2313608fb21ac79d6a01a9dde Parents: 060d89a Author: atomtongAuthored: Wed Nov 15 11:24:54 2017 +0800 Committer: atomtong Committed: Wed Nov 15 11:24:54 2017 +0800 -- .../sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fd246676/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java index 70ca32b..f6439bc 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java @@ -123,9 +123,10 @@ public class WXLogUtils { public static void d(String tag, String msg) { - log(tag, msg, LogLevel.DEBUG); + if(!TextUtils.isEmpty(tag) && !TextUtils.isEmpty(msg)){ + log(tag, msg, LogLevel.DEBUG); - if(WXEnvironment.isApkDebugable()){//sLogLevel in debug mode is "LogLevel.DEBUG" + if(WXEnvironment.isApkDebugable()){//sLogLevel in debug mode is "LogLevel.DEBUG" if ("jsLog".equals(tag) && jsLogWatcher != null) { if (msg.endsWith("__DEBUG")) { jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__DEBUG", "")); @@ -151,7 +152,8 @@ public class WXLogUtils { return; } } - sendLog(LogLevel.DEBUG, tag + ":" + msg);// WXDebugTool sendLog + sendLog(LogLevel.DEBUG, tag + ":" + msg);// WXDebugTool sendLog + } } }
[04/19] incubator-weex git commit: * [android] change format data
* [android] change format data Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9a36f0bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9a36f0bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9a36f0bd Branch: refs/heads/master Commit: 9a36f0bd808b36f52ae8d2abfb55a4a40d5074dd Parents: f7b8510 Author: atomtongAuthored: Thu Nov 2 01:10:04 2017 +0800 Committer: atomtong Committed: Thu Nov 2 01:10:04 2017 +0800 -- .../src/main/java/com/taobao/weex/WXSDKInstance.java| 2 +- .../main/java/com/taobao/weex/common/WXPerformance.java | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9a36f0bd/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java index 14c6172..8aa9809 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -131,7 +131,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. *for network tracker */ public String mwxDims[] = new String [5]; - public Double measureTimes[] = new Double [5]; + public long measureTimes[] = new long [5]; public WeakReference templateRef; public Map responseHeaders = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9a36f0bd/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 8f682ee..8238041 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 @@ -181,7 +181,7 @@ public class WXPerformance { */ public String wxDims[] = new String [5]; - public Double measureTimes[] = new Double [5]; + public long measureTimes[] = new long [5]; public WXPerformance(){ mErrMsgBuilder=new StringBuilder(); @@ -209,11 +209,11 @@ public class WXPerformance { quotas.put("SDKInitTime",(double)WXEnvironment.sSDKInitTime); quotas.put("maxDeepViewLayer", (double) maxDeepViewLayer); quotas.put("useScroller", (double) useScroller); - quotas.put("measureTime1", measureTimes[0]); - quotas.put("measureTime2", measureTimes[1]); - quotas.put("measureTime3", measureTimes[2]); - quotas.put("measureTime4", measureTimes[3]); - quotas.put("measureTime5", measureTimes[4]); + quotas.put("measureTime1", (double) measureTimes[0]); + quotas.put("measureTime2", (double) measureTimes[1]); + quotas.put("measureTime3", (double) measureTimes[2]); + quotas.put("measureTime4", (double) measureTimes[3]); + quotas.put("measureTime5", (double) measureTimes[4]); return quotas; }
[GitHub] incubator-weex pull request #863: [WEEX-115] [android]logwatcher is design t...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/863 ---
[14/19] incubator-weex git commit: [android] remove debug log into debug mode
[android] remove debug log into debug mode Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/265d4272 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/265d4272 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/265d4272 Branch: refs/heads/master Commit: 265d4272e3af8fc1ecaff2b58d33a0d47f41433e Parents: 71d92a2 Author: atomtongAuthored: Mon Nov 13 15:24:44 2017 +0800 Committer: atomtong Committed: Mon Nov 13 15:24:44 2017 +0800 -- .../main/java/com/taobao/weex/WXSDKInstance.java| 3 +-- .../com/taobao/weex/bridge/WXBridgeManager.java | 4 ++-- .../main/java/com/taobao/weex/utils/WXLogUtils.java | 16 +--- 3 files changed, 12 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265d4272/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java index 8aa9809..11e7ce1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -1074,13 +1074,12 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. } WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, mWXPerformance.toString()); - } } }); } if(!WXEnvironment.isApkDebugable()){ - Log.e("weex_perf",mWXPerformance.getPerfData()); + WXLogUtils.e("weex_perf",mWXPerformance.getPerfData()); } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265d4272/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 b6db683..97fb867 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 @@ -1529,14 +1529,14 @@ public class WXBridgeManager implements Callback, BactchExecutor { public void invokeExecJS(String instanceId, String namespace, String function, WXJSObject[] args, boolean logTaskDetail) { -// if (WXEnvironment.isApkDebugable()) { + if (WXEnvironment.isApkDebugable()) { mLodBuilder.append("callJS instanceId:").append(instanceId) .append("function:").append(function); if (logTaskDetail) mLodBuilder.append(" tasks:").append(WXJsonUtils.fromObjectToJSONString(args)); WXLogUtils.d(mLodBuilder.substring(0)); mLodBuilder.setLength(0); -// } + } mWXBridge.execJS(instanceId, namespace, function, args); } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265d4272/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java index 10f1597..70ca32b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java @@ -75,14 +75,18 @@ public class WXLogUtils { sLogWatcher.onLog(level.getName(), tag, msg); } -if (msg != null && WXEnvironment.sLogLevel.compare(level) >= 0) { + if (WXEnvironment.isApkDebugable()) { Log.println(level.getPriority(),tag, msg); // if not debug level then print log - if(WXEnvironment.isApkDebugable() && !level.getName().equals("debug")){ + if(!level.getName().equals("debug")){ writeConsoleLog(level.getName(), msg); sendLog(level, msg); } -} +}else { + if(level.getPriority() - LogLevel.WARN.getPriority() >=0){ + Log.println(level.getPriority(),tag, msg); + } + } } public static void d(String msg) { @@ -120,10 +124,8 @@ public class WXLogUtils { public static void d(String tag, String msg) { log(tag, msg, LogLevel.DEBUG); - sendLog(LogLevel.DEBUG, tag + ":" + msg);// WXDebugTool sendLog - if(WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0){//sLogLevel in debug mode is "LogLevel.DEBUG" - if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg)) { + if(WXEnvironment.isApkDebugable()){//sLogLevel in debug mode is "LogLevel.DEBUG" if
[13/19] incubator-weex git commit: Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack
Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack * release-0.16-gitlab: * [android] change format data * [android] register dim and mes * [android] get screenreader time add mtop coume time Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/71d92a29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/71d92a29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/71d92a29 Branch: refs/heads/master Commit: 71d92a2959cd6ff47470d510399f99c8d307933b Parents: 454ea94 9d3caa2 Author: atomtongAuthored: Sat Nov 11 14:27:26 2017 +0800 Committer: atomtong Committed: Sat Nov 11 14:27:26 2017 +0800 -- .../java/com/taobao/weex/WXSDKInstance.java | 11 +-- .../com/taobao/weex/common/WXPerformance.java | 32 +--- 2 files changed, 36 insertions(+), 7 deletions(-) --
[17/19] incubator-weex git commit: * [android] comment position fixed
* [android] comment position fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/060d89aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/060d89aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/060d89aa Branch: refs/heads/master Commit: 060d89aa9dc886efe4066f67d664c63488f65d66 Parents: e7eed89 Author: atomtongAuthored: Tue Nov 14 19:34:57 2017 +0800 Committer: atomtong Committed: Tue Nov 14 19:34:57 2017 +0800 -- .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/060d89aa/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 e40013c..d125d5b 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 @@ -1536,9 +1536,9 @@ public class WXBridgeManager implements Callback, BactchExecutor { mLodBuilder.append(" tasks:").append(WXJsonUtils.fromObjectToJSONString(args)); WXLogUtils.d(mLodBuilder.substring(0)); mLodBuilder.setLength(0); - } +// } mWXBridge.execJS(instanceId, namespace, function, args); -// } + } private void invokeInitFramework(Message msg) { String framework = "";
[09/19] incubator-weex git commit: * [android] release log analyse logwatcher
* [android] release log analyse logwatcher Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7efcc193 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7efcc193 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7efcc193 Branch: refs/heads/master Commit: 7efcc19320afb48dc2a66aaf4d871719671f3885 Parents: 8a19b9b Author: atomtongAuthored: Fri Nov 10 21:03:27 2017 +0800 Committer: atomtong Committed: Fri Nov 10 21:03:27 2017 +0800 -- .../sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java| 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7efcc193/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java index af20f22..78b3dbf 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java @@ -124,6 +124,12 @@ public class WXLogUtils { public static void d(String tag, String msg) { + if(!WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg)){ + if(sLogWatcher != null){//sLogWatcher designed to track analyse log + log(tag, msg, LogLevel.DEBUG); + } + } + if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg) && WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0) { if ("jsLog".equals(tag) && jsLogWatcher != null) { if (msg.endsWith("__DEBUG")) {
[11/19] incubator-weex git commit: * [android] log track adapter fix logLevel
* [android] log track adapter fix logLevel Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/454ea94b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/454ea94b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/454ea94b Branch: refs/heads/master Commit: 454ea94b97657a95b7f13fb23e9a8281ffb3ae8d Parents: a1dc1ac Author: atomtongAuthored: Sat Nov 11 14:22:05 2017 +0800 Committer: atomtong Committed: Sat Nov 11 14:22:05 2017 +0800 -- .../java/com/taobao/weex/utils/WXLogUtils.java | 68 +--- 1 file changed, 30 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/454ea94b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java index 78b3dbf..10f1597 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java @@ -76,12 +76,7 @@ public class WXLogUtils { } if (msg != null && WXEnvironment.sLogLevel.compare(level) >= 0) { - if (sLogWatcher != null ) { -sLogWatcher.onLog(level.getName(), tag, msg); - }else{ Log.println(level.getPriority(),tag, msg); - } - // if not debug level then print log if(WXEnvironment.isApkDebugable() && !level.getName().equals("debug")){ writeConsoleLog(level.getName(), msg); @@ -124,41 +119,38 @@ public class WXLogUtils { public static void d(String tag, String msg) { - if(!WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg)){ - if(sLogWatcher != null){//sLogWatcher designed to track analyse log - log(tag, msg, LogLevel.DEBUG); + log(tag, msg, LogLevel.DEBUG); + sendLog(LogLevel.DEBUG, tag + ":" + msg);// WXDebugTool sendLog + + if(WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0){//sLogLevel in debug mode is "LogLevel.DEBUG" + if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg)) { + if ("jsLog".equals(tag) && jsLogWatcher != null) { + if (msg.endsWith("__DEBUG")) { + jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__DEBUG", "")); + } else if (msg.endsWith("__INFO")) { + jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__INFO", "")); + } else if (msg.endsWith("__WARN")) { + jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__WARN", "")); + } else if (msg.endsWith("__ERROR")) { + jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__ERROR", "")); + } else { + jsLogWatcher.onJsLog(Log.DEBUG, msg); + } + } + + /** This log method will be invoked from jni code, so try to extract loglevel from message. **/ + writeConsoleLog("debug", tag + ":" + msg); + if(msg.contains(" | __")){ + String[] msgs=msg.split(" | __"); + LogLevel level; + if( msgs!=null && msgs.length==4 && !TextUtils.isEmpty(msgs[0]) && !TextUtils.isEmpty(msgs[2])){ + level=getLogLevel(msgs[2]); + sendLog(level,msgs[0]); + return; + } + } } } - -if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg) && WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0) { - if ("jsLog".equals(tag) && jsLogWatcher != null) { -if (msg.endsWith("__DEBUG")) { - jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__DEBUG", "")); -} else if (msg.endsWith("__INFO")) { - jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__INFO", "")); -} else if (msg.endsWith("__WARN")) { - jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__WARN", "")); -} else if (msg.endsWith("__ERROR")) { - jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__ERROR", "")); -} else { - jsLogWatcher.onJsLog(Log.DEBUG, msg); -} - } - - /** This log method will be invoked from jni code, so try to extract loglevel from message. **/ - writeConsoleLog("debug", tag + ":" + msg); - if(msg.contains(" | __")){ -String[] msgs=msg.split(" | __"); -LogLevel level; -if( msgs!=null && msgs.length==4 && !TextUtils.isEmpty(msgs[0]) && !TextUtils.isEmpty(msgs[2])){ - level=getLogLevel(msgs[2]); - sendLog(level,msgs[0]); -
[03/19] incubator-weex git commit: * [android] register dim and mes
* [android] register dim and mes Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f7b85105 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f7b85105 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f7b85105 Branch: refs/heads/master Commit: f7b851052fb0cc3f8112da30a96dc30680a71a17 Parents: 7857ba4 Author: atomtongAuthored: Thu Nov 2 00:36:26 2017 +0800 Committer: atomtong Committed: Thu Nov 2 00:36:26 2017 +0800 -- .../main/java/com/taobao/weex/common/WXPerformance.java | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f7b85105/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 04eb354..8f682ee 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 @@ -235,7 +235,8 @@ public class WXPerformance { } public static String[] getDimensions(){ -return new String[]{"bizType","templateUrl","pageName","JSLibVersion","WXSDKVersion","connectionType","requestType"}; +return new String[]{"bizType","templateUrl","pageName","JSLibVersion","WXSDKVersion","connectionType","requestType" +,"wxdim1","wxdim2","wxdim3","wxdim4","wxdim5"}; } public static String[] getMeasures(){ @@ -258,7 +259,13 @@ public class WXPerformance { "actualNetworkTime", "firstScreenJSFExecuteTime", "maxDeepViewLayer", -"useScroller"}; +"useScroller", + "measureTime1", + "measureTime2", + "measureTime3", + "measureTime4", + "measureTime5" + }; } @Override
[10/19] incubator-weex git commit: Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack
Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack * release-0.16-gitlab: Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a1dc1ac4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a1dc1ac4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a1dc1ac4 Branch: refs/heads/master Commit: a1dc1ac43960a732813a7bb5b5cfca7411090805 Parents: 7efcc19 8b9a3a1 Author: atomtongAuthored: Sat Nov 11 13:58:59 2017 +0800 Committer: atomtong Committed: Sat Nov 11 13:58:59 2017 +0800 -- --
[05/19] incubator-weex git commit: Merge branch 'release-0.16-gitlab' into release-0.16-github-mtop-tracker
Merge branch 'release-0.16-gitlab' into release-0.16-github-mtop-tracker * release-0.16-gitlab: * [devtool] fix devtool network mode Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72f5e138 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72f5e138 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72f5e138 Branch: refs/heads/master Commit: 72f5e138a17d5ffbdf3f4b93d9e19b6867a52b1e Parents: 9a36f0b 0c20eed Author: atomtongAuthored: Thu Nov 2 08:49:53 2017 +0800 Committer: atomtong Committed: Thu Nov 2 08:49:53 2017 +0800 -- android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java | 1 + 1 file changed, 1 insertion(+) --
[GitHub] incubator-weex pull request #852: [WEEX-108][Android] support role property ...
Github user misakuo closed the pull request at: https://github.com/apache/incubator-weex/pull/852 ---
[GitHub] incubator-weex pull request #852: [WEEX-108][Android] support role property ...
GitHub user misakuo reopened a pull request: https://github.com/apache/incubator-weex/pull/852 [WEEX-108][Android] support role property to accessibility Testcase: http://dotwe.org/weex/a1a89e2c1f82aaa1559cb9ceefd63f7f You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-feature-accessible Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/852.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 #852 commit c4721babb57187e5f85e7c301f617e0104b39b66 Author: misakuoDate: 2017-11-13T03:37:08Z * [android] support role property to accessibility ---
[GitHub] incubator-weex pull request #864: [iOS] Make sure gesture recognizers won't ...
GitHub user AntiMoron opened a pull request: https://github.com/apache/incubator-weex/pull/864 [iOS] Make sure gesture recognizers won't be lost. 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/AntiMoron/incubator-weex master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/864.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 #864 commit c71931d8d76f0dfabbc9ce2bd92329ba9a74a4fc Author: MeoJaDate: 2017-11-15T03:57:25Z [iOS] Make sure gesture recognizers won't be lost. ---
[2/2] incubator-weex git commit: [WEEX-109][android] support scroll start scroll end event on scroller
[WEEX-109][android] support scroll start scroll end event on scroller Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4747acc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4747acc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4747acc9 Branch: refs/heads/master Commit: 4747acc95aab3d00d712306f90ac6068e762db3e Parents: 00a4cd6 40de940 Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 11:27:44 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 11:28:12 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 2 + .../taobao/weex/ui/component/WXScroller.java| 43 ++- .../component/helper/ScrollStartEndHelper.java | 116 +++ .../ui/component/list/BasicListComponent.java | 35 +- .../list/template/WXRecyclerTemplateList.java | 39 +-- 5 files changed, 219 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4747acc9/android/sdk/src/main/java/com/taobao/weex/common/Constants.java -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4747acc9/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java --
[GitHub] incubator-weex pull request #861: [WEEX-109][android] support scroll start s...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/861 ---
[1/2] incubator-weex git commit: [WEEX-109][android] support scroll start scroll end event on scroller list template list
Repository: incubator-weex Updated Branches: refs/heads/master 00a4cd654 -> 4747acc95 [WEEX-109][android] support scroll start scroll end event on scroller list template list Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/40de9402 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/40de9402 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/40de9402 Branch: refs/heads/master Commit: 40de94021c0d5e139f8c8696d19ce493f252b772 Parents: 8a19b9b Author: jianbai.gbjAuthored: Mon Nov 13 18:09:08 2017 +0800 Committer: jianbai.gbj Committed: Mon Nov 13 18:09:08 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 2 + .../taobao/weex/ui/component/WXScroller.java| 43 ++- .../component/helper/ScrollStartEndHelper.java | 116 +++ .../ui/component/list/BasicListComponent.java | 35 +- .../list/template/WXRecyclerTemplateList.java | 39 +-- 5 files changed, 219 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/40de9402/android/sdk/src/main/java/com/taobao/weex/common/Constants.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java index 32c91ba..5145f9e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@ -278,6 +278,8 @@ public class Constants { String ONPULLING_DOWN = "pullingdown"; String ONPULLING_UP = "pullingup"; String SCROLL = "scroll"; +String SCROLL_START = "scrollstart"; +String SCROLL_END = "scrollend"; String CLICKBACKITEM = "clickbackitem"; String RESUME_EVENT = "WXApplicationDidBecomeActiveEvent"; String PAUSE_EVENT = "WXApplicationWillResignActiveEvent"; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/40de9402/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java index 9e56259..9885d62 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java @@ -42,6 +42,7 @@ import com.taobao.weex.common.OnWXScrollListener; import com.taobao.weex.common.WXThread; import com.taobao.weex.dom.WXDomObject; import com.taobao.weex.ui.ComponentCreator; +import com.taobao.weex.ui.component.helper.ScrollStartEndHelper; import com.taobao.weex.ui.component.helper.WXStickyHelper; import com.taobao.weex.ui.view.IWXScroller; import com.taobao.weex.ui.view.WXBaseRefreshLayout; @@ -78,6 +79,14 @@ public class WXScroller extends WXVContainer implements WXScrollViewL private boolean mForceLoadmoreNextTime = false; private int mOffsetAccuracy = 10; private Point mLastReport = new Point(-1, -1); + private boolean mHasAddScrollEvent = false; + + /** + * scroll start and scroll end event + * */ + private ScrollStartEndHelper mScrollStartEndHelper; + + public static class Creator implements ComponentCreator { public WXComponent createInstance(WXSDKInstance instance, WXDomObject node, WXVContainer parent) throws IllegalAccessException, InvocationTargetException, InstantiationException { @@ -102,6 +111,7 @@ public class WXScroller extends WXVContainer implements WXScrollViewL private boolean isScrollable = true; + @Deprecated public WXScroller(WXSDKInstance instance, WXDomObject dom, WXVContainer parent, String instanceId, boolean isLazy) { this(instance,dom,parent); @@ -148,11 +158,17 @@ public class WXScroller extends WXVContainer implements WXScrollViewL @Override public void addEvent(String type) { super.addEvent(type); -if (Constants.Event.SCROLL.equals(type) && getInnerView() != null) { +if (ScrollStartEndHelper.isScrollEvent(type) +&& getInnerView() != null && !mHasAddScrollEvent) { + mHasAddScrollEvent = true; if (getInnerView() instanceof WXScrollView) { ((WXScrollView) getInnerView()).addScrollViewListener(new WXScrollViewListener() { @Override public void onScrollChanged(WXScrollView scrollView, int x, int y, int oldx, int oldy) { +getScrollStartEndHelper().onScrolled(x, y); +if(!getDomObject().getEvents().contains(Constants.Event.SCROLL)){ + return; +} if (shouldReport(x, y))
[GitHub] incubator-weex pull request #859: [WEEX-110][android]WXSwipeLayout support n...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/859 ---
[4/7] incubator-weex git commit: nested scroll helper
nested scroll helper Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d4c004bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d4c004bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d4c004bd Branch: refs/heads/master Commit: d4c004bde700e5ccc7b5d2d1b974ede8ceb34c1f Parents: 69f634a Author: jianbai.gbjAuthored: Mon Oct 30 20:20:57 2017 +0800 Committer: jianbai.gbj Committed: Mon Oct 30 20:20:57 2017 +0800 -- .../ui/view/refresh/core/WXSwipeLayout.java | 32 1 file changed, 19 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4c004bd/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java index 1676c99..e1ec10b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -297,18 +297,6 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, mNestedScrollInProgress = true; } - /** - * Callback on TouchEvent.ACTION_CANCLE or TouchEvent.ACTION_UP - * handler : refresh or loading - * @param child : child view of SwipeLayout,RecyclerView or Scroller - */ - @Override - public void onStopNestedScroll(View child) { -mNestedScrollingParentHelper.onStopNestedScroll(child); -mNestedScrollInProgress = true; -handlerAction(); -stopNestedScroll(); - } /** * With child view to processing move events @@ -320,6 +308,12 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, @Override public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) { if ((!mPullRefreshEnable && !mPullLoadEnable)) { + // Now let our nested parent consume the leftovers + final int[] parentConsumed = mParentScrollConsumed; + if (dispatchNestedPreScroll(dx - consumed[0], dy - consumed[1], parentConsumed, null)) { +consumed[0] += parentConsumed[0]; +consumed[1] += parentConsumed[1]; + } return; } @@ -338,7 +332,6 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, if (moveSpinner(-dy)) { consumed[1] += dy; } - // Now let our nested parent consume the leftovers final int[] parentConsumed = mParentScrollConsumed; if (dispatchNestedPreScroll(dx - consumed[0], dy - consumed[1], parentConsumed, null)) { @@ -353,6 +346,19 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, } + /** + * Callback on TouchEvent.ACTION_CANCLE or TouchEvent.ACTION_UP + * handler : refresh or loading + * @param child : child view of SwipeLayout,RecyclerView or Scroller + */ + @Override + public void onStopNestedScroll(View child) { +mNestedScrollingParentHelper.onStopNestedScroll(child); +mNestedScrollInProgress = true; +handlerAction(); +stopNestedScroll(); + } + @Override public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
[7/7] incubator-weex git commit: [WEEX-110][android]WXSwipeLayout support nested scrolling for list
[WEEX-110][android]WXSwipeLayout support nested scrolling for list Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/00a4cd65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/00a4cd65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/00a4cd65 Branch: refs/heads/master Commit: 00a4cd654381f7dbf53b8433b2ed4670753caf78 Parents: 6b3519a f669385 Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 11:26:21 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 11:26:41 2017 +0800 -- .../weex/ui/component/list/WXListComponent.java | 10 +- .../list/template/WXRecyclerTemplateList.java | 5 + .../ui/view/refresh/core/WXSwipeLayout.java | 214 --- 3 files changed, 197 insertions(+), 32 deletions(-) --
[1/7] incubator-weex git commit: nest scroll
Repository: incubator-weex Updated Branches: refs/heads/master 6b3519a2d -> 00a4cd654 nest scroll Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/868a9bd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/868a9bd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/868a9bd6 Branch: refs/heads/master Commit: 868a9bd64c35cf86ea29a6f4bbfe70e06dccfa8c Parents: 1538690 Author: jianbai.gbjAuthored: Thu Oct 26 14:04:04 2017 +0800 Committer: jianbai.gbj Committed: Thu Oct 26 14:04:04 2017 +0800 -- .../ui/view/refresh/core/WXSwipeLayout.java | 92 1 file changed, 77 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/868a9bd6/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java index fa26de7..e9c84e4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -24,6 +24,8 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.Color; import android.os.Build; +import android.support.v4.view.NestedScrollingChild; +import android.support.v4.view.NestedScrollingChildHelper; import android.support.v4.view.NestedScrollingParent; import android.support.v4.view.NestedScrollingParentHelper; import android.support.v4.view.ViewCompat; @@ -36,9 +38,11 @@ import android.view.View; import android.widget.AbsListView; import android.widget.FrameLayout; -public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent { +public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, NestedScrollingChild { - private NestedScrollingParentHelper parentHelper; + private NestedScrollingParentHelper mNestedScrollingParentHelper; + private NestedScrollingChildHelper mNestedScrollingChildHelper; + private final int[] mParentOffsetInWindow = new int[2]; private WXOnRefreshListener onRefreshListener; private WXOnLoadingListener onLoadingListener; @@ -143,7 +147,9 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent throw new RuntimeException("WXSwipeLayout should not have more than one child"); } -parentHelper = new NestedScrollingParentHelper(this); +mNestedScrollingParentHelper = new NestedScrollingParentHelper(this); +mNestedScrollingChildHelper = new NestedScrollingChildHelper(this); +setNestedScrollingEnabled(true); if (isInEditMode() && attrs == null) { return; @@ -206,6 +212,68 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent return super.onInterceptTouchEvent(ev); } + // NestedScrollingChild + + @Override + public void setNestedScrollingEnabled(boolean enabled) { +mNestedScrollingChildHelper.setNestedScrollingEnabled(enabled); + } + + @Override + public boolean isNestedScrollingEnabled() { +return mNestedScrollingChildHelper.isNestedScrollingEnabled(); + } + + @Override + public boolean startNestedScroll(int axes) { +return mNestedScrollingChildHelper.startNestedScroll(axes); + } + + @Override + public void stopNestedScroll() { +mNestedScrollingChildHelper.stopNestedScroll(); + } + + @Override + public boolean hasNestedScrollingParent() { +return mNestedScrollingChildHelper.hasNestedScrollingParent(); + } + + @Override + public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed, + int dyUnconsumed, int[] offsetInWindow) { +return mNestedScrollingChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed, +dxUnconsumed, dyUnconsumed, offsetInWindow); + } + + @Override + public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow) { +return mNestedScrollingChildHelper.dispatchNestedPreScroll( +dx, dy, consumed, offsetInWindow); + } + + @Override + public boolean onNestedPreFling(View target, float velocityX, + float velocityY) { +return dispatchNestedPreFling(velocityX, velocityY); + } + + @Override + public boolean onNestedFling(View target, float velocityX, float velocityY, + boolean consumed) { +return dispatchNestedFling(velocityX, velocityY, consumed); + } + + @Override + public
[5/7] incubator-weex git commit: [WEEX-110][android]WXSwipeLayout support nested scroll for list
[WEEX-110][android]WXSwipeLayout support nested scroll for list Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/874147d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/874147d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/874147d8 Branch: refs/heads/master Commit: 874147d8f28f2ab9a3656a3f4ba5e2df8753800e Parents: d4c004b Author: jianbai.gbjAuthored: Tue Oct 31 14:05:52 2017 +0800 Committer: jianbai.gbj Committed: Tue Nov 14 11:27:54 2017 +0800 -- .../weex/ui/component/list/WXListComponent.java | 10 +- .../list/template/WXRecyclerTemplateList.java | 5 + .../ui/view/refresh/core/WXSwipeLayout.java | 130 ++- 3 files changed, 110 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/874147d8/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java index c5ef8b5..507a40c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java @@ -37,6 +37,7 @@ import com.taobao.weex.ui.component.WXVContainer; import com.taobao.weex.ui.view.listview.WXRecyclerView; import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder; import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView; +import com.taobao.weex.utils.WXUtils; import java.util.Map; @@ -79,8 +80,13 @@ public class WXListComponent extends BasicListComponent { @Override protected BounceRecyclerView generateListView(Context context, int orientation) { - -return new BounceRecyclerView(context,mLayoutType,mColumnCount,mColumnGap,orientation); +BounceRecyclerView bounceRecyclerView = new BounceRecyclerView(context,mLayoutType,mColumnCount,mColumnGap,orientation); +if(bounceRecyclerView.getSwipeLayout() != null){ + if(WXUtils.getBoolean(getDomObject().getAttrs().get("nestedScrollingEnabled"), false)) { + bounceRecyclerView.getSwipeLayout().setNestedScrollingEnabled(true); + } +} +return bounceRecyclerView; } @Override http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/874147d8/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java index 76bcce0..54e1564 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java @@ -236,6 +236,11 @@ public class WXRecyclerTemplateList extends WXVContainer imp if(itemViewCacheSize != 2) { bounceRecyclerView.getInnerView().setItemViewCacheSize(itemViewCacheSize); } +if(bounceRecyclerView.getSwipeLayout() != null){ + if(WXUtils.getBoolean(getDomObject().getAttrs().get("nestedScrollingEnabled"), false)) { + bounceRecyclerView.getSwipeLayout().setNestedScrollingEnabled(true); +} +} bounceRecyclerView.getInnerView().setHasFixedSize(hasFixedSize); bounceRecyclerView.setRecyclerViewBaseAdapter(recyclerViewBaseAdapter); bounceRecyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/874147d8/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java index e1ec10b..a69dc0e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -29,12 +29,15 @@ import android.support.v4.view.NestedScrollingChildHelper; import android.support.v4.view.NestedScrollingParent; import android.support.v4.view.NestedScrollingParentHelper; import android.support.v4.view.ViewCompat; +import android.support.v4.view.ViewParentCompat; import
[3/7] incubator-weex git commit: nest scroll check
nest scroll check Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/69f634a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/69f634a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/69f634a4 Branch: refs/heads/master Commit: 69f634a420df660433536d7630376222ace8e647 Parents: 1f54c7d Author: jianbai.gbjAuthored: Thu Oct 26 20:06:36 2017 +0800 Committer: jianbai.gbj Committed: Thu Oct 26 20:06:36 2017 +0800 -- .../com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/69f634a4/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java index b8c8465..1676c99 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -44,6 +44,7 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, private NestedScrollingChildHelper mNestedScrollingChildHelper; private final int[] mParentScrollConsumed = new int[2]; private final int[] mParentOffsetInWindow = new int[2]; + private boolean mNestedScrollInProgress; private WXOnRefreshListener onRefreshListener; private WXOnLoadingListener onLoadingListener; @@ -210,6 +211,12 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, if ((!mPullRefreshEnable && !mPullLoadEnable)) { return false; } +if (!isEnabled() || canChildScrollUp() +|| mRefreshing || mNestedScrollInProgress) { + // Fail fast if we're not in a state where a swipe is possible + return false; +} + return super.onInterceptTouchEvent(ev); } @@ -287,6 +294,7 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, public void onNestedScrollAccepted(View child, View target, int axes) { mNestedScrollingParentHelper.onNestedScrollAccepted(child, target, axes); startNestedScroll(axes & ViewCompat.SCROLL_AXIS_VERTICAL); +mNestedScrollInProgress = true; } /** @@ -297,6 +305,7 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, @Override public void onStopNestedScroll(View child) { mNestedScrollingParentHelper.onStopNestedScroll(child); +mNestedScrollInProgress = true; handlerAction(); stopNestedScroll(); }
[2/7] incubator-weex git commit: nest scroll parent
nest scroll parent Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1f54c7d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1f54c7d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1f54c7d3 Branch: refs/heads/master Commit: 1f54c7d3378bece79a4bb2762ea34b185f0259f1 Parents: 868a9bd Author: jianbai.gbjAuthored: Thu Oct 26 14:35:22 2017 +0800 Committer: jianbai.gbj Committed: Thu Oct 26 14:35:22 2017 +0800 -- .../ui/view/refresh/core/WXSwipeLayout.java | 27 +++- 1 file changed, 20 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1f54c7d3/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java index e9c84e4..b8c8465 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -42,6 +42,7 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, private NestedScrollingParentHelper mNestedScrollingParentHelper; private NestedScrollingChildHelper mNestedScrollingChildHelper; + private final int[] mParentScrollConsumed = new int[2]; private final int[] mParentOffsetInWindow = new int[2]; private WXOnRefreshListener onRefreshListener; private WXOnLoadingListener onLoadingListener; @@ -278,13 +279,14 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, @Override public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) { -return true; +return isEnabled() && !mRefreshing +&& (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0; } @Override public void onNestedScrollAccepted(View child, View target, int axes) { mNestedScrollingParentHelper.onNestedScrollAccepted(child, target, axes); -startNestedScroll(axes); +startNestedScroll(axes & ViewCompat.SCROLL_AXIS_VERTICAL); } /** @@ -325,13 +327,15 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, } if (moveSpinner(-dy)) { - consumed[1] += dy; + consumed[1] += dy; } - } - @Override - public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) { - dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, mParentOffsetInWindow); +// Now let our nested parent consume the leftovers +final int[] parentConsumed = mParentScrollConsumed; +if (dispatchNestedPreScroll(dx - consumed[0], dy - consumed[1], parentConsumed, null)) { + consumed[0] += parentConsumed[0]; + consumed[1] += parentConsumed[1]; +} } @Override @@ -341,6 +345,15 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, + @Override + public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) { + dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, mParentOffsetInWindow); + } + + + + + private double calculateDistanceY(View target, int dy) { int viewHeight = target.getMeasuredHeight(); double ratio = (viewHeight - Math.abs(target.getY())) / 1.0d / viewHeight * DAMPING;
[6/7] incubator-weex git commit: [WEEX-109][android] support scroll start scroll end event on scroller list template list, handle pull action when nestedScrollingEnable false
[WEEX-109][android] support scroll start scroll end event on scroller list template list, handle pull action when nestedScrollingEnable false Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f6693854 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f6693854 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f6693854 Branch: refs/heads/master Commit: f6693854d79b9785b7a3ba7a43835e4aab7537a8 Parents: 874147d Author: jianbai.gbjAuthored: Tue Nov 14 20:18:55 2017 +0800 Committer: jianbai.gbj Committed: Tue Nov 14 20:18:55 2017 +0800 -- .../java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6693854/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java index a69dc0e..5a2050b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -414,9 +414,9 @@ public class WXSwipeLayout extends FrameLayout implements NestedScrollingParent, @Override public void onStopNestedScroll(View child) { mNestedScrollingParentHelper.onStopNestedScroll(child); +handlerAction(); if(isNestedScrollingEnabled()) { mNestedScrollInProgress = true; - handlerAction(); stopNestedScroll(); } }
[GitHub] incubator-weex pull request #852: [WEEX-108][Android] support role property ...
GitHub user misakuo reopened a pull request: https://github.com/apache/incubator-weex/pull/852 [WEEX-108][Android] support role property to accessibility Testcase: http://dotwe.org/weex/a1a89e2c1f82aaa1559cb9ceefd63f7f You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-feature-accessible Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/852.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 #852 commit c4721babb57187e5f85e7c301f617e0104b39b66 Author: misakuoDate: 2017-11-13T03:37:08Z * [android] support role property to accessibility ---
[GitHub] incubator-weex pull request #852: [WEEX-108][Android] support role property ...
Github user misakuo closed the pull request at: https://github.com/apache/incubator-weex/pull/852 ---
[GitHub] incubator-weex pull request #831: [WEEX-100][Android] support multi language...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/831 ---
[2/2] incubator-weex git commit: [WEEX-100][Android] support multi language on dialog
[WEEX-100][Android] support multi language on dialog Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6b3519a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6b3519a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6b3519a2 Branch: refs/heads/master Commit: 6b3519a2d14df113a83bec3c4bebc6947e3d9031 Parents: 1c7f1ff a8cac84 Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 11:18:11 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 11:19:17 2017 +0800 -- .../weex/appfram/pickers/DatePickerImpl.java| 33 ++-- .../weex/appfram/pickers/WXPickersModule.java | 7 +++-- .../ui/component/helper/WXTimeInputHelper.java | 6 ++-- 3 files changed, 39 insertions(+), 7 deletions(-) --
[1/2] incubator-weex git commit: * [android] support mutil language on dialog
Repository: incubator-weex Updated Branches: refs/heads/master 1c7f1ff75 -> 6b3519a2d * [android] support mutil language on dialog Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a8cac846 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a8cac846 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a8cac846 Branch: refs/heads/master Commit: a8cac8467f6236b962a9c3d13b9ebf72bf4c1ad5 Parents: 659284d Author: misakuoAuthored: Mon Oct 23 14:18:36 2017 +0800 Committer: misakuo Committed: Mon Oct 23 14:18:36 2017 +0800 -- .../weex/appfram/pickers/DatePickerImpl.java| 33 ++-- .../weex/appfram/pickers/WXPickersModule.java | 7 +++-- .../ui/component/helper/WXTimeInputHelper.java | 6 ++-- 3 files changed, 39 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8cac846/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java index f6950bf..db00765 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java +++ b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java @@ -18,6 +18,7 @@ */ package com.taobao.weex.appfram.pickers; +import android.app.AlertDialog; import android.app.DatePickerDialog; import android.app.TimePickerDialog; import android.content.Context; @@ -25,6 +26,7 @@ import android.content.DialogInterface; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; +import android.widget.Button; import android.widget.DatePicker; import android.widget.TimePicker; @@ -35,6 +37,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Locale; +import java.util.Map; /** * Created by moxun on 16/11/23. @@ -48,7 +51,7 @@ public class DatePickerImpl { private static SimpleDateFormat timeFormatter; private static SimpleDateFormat dateFormatter; -public static void pickDate(@NonNull Context context, String value, String max, String min, @NonNull final OnPickListener listener) { +public static void pickDate(@NonNull Context context, String value, String max, String min, @NonNull final OnPickListener listener, @Nullable Map extras) { Calendar calendar = Calendar.getInstance(); calendar.setTime(parseDate(value)); final DatePickerDialog dialog = new DatePickerDialog( @@ -102,10 +105,13 @@ public class DatePickerImpl { } }); +setButtonText(dialog, DialogInterface.BUTTON_NEGATIVE, String.valueOf(extras.get("cancelTitle"))); +setButtonText(dialog, DialogInterface.BUTTON_POSITIVE, String.valueOf(extras.get("confirmTitle"))); + dialog.show(); } -public static void pickTime(@NonNull Context context, String value, @NonNull final OnPickListener listener) { +public static void pickTime(@NonNull Context context, String value, @NonNull final OnPickListener listener, @Nullable Map extras) { Calendar calendar = Calendar.getInstance(); calendar.setTime(parseTime(value)); TimePickerDialog dialog = new TimePickerDialog( @@ -131,6 +137,9 @@ public class DatePickerImpl { } }); +setButtonText(dialog, DialogInterface.BUTTON_NEGATIVE, String.valueOf(extras.get("cancelTitle"))); +setButtonText(dialog, DialogInterface.BUTTON_POSITIVE, String.valueOf(extras.get("confirmTitle"))); + dialog.show(); } @@ -165,4 +174,24 @@ public class DatePickerImpl { } return new Date(); } + +private static void setButtonText(final AlertDialog dialog, final int which, final CharSequence text) { +if (TextUtils.isEmpty(text) || "null".equals(text)) { +return; +} +try { +dialog.getWindow().getDecorView().post(new Runnable() { +@Override +public void run() { +Button button = dialog.getButton(which); +if (button != null) { +button.setAllCaps(false); +button.setText(text); +} +} +}); +} catch (Throwable t) { +t.printStackTrace(); +} +} }
[6/6] incubator-weex git commit: * [android] support ripple background
* [android] support ripple background Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1c7f1ff7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1c7f1ff7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1c7f1ff7 Branch: refs/heads/master Commit: 1c7f1ff75993c7d3d9c24ddbb653706fac1a1271 Parents: 3949bff aff7e3a Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 11:17:18 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 11:17:30 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 92 ++-- .../pesudo/OnActivePseudoListener.java | 26 ++ .../component/pesudo/OnActivePseudoListner.java | 26 -- .../pesudo/TouchActivePseudoListener.java | 12 +-- 5 files changed, 118 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1c7f1ff7/android/sdk/src/main/java/com/taobao/weex/common/Constants.java -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1c7f1ff7/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java --
[GitHub] incubator-weex pull request #792: + [android] support ripple background
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/792 ---
[4/6] incubator-weex git commit: * [android] remove static import
* [android] remove static import Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/240f6040 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/240f6040 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/240f6040 Branch: refs/heads/master Commit: 240f604068ea54b8c666468bca472afde83f612d Parents: c38239b Author: misakuoAuthored: Mon Oct 16 11:12:15 2017 +0800 Committer: misakuo Committed: Mon Oct 16 11:12:15 2017 +0800 -- .../main/java/com/taobao/weex/ui/component/WXComponent.java | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/240f6040/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index 5a1d046..351f768 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@ -75,7 +75,6 @@ import com.taobao.weex.tracing.WXTracing; import com.taobao.weex.ui.IFComponentHolder; import com.taobao.weex.ui.animation.WXAnimationModule; import com.taobao.weex.ui.component.pesudo.OnActivePseudoListener; -import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner; import com.taobao.weex.ui.component.pesudo.PesudoStatus; import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener; import com.taobao.weex.ui.flat.FlatComponent; @@ -732,11 +731,11 @@ public abstract class WXComponent implements IWXObject, IWXActi switch (key) { case Constants.Name.PREVENT_MOVE_EVENT: if(mGesture != null){ - mGesture.setPreventMoveEvent(WXUtils.getBoolean(param,false)); + mGesture.setPreventMoveEvent(getBoolean(param,false)); } return true; case Constants.Name.DISABLED: -Boolean disabled = WXUtils.getBoolean(param,null); +Boolean disabled = getBoolean(param,null); if (disabled != null) { setDisabled(disabled); setPseudoClassStatus(Constants.PSEUDO.DISABLED, disabled); @@ -832,7 +831,7 @@ public abstract class WXComponent implements IWXObject, IWXActi setAriaLabel(label); return true; case Constants.Name.ARIA_HIDDEN: -boolean isHidden = WXUtils.getBoolean(param,false); +boolean isHidden = getBoolean(param,false); setAriaHidden(isHidden); return true; case Constants.Name.WIDTH: @@ -998,7 +997,7 @@ public abstract class WXComponent implements IWXObject, IWXActi if (view instanceof WXGestureObservable) { if (mGesture == null) { mGesture = new WXGesture(this, mContext); - boolean isPreventMove = getBoolean(getDomObject().getAttrs().get(Constants.Name.PREVENT_MOVE_EVENT),false); + boolean isPreventMove = WXUtils.getBoolean(getDomObject().getAttrs().get(Constants.Name.PREVENT_MOVE_EVENT),false); mGesture.setPreventMoveEvent(isPreventMove); } mGestureType.add(type);
[5/6] incubator-weex git commit: * [android] remove static import
* [android] remove static import Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aff7e3a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aff7e3a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aff7e3a7 Branch: refs/heads/master Commit: aff7e3a70a3a2e3d930ff9443db8b3042beb3ca6 Parents: 240f604 Author: misakuoAuthored: Mon Oct 16 11:14:07 2017 +0800 Committer: misakuo Committed: Mon Oct 16 11:14:07 2017 +0800 -- .../java/com/taobao/weex/ui/component/WXComponent.java| 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aff7e3a7/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index 351f768..de8553f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@ -106,8 +106,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.taobao.weex.utils.WXUtils.getBoolean; - /** * abstract component * @@ -731,11 +729,11 @@ public abstract class WXComponent implements IWXObject, IWXActi switch (key) { case Constants.Name.PREVENT_MOVE_EVENT: if(mGesture != null){ - mGesture.setPreventMoveEvent(getBoolean(param,false)); + mGesture.setPreventMoveEvent(WXUtils.getBoolean(param,false)); } return true; case Constants.Name.DISABLED: -Boolean disabled = getBoolean(param,null); +Boolean disabled = WXUtils.getBoolean(param,null); if (disabled != null) { setDisabled(disabled); setPseudoClassStatus(Constants.PSEUDO.DISABLED, disabled); @@ -831,7 +829,7 @@ public abstract class WXComponent implements IWXObject, IWXActi setAriaLabel(label); return true; case Constants.Name.ARIA_HIDDEN: -boolean isHidden = getBoolean(param,false); +boolean isHidden = WXUtils.getBoolean(param,false); setAriaHidden(isHidden); return true; case Constants.Name.WIDTH: @@ -1913,7 +1911,7 @@ public abstract class WXComponent implements IWXObject, IWXActi protected boolean isRippleEnabled() { try { Object obj = getDomObject().getAttrs().get(Constants.Name.RIPPLE_ENABLED); - return getBoolean(obj, false); + return WXUtils.getBoolean(obj, false); } catch (Throwable t) { //ignore }
[2/6] incubator-weex git commit: * [android] fix wrong ripple with pseudo class
* [android] fix wrong ripple with pseudo class Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bdad06d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bdad06d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bdad06d0 Branch: refs/heads/master Commit: bdad06d015b6b6b8edd758b5cb8b4fb6ad515b0f Parents: 0bf3d92 Author: misakuoAuthored: Tue Oct 10 17:43:49 2017 +0800 Committer: misakuo Committed: Tue Oct 10 17:43:49 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 27 .../pesudo/OnActivePseudoListener.java | 26 +++ .../component/pesudo/OnActivePseudoListner.java | 26 --- .../pesudo/TouchActivePseudoListener.java | 12 - 4 files changed, 54 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdad06d0/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index 09e5e8d..e524a0c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@ -74,7 +74,7 @@ import com.taobao.weex.tracing.Stopwatch; import com.taobao.weex.tracing.WXTracing; import com.taobao.weex.ui.IFComponentHolder; import com.taobao.weex.ui.animation.WXAnimationModule; -import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner; +import com.taobao.weex.ui.component.pesudo.OnActivePseudoListener; import com.taobao.weex.ui.component.pesudo.PesudoStatus; import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener; import com.taobao.weex.ui.flat.FlatComponent; @@ -112,7 +112,7 @@ import static com.taobao.weex.utils.WXUtils.getBoolean; * abstract component * */ -public abstract class WXComponent implements IWXObject, IWXActivityStateListener,OnActivePseudoListner { +public abstract class WXComponent implements IWXObject, IWXActivityStateListener,OnActivePseudoListener { public static final String PROP_FIXED_SIZE = "fixedSize"; public static final String PROP_FS_MATCH_PARENT = "m"; @@ -1278,9 +1278,7 @@ public abstract class WXComponent implements IWXObject, IWXActi public void setBackgroundColor(String color) { if (!TextUtils.isEmpty(color)) { int colorInt = WXResourceUtils.getColor(color); - Object obj = getDomObject().getAttrs().get(Constants.Name.RIPPLE_ENABLED); - boolean isRippleEnabled = getBoolean(obj, false); - if (isRippleEnabled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (isRippleEnabled() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mRippleBackground = prepareBackgroundRipple(); if (mRippleBackground != null) { if (mBackgroundDrawable == null) { @@ -1735,6 +1733,15 @@ public abstract class WXComponent implements IWXObject, IWXActi status, pesudoStyles, styles.getPesudoResetStyles()); + +if (resultStyles != null && isRippleEnabled()) { + resultStyles.remove(Constants.Name.BACKGROUND_COLOR); + if (resultStyles.isEmpty()) { +WXLogUtils.d("PseudoClass", "skip empty pseudo styles"); +return; + } +} + updateStyleByPesudo(resultStyles); } @@ -1896,4 +1903,14 @@ public abstract class WXComponent implements IWXObject, IWXActi } } } + + protected boolean isRippleEnabled() { +try { + Object obj = getDomObject().getAttrs().get(Constants.Name.RIPPLE_ENABLED); + return getBoolean(obj, false); +} catch (Throwable t) { + //ignore +} +return false; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdad06d0/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListener.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListener.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListener.java new file mode 100644 index 000..989f9e9 --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListener.java @@ -0,0 +1,26 @@ +/* + * 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
[1/6] incubator-weex git commit: + [android] support ripple background with pseudo class on API 21 and higher
Repository: incubator-weex Updated Branches: refs/heads/master 3949bffae -> 1c7f1ff75 + [android] support ripple background with pseudo class on API 21 and higher Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0bf3d925 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0bf3d925 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0bf3d925 Branch: refs/heads/master Commit: 0bf3d925dcbb38d211ebb23a1eb5451f69e4f55e Parents: 08e1c3e Author: misakuoAuthored: Mon Sep 25 17:13:16 2017 +0800 Committer: misakuo Committed: Mon Sep 25 17:13:16 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 79 ++-- 2 files changed, 72 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bf3d925/android/sdk/src/main/java/com/taobao/weex/common/Constants.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java index e74e083..de2c604 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@ -199,6 +199,7 @@ public class Constants { String VIF_FALSE = "ifFalse"; String UNDEFINED = "undefined"; String FLAT = "flat"; +String RIPPLE_ENABLED = "rippleEnabled"; } public interface Value { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bf3d925/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index b389d67..09e5e8d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@ -21,13 +21,19 @@ package com.taobao.weex.ui.component; import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; +import android.content.res.ColorStateList; +import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.Path; import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; +import android.graphics.RectF; import android.graphics.Shader; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; +import android.graphics.drawable.RippleDrawable; import android.os.Build; import android.os.Message; import android.support.annotation.CallSuper; @@ -44,6 +50,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.MarginLayoutParams; import android.widget.FrameLayout; + import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.taobao.weex.ComponentObserver; @@ -67,8 +74,6 @@ import com.taobao.weex.tracing.Stopwatch; import com.taobao.weex.tracing.WXTracing; import com.taobao.weex.ui.IFComponentHolder; import com.taobao.weex.ui.animation.WXAnimationModule; -import com.taobao.weex.ui.component.binding.Statements; -import com.taobao.weex.ui.component.list.WXCell; import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner; import com.taobao.weex.ui.component.pesudo.PesudoStatus; import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener; @@ -88,6 +93,7 @@ import com.taobao.weex.utils.WXReflectionUtils; import com.taobao.weex.utils.WXResourceUtils; import com.taobao.weex.utils.WXUtils; import com.taobao.weex.utils.WXViewUtils; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -100,6 +106,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static com.taobao.weex.utils.WXUtils.getBoolean; + /** * abstract component * @@ -124,6 +132,7 @@ public abstract class WXComponent implements IWXObject, IWXActi private Set mGestureType; private BorderDrawable mBackgroundDrawable; + private Drawable mRippleBackground; private int mPreRealWidth = 0; private int mPreRealHeight = 0; private int mPreRealLeft = 0; @@ -432,14 +441,13 @@ public abstract class WXComponent implements IWXObject, IWXActi if (mBackgroundDrawable == null) { mBackgroundDrawable = new BorderDrawable(); if (mHost != null) { -Drawable backgroundDrawable = mHost.getBackground();
[3/6] incubator-weex git commit: Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-ripple-background
Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-ripple-background # Conflicts: # android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c38239b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c38239b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c38239b3 Branch: refs/heads/master Commit: c38239b3c00ac644854ce757d73f40df3a3763ba Parents: bdad06d ccf0590 Author: misakuoAuthored: Mon Oct 16 11:10:17 2017 +0800 Committer: misakuo Committed: Mon Oct 16 11:10:17 2017 +0800 -- .github/PULL_REQUEST_TEMPLATE.md|34 +- CONTRIBUTING.md |20 +- README.md | 1 + WeexSDK.podspec | 2 +- android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 22620 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 342264 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12126020 bytes .../main/java/com/taobao/weex/WXSDKEngine.java | 3 +- .../java/com/taobao/weex/WXSDKInstance.java |11 +- .../taobao/weex/bridge/NativeInvokeHelper.java | 2 +- .../java/com/taobao/weex/bridge/WXBridge.java |43 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 184 +- .../java/com/taobao/weex/common/IWXBridge.java | 9 + .../main/java/com/taobao/weex/dom/WXAttr.java |15 +- .../com/taobao/weex/dom/WXCellDomObject.java|11 + .../java/com/taobao/weex/dom/WXDomManager.java | 4 + .../java/com/taobao/weex/dom/WXDomObject.java |19 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../taobao/weex/dom/WXRecyclerDomObject.java|50 +- .../com/taobao/weex/dom/WXTextDomObject.java|39 +- .../dom/action/AbstractAddElementAction.java|12 +- .../com/taobao/weex/dom/binding/ELUtils.java|14 +- .../taobao/weex/dom/binding/WXStatement.java|93 +- .../java/com/taobao/weex/dom/flex/CSSNode.java |32 +- .../com/taobao/weex/el/parse/ArrayStack.java| 3 - .../java/com/taobao/weex/el/parse/Block.java| 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java| 5 +- .../taobao/weex/ui/component/WXComponent.java |23 +- .../weex/ui/component/binding/Layouts.java | 106 +- .../weex/ui/component/binding/Statements.java | 129 +- .../ui/component/list/BasicListComponent.java |82 +- .../taobao/weex/ui/component/list/WXCell.java |30 + .../list/template/CellLifecycleManager.java | 211 - .../component/list/template/DomTreeBuilder.java | 100 + .../component/list/template/TemplateCache.java |30 + .../list/template/TemplateViewHolder.java | 9 + .../list/template/WXRecyclerTemplateList.java | 390 +- .../weex/ui/view/WXBaseCircleIndicator.java |40 +- .../com/taobao/weex/utils/BoxShadowUtil.java|65 +- .../java/com/taobao/weex/utils/WXFileUtils.java |26 + .../java/com/taobao/weex/utils/WXLogUtils.java |17 + .../taobao/weex/utils/WXReflectionUtils.java| 6 + .../taobao/weex/utils/WXSoInstallMgrSdk.java|56 + .../java/com/taobao/weex/WXSDKEngineTest.java |12 +- .../java/com/taobao/weex/el/ParserTest.java | 4 +- .../ui/component/binding/StatementTest.java | 8 +- .../com/taobao/weex/utils/WXFileUtilsTest.java | 8 + .../taobao/weex/bridge/WXWebsocketBridge.java |15 + build/build.js |17 +- build/config.js |15 +- build/karma.vue.conf.js | 2 + dangerfile-android.js | 8 +- dangerfile-ios.js |10 +- dangerfile-jsfm.js | 8 +- dangerfile.js | 6 +- doc/source/cn/guide/set-up-env.md |68 +- .../cn/references/advanced/extend-to-ios.md | 4 +- doc/source/cn/references/components/image.md|24 + doc/source/cn/references/modules/animation.md | 5 +- doc/source/cn/releasenote.md|51 + doc/source/guide/set-up-env.md |82 +- doc/source/references/advanced/extend-to-ios.md | 4 +- doc/source/references/components/image.md |22 + doc/source/references/modules/animation.md | 6 +- doc/source/releasenote.md
[GitHub] incubator-weex pull request #782: + [android] support style:direction with r...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/782 ---
[4/5] incubator-weex git commit: Merge branch 'release-0.16' into android-feature-text-rtl
Merge branch 'release-0.16' into android-feature-text-rtl Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4dfee864 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4dfee864 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4dfee864 Branch: refs/heads/master Commit: 4dfee8643bcc1839bb432f63d22e9d1293b0cd3a Parents: d6fee3a 3c3536a Author: moxunAuthored: Tue Nov 14 14:21:48 2017 +0800 Committer: GitHub Committed: Tue Nov 14 14:21:48 2017 +0800 -- .github/PULL_REQUEST_TEMPLATE.md|4 +- .travis.yml |4 - CONTRIBUTING.md | 22 +- .../java/com/alibaba/weex/IndexActivity.java| 12 - android/sdk/build.gradle|1 + android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22620 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 342264 -> 335324 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes android/sdk/libs/armeabi/libweexjst.so | Bin 0 -> 22552 bytes .../java/com/taobao/weex/WXEnvironment.java |1 + .../main/java/com/taobao/weex/WXSDKEngine.java | 13 + .../java/com/taobao/weex/WXSDKInstance.java | 53 +- .../java/com/taobao/weex/bridge/WXBridge.java |6 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 1031 +- .../java/com/taobao/weex/common/Constants.java | 18 +- .../java/com/taobao/weex/common/IWXBridge.java |2 +- .../com/taobao/weex/dom/DOMActionContext.java |2 + .../taobao/weex/dom/DOMActionContextImpl.java | 17 +- .../java/com/taobao/weex/dom/WXDomHandler.java | 15 +- .../java/com/taobao/weex/dom/WXDomObject.java | 37 +- .../com/taobao/weex/dom/WXTextDomObject.java| 20 +- .../dom/action/AbstractAddElementAction.java|4 +- .../taobao/weex/dom/action/AnimationAction.java | 43 +- .../weex/dom/action/MoveElementAction.java |3 + .../weex/dom/action/UpdateStyleAction.java | 20 +- .../weex/dom/transition/WXTransition.java | 626 +++ .../weex/ui/animation/TransformParser.java | 296 + .../weex/ui/animation/WXAnimationBean.java | 128 +-- .../ui/component/AbstractEditComponent.java |8 + .../taobao/weex/ui/component/WXComponent.java | 85 +- .../weex/ui/component/WXComponentFactory.java |2 - .../com/taobao/weex/ui/component/WXImage.java | 40 + .../taobao/weex/ui/component/WXScroller.java|2 +- .../com/taobao/weex/ui/component/WXSlider.java |2 +- .../weex/ui/component/WXSliderNeighbor.java |2 +- .../taobao/weex/ui/component/WXVContainer.java | 49 +- .../ui/component/list/BasicListComponent.java | 122 ++- .../ui/component/list/StickyHeaderHelper.java | 43 +- .../taobao/weex/ui/component/list/WXCell.java | 71 +- .../list/template/WXRecyclerTemplateList.java |4 +- .../taobao/weex/ui/module/WXTimerModule.java| 10 +- .../com/taobao/weex/ui/view/WXImageView.java| 87 ++ .../weex/ui/view/listview/WXRecyclerView.java | 24 +- .../com/taobao/weex/utils/BoxShadowUtil.java| 103 +- .../com/taobao/weex/utils/FunctionParser.java |2 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 34 +- .../taobao/weex/utils/WXSoInstallMgrSdk.java| 25 +- .../java/com/taobao/weex/utils/WXViewUtils.java | 30 +- .../weex/dom/transition/WXTransitionTest.java | 96 ++ .../weex/ui/animation/TransformParserTest.java | 38 + .../com/taobao/weex/utils/WXLogUtilsTest.java | 16 +- .../java/com/taobao/weex/utils/WXUtilsTest.java |3 +- .../taobao/weex/bridge/WXWebsocketBridge.java |2 +- dangerfile.js | 47 +- doc/source/cn/guide/contributing.md | 27 +- doc/source/guide/contributing.md| 26 +- doc/source/references/platform-difference.md| 11 + doc/source/references/platfrom-difference.md| 11 - .../references/vue/difference-with-web.md |2 +- doc/themes/weex/layout/_partial/article.ejs |2 + doc/themes/weex/layout/index.ejs|3 + doc/themes/weex/layout/layout.ejs |2 - doc/themes/weex/source/css/common.scss |4 +- doc/themes/weex/source/css/partial/header.scss |2 +- doc/themes/weex/source/css/post.scss|7 +- doc/themes/weex/source/css/variable.scss|2 +- html5/render/browser/extend/api/storage.js | 123 ++- html5/render/browser/extend/api/stream.js |9 +- html5/render/vue/README.md | 20 +- html5/render/vue/components/a.js|3 - html5/render/vue/components/image.js| 42 +-
[3/5] incubator-weex git commit: Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-text-rtl
Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-text-rtl # Conflicts: # android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d6fee3a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d6fee3a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d6fee3a7 Branch: refs/heads/master Commit: d6fee3a7a1d62acba3d2a76410406f1a4a9e4390 Parents: c2db749 Author: misakuoAuthored: Wed Oct 11 10:10:35 2017 +0800 Committer: misakuo Committed: Wed Oct 11 10:10:35 2017 +0800 -- .../sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java| 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d6fee3a7/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 c66e1af..ce9c8c9 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 @@ -37,12 +37,9 @@ import android.text.TextUtils; import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.ForegroundColorSpan; -import android.util.Log; - import com.taobao.weex.WXEnvironment; import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXThread; import com.taobao.weex.dom.flex.CSSConstants; import com.taobao.weex.dom.flex.CSSNode; import com.taobao.weex.dom.flex.FloatUtil;
[5/5] incubator-weex git commit: * [android] support style:direction with rtl on android
* [android] support style:direction with rtl on android Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3949bffa Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3949bffa Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3949bffa Branch: refs/heads/master Commit: 3949bffaebd63ec5359d04f673b1352f8f3b6400 Parents: 7a27431 4dfee86 Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 11:15:05 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 11:15:24 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 3 + .../com/taobao/weex/dom/WXTextDomObject.java| 17 +++-- .../taobao/weex/utils/StaticLayoutProxy.java| 72 3 files changed, 86 insertions(+), 6 deletions(-) --
[1/5] incubator-weex git commit: + [android] support style:direction rtl
Repository: incubator-weex Updated Branches: refs/heads/master 7a2743136 -> 3949bffae + [android] support style:direction rtl Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8e41fb37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8e41fb37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8e41fb37 Branch: refs/heads/master Commit: 8e41fb37b19a2c8ee0f98533a46c5ea7a2e8b2ca Parents: 2077164 Author: misakuoAuthored: Tue Sep 26 15:55:13 2017 +0800 Committer: misakuo Committed: Tue Sep 26 15:55:13 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 3 + .../com/taobao/weex/dom/WXTextDomObject.java| 16 +++-- .../taobao/weex/utils/StaticLayoutProxy.java| 72 3 files changed, 87 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8e41fb37/android/sdk/src/main/java/com/taobao/weex/common/Constants.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java index e74e083..c32e943 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@ -182,6 +182,9 @@ public class Constants { String ARIA_LABEL = "ariaLabel"; String ARIA_HIDDEN = "ariaHidden"; +String DIRECTION = "direction"; +String RTL = "rtl"; + interface Recycler{ String LIST_DATA = "listData"; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8e41fb37/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 06c4e8a..eea8df9 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 @@ -18,8 +18,6 @@ */ package com.taobao.weex.dom; -import static com.taobao.weex.dom.WXStyle.UNSET; - import android.graphics.Canvas; import android.graphics.Typeface; import android.os.Build; @@ -39,6 +37,7 @@ import android.text.TextUtils; import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.ForegroundColorSpan; + import com.taobao.weex.WXEnvironment; import com.taobao.weex.common.Constants; import com.taobao.weex.dom.flex.CSSConstants; @@ -47,15 +46,19 @@ import com.taobao.weex.dom.flex.FloatUtil; import com.taobao.weex.dom.flex.MeasureOutput; import com.taobao.weex.ui.component.WXText; import com.taobao.weex.ui.component.WXTextDecoration; +import com.taobao.weex.utils.StaticLayoutProxy; import com.taobao.weex.utils.WXDomUtils; import com.taobao.weex.utils.WXLogUtils; import com.taobao.weex.utils.WXResourceUtils; + import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import static com.taobao.weex.dom.WXStyle.UNSET; + /** * Class for calculating a given text's height and width. The calculating of width and height of * text is done by {@link Layout}. @@ -305,8 +308,13 @@ public class WXTextDomObject extends WXDomObject { textWidth = getTextWidth(mTextPaint, width, forceWidth); Layout layout; if (!FloatUtil.floatsEqual(previousWidth, textWidth) || previousLayout == null) { - layout = new StaticLayout(spanned, mTextPaint, (int) Math.ceil(textWidth), - Layout.Alignment.ALIGN_NORMAL, 1, 0, false); + boolean forceRtl = false; + Object direction = getStyles().get(Constants.Name.DIRECTION); + if (direction != null && "text".equals(mType)) { +forceRtl = direction.equals(Constants.Name.RTL); + } + layout = StaticLayoutProxy.create(spanned, mTextPaint, (int) Math.ceil(textWidth), + Layout.Alignment.ALIGN_NORMAL, 1, 0, false, forceRtl); } else { layout = previousLayout; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8e41fb37/android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java b/android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java new file mode 100644 index 000..98fe0ed --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java @@ -0,0 +1,72 @@ +/** + * Licensed to the
[2/5] incubator-weex git commit: Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-text-rtl
Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-text-rtl # Conflicts: # android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c2db749c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2db749c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2db749c Branch: refs/heads/master Commit: c2db749c754790d77c62ee331fc6ae1509d6465c Parents: 8e41fb3 3cf15bc Author: misakuoAuthored: Wed Oct 11 10:09:29 2017 +0800 Committer: misakuo Committed: Wed Oct 11 10:09:29 2017 +0800 -- .github/PULL_REQUEST_TEMPLATE.md| 34 +- CONTRIBUTING.md | 20 +- README.md | 1 + WeexSDK.podspec | 2 +- android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 22620 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 342264 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12126020 bytes .../main/java/com/taobao/weex/WXSDKEngine.java | 3 +- .../java/com/taobao/weex/WXSDKInstance.java | 11 +- .../taobao/weex/bridge/NativeInvokeHelper.java | 2 +- .../java/com/taobao/weex/bridge/WXBridge.java | 43 ++- .../com/taobao/weex/bridge/WXBridgeManager.java | 184 ++--- .../java/com/taobao/weex/common/IWXBridge.java | 9 + .../main/java/com/taobao/weex/dom/WXAttr.java | 15 +- .../com/taobao/weex/dom/WXCellDomObject.java| 11 + .../java/com/taobao/weex/dom/WXDomManager.java | 4 + .../java/com/taobao/weex/dom/WXDomObject.java | 19 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../taobao/weex/dom/WXRecyclerDomObject.java| 50 ++- .../com/taobao/weex/dom/WXTextDomObject.java| 39 +- .../com/taobao/weex/dom/binding/ELUtils.java| 14 +- .../taobao/weex/dom/binding/WXStatement.java| 93 + .../java/com/taobao/weex/dom/flex/CSSNode.java | 32 +- .../com/taobao/weex/el/parse/ArrayStack.java| 3 - .../java/com/taobao/weex/el/parse/Block.java| 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java| 5 +- .../taobao/weex/ui/component/WXComponent.java | 26 +- .../weex/ui/component/binding/Layouts.java | 106 - .../weex/ui/component/binding/Statements.java | 122 -- .../ui/component/list/BasicListComponent.java | 82 +--- .../taobao/weex/ui/component/list/WXCell.java | 30 ++ .../list/template/CellLifecycleManager.java | 211 -- .../component/list/template/DomTreeBuilder.java | 100 + .../component/list/template/TemplateCache.java | 30 ++ .../list/template/TemplateViewHolder.java | 9 + .../list/template/WXRecyclerTemplateList.java | 387 ++- .../weex/ui/view/WXBaseCircleIndicator.java | 40 +- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 ++-- .../java/com/taobao/weex/utils/WXFileUtils.java | 26 ++ .../java/com/taobao/weex/utils/WXLogUtils.java | 17 + .../taobao/weex/utils/WXReflectionUtils.java| 6 + .../taobao/weex/utils/WXSoInstallMgrSdk.java| 56 +++ .../java/com/taobao/weex/WXSDKEngineTest.java | 12 +- .../java/com/taobao/weex/el/ParserTest.java | 4 +- .../ui/component/binding/StatementTest.java | 8 +- .../com/taobao/weex/utils/WXFileUtilsTest.java | 8 + .../taobao/weex/bridge/WXWebsocketBridge.java | 15 + dangerfile-android.js | 8 +- dangerfile-ios.js | 10 +- dangerfile-jsfm.js | 8 +- dangerfile.js | 6 +- doc/source/cn/guide/set-up-env.md | 4 +- .../cn/references/advanced/extend-to-ios.md | 4 +- doc/source/cn/references/components/image.md| 24 ++ doc/source/cn/releasenote.md| 51 +++ doc/source/guide/set-up-env.md | 34 +- doc/source/references/advanced/extend-to-ios.md | 4 +- doc/source/references/components/image.md | 22 ++ doc/source/releasenote.md | 51 +++ examples/component/web-demo.we | 3 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../Sources/Component/WXComponent_internal.h| 2 + .../Sources/Component/WXImageComponent.m| 89 ++--- .../Sources/Component/WXScrollerComponent.m | 38 +-
[2/2] incubator-weex git commit: * [android] new local module
* [android] new local module Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7a274313 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7a274313 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7a274313 Branch: refs/heads/master Commit: 7a2743136fc6178089fb67ff75c6dfc291248a2a Parents: 3a0ac37 aa28a1f Author: gurisxie <279483...@qq.com> Authored: Wed Nov 15 11:10:27 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Nov 15 11:10:56 2017 +0800 -- .../main/java/com/taobao/weex/WXSDKEngine.java | 2 + .../taobao/weex/ui/module/WXLocalModule.java| 93 2 files changed, 95 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7a274313/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java --
[GitHub] incubator-weex pull request #781: + [android] new local module
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/781 ---
[1/2] incubator-weex git commit: + [android] new local module
Repository: incubator-weex Updated Branches: refs/heads/master 3a0ac37de -> 7a2743136 + [android] new local module Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aa28a1f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aa28a1f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aa28a1f9 Branch: refs/heads/master Commit: aa28a1f99f1f2ba7f1adb282892c5fc10afb5b26 Parents: fc7bcca Author: misakuoAuthored: Wed Sep 27 14:26:03 2017 +0800 Committer: misakuo Committed: Wed Sep 27 14:26:03 2017 +0800 -- .../main/java/com/taobao/weex/WXSDKEngine.java | 2 + .../taobao/weex/ui/module/WXLocalModule.java| 93 2 files changed, 95 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aa28a1f9/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 175e96e..52a688c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java @@ -89,6 +89,7 @@ import com.taobao.weex.ui.component.list.SimpleListComponent; import com.taobao.weex.ui.component.list.WXCell; import com.taobao.weex.ui.component.list.WXListComponent; import com.taobao.weex.ui.component.list.template.WXRecyclerTemplateList; +import com.taobao.weex.ui.module.WXLocalModule; import com.taobao.weex.ui.module.WXMetaModule; import com.taobao.weex.ui.module.WXModalUIModule; import com.taobao.weex.ui.module.WXTimerModule; @@ -300,6 +301,7 @@ public class WXSDKEngine { registerModule("picker", WXPickersModule.class); registerModule("meta", WXMetaModule.class,true); registerModule("webSocket", WebSocketModule.class); + registerModule("local", WXLocalModule.class); registerDomObject(simpleList, WXListDomObject.class); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aa28a1f9/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocalModule.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocalModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocalModule.java new file mode 100644 index 000..5f6d8cb --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocalModule.java @@ -0,0 +1,93 @@ +/** + * 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.ui.module; + +import android.content.Context; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.os.Build; +import android.os.LocaleList; +import android.text.TextUtils; + +import com.taobao.weex.WXEnvironment; +import com.taobao.weex.annotation.JSMethod; +import com.taobao.weex.bridge.JSCallback; +import com.taobao.weex.common.WXModule; + +import java.util.Locale; + +/** + * Created by moxun on 2017/9/26. + * + * Ref: https://tools.ietf.org/html/bcp47 + */ + +public class WXLocalModule extends WXModule { + + @JSMethod + public void getLanguage(JSCallback callback) { +callback.invoke(getLanguageTags()); + } + + @JSMethod + public void getLanguages(JSCallback callback) { +callback.invoke(getLanguageTags().split(",")); + } + + private String getLanguageTags() { +Context application = WXEnvironment.getApplication(); +if (application != null) { + Resources res = application.getResources(); + if (res != null) { +Configuration configuration = res.getConfiguration(); +if (configuration != null) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { +LocaleList localeList = configuration.getLocales(); +return localeList.toLanguageTags(); + } else { +Locale local = configuration.locale; +
incubator-weex-site git commit: [WEEX-86][doc] Adds a guide on how to create a plugin (#8)
Repository: incubator-weex-site Updated Branches: refs/heads/master 0c10fd3e3 -> 262c556f1 [WEEX-86][doc] Adds a guide on how to create a plugin (#8) + [guide] create a plugin Update how to create a plugin according to latest developments in the plugin generator. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/262c556f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/262c556f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/262c556f Branch: refs/heads/master Commit: 262c556f127767a4c5ceae7e968ca74fb98744f6 Parents: 0c10fd3 Author: Tiago AlvesAuthored: Sun Nov 5 12:22:08 2017 -0200 Committer: Hanks Committed: Tue Nov 14 23:30:08 2017 +0800 -- source/guide/create-a-plugin.md | 131 +++ source/guide/extend-android.md | 2 +- source/guide/extend-ios.md | 2 +- source/guide/extend-js-framework.md | 2 +- source/guide/extend-web-render.md | 2 +- 5 files changed, 135 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/262c556f/source/guide/create-a-plugin.md -- diff --git a/source/guide/create-a-plugin.md b/source/guide/create-a-plugin.md new file mode 100644 index 000..8f57ab9 --- /dev/null +++ b/source/guide/create-a-plugin.md @@ -0,0 +1,131 @@ +--- +title: Create a plugin +type: guide +group: Extend +order: 6.1 +version: 2.1 +--- + +The weex plugin development kit is designed to help developers build weex plugins quickly and easily, allowing them to integrate native functionality without changing business code. + +The plugin abstracts a functionality and/or component to the rest of the app by including the specific implementation for each target platform ([Web](#web), [Android](#android) and [iOS](#ios)) and exposing it through a common API. + +## Getting started + +Create a weex plugin with weexpack: +``` +weex plugin create weex-my-plugin +``` +This will create a project structure similar to this: +``` + âââ android (Android native code project) + ââââ ... + âââ ios (iOS native code project) + ââââ ... + âââ js (html5 project) + ââââ ... + âââ examples (sample app) + ââââ index.vue + âââ playground (sample projects to test the plugin) + ââââ android + ââââ browser + ââââ ios + âââ WeexMyPlugin.podspec (iOS .podspec) + âââ package.json + âââ README.md + ``` + +The `examples` directory contains a weex app that you can use to test your plugin. This test app will be loaded from the playground apps that are installed in the `playground` folder. + +## Web + +### Developing and testing with the playground app +1. Build the example weex app in `examples/index.vue`: + ``` + npm run start:web + ``` + Webpack will be listening for changes in `examples/index.vue` and re-build the example app for you. The app will be served in the port 12580 (e.g. http://localhost:12580). + +2. Edit the plugin JavaScript/HTML/CSS code under the `js` folder. Refresh the test app to update the plugin in the playground app. + +### Extending Web functionality +See [Extend Web Render](./extend-web-render.html). + +## Android + +### Developing and testing with the playground app +1. Build the example weex app in `examples/index.vue`: + ``` + npm run start:native + ``` + Webpack will be listening for changes in `examples/index.vue` and re-build the example app for you. + +2. Open the android project under `playground/android` with Android Studio. + + The native plugin code will be linked as a gradle dependency. You can develop and test the plugin directly from Android Studio. You can also use `weex debug` to debug the playground app. + +### Extending native functionality +See [Extend Android](./extend-android.html). + +## iOS + +### Developing and testing with the playground app +1. Build the example weex app in `examples/index.vue`: + ``` + npm run start:native + ``` + Webpack will be listening for changes in `examples/index.vue` and re-build the example app for you. + +2. Open the iOS playground app and install the dependencies: + ``` + cd playground/ios + pod install + ``` +3. Open `WeexDemo.xcworkspace` in Xcode. + + The native plugin code will be linked as cocoa pod. You can develop and test the plugin directly from Xcode. You can also use `weex debug` to debug the playground app. + +### Extending native functionality +See [Extend iOS](./extend-ios.html). + +### Publishing a plugin to the cocapods
[GitHub] incubator-weex pull request #863: [WEEX-115] [android]logwatcher is design t...
Github user atomtong closed the pull request at: https://github.com/apache/incubator-weex/pull/863 ---
[GitHub] incubator-weex pull request #863: [WEEX-115] [android]logwatcher is design t...
GitHub user atomtong reopened a pull request: https://github.com/apache/incubator-weex/pull/863 [WEEX-115] [android]logwatcher is design to support release environment critical issuses analyzing * instance support extend dimensionality and indicator to tolerance of performance * fix logwatcher bug in release mode see [[WEEX-115]](https://issues.apache.org/jira/browse/WEEX-115) [android]logwatcher is design to support release environment critical issuses analyzing You can merge this pull request into a Git repository by running: $ git pull https://github.com/atomtong/incubator-weex release-0.16-android-bugfixed-logtrack Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/863.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 #863 commit 0c20eed10795c776156592a7e1960a8b6a8a3a8c Author: atomtongDate: 2017-11-01T11:21:06Z Merge branch 'release-0.16-github' into release-0.16-devtool-bugfixed * release-0.16-github: onVisibilityChanged most sense right. but when native component custom set parent visibility, the method not paired on some platform, e.g when parent become invisible, changedView is this, visibility is invisible. * [html5] bugfix: - scroll event listenning on window. - img lazyloading. - scrollToElement on latest chrome. - rm id of a comp. - fix stream.fetch. - add statistics for components and modules. - support lazyload and appear watcher when body height set to 100% - add try catch for accessing localStorage may throw a error. - image support sprite (sprite-src, sprite-position, sprite-width). - fix indicator when there's only one slide in slider. when cell amount is big, watch appear will none changed will result too many logs when scroll, move log to appear changed commit 7857ba40a7692797e0fcc103e8c622c95af8446c Author: atomtong Date: 2017-11-01T15:38:01Z * [android] get screenreader time add mtop coume time commit f7b851052fb0cc3f8112da30a96dc30680a71a17 Author: atomtong Date: 2017-11-01T16:36:26Z * [android] register dim and mes commit 9a36f0bd808b36f52ae8d2abfb55a4a40d5074dd Author: atomtong Date: 2017-11-01T17:10:04Z * [android] change format data commit 72f5e138a17d5ffbdf3f4b93d9e19b6867a52b1e Author: atomtong Date: 2017-11-02T00:49:53Z Merge branch 'release-0.16-gitlab' into release-0.16-github-mtop-tracker * release-0.16-gitlab: * [devtool] fix devtool network mode commit e5c3f226b0fee98373fee4f9d864e8ac40e2f805 Author: atomtong Date: 2017-11-07T07:27:03Z Merge branch 'release-0.16-github' into release-0.16-gitlab * release-0.16-github: when header view has parent, remove it from parent remove log when app run, improve performance commit 8a87fcd1609bc26700a4ba4bce7ddf2a6d9d4174 Author: atomtong Date: 2017-11-09T03:45:26Z Merge branch 'release-0.16-github' into release-0.16-gitlab * release-0.16-github: commit 8b9a3a1644023de368d44b559427306f3cbfbfba Author: atomtong Date: 2017-11-09T06:13:17Z Merge branch 'android-bugfix-log-tlog' into release-0.16-gitlab * android-bugfix-log-tlog: * [android] android bugfixed logwatcher commit 7efcc19320afb48dc2a66aaf4d871719671f3885 Author: atomtong Date: 2017-11-10T13:03:27Z * [android] release log analyse logwatcher commit a1dc1ac43960a732813a7bb5b5cfca7411090805 Author: atomtong Date: 2017-11-11T05:58:59Z Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack * release-0.16-gitlab: commit 454ea94b97657a95b7f13fb23e9a8281ffb3ae8d Author: atomtong Date: 2017-11-11T06:22:05Z * [android] log track adapter fix logLevel commit 9d3caa20f34d703caba78fbe5ac3db3091ee7d04 Author: atomtong Date: 2017-11-11T06:26:23Z Merge branch 'release-0.16-github-mtop-tracker' into release-0.16-gitlab * release-0.16-github-mtop-tracker: * [android] change format data * [android] register dim and mes * [android] get screenreader time add mtop coume time commit 71d92a2959cd6ff47470d510399f99c8d307933b Author: atomtong Date: 2017-11-11T06:27:26Z Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack * release-0.16-gitlab: * [android] change format data * [android] register dim and mes * [android] get screenreader time add mtop coume time commit 265d4272e3af8fc1ecaff2b58d33a0d47f41433e Author: atomtong Date:
[GitHub] incubator-weex issue #863: [WEEX-115] [android]logwatcher is design to suppo...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/863 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #863: [WEEX-115] [android]logwatcher is design t...
GitHub user atomtong opened a pull request: https://github.com/apache/incubator-weex/pull/863 [WEEX-115] [android]logwatcher is design to support release environment critical issuses analyzing * instance support extend dimensionality and indicator to tolerance of performance * fix logwatcher bug in release mode see [[WEEX-115]](https://issues.apache.org/jira/browse/WEEX-115) [android]logwatcher is design to support release environment critical issuses analyzing You can merge this pull request into a Git repository by running: $ git pull https://github.com/atomtong/incubator-weex release-0.16-android-bugfixed-logtrack Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/863.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 #863 commit 0c20eed10795c776156592a7e1960a8b6a8a3a8c Author: atomtongDate: 2017-11-01T11:21:06Z Merge branch 'release-0.16-github' into release-0.16-devtool-bugfixed * release-0.16-github: onVisibilityChanged most sense right. but when native component custom set parent visibility, the method not paired on some platform, e.g when parent become invisible, changedView is this, visibility is invisible. * [html5] bugfix: - scroll event listenning on window. - img lazyloading. - scrollToElement on latest chrome. - rm id of a comp. - fix stream.fetch. - add statistics for components and modules. - support lazyload and appear watcher when body height set to 100% - add try catch for accessing localStorage may throw a error. - image support sprite (sprite-src, sprite-position, sprite-width). - fix indicator when there's only one slide in slider. when cell amount is big, watch appear will none changed will result too many logs when scroll, move log to appear changed commit 7857ba40a7692797e0fcc103e8c622c95af8446c Author: atomtong Date: 2017-11-01T15:38:01Z * [android] get screenreader time add mtop coume time commit f7b851052fb0cc3f8112da30a96dc30680a71a17 Author: atomtong Date: 2017-11-01T16:36:26Z * [android] register dim and mes commit 9a36f0bd808b36f52ae8d2abfb55a4a40d5074dd Author: atomtong Date: 2017-11-01T17:10:04Z * [android] change format data commit 72f5e138a17d5ffbdf3f4b93d9e19b6867a52b1e Author: atomtong Date: 2017-11-02T00:49:53Z Merge branch 'release-0.16-gitlab' into release-0.16-github-mtop-tracker * release-0.16-gitlab: * [devtool] fix devtool network mode commit e5c3f226b0fee98373fee4f9d864e8ac40e2f805 Author: atomtong Date: 2017-11-07T07:27:03Z Merge branch 'release-0.16-github' into release-0.16-gitlab * release-0.16-github: when header view has parent, remove it from parent remove log when app run, improve performance commit 8a87fcd1609bc26700a4ba4bce7ddf2a6d9d4174 Author: atomtong Date: 2017-11-09T03:45:26Z Merge branch 'release-0.16-github' into release-0.16-gitlab * release-0.16-github: commit 8b9a3a1644023de368d44b559427306f3cbfbfba Author: atomtong Date: 2017-11-09T06:13:17Z Merge branch 'android-bugfix-log-tlog' into release-0.16-gitlab * android-bugfix-log-tlog: * [android] android bugfixed logwatcher commit 7efcc19320afb48dc2a66aaf4d871719671f3885 Author: atomtong Date: 2017-11-10T13:03:27Z * [android] release log analyse logwatcher commit a1dc1ac43960a732813a7bb5b5cfca7411090805 Author: atomtong Date: 2017-11-11T05:58:59Z Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack * release-0.16-gitlab: commit 454ea94b97657a95b7f13fb23e9a8281ffb3ae8d Author: atomtong Date: 2017-11-11T06:22:05Z * [android] log track adapter fix logLevel commit 9d3caa20f34d703caba78fbe5ac3db3091ee7d04 Author: atomtong Date: 2017-11-11T06:26:23Z Merge branch 'release-0.16-github-mtop-tracker' into release-0.16-gitlab * release-0.16-github-mtop-tracker: * [android] change format data * [android] register dim and mes * [android] get screenreader time add mtop coume time commit 71d92a2959cd6ff47470d510399f99c8d307933b Author: atomtong Date: 2017-11-11T06:27:26Z Merge branch 'release-0.16-gitlab' into release-0.16-android-bugfixed-logtrack * release-0.16-gitlab: * [android] change format data * [android] register dim and mes * [android] get screenreader time add mtop coume time commit 265d4272e3af8fc1ecaff2b58d33a0d47f41433e Author: atomtong Date: 2017-11-13T07:24:44Z
[GitHub] incubator-weex pull request #862: [WEEX-114][android] getComponentRect for v...
Github user gubaojian closed the pull request at: https://github.com/apache/incubator-weex/pull/862 ---