[GitHub] incubator-weex pull request #748: * [android] better solution for draw box-s...
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/748 * [android] better solution for draw box-shadow Using `BlurMaskFilter` instead of the `Paint.setSahdowLayer` to draw shadow layer Testcase: http://dotwe.org/vue/2023765cfe6cfc27f722ab88e014fbfe You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-feature-boxshadow Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/748.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 #748 commit 0839ee18c27c52a9030e06c3e2cd5142ee6db616 Author: misakuo Date: 2017-09-27T07:22:02Z * [android] better solution for draw box-shadow ---
[GitHub] incubator-weex issue #748: * [android] better solution for draw box-shadow
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/748 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex pull request #749: * [android] fix android new Date() cannot ...
GitHub user yuhun-alibaba opened a pull request: https://github.com/apache/incubator-weex/pull/749 * [android] fix android new Date() cannot get accuracy time [ISSUE ID] https://aone.alibaba-inc.com/issue/12621307 if we use var time = new Date(), cannot get accuracy time on some android platform such as nexus5, android5.0 rom. the root cause is miss ANDROID_ROOT envp when run jsc process, cause libc init exception You can merge this pull request into a Git repository by running: $ git pull https://github.com/yuhun-alibaba/incubator-weex 0.16-dev-bugfix Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/749.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 #749 commit f47c293690b116895c421c5d77f01b48b3686336 Author: yuhun-alibaba Date: 2017-09-27T07:45:26Z * [android] fix android new Date() cannot get accuracy time [ISSUE ID] https://aone.alibaba-inc.com/issue/12636699?from=ak&; ---
[GitHub] incubator-weex issue #749: * [android] fix android new Date() cannot get acc...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/749 Messages :book: has no jsfm file changed,skip test! Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex issue #748: * [android] better solution for draw box-shadow
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/748 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex issue #748: * [android] better solution for draw box-shadow
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/748 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[4/4] incubator-weex git commit: * [android] fix negative offset
* [android] fix negative offset Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27f69b75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27f69b75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27f69b75 Branch: refs/heads/0.16-dev Commit: 27f69b75a2881afcc229a78e00b43ae2a2d0abd6 Parents: 007dd16 Author: misakuo Authored: Wed Sep 27 18:05:08 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:05:08 2017 +0800 -- .../main/java/com/taobao/weex/utils/BoxShadowUtil.java| 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27f69b75/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index 892e80c..3f522dd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -139,8 +139,14 @@ public class BoxShadowUtil { viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread ); -float shadowDx = 2f * dx + shadowRadius; -float shadowDy = 2f * dy + shadowRadius; +float shadowDx = shadowRadius; +float shadowDy = shadowRadius; +if (dx > 0) { + shadowDx = shadowDx + 2f * dx; +} +if (dy > 0) { + shadowDy = shadowDy + 2f * dy; +} shadowRect.offset(shadowDx, shadowDy); Paint shadowPaint = new Paint();
[2/4] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c75a841 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c75a841 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c75a841 Branch: refs/heads/0.16-dev Commit: 2c75a84128a262f770e026acf6236ab8d152ee54 Parents: 0839ee1 Author: misakuo Authored: Wed Sep 27 17:10:24 2017 +0800 Committer: misakuo Committed: Wed Sep 27 17:10:24 2017 +0800 -- .../java/com/taobao/weex/utils/BoxShadowUtil.java | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c75a841/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index c1cc693..892e80c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -40,6 +40,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import android.view.ViewParent; import com.taobao.weex.WXEnvironment; @@ -147,7 +148,9 @@ public class BoxShadowUtil { shadowPaint.setColor(shadowColor); shadowPaint.setStyle(Paint.Style.FILL); -shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); +if (shadowRadius > 0) { + shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); +} Path shadowPath = new Path(); float[] shadowRadii = new float[8]; @@ -186,8 +189,13 @@ public class BoxShadowUtil { target.getOverlay().clear(); target.getOverlay().add(shadowDrawable); //Relayout to ensure the shadows are fully drawn - target.getParent().requestLayout(); - ((ViewGroup) target.getParent()).invalidate(shadowDrawable.getBounds()); + ViewParent parent = target.getParent(); + if (parent != null) { +parent.requestLayout(); +if (parent instanceof ViewGroup) { + ((ViewGroup) parent).invalidate(shadowDrawable.getBounds()); +} + } } else { // I have a dream that one day our minSdkVersion will equals or higher than 21 Log.w("BoxShadowUtil", "Call setNormalBoxShadow() requires API level 18 or higher.");
[1/4] incubator-weex git commit: * [android] better solution for draw box-shadow
Repository: incubator-weex Updated Branches: refs/heads/0.16-dev fa4726a1d -> 27f69b75a * [android] better solution for draw box-shadow Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0839ee18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0839ee18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0839ee18 Branch: refs/heads/0.16-dev Commit: 0839ee18c27c52a9030e06c3e2cd5142ee6db616 Parents: fa4726a Author: misakuo Authored: Wed Sep 27 15:22:02 2017 +0800 Committer: misakuo Committed: Wed Sep 27 15:22:02 2017 +0800 -- .../com/taobao/weex/utils/BoxShadowUtil.java| 47 1 file changed, 19 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0839ee18/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index b1ebb63..c1cc693 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -20,6 +20,7 @@ package com.taobao.weex.utils; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.BlurMaskFilter; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; @@ -40,6 +41,8 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; +import com.taobao.weex.WXEnvironment; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -103,18 +106,21 @@ public class BoxShadowUtil { float[] radii, float shadowRadius, float shadowSpread, float dx, float dy, int shadowColor) { - -if (shadowRadius == 0) { - // 0 can not draw shadow layer - shadowRadius = 0.01f; -} - int canvasWidth = viewWidth + 2 * (int) (shadowRadius + shadowSpread + Math.abs(dx)); int canvasHeight = viewHeight + 2 * (int) (shadowRadius + shadowSpread + Math.abs(dy)); Bitmap output = Bitmap.createBitmap(canvasWidth, canvasHeight, Bitmap.Config.ARGB_); Canvas canvas = new Canvas(output); +if (false && WXEnvironment.isApkDebugable()) { + // Using for debug + Paint strokePaint = new Paint(); + strokePaint.setColor(Color.BLACK); + strokePaint.setStrokeWidth(2); + strokePaint.setStyle(Paint.Style.STROKE); + canvas.drawRect(canvas.getClipBounds(), strokePaint); +} + float offsetX = shadowRadius + shadowSpread + Math.abs(dx); float offsetY = shadowRadius + shadowSpread + Math.abs(dy); RectF selfRect = new RectF( @@ -127,36 +133,21 @@ public class BoxShadowUtil { // can not antialias canvas.clipPath(contentPath, Region.Op.DIFFERENCE); -float shadowLeft, shadowTop; -if (shadowSpread == 0f) { - shadowLeft = shadowRadius; - shadowTop = shadowRadius; -} else { - shadowLeft = shadowRadius + dx - shadowSpread; - shadowTop = shadowRadius + dy - shadowSpread; -} RectF shadowRect = new RectF( -shadowLeft, -shadowTop, -canvasWidth - shadowRadius + shadowSpread, -canvasHeight - shadowRadius + shadowSpread); +0f, 0f, +viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread +); -shadowRect.top += Math.abs(dy); -shadowRect.bottom -= Math.abs(dy); -shadowRect.left += Math.abs(dx); -shadowRect.right -= Math.abs(dx); +float shadowDx = 2f * dx + shadowRadius; +float shadowDy = 2f * dy + shadowRadius; +shadowRect.offset(shadowDx, shadowDy); Paint shadowPaint = new Paint(); shadowPaint.setAntiAlias(true); shadowPaint.setColor(shadowColor); shadowPaint.setStyle(Paint.Style.FILL); -float shadowDx = 0f, shadowDy = 0f; -if (shadowSpread == 0f) { - shadowDx = dx; - shadowDy = dy; -} -shadowPaint.setShadowLayer(shadowRadius, shadowDx, shadowDy, shadowColor); +shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); Path shadowPath = new Path(); float[] shadowRadii = new float[8];
[3/4] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/007dd161 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/007dd161 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/007dd161 Branch: refs/heads/0.16-dev Commit: 007dd161ddee82d6ce4b681b33e43646d8b6568b Parents: 2c75a84 Author: misakuo Authored: Wed Sep 27 17:12:33 2017 +0800 Committer: misakuo Committed: Wed Sep 27 17:12:33 2017 +0800 -- .../java/com/taobao/weex/ui/component/WXComponent.java| 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/007dd161/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..e9d7296 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 @@ -44,6 +44,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 +68,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 +87,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; @@ -854,7 +854,11 @@ public abstract class WXComponent implements IWXObject, IWXActi case Constants.Name.BOTTOM: return true; case Constants.Name.BOX_SHADOW: -updateBoxShadow(); +try { + updateBoxShadow(); +} catch (Throwable t) { + t.printStackTrace(); +} return true; default: return false;
[GitHub] incubator-weex pull request #748: * [android] better solution for draw box-s...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/748 ---
[GitHub] incubator-weex pull request #750: * [android] remove methods
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/750 * [android] remove methods Remove 3 methods You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-bugfix-reduce-method Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/750.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 #750 commit 901be692f9b2469b88460f13881b78a094c80a0c Author: misakuo Date: 2017-09-21T06:18:37Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit 9314f30904dd47ce496968dc54a6a4f18652e9b1 Author: misakuo Date: 2017-09-25T03:00:50Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit 5e342b4b0546a36be2b7b2ee65d8c093b7544525 Author: misakuo Date: 2017-09-25T03:13:42Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47 Author: misakuo Date: 2017-09-25T09:11:28Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit 8eb26bb76572ad4d3c31302da3d5793380fbddd7 Author: misakuo Date: 2017-09-26T03:24:07Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit 20771648e257894b8ba870b895c9db8148088e7e Author: misakuo Date: 2017-09-26T07:53:51Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit fc7bcca34fb90be76fb1fbffad9c2873746e5cb6 Author: misakuo Date: 2017-09-27T06:25:15Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit 4656959c140dc3f8f540e4ad2e62a030cf9303b8 Author: misakuo Date: 2017-09-27T10:42:30Z Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev commit c643ceafeb284602acc2ea87a0a0cf1dfa5d7854 Author: misakuo Date: 2017-09-27T10:52:02Z * [android] remove 3 methods ---
[1/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Repository: incubator-weex Updated Branches: refs/heads/0.16-dev 27f69b75a -> c643ceafe Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/901be692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/901be692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/901be692 Branch: refs/heads/0.16-dev Commit: 901be692f9b2469b88460f13881b78a094c80a0c Parents: 5123304 20b1157 Author: misakuo Authored: Thu Sep 21 14:18:37 2017 +0800 Committer: misakuo Committed: Thu Sep 21 14:18:37 2017 +0800 -- .travis.yml | 47 +--- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- .../com/taobao/weex/dom/WXTextDomObject.java| 11 +- .../java/com/taobao/weex/utils/LogLevel.java| 4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 +++ dangerfile-android.js | 108 +++ dangerfile-ios.js | 107 ++ dangerfile-jsfm.js | 105 ++ package.json| 5 +- scripts/generate_apache_release.sh | 2 +- test/pages/components/iconfont.vue | 6 +- test/scripts/components/scroll-event.test.js| 2 +- 12 files changed, 360 insertions(+), 56 deletions(-) --
[4/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08e1c3e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08e1c3e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08e1c3e4 Branch: refs/heads/0.16-dev Commit: 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47 Parents: 5e342b4 0faa131 Author: misakuo Authored: Mon Sep 25 17:11:28 2017 +0800 Committer: misakuo Committed: Mon Sep 25 17:11:28 2017 +0800 -- pre-build/native-bundle-main.js | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[2/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9314f309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9314f309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9314f309 Branch: refs/heads/0.16-dev Commit: 9314f30904dd47ce496968dc54a6a4f18652e9b1 Parents: 901be69 cfc4393 Author: misakuo Authored: Mon Sep 25 11:00:50 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:00:50 2017 +0800 -- .travis.yml | 13 +- WeexSDK.podspec |2 - .../main/java/com/taobao/weex/WXSDKEngine.java |5 + .../java/com/taobao/weex/WXSDKInstance.java | 12 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 31 +- .../java/com/taobao/weex/common/Constants.java | 30 +- .../main/java/com/taobao/weex/dom/WXAttr.java | 147 +- .../com/taobao/weex/dom/WXCellDomObject.java| 53 +- .../java/com/taobao/weex/dom/WXDomObject.java | 26 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 120 +- .../taobao/weex/dom/WXRecyclerDomObject.java| 58 +- .../com/taobao/weex/dom/WXTextDomObject.java| 13 +- .../com/taobao/weex/dom/action/Actions.java |4 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../weex/dom/action/RemoveEventAction.java |5 +- .../com/taobao/weex/dom/binding/ELUtils.java| 125 ++ .../taobao/weex/dom/binding/WXStatement.java| 160 ++ .../com/taobao/weex/el/parse/ArrayStack.java| 75 + .../java/com/taobao/weex/el/parse/Block.java| 75 + .../java/com/taobao/weex/el/parse/Operator.java | 106 + .../com/taobao/weex/el/parse/Operators.java | 499 + .../java/com/taobao/weex/el/parse/Parser.java | 485 + .../java/com/taobao/weex/el/parse/Symbol.java | 37 + .../java/com/taobao/weex/el/parse/Token.java| 89 + .../weex/ui/component/AppearanceHelper.java |9 + .../weex/ui/component/WXBasicComponentType.java |3 + .../taobao/weex/ui/component/WXComponent.java | 93 +- .../com/taobao/weex/ui/component/WXHeader.java |4 +- .../com/taobao/weex/ui/component/WXImage.java |7 + .../com/taobao/weex/ui/component/WXLoading.java |5 +- .../com/taobao/weex/ui/component/WXRefresh.java |5 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 413 .../ui/component/list/RecyclerTransform.java| 90 + .../taobao/weex/ui/component/list/WXCell.java |2 +- .../list/template/CellLifecycleManager.java | 211 ++ .../list/template/TemplateStickyHelper.java | 252 +++ .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1460 ++ .../weex/ui/view/WXBaseCircleIndicator.java |4 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../com/taobao/weex/el/IfStatementTest.java | 155 ++ .../java/com/taobao/weex/el/ParserTest.java | 244 +++ .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 ++ .../ui/component/list/WXListComponentTest.java |3 +- dangerfile-android.js |2 +- dangerfile-ios.js |2 +- dangerfile-jsfm.js |2 +- dangerfile.js |2 +- doc/source/cn/guide/index.md|9 +- doc/source/cn/guide/set-up-env.md |4 +- doc/source/cn/guide/tools/toolkit.md|2 +- .../cn/references/advanced/extend-to-android.md | 21 +- doc/source/cn/references/common-style.md|1 + doc/source/cn/references/components/text.md |6 +- doc/source/cn/references/modules/animation.md |2 + doc/source/cn/references/modules/dom.md |2 +- doc/source/cn/references/weex-variable.md | 48 + doc/source/guide/index.md |4 +- doc/source/guide/set-up-env.md |6 +- doc/source/guide/tools/toolkit.md |5 +- doc/source/references/common-style.md |1 + doc/source/references/components/text.md|8 +- doc/source/references/modules/animation.md |3 +- doc/source/references/modules/dom.md|2 +- doc/source/references/weex-variable.md | 52 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../Sources/Bridge/WXDebugLoggerBridge.h| 26 - .../Sources/Bridge/WXDebugLoggerBridge.m| 213 --- ios/sdk/WeexSDK/Sources/Bridge/WXJSC
[6/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20771648 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20771648 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20771648 Branch: refs/heads/0.16-dev Commit: 20771648e257894b8ba870b895c9db8148088e7e Parents: 8eb26bb 915935b Author: misakuo Authored: Tue Sep 26 15:53:51 2017 +0800 Committer: misakuo Committed: Tue Sep 26 15:53:51 2017 +0800 -- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + examples/vue/showcase/a-node-click.vue | 6 +- html5/render/vue/README.md | 42 + html5/render/vue/components/a.js| 19 +-- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js| 7 +- html5/render/vue/components/scrollable/cell.js | 3 +- .../render/vue/components/scrollable/header.js | 5 +- html5/render/vue/components/scrollable/list.js | 2 +- .../components/scrollable/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++ .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + html5/render/vue/components/slider/indicator.js | 2 + .../render/vue/components/slider/slideMixin.js | 13 +- html5/render/vue/components/slider/slider.css | 6 + html5/render/vue/components/switch.js | 12 +- html5/render/vue/components/text.js | 3 + html5/render/vue/core/node.js | 148 +--- html5/render/vue/env/event-manager.js | 168 +++ html5/render/vue/env/viewport.js| 8 + html5/render/vue/env/weex.js| 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 - html5/render/vue/mixins/style.js| 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js| 36 html5/render/vue/modules/modal/style.js | 20 ++- html5/render/vue/styles/base.css| 15 ++ html5/render/vue/styles/reset.css | 5 +- html5/render/vue/utils/component.js | 166 +++--- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- html5/test/render/vue/components/switch.js | 5 +- html5/test/render/vue/components/text.js| 4 +- html5/test/render/vue/components/web.js | 4 +- html5/test/render/vue/helper/index.js | 11 ++ html5/test/render/vue/utils/component.js| 5 - ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- package.json| 6 +- .../weex-vue-slider/package.json| 2 +- packages/weex-vue-render/README.md | 42 + packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 ++- packages/weex-vue-render/src/index.js | 17 +- scripts/release_files.rules | 1 + vue.html| 15 +- 56 files changed, 810 insertions(+), 339 deletions(-) --
[7/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fc7bcca3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fc7bcca3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fc7bcca3 Branch: refs/heads/0.16-dev Commit: fc7bcca34fb90be76fb1fbffad9c2873746e5cb6 Parents: 2077164 fa4726a Author: misakuo Authored: Wed Sep 27 14:25:15 2017 +0800 Committer: misakuo Committed: Wed Sep 27 14:25:15 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- .../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 +- .../ui/component/list/BasicListComponent.java | 52 +-- .../list/template/WXRecyclerTemplateList.java | 13 +-- .../java/com/taobao/weex/el/ParserTest.java | 4 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../RecycleList/WXRecycleListComponent.m| 7 ++ .../Component/Recycler/WXRecyclerComponent.m| 7 ++ .../WeexSDK/Sources/Component/WXListComponent.m | 7 ++ .../Sources/Component/WXScrollerComponent.m | 7 ++ .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- 23 files changed, 71 insertions(+), 184 deletions(-) --
[9/9] incubator-weex git commit: * [android] remove 3 methods
* [android] remove 3 methods Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c643ceaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c643ceaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c643ceaf Branch: refs/heads/0.16-dev Commit: c643ceafeb284602acc2ea87a0a0cf1dfa5d7854 Parents: 4656959 Author: misakuo Authored: Wed Sep 27 18:52:02 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:52:02 2017 +0800 -- .../weex/ui/view/WXBaseCircleIndicator.java | 40 +--- 1 file changed, 18 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c643ceaf/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java index 5983f2d..ea4a817 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java @@ -24,6 +24,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Paint.Style; +import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.util.AttributeSet; import android.view.MotionEvent; @@ -34,7 +35,7 @@ import com.taobao.weex.ui.view.gesture.WXGestureObservable; import com.taobao.weex.utils.WXViewUtils; -public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeListener, WXGestureObservable { +public class WXBaseCircleIndicator extends FrameLayout implements WXGestureObservable { private final Paint mPaintPage = new Paint(); private final Paint mPaintFill = new Paint(); @@ -59,6 +60,8 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi private int fillColor = Color.DKGRAY; private int realCurrentItem; + private OnPageChangeListener mListener; + public WXBaseCircleIndicator(Context context) { super(context); @@ -91,12 +94,21 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi } /** - * @param mCircleViewPager the mCircleViewPager to set + * @param viewPager the mCircleViewPager to set */ - public void setCircleViewPager(WXCircleViewPager mCircleViewPager) { -this.mCircleViewPager = mCircleViewPager; -if (this.mCircleViewPager != null) { - this.mCircleViewPager.addOnPageChangeListener(this); + public void setCircleViewPager(WXCircleViewPager viewPager) { +mCircleViewPager = viewPager; +if (mCircleViewPager != null) { + if (mListener == null) { +mListener = new ViewPager.SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { +realCurrentItem = mCircleViewPager.getRealCurrentItem(); +invalidate(); + } +}; + } + this.mCircleViewPager.addOnPageChangeListener(mListener); this.realCurrentItem = mCircleViewPager.getRealCurrentItem(); if (realCurrentItem < 0) { realCurrentItem = 0; @@ -105,22 +117,6 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi requestLayout(); } - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { -realCurrentItem = mCircleViewPager.getRealCurrentItem(); -invalidate(); - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - /** * @param radius the radius to set */
[3/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e342b4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e342b4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e342b4b Branch: refs/heads/0.16-dev Commit: 5e342b4b0546a36be2b7b2ee65d8c093b7544525 Parents: 9314f30 0e9760a Author: misakuo Authored: Mon Sep 25 11:13:42 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:13:42 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 63 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 510 +++ .../com/taobao/weex/utils/WXResourceUtils.java | 4 + test/screenshot/border-android.png | Bin 162929 -> 0 bytes 5 files changed, 575 insertions(+), 3 deletions(-) --
[5/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8eb26bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8eb26bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8eb26bb7 Branch: refs/heads/0.16-dev Commit: 8eb26bb76572ad4d3c31302da3d5793380fbddd7 Parents: 08e1c3e 2513b0f Author: misakuo Authored: Tue Sep 26 11:24:07 2017 +0800 Committer: misakuo Committed: Tue Sep 26 11:24:07 2017 +0800 -- .../dom/action/AbstractAddElementAction.java|12 +- .../weex/ui/component/binding/Statements.java | 7 + .../list/template/WXRecyclerTemplateList.java | 3 + build/config.js | 3 +- doc/source/cn/guide/set-up-env.md |64 +- doc/source/cn/references/modules/animation.md | 5 +- doc/source/guide/set-up-env.md |58 +- doc/source/references/modules/animation.md | 6 +- html5/render/vue/components/input.js| 2 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js |15 +- html5/runtime/vdom/Element.js |45 +- html5/test/unit/default/vm/events.js| 4 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 9 +- .../RecycleList/WXRecycleListUpdateManager.h| 1 + .../Sources/Component/WXImageComponent.m| 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 8 +- .../Sources/Display/WXComponent+Display.m |14 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 4 +- .../Sources/Manager/WXComponentManager.m| 4 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m |61 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 8 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h |16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m |24 + ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + package.json| 6 +- packages/weex-js-framework/index.js | 44451 + packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz| Bin 13215 -> 0 bytes start | 5 +- 36 files changed, 22756 insertions(+), 22379 deletions(-) --
[8/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4656959c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4656959c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4656959c Branch: refs/heads/0.16-dev Commit: 4656959c140dc3f8f540e4ad2e62a030cf9303b8 Parents: fc7bcca 27f69b7 Author: misakuo Authored: Wed Sep 27 18:42:30 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:42:30 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 2 files changed, 42 insertions(+), 33 deletions(-) --
[GitHub] incubator-weex pull request #750: * [android] remove methods
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/750 ---
[GitHub] incubator-weex issue #750: * [android] remove methods
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/750 Messages :book: has no jsfm file changed,skip test! Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[01/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Repository: incubator-weex Updated Branches: refs/heads/master 9f96caefc -> 717913371 Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/901be692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/901be692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/901be692 Branch: refs/heads/master Commit: 901be692f9b2469b88460f13881b78a094c80a0c Parents: 5123304 20b1157 Author: misakuo Authored: Thu Sep 21 14:18:37 2017 +0800 Committer: misakuo Committed: Thu Sep 21 14:18:37 2017 +0800 -- .travis.yml | 47 +--- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- .../com/taobao/weex/dom/WXTextDomObject.java| 11 +- .../java/com/taobao/weex/utils/LogLevel.java| 4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 +++ dangerfile-android.js | 108 +++ dangerfile-ios.js | 107 ++ dangerfile-jsfm.js | 105 ++ package.json| 5 +- scripts/generate_apache_release.sh | 2 +- test/pages/components/iconfont.vue | 6 +- test/scripts/components/scroll-event.test.js| 2 +- 12 files changed, 360 insertions(+), 56 deletions(-) --
[12/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4656959c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4656959c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4656959c Branch: refs/heads/master Commit: 4656959c140dc3f8f540e4ad2e62a030cf9303b8 Parents: fc7bcca 27f69b7 Author: misakuo Authored: Wed Sep 27 18:42:30 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:42:30 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 2 files changed, 42 insertions(+), 33 deletions(-) --
[02/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9314f309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9314f309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9314f309 Branch: refs/heads/master Commit: 9314f30904dd47ce496968dc54a6a4f18652e9b1 Parents: 901be69 cfc4393 Author: misakuo Authored: Mon Sep 25 11:00:50 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:00:50 2017 +0800 -- .travis.yml | 13 +- WeexSDK.podspec |2 - .../main/java/com/taobao/weex/WXSDKEngine.java |5 + .../java/com/taobao/weex/WXSDKInstance.java | 12 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 31 +- .../java/com/taobao/weex/common/Constants.java | 30 +- .../main/java/com/taobao/weex/dom/WXAttr.java | 147 +- .../com/taobao/weex/dom/WXCellDomObject.java| 53 +- .../java/com/taobao/weex/dom/WXDomObject.java | 26 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 120 +- .../taobao/weex/dom/WXRecyclerDomObject.java| 58 +- .../com/taobao/weex/dom/WXTextDomObject.java| 13 +- .../com/taobao/weex/dom/action/Actions.java |4 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../weex/dom/action/RemoveEventAction.java |5 +- .../com/taobao/weex/dom/binding/ELUtils.java| 125 ++ .../taobao/weex/dom/binding/WXStatement.java| 160 ++ .../com/taobao/weex/el/parse/ArrayStack.java| 75 + .../java/com/taobao/weex/el/parse/Block.java| 75 + .../java/com/taobao/weex/el/parse/Operator.java | 106 + .../com/taobao/weex/el/parse/Operators.java | 499 + .../java/com/taobao/weex/el/parse/Parser.java | 485 + .../java/com/taobao/weex/el/parse/Symbol.java | 37 + .../java/com/taobao/weex/el/parse/Token.java| 89 + .../weex/ui/component/AppearanceHelper.java |9 + .../weex/ui/component/WXBasicComponentType.java |3 + .../taobao/weex/ui/component/WXComponent.java | 93 +- .../com/taobao/weex/ui/component/WXHeader.java |4 +- .../com/taobao/weex/ui/component/WXImage.java |7 + .../com/taobao/weex/ui/component/WXLoading.java |5 +- .../com/taobao/weex/ui/component/WXRefresh.java |5 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 413 .../ui/component/list/RecyclerTransform.java| 90 + .../taobao/weex/ui/component/list/WXCell.java |2 +- .../list/template/CellLifecycleManager.java | 211 ++ .../list/template/TemplateStickyHelper.java | 252 +++ .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1460 ++ .../weex/ui/view/WXBaseCircleIndicator.java |4 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../com/taobao/weex/el/IfStatementTest.java | 155 ++ .../java/com/taobao/weex/el/ParserTest.java | 244 +++ .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 ++ .../ui/component/list/WXListComponentTest.java |3 +- dangerfile-android.js |2 +- dangerfile-ios.js |2 +- dangerfile-jsfm.js |2 +- dangerfile.js |2 +- doc/source/cn/guide/index.md|9 +- doc/source/cn/guide/set-up-env.md |4 +- doc/source/cn/guide/tools/toolkit.md|2 +- .../cn/references/advanced/extend-to-android.md | 21 +- doc/source/cn/references/common-style.md|1 + doc/source/cn/references/components/text.md |6 +- doc/source/cn/references/modules/animation.md |2 + doc/source/cn/references/modules/dom.md |2 +- doc/source/cn/references/weex-variable.md | 48 + doc/source/guide/index.md |4 +- doc/source/guide/set-up-env.md |6 +- doc/source/guide/tools/toolkit.md |5 +- doc/source/references/common-style.md |1 + doc/source/references/components/text.md|8 +- doc/source/references/modules/animation.md |3 +- doc/source/references/modules/dom.md|2 +- doc/source/references/weex-variable.md | 52 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../Sources/Bridge/WXDebugLoggerBridge.h| 26 - .../Sources/Bridge/WXDebugLoggerBridge.m| 213 --- ios/sdk/WeexSDK/Sources/Bridge/WXJSCor
[08/14] incubator-weex git commit: * [android] better solution for draw box-shadow
* [android] better solution for draw box-shadow Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0839ee18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0839ee18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0839ee18 Branch: refs/heads/master Commit: 0839ee18c27c52a9030e06c3e2cd5142ee6db616 Parents: fa4726a Author: misakuo Authored: Wed Sep 27 15:22:02 2017 +0800 Committer: misakuo Committed: Wed Sep 27 15:22:02 2017 +0800 -- .../com/taobao/weex/utils/BoxShadowUtil.java| 47 1 file changed, 19 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0839ee18/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index b1ebb63..c1cc693 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -20,6 +20,7 @@ package com.taobao.weex.utils; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.BlurMaskFilter; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; @@ -40,6 +41,8 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; +import com.taobao.weex.WXEnvironment; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -103,18 +106,21 @@ public class BoxShadowUtil { float[] radii, float shadowRadius, float shadowSpread, float dx, float dy, int shadowColor) { - -if (shadowRadius == 0) { - // 0 can not draw shadow layer - shadowRadius = 0.01f; -} - int canvasWidth = viewWidth + 2 * (int) (shadowRadius + shadowSpread + Math.abs(dx)); int canvasHeight = viewHeight + 2 * (int) (shadowRadius + shadowSpread + Math.abs(dy)); Bitmap output = Bitmap.createBitmap(canvasWidth, canvasHeight, Bitmap.Config.ARGB_); Canvas canvas = new Canvas(output); +if (false && WXEnvironment.isApkDebugable()) { + // Using for debug + Paint strokePaint = new Paint(); + strokePaint.setColor(Color.BLACK); + strokePaint.setStrokeWidth(2); + strokePaint.setStyle(Paint.Style.STROKE); + canvas.drawRect(canvas.getClipBounds(), strokePaint); +} + float offsetX = shadowRadius + shadowSpread + Math.abs(dx); float offsetY = shadowRadius + shadowSpread + Math.abs(dy); RectF selfRect = new RectF( @@ -127,36 +133,21 @@ public class BoxShadowUtil { // can not antialias canvas.clipPath(contentPath, Region.Op.DIFFERENCE); -float shadowLeft, shadowTop; -if (shadowSpread == 0f) { - shadowLeft = shadowRadius; - shadowTop = shadowRadius; -} else { - shadowLeft = shadowRadius + dx - shadowSpread; - shadowTop = shadowRadius + dy - shadowSpread; -} RectF shadowRect = new RectF( -shadowLeft, -shadowTop, -canvasWidth - shadowRadius + shadowSpread, -canvasHeight - shadowRadius + shadowSpread); +0f, 0f, +viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread +); -shadowRect.top += Math.abs(dy); -shadowRect.bottom -= Math.abs(dy); -shadowRect.left += Math.abs(dx); -shadowRect.right -= Math.abs(dx); +float shadowDx = 2f * dx + shadowRadius; +float shadowDy = 2f * dy + shadowRadius; +shadowRect.offset(shadowDx, shadowDy); Paint shadowPaint = new Paint(); shadowPaint.setAntiAlias(true); shadowPaint.setColor(shadowColor); shadowPaint.setStyle(Paint.Style.FILL); -float shadowDx = 0f, shadowDy = 0f; -if (shadowSpread == 0f) { - shadowDx = dx; - shadowDy = dy; -} -shadowPaint.setShadowLayer(shadowRadius, shadowDx, shadowDy, shadowColor); +shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); Path shadowPath = new Path(); float[] shadowRadii = new float[8];
[04/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08e1c3e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08e1c3e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08e1c3e4 Branch: refs/heads/master Commit: 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47 Parents: 5e342b4 0faa131 Author: misakuo Authored: Mon Sep 25 17:11:28 2017 +0800 Committer: misakuo Committed: Mon Sep 25 17:11:28 2017 +0800 -- pre-build/native-bundle-main.js | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[11/14] incubator-weex git commit: * [android] fix negative offset
* [android] fix negative offset Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27f69b75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27f69b75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27f69b75 Branch: refs/heads/master Commit: 27f69b75a2881afcc229a78e00b43ae2a2d0abd6 Parents: 007dd16 Author: misakuo Authored: Wed Sep 27 18:05:08 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:05:08 2017 +0800 -- .../main/java/com/taobao/weex/utils/BoxShadowUtil.java| 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27f69b75/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index 892e80c..3f522dd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -139,8 +139,14 @@ public class BoxShadowUtil { viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread ); -float shadowDx = 2f * dx + shadowRadius; -float shadowDy = 2f * dy + shadowRadius; +float shadowDx = shadowRadius; +float shadowDy = shadowRadius; +if (dx > 0) { + shadowDx = shadowDx + 2f * dx; +} +if (dy > 0) { + shadowDy = shadowDy + 2f * dy; +} shadowRect.offset(shadowDx, shadowDy); Paint shadowPaint = new Paint();
[05/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8eb26bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8eb26bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8eb26bb7 Branch: refs/heads/master Commit: 8eb26bb76572ad4d3c31302da3d5793380fbddd7 Parents: 08e1c3e 2513b0f Author: misakuo Authored: Tue Sep 26 11:24:07 2017 +0800 Committer: misakuo Committed: Tue Sep 26 11:24:07 2017 +0800 -- .../dom/action/AbstractAddElementAction.java|12 +- .../weex/ui/component/binding/Statements.java | 7 + .../list/template/WXRecyclerTemplateList.java | 3 + build/config.js | 3 +- doc/source/cn/guide/set-up-env.md |64 +- doc/source/cn/references/modules/animation.md | 5 +- doc/source/guide/set-up-env.md |58 +- doc/source/references/modules/animation.md | 6 +- html5/render/vue/components/input.js| 2 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js |15 +- html5/runtime/vdom/Element.js |45 +- html5/test/unit/default/vm/events.js| 4 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 9 +- .../RecycleList/WXRecycleListUpdateManager.h| 1 + .../Sources/Component/WXImageComponent.m| 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 8 +- .../Sources/Display/WXComponent+Display.m |14 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 4 +- .../Sources/Manager/WXComponentManager.m| 4 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m |61 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 8 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h |16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m |24 + ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + package.json| 6 +- packages/weex-js-framework/index.js | 44451 + packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz| Bin 13215 -> 0 bytes start | 5 +- 36 files changed, 22756 insertions(+), 22379 deletions(-) --
[10/14] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/007dd161 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/007dd161 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/007dd161 Branch: refs/heads/master Commit: 007dd161ddee82d6ce4b681b33e43646d8b6568b Parents: 2c75a84 Author: misakuo Authored: Wed Sep 27 17:12:33 2017 +0800 Committer: misakuo Committed: Wed Sep 27 17:12:33 2017 +0800 -- .../java/com/taobao/weex/ui/component/WXComponent.java| 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/007dd161/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..e9d7296 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 @@ -44,6 +44,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 +68,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 +87,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; @@ -854,7 +854,11 @@ public abstract class WXComponent implements IWXObject, IWXActi case Constants.Name.BOTTOM: return true; case Constants.Name.BOX_SHADOW: -updateBoxShadow(); +try { + updateBoxShadow(); +} catch (Throwable t) { + t.printStackTrace(); +} return true; default: return false;
[14/14] incubator-weex git commit: Merge branch '0.16-dev'
Merge branch '0.16-dev' Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/71791337 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/71791337 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/71791337 Branch: refs/heads/master Commit: 7179133716331a991c875d4bf149c1cc9025d164 Parents: 9f96cae c643cea Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 22:09:22 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 22:09:22 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../weex/ui/view/WXBaseCircleIndicator.java | 40 ++-- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 3 files changed, 60 insertions(+), 55 deletions(-) --
[09/14] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c75a841 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c75a841 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c75a841 Branch: refs/heads/master Commit: 2c75a84128a262f770e026acf6236ab8d152ee54 Parents: 0839ee1 Author: misakuo Authored: Wed Sep 27 17:10:24 2017 +0800 Committer: misakuo Committed: Wed Sep 27 17:10:24 2017 +0800 -- .../java/com/taobao/weex/utils/BoxShadowUtil.java | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c75a841/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index c1cc693..892e80c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -40,6 +40,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import android.view.ViewParent; import com.taobao.weex.WXEnvironment; @@ -147,7 +148,9 @@ public class BoxShadowUtil { shadowPaint.setColor(shadowColor); shadowPaint.setStyle(Paint.Style.FILL); -shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); +if (shadowRadius > 0) { + shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); +} Path shadowPath = new Path(); float[] shadowRadii = new float[8]; @@ -186,8 +189,13 @@ public class BoxShadowUtil { target.getOverlay().clear(); target.getOverlay().add(shadowDrawable); //Relayout to ensure the shadows are fully drawn - target.getParent().requestLayout(); - ((ViewGroup) target.getParent()).invalidate(shadowDrawable.getBounds()); + ViewParent parent = target.getParent(); + if (parent != null) { +parent.requestLayout(); +if (parent instanceof ViewGroup) { + ((ViewGroup) parent).invalidate(shadowDrawable.getBounds()); +} + } } else { // I have a dream that one day our minSdkVersion will equals or higher than 21 Log.w("BoxShadowUtil", "Call setNormalBoxShadow() requires API level 18 or higher.");
[13/14] incubator-weex git commit: * [android] remove 3 methods
* [android] remove 3 methods Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c643ceaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c643ceaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c643ceaf Branch: refs/heads/master Commit: c643ceafeb284602acc2ea87a0a0cf1dfa5d7854 Parents: 4656959 Author: misakuo Authored: Wed Sep 27 18:52:02 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:52:02 2017 +0800 -- .../weex/ui/view/WXBaseCircleIndicator.java | 40 +--- 1 file changed, 18 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c643ceaf/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java index 5983f2d..ea4a817 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java @@ -24,6 +24,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Paint.Style; +import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.util.AttributeSet; import android.view.MotionEvent; @@ -34,7 +35,7 @@ import com.taobao.weex.ui.view.gesture.WXGestureObservable; import com.taobao.weex.utils.WXViewUtils; -public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeListener, WXGestureObservable { +public class WXBaseCircleIndicator extends FrameLayout implements WXGestureObservable { private final Paint mPaintPage = new Paint(); private final Paint mPaintFill = new Paint(); @@ -59,6 +60,8 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi private int fillColor = Color.DKGRAY; private int realCurrentItem; + private OnPageChangeListener mListener; + public WXBaseCircleIndicator(Context context) { super(context); @@ -91,12 +94,21 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi } /** - * @param mCircleViewPager the mCircleViewPager to set + * @param viewPager the mCircleViewPager to set */ - public void setCircleViewPager(WXCircleViewPager mCircleViewPager) { -this.mCircleViewPager = mCircleViewPager; -if (this.mCircleViewPager != null) { - this.mCircleViewPager.addOnPageChangeListener(this); + public void setCircleViewPager(WXCircleViewPager viewPager) { +mCircleViewPager = viewPager; +if (mCircleViewPager != null) { + if (mListener == null) { +mListener = new ViewPager.SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { +realCurrentItem = mCircleViewPager.getRealCurrentItem(); +invalidate(); + } +}; + } + this.mCircleViewPager.addOnPageChangeListener(mListener); this.realCurrentItem = mCircleViewPager.getRealCurrentItem(); if (realCurrentItem < 0) { realCurrentItem = 0; @@ -105,22 +117,6 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi requestLayout(); } - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { -realCurrentItem = mCircleViewPager.getRealCurrentItem(); -invalidate(); - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - /** * @param radius the radius to set */
[07/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fc7bcca3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fc7bcca3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fc7bcca3 Branch: refs/heads/master Commit: fc7bcca34fb90be76fb1fbffad9c2873746e5cb6 Parents: 2077164 fa4726a Author: misakuo Authored: Wed Sep 27 14:25:15 2017 +0800 Committer: misakuo Committed: Wed Sep 27 14:25:15 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- .../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 +- .../ui/component/list/BasicListComponent.java | 52 +-- .../list/template/WXRecyclerTemplateList.java | 13 +-- .../java/com/taobao/weex/el/ParserTest.java | 4 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../RecycleList/WXRecycleListComponent.m| 7 ++ .../Component/Recycler/WXRecyclerComponent.m| 7 ++ .../WeexSDK/Sources/Component/WXListComponent.m | 7 ++ .../Sources/Component/WXScrollerComponent.m | 7 ++ .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- 23 files changed, 71 insertions(+), 184 deletions(-) --
[03/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e342b4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e342b4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e342b4b Branch: refs/heads/master Commit: 5e342b4b0546a36be2b7b2ee65d8c093b7544525 Parents: 9314f30 0e9760a Author: misakuo Authored: Mon Sep 25 11:13:42 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:13:42 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 63 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 510 +++ .../com/taobao/weex/utils/WXResourceUtils.java | 4 + test/screenshot/border-android.png | Bin 162929 -> 0 bytes 5 files changed, 575 insertions(+), 3 deletions(-) --
[05/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e342b4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e342b4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e342b4b Branch: refs/heads/release Commit: 5e342b4b0546a36be2b7b2ee65d8c093b7544525 Parents: 9314f30 0e9760a Author: misakuo Authored: Mon Sep 25 11:13:42 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:13:42 2017 +0800 -- .../java/com/taobao/weex/common/Constants.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 63 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 510 +++ .../com/taobao/weex/utils/WXResourceUtils.java | 4 + test/screenshot/border-android.png | Bin 162929 -> 0 bytes 5 files changed, 575 insertions(+), 3 deletions(-) --
[06/14] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20771648 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20771648 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20771648 Branch: refs/heads/master Commit: 20771648e257894b8ba870b895c9db8148088e7e Parents: 8eb26bb 915935b Author: misakuo Authored: Tue Sep 26 15:53:51 2017 +0800 Committer: misakuo Committed: Tue Sep 26 15:53:51 2017 +0800 -- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + examples/vue/showcase/a-node-click.vue | 6 +- html5/render/vue/README.md | 42 + html5/render/vue/components/a.js| 19 +-- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js| 7 +- html5/render/vue/components/scrollable/cell.js | 3 +- .../render/vue/components/scrollable/header.js | 5 +- html5/render/vue/components/scrollable/list.js | 2 +- .../components/scrollable/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++ .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + html5/render/vue/components/slider/indicator.js | 2 + .../render/vue/components/slider/slideMixin.js | 13 +- html5/render/vue/components/slider/slider.css | 6 + html5/render/vue/components/switch.js | 12 +- html5/render/vue/components/text.js | 3 + html5/render/vue/core/node.js | 148 +--- html5/render/vue/env/event-manager.js | 168 +++ html5/render/vue/env/viewport.js| 8 + html5/render/vue/env/weex.js| 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 - html5/render/vue/mixins/style.js| 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js| 36 html5/render/vue/modules/modal/style.js | 20 ++- html5/render/vue/styles/base.css| 15 ++ html5/render/vue/styles/reset.css | 5 +- html5/render/vue/utils/component.js | 166 +++--- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- html5/test/render/vue/components/switch.js | 5 +- html5/test/render/vue/components/text.js| 4 +- html5/test/render/vue/components/web.js | 4 +- html5/test/render/vue/helper/index.js | 11 ++ html5/test/render/vue/utils/component.js| 5 - ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- package.json| 6 +- .../weex-vue-slider/package.json| 2 +- packages/weex-vue-render/README.md | 42 + packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 ++- packages/weex-vue-render/src/index.js | 17 +- scripts/release_files.rules | 1 + vue.html| 15 +- 56 files changed, 810 insertions(+), 339 deletions(-) --
[16/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4656959c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4656959c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4656959c Branch: refs/heads/release Commit: 4656959c140dc3f8f540e4ad2e62a030cf9303b8 Parents: fc7bcca 27f69b7 Author: misakuo Authored: Wed Sep 27 18:42:30 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:42:30 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 2 files changed, 42 insertions(+), 33 deletions(-) --
[03/18] incubator-weex git commit: Update web-demo.we
Update web-demo.we Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5b59d18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5b59d18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5b59d18f Branch: refs/heads/release Commit: 5b59d18f38ba5a16cb2070c860b45fec3f30308b Parents: 75101d5 Author: iamqk Authored: Thu Sep 21 16:06:28 2017 +0800 Committer: GitHub Committed: Thu Sep 21 16:06:28 2017 +0800 -- examples/component/web-demo.we | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b59d18f/examples/component/web-demo.we -- diff --git a/examples/component/web-demo.we b/examples/component/web-demo.we index 2be930c..0b7e953 100644 --- a/examples/component/web-demo.we +++ b/examples/component/web-demo.we @@ -46,6 +46,7 @@ module.exports = { methods: { goback: function() { +var $webview = require('@weex-module/webview'); var webElement = this.$el('webview'); $webview.goBack(webElement.ref); }, @@ -70,4 +71,4 @@ } } } - \ No newline at end of file +
[14/18] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/007dd161 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/007dd161 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/007dd161 Branch: refs/heads/release Commit: 007dd161ddee82d6ce4b681b33e43646d8b6568b Parents: 2c75a84 Author: misakuo Authored: Wed Sep 27 17:12:33 2017 +0800 Committer: misakuo Committed: Wed Sep 27 17:12:33 2017 +0800 -- .../java/com/taobao/weex/ui/component/WXComponent.java| 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/007dd161/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..e9d7296 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 @@ -44,6 +44,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 +68,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 +87,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; @@ -854,7 +854,11 @@ public abstract class WXComponent implements IWXObject, IWXActi case Constants.Name.BOTTOM: return true; case Constants.Name.BOX_SHADOW: -updateBoxShadow(); +try { + updateBoxShadow(); +} catch (Throwable t) { + t.printStackTrace(); +} return true; default: return false;
[01/18] incubator-weex git commit: Fix typo on homepage
Repository: incubator-weex Updated Branches: refs/heads/release 403563d8f -> 717913371 Fix typo on homepage Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54c7cd0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54c7cd0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54c7cd0a Branch: refs/heads/release Commit: 54c7cd0aa467433dd1264b8aa0548a920bc56ccd Parents: 75101d5 Author: Ruben Oost Authored: Thu Sep 14 14:31:50 2017 +0200 Committer: GitHub Committed: Thu Sep 14 14:31:50 2017 +0200 -- doc/themes/weex/languages/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54c7cd0a/doc/themes/weex/languages/en.yml -- diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml index 12cec69..f0e5270 100644 --- a/doc/themes/weex/languages/en.yml +++ b/doc/themes/weex/languages/en.yml @@ -90,7 +90,7 @@ menu: download: Download resources: Resources tools: Tools - invovled: Get Invovled + invovled: Get Involved advanced: Advanced github: GitHub legacy: Old Syntax Doc
[08/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20771648 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20771648 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20771648 Branch: refs/heads/release Commit: 20771648e257894b8ba870b895c9db8148088e7e Parents: 8eb26bb 915935b Author: misakuo Authored: Tue Sep 26 15:53:51 2017 +0800 Committer: misakuo Committed: Tue Sep 26 15:53:51 2017 +0800 -- build/build.js | 17 +- build/config.js | 12 +- build/karma.vue.conf.js | 2 + examples/vue/showcase/a-node-click.vue | 6 +- html5/render/vue/README.md | 42 + html5/render/vue/components/a.js| 19 +-- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js| 7 +- html5/render/vue/components/scrollable/cell.js | 3 +- .../render/vue/components/scrollable/header.js | 5 +- html5/render/vue/components/scrollable/list.js | 2 +- .../components/scrollable/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +++ .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 ++- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + html5/render/vue/components/slider/indicator.js | 2 + .../render/vue/components/slider/slideMixin.js | 13 +- html5/render/vue/components/slider/slider.css | 6 + html5/render/vue/components/switch.js | 12 +- html5/render/vue/components/text.js | 3 + html5/render/vue/core/node.js | 148 +--- html5/render/vue/env/event-manager.js | 168 +++ html5/render/vue/env/viewport.js| 8 + html5/render/vue/env/weex.js| 21 +++ html5/render/vue/index.js | 15 ++ html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 - html5/render/vue/mixins/style.js| 18 +- html5/render/vue/modules/animation.js | 44 +++-- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js| 36 html5/render/vue/modules/modal/style.js | 20 ++- html5/render/vue/styles/base.css| 15 ++ html5/render/vue/styles/reset.css | 5 +- html5/render/vue/utils/component.js | 166 +++--- html5/render/vue/utils/event.js | 16 ++ html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- html5/test/render/vue/components/switch.js | 5 +- html5/test/render/vue/components/text.js| 4 +- html5/test/render/vue/components/web.js | 4 +- html5/test/render/vue/helper/index.js | 11 ++ html5/test/render/vue/utils/component.js| 5 - ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +- package.json| 6 +- .../weex-vue-slider/package.json| 2 +- packages/weex-vue-render/README.md | 42 + packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 ++- packages/weex-vue-render/src/index.js | 17 +- scripts/release_files.rules | 1 + vue.html| 15 +- 56 files changed, 810 insertions(+), 339 deletions(-) --
[04/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9314f309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9314f309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9314f309 Branch: refs/heads/release Commit: 9314f30904dd47ce496968dc54a6a4f18652e9b1 Parents: 901be69 cfc4393 Author: misakuo Authored: Mon Sep 25 11:00:50 2017 +0800 Committer: misakuo Committed: Mon Sep 25 11:00:50 2017 +0800 -- .travis.yml | 13 +- WeexSDK.podspec |2 - .../main/java/com/taobao/weex/WXSDKEngine.java |5 + .../java/com/taobao/weex/WXSDKInstance.java | 12 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 31 +- .../java/com/taobao/weex/common/Constants.java | 30 +- .../main/java/com/taobao/weex/dom/WXAttr.java | 147 +- .../com/taobao/weex/dom/WXCellDomObject.java| 53 +- .../java/com/taobao/weex/dom/WXDomObject.java | 26 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 120 +- .../taobao/weex/dom/WXRecyclerDomObject.java| 58 +- .../com/taobao/weex/dom/WXTextDomObject.java| 13 +- .../com/taobao/weex/dom/action/Actions.java |4 +- .../taobao/weex/dom/action/AddEventAction.java | 11 +- .../weex/dom/action/CreateBodyAction.java | 12 +- .../weex/dom/action/RemoveEventAction.java |5 +- .../com/taobao/weex/dom/binding/ELUtils.java| 125 ++ .../taobao/weex/dom/binding/WXStatement.java| 160 ++ .../com/taobao/weex/el/parse/ArrayStack.java| 75 + .../java/com/taobao/weex/el/parse/Block.java| 75 + .../java/com/taobao/weex/el/parse/Operator.java | 106 + .../com/taobao/weex/el/parse/Operators.java | 499 + .../java/com/taobao/weex/el/parse/Parser.java | 485 + .../java/com/taobao/weex/el/parse/Symbol.java | 37 + .../java/com/taobao/weex/el/parse/Token.java| 89 + .../weex/ui/component/AppearanceHelper.java |9 + .../weex/ui/component/WXBasicComponentType.java |3 + .../taobao/weex/ui/component/WXComponent.java | 93 +- .../com/taobao/weex/ui/component/WXHeader.java |4 +- .../com/taobao/weex/ui/component/WXImage.java |7 + .../com/taobao/weex/ui/component/WXLoading.java |5 +- .../com/taobao/weex/ui/component/WXRefresh.java |5 +- .../weex/ui/component/binding/Layouts.java | 92 + .../weex/ui/component/binding/Statements.java | 413 .../ui/component/list/RecyclerTransform.java| 90 + .../taobao/weex/ui/component/list/WXCell.java |2 +- .../list/template/CellLifecycleManager.java | 211 ++ .../list/template/TemplateStickyHelper.java | 252 +++ .../list/template/TemplateViewHolder.java | 79 + .../list/template/WXRecyclerTemplateList.java | 1460 ++ .../weex/ui/view/WXBaseCircleIndicator.java |4 +- .../listview/ExtendedLinearLayoutManager.java | 20 + .../weex/ui/view/listview/WXRecyclerView.java | 50 + .../java/com/taobao/weex/utils/WXUtils.java | 21 + .../com/taobao/weex/el/IfStatementTest.java | 155 ++ .../java/com/taobao/weex/el/ParserTest.java | 244 +++ .../ui/component/binding/BindingValueTest.java | 65 + .../ui/component/binding/StatementTest.java | 184 ++ .../ui/component/list/WXListComponentTest.java |3 +- dangerfile-android.js |2 +- dangerfile-ios.js |2 +- dangerfile-jsfm.js |2 +- dangerfile.js |2 +- doc/source/cn/guide/index.md|9 +- doc/source/cn/guide/set-up-env.md |4 +- doc/source/cn/guide/tools/toolkit.md|2 +- .../cn/references/advanced/extend-to-android.md | 21 +- doc/source/cn/references/common-style.md|1 + doc/source/cn/references/components/text.md |6 +- doc/source/cn/references/modules/animation.md |2 + doc/source/cn/references/modules/dom.md |2 +- doc/source/cn/references/weex-variable.md | 48 + doc/source/guide/index.md |4 +- doc/source/guide/set-up-env.md |6 +- doc/source/guide/tools/toolkit.md |5 +- doc/source/references/common-style.md |1 + doc/source/references/components/text.md|8 +- doc/source/references/modules/animation.md |3 +- doc/source/references/modules/dom.md|2 +- doc/source/references/weex-variable.md | 52 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 151 +- .../Sources/Bridge/WXDebugLoggerBridge.h| 26 - .../Sources/Bridge/WXDebugLoggerBridge.m| 213 --- ios/sdk/WeexSDK/Sources/Bridge/WXJSCo
[10/18] incubator-weex git commit: Merge branch 'doc-bugfix-typo' of https://github.com/rubenoost/incubator-weex
Merge branch 'doc-bugfix-typo' of https://github.com/rubenoost/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9f96caef Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f96caef Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f96caef Branch: refs/heads/release Commit: 9f96caefca27cba0b12539929cee89778f366f34 Parents: 72a41b8 54c7cd0 Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 11:20:38 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 11:20:38 2017 +0800 -- --
[13/18] incubator-weex git commit: * [android] prevent NPE
* [android] prevent NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c75a841 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c75a841 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c75a841 Branch: refs/heads/release Commit: 2c75a84128a262f770e026acf6236ab8d152ee54 Parents: 0839ee1 Author: misakuo Authored: Wed Sep 27 17:10:24 2017 +0800 Committer: misakuo Committed: Wed Sep 27 17:10:24 2017 +0800 -- .../java/com/taobao/weex/utils/BoxShadowUtil.java | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c75a841/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index c1cc693..892e80c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -40,6 +40,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import android.view.ViewParent; import com.taobao.weex.WXEnvironment; @@ -147,7 +148,9 @@ public class BoxShadowUtil { shadowPaint.setColor(shadowColor); shadowPaint.setStyle(Paint.Style.FILL); -shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); +if (shadowRadius > 0) { + shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); +} Path shadowPath = new Path(); float[] shadowRadii = new float[8]; @@ -186,8 +189,13 @@ public class BoxShadowUtil { target.getOverlay().clear(); target.getOverlay().add(shadowDrawable); //Relayout to ensure the shadows are fully drawn - target.getParent().requestLayout(); - ((ViewGroup) target.getParent()).invalidate(shadowDrawable.getBounds()); + ViewParent parent = target.getParent(); + if (parent != null) { +parent.requestLayout(); +if (parent instanceof ViewGroup) { + ((ViewGroup) parent).invalidate(shadowDrawable.getBounds()); +} + } } else { // I have a dream that one day our minSdkVersion will equals or higher than 21 Log.w("BoxShadowUtil", "Call setNormalBoxShadow() requires API level 18 or higher.");
[11/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fc7bcca3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fc7bcca3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fc7bcca3 Branch: refs/heads/release Commit: fc7bcca34fb90be76fb1fbffad9c2873746e5cb6 Parents: 2077164 fa4726a Author: misakuo Authored: Wed Sep 27 14:25:15 2017 +0800 Committer: misakuo Committed: Wed Sep 27 14:25:15 2017 +0800 -- .../main/java/com/taobao/weex/dom/WXAttr.java | 9 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../com/taobao/weex/dom/binding/ELUtils.java| 12 --- .../taobao/weex/dom/binding/WXStatement.java| 93 ++-- .../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 +- .../ui/component/list/BasicListComponent.java | 52 +-- .../list/template/WXRecyclerTemplateList.java | 13 +-- .../java/com/taobao/weex/el/ParserTest.java | 4 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../RecycleList/WXRecycleListComponent.m| 7 ++ .../Component/Recycler/WXRecyclerComponent.m| 7 ++ .../WeexSDK/Sources/Component/WXListComponent.m | 7 ++ .../Sources/Component/WXScrollerComponent.m | 7 ++ .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- 23 files changed, 71 insertions(+), 184 deletions(-) --
[02/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/901be692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/901be692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/901be692 Branch: refs/heads/release Commit: 901be692f9b2469b88460f13881b78a094c80a0c Parents: 5123304 20b1157 Author: misakuo Authored: Thu Sep 21 14:18:37 2017 +0800 Committer: misakuo Committed: Thu Sep 21 14:18:37 2017 +0800 -- .travis.yml | 47 +--- POSSIBLE-NOTICES-FOR-BIN-DIST | 5 +- .../com/taobao/weex/dom/WXTextDomObject.java| 11 +- .../java/com/taobao/weex/utils/LogLevel.java| 4 +- .../java/com/taobao/weex/utils/WXLogUtils.java | 14 +++ dangerfile-android.js | 108 +++ dangerfile-ios.js | 107 ++ dangerfile-jsfm.js | 105 ++ package.json| 5 +- scripts/generate_apache_release.sh | 2 +- test/pages/components/iconfont.vue | 6 +- test/scripts/components/scroll-event.test.js| 2 +- 12 files changed, 360 insertions(+), 56 deletions(-) --
[15/18] incubator-weex git commit: * [android] fix negative offset
* [android] fix negative offset Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27f69b75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27f69b75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27f69b75 Branch: refs/heads/release Commit: 27f69b75a2881afcc229a78e00b43ae2a2d0abd6 Parents: 007dd16 Author: misakuo Authored: Wed Sep 27 18:05:08 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:05:08 2017 +0800 -- .../main/java/com/taobao/weex/utils/BoxShadowUtil.java| 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27f69b75/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index 892e80c..3f522dd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -139,8 +139,14 @@ public class BoxShadowUtil { viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread ); -float shadowDx = 2f * dx + shadowRadius; -float shadowDy = 2f * dy + shadowRadius; +float shadowDx = shadowRadius; +float shadowDy = shadowRadius; +if (dx > 0) { + shadowDx = shadowDx + 2f * dx; +} +if (dy > 0) { + shadowDy = shadowDy + 2f * dy; +} shadowRect.offset(shadowDx, shadowDy); Paint shadowPaint = new Paint();
[17/18] incubator-weex git commit: * [android] remove 3 methods
* [android] remove 3 methods Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c643ceaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c643ceaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c643ceaf Branch: refs/heads/release Commit: c643ceafeb284602acc2ea87a0a0cf1dfa5d7854 Parents: 4656959 Author: misakuo Authored: Wed Sep 27 18:52:02 2017 +0800 Committer: misakuo Committed: Wed Sep 27 18:52:02 2017 +0800 -- .../weex/ui/view/WXBaseCircleIndicator.java | 40 +--- 1 file changed, 18 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c643ceaf/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java index 5983f2d..ea4a817 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java @@ -24,6 +24,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Paint.Style; +import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.util.AttributeSet; import android.view.MotionEvent; @@ -34,7 +35,7 @@ import com.taobao.weex.ui.view.gesture.WXGestureObservable; import com.taobao.weex.utils.WXViewUtils; -public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeListener, WXGestureObservable { +public class WXBaseCircleIndicator extends FrameLayout implements WXGestureObservable { private final Paint mPaintPage = new Paint(); private final Paint mPaintFill = new Paint(); @@ -59,6 +60,8 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi private int fillColor = Color.DKGRAY; private int realCurrentItem; + private OnPageChangeListener mListener; + public WXBaseCircleIndicator(Context context) { super(context); @@ -91,12 +94,21 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi } /** - * @param mCircleViewPager the mCircleViewPager to set + * @param viewPager the mCircleViewPager to set */ - public void setCircleViewPager(WXCircleViewPager mCircleViewPager) { -this.mCircleViewPager = mCircleViewPager; -if (this.mCircleViewPager != null) { - this.mCircleViewPager.addOnPageChangeListener(this); + public void setCircleViewPager(WXCircleViewPager viewPager) { +mCircleViewPager = viewPager; +if (mCircleViewPager != null) { + if (mListener == null) { +mListener = new ViewPager.SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { +realCurrentItem = mCircleViewPager.getRealCurrentItem(); +invalidate(); + } +}; + } + this.mCircleViewPager.addOnPageChangeListener(mListener); this.realCurrentItem = mCircleViewPager.getRealCurrentItem(); if (realCurrentItem < 0) { realCurrentItem = 0; @@ -105,22 +117,6 @@ public class WXBaseCircleIndicator extends FrameLayout implements OnPageChangeLi requestLayout(); } - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { -realCurrentItem = mCircleViewPager.getRealCurrentItem(); -invalidate(); - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - /** * @param radius the radius to set */
[06/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08e1c3e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08e1c3e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08e1c3e4 Branch: refs/heads/release Commit: 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47 Parents: 5e342b4 0faa131 Author: misakuo Authored: Mon Sep 25 17:11:28 2017 +0800 Committer: misakuo Committed: Mon Sep 25 17:11:28 2017 +0800 -- pre-build/native-bundle-main.js | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[12/18] incubator-weex git commit: * [android] better solution for draw box-shadow
* [android] better solution for draw box-shadow Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0839ee18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0839ee18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0839ee18 Branch: refs/heads/release Commit: 0839ee18c27c52a9030e06c3e2cd5142ee6db616 Parents: fa4726a Author: misakuo Authored: Wed Sep 27 15:22:02 2017 +0800 Committer: misakuo Committed: Wed Sep 27 15:22:02 2017 +0800 -- .../com/taobao/weex/utils/BoxShadowUtil.java| 47 1 file changed, 19 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0839ee18/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java index b1ebb63..c1cc693 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java @@ -20,6 +20,7 @@ package com.taobao.weex.utils; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.BlurMaskFilter; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; @@ -40,6 +41,8 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; +import com.taobao.weex.WXEnvironment; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -103,18 +106,21 @@ public class BoxShadowUtil { float[] radii, float shadowRadius, float shadowSpread, float dx, float dy, int shadowColor) { - -if (shadowRadius == 0) { - // 0 can not draw shadow layer - shadowRadius = 0.01f; -} - int canvasWidth = viewWidth + 2 * (int) (shadowRadius + shadowSpread + Math.abs(dx)); int canvasHeight = viewHeight + 2 * (int) (shadowRadius + shadowSpread + Math.abs(dy)); Bitmap output = Bitmap.createBitmap(canvasWidth, canvasHeight, Bitmap.Config.ARGB_); Canvas canvas = new Canvas(output); +if (false && WXEnvironment.isApkDebugable()) { + // Using for debug + Paint strokePaint = new Paint(); + strokePaint.setColor(Color.BLACK); + strokePaint.setStrokeWidth(2); + strokePaint.setStyle(Paint.Style.STROKE); + canvas.drawRect(canvas.getClipBounds(), strokePaint); +} + float offsetX = shadowRadius + shadowSpread + Math.abs(dx); float offsetY = shadowRadius + shadowSpread + Math.abs(dy); RectF selfRect = new RectF( @@ -127,36 +133,21 @@ public class BoxShadowUtil { // can not antialias canvas.clipPath(contentPath, Region.Op.DIFFERENCE); -float shadowLeft, shadowTop; -if (shadowSpread == 0f) { - shadowLeft = shadowRadius; - shadowTop = shadowRadius; -} else { - shadowLeft = shadowRadius + dx - shadowSpread; - shadowTop = shadowRadius + dy - shadowSpread; -} RectF shadowRect = new RectF( -shadowLeft, -shadowTop, -canvasWidth - shadowRadius + shadowSpread, -canvasHeight - shadowRadius + shadowSpread); +0f, 0f, +viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread +); -shadowRect.top += Math.abs(dy); -shadowRect.bottom -= Math.abs(dy); -shadowRect.left += Math.abs(dx); -shadowRect.right -= Math.abs(dx); +float shadowDx = 2f * dx + shadowRadius; +float shadowDy = 2f * dy + shadowRadius; +shadowRect.offset(shadowDx, shadowDy); Paint shadowPaint = new Paint(); shadowPaint.setAntiAlias(true); shadowPaint.setColor(shadowColor); shadowPaint.setStyle(Paint.Style.FILL); -float shadowDx = 0f, shadowDy = 0f; -if (shadowSpread == 0f) { - shadowDx = dx; - shadowDy = dy; -} -shadowPaint.setShadowLayer(shadowRadius, shadowDx, shadowDy, shadowColor); +shadowPaint.setMaskFilter(new BlurMaskFilter(shadowRadius, BlurMaskFilter.Blur.NORMAL)); Path shadowPath = new Path(); float[] shadowRadii = new float[8];
[07/18] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8eb26bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8eb26bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8eb26bb7 Branch: refs/heads/release Commit: 8eb26bb76572ad4d3c31302da3d5793380fbddd7 Parents: 08e1c3e 2513b0f Author: misakuo Authored: Tue Sep 26 11:24:07 2017 +0800 Committer: misakuo Committed: Tue Sep 26 11:24:07 2017 +0800 -- .../dom/action/AbstractAddElementAction.java|12 +- .../weex/ui/component/binding/Statements.java | 7 + .../list/template/WXRecyclerTemplateList.java | 3 + build/config.js | 3 +- doc/source/cn/guide/set-up-env.md |64 +- doc/source/cn/references/modules/animation.md | 5 +- doc/source/guide/set-up-env.md |58 +- doc/source/references/modules/animation.md | 6 +- html5/render/vue/components/input.js| 2 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js |15 +- html5/runtime/vdom/Element.js |45 +- html5/test/unit/default/vm/events.js| 4 +- html5/test/unit/default/vm/vm.js| 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 9 +- .../RecycleList/WXRecycleListUpdateManager.h| 1 + .../Sources/Component/WXImageComponent.m| 1 + .../WeexSDK/Sources/Component/WXTextComponent.m | 8 +- .../Sources/Display/WXComponent+Display.m |14 +- .../WeexSDK/Sources/Manager/WXBridgeManager.h | 4 +- .../Sources/Manager/WXComponentManager.m| 4 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m |61 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 8 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h |16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m |24 + ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 + package.json| 6 +- packages/weex-js-framework/index.js | 44451 + packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz| Bin 13215 -> 0 bytes start | 5 +- 36 files changed, 22756 insertions(+), 22379 deletions(-) --
[09/18] incubator-weex git commit: Merge branch 'patch-1' of https://github.com/iamqk/incubator-weex
Merge branch 'patch-1' of https://github.com/iamqk/incubator-weex Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72a41b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72a41b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72a41b80 Branch: refs/heads/release Commit: 72a41b804938fde1f239e6ad8ddf5dea3eff328f Parents: 403563d 5b59d18 Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 11:02:07 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 11:02:07 2017 +0800 -- examples/component/web-demo.we | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[18/18] incubator-weex git commit: Merge branch '0.16-dev'
Merge branch '0.16-dev' Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/71791337 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/71791337 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/71791337 Branch: refs/heads/release Commit: 7179133716331a991c875d4bf149c1cc9025d164 Parents: 9f96cae c643cea Author: gurisxie <279483...@qq.com> Authored: Wed Sep 27 22:09:22 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Sep 27 22:09:22 2017 +0800 -- .../taobao/weex/ui/component/WXComponent.java | 10 ++- .../weex/ui/view/WXBaseCircleIndicator.java | 40 ++-- .../com/taobao/weex/utils/BoxShadowUtil.java| 65 +++- 3 files changed, 60 insertions(+), 55 deletions(-) --
[incubator-weex] Git Push Summary
Repository: incubator-weex Updated Branches: refs/heads/release-0.16 [created] 717913371
[GitHub] incubator-weex pull request #751: [WEEX-74] Added Jira issue number as commi...
GitHub user jondong opened a pull request: https://github.com/apache/incubator-weex/pull/751 [WEEX-74] Added Jira issue number as commit log title As Apache Jira provides the function that can automatically connect commit and Jira issue according to the issue number with specific format, so added a new way in commit message title check regex to allow this. Removed the Merge title because we are not going to allow merge and start to follow the rebase way. Also updated error message to point to the correct URL. 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/jondong/incubator-weex WEEX-74 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/751.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 #751 commit 634c6413c1e715cb3174b1b039198f339df25736 Author: Jonathan Dong Date: 2017-09-27T15:18:51Z [WEEX-74] Added Jira issue number as commit log title As Apache Jira provides the function that can automatically connect commit and Jira issue according to the issue number with specific format, so added a new way in commit message title check regex to allow this. Removed the Merge title because we are not going to allow merge and start to follow the rebase way. Also updated error message to point to the correct URL. ---
[GitHub] incubator-weex issue #751: [WEEX-74] Added Jira issue number as commit log t...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/751 Warnings :warning: No Changelog changes! Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex pull request #752: + [android] add LogWatcher interface
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/752 + [android] add LogWatcher interface You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-feature-log-watcher Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/752.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 #752 commit c2d1d06d02fadea250ff6c89f373adc5ea81c3e8 Author: misakuo Date: 2017-09-28T05:50:43Z + [android] add LogWatcher interface ---
[GitHub] incubator-weex issue #752: + [android] add LogWatcher interface
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/752 Messages :book: has no jsfm file changed,skip test! Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex pull request #752: + [android] add LogWatcher interface
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/752 ---
incubator-weex git commit: + [android] add LogWatcher interface
Repository: incubator-weex Updated Branches: refs/heads/0.16-dev c643ceafe -> c2d1d06d0 + [android] add LogWatcher interface Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c2d1d06d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2d1d06d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2d1d06d Branch: refs/heads/0.16-dev Commit: c2d1d06d02fadea250ff6c89f373adc5ea81c3e8 Parents: c643cea Author: misakuo Authored: Thu Sep 28 13:50:43 2017 +0800 Committer: misakuo Committed: Thu Sep 28 13:50:43 2017 +0800 -- .../main/java/com/taobao/weex/utils/WXLogUtils.java| 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2d1d06d/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 4f1b818..c4e4b96 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 @@ -41,6 +41,7 @@ public class WXLogUtils { private static StringBuilder builder = new StringBuilder(50); private static HashMap clazzMaps = new HashMap<>(2); private static JsLogWatcher jsLogWatcher; + private static LogWatcher sLogWatcher; static { clazzMaps.put(CLAZZ_NAME_DEBUG_TOOL, loadClass(CLAZZ_NAME_DEBUG_TOOL)); @@ -75,6 +76,9 @@ public class WXLogUtils { writeConsoleLog(level.getName(), msg); sendLog(level, msg); } +if (sLogWatcher != null) { + sLogWatcher.onLog(level.getName(), tag, msg); +} } public static void d(String msg) { @@ -139,6 +143,7 @@ public class WXLogUtils { } } sendLog(LogLevel.DEBUG, tag + ":" + msg); + log(tag, msg, LogLevel.DEBUG); } } @@ -298,7 +303,15 @@ public class WXLogUtils { jsLogWatcher = watcher; } + public static void setLogWatcher(LogWatcher watcher) { +sLogWatcher = watcher; + } + public interface JsLogWatcher { void onJsLog(int level, String log); } + + public interface LogWatcher { +void onLog(String level, String tag, String msg); + } }
[GitHub] incubator-weex issue #749: * [android] fix android new Date() cannot get acc...
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/749 @yuhun-alibaba please not use alibaba issue that others can't not reach. also,I guess you need bugfix on version 0.16,please pr to release-0.16 branch. Thanks. ---
[GitHub] incubator-weex pull request #749: * [android] fix android new Date() cannot ...
Github user yuhun-alibaba closed the pull request at: https://github.com/apache/incubator-weex/pull/749 ---
[GitHub] incubator-weex pull request #753: * [android] fix android new Date() cannot ...
GitHub user yuhun-alibaba opened a pull request: https://github.com/apache/incubator-weex/pull/753 * [android] fix android new Date() cannot get accuracy time [ISSUE ID] https://aone.alibaba-inc.com/issue/12621307 if we use var time = new Date(), cannot get accuracy time on some android platform such as nexus5, android5.0 rom. the root cause is miss ANDROID_ROOT envp when run jsc process, cause libc init exception You can merge this pull request into a Git repository by running: $ git pull https://github.com/yuhun-alibaba/incubator-weex 0.16-dev-bugfix Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/753.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 #753 commit f47c293690b116895c421c5d77f01b48b3686336 Author: yuhun-alibaba Date: 2017-09-27T07:45:26Z * [android] fix android new Date() cannot get accuracy time [ISSUE ID] https://aone.alibaba-inc.com/issue/12636699?from=ak&; ---
[GitHub] incubator-weex issue #753: * [android] fix android new Date() cannot get acc...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/753 Messages :book: has no jsfm file changed,skip test! Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex pull request #754: * [ios] support attributes to set scrollVe...
GitHub user acton393 opened a pull request: https://github.com/apache/incubator-weex/pull/754 * [ios] support attributes to set scrollVertical when the scrollView contentSize smaller than the scrollview frame size * [ios] support attributes to set scrollVertical when the scrollView contentSize smaller than the scrollview frame size try case : http://dotwe.org/vue/7f349e0545703a3f17d7757e27c80849 You can merge this pull request into a Git repository by running: $ git pull https://github.com/acton393/incubator-weex release-0.16 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/754.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 #754 commit f40f25f0928cb4053ae86d8c81bd6f47463471f4 Author: acton393 Date: 2017-09-28T04:00:34Z * [ios] support attributes to set scrollVertical when the scrollView content size is smaller than the scrollview frame size commit 5eb1cf06d1681d2d58b9d7b664c817ed2bd0a7c4 Author: acton393 Date: 2017-09-28T04:01:05Z * [ios] cancel useless error log ---
[GitHub] incubator-weex issue #754: * [ios] support attributes to set scrollVertical ...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/754 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---