[12/50] [abbrv] incubator-weex git commit: * [android] fix unit android test log mocked

[gurisxie]

* [android] fix unit android test log mocked


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f4bfd225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f4bfd225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f4bfd225

Branch: refs/heads/release
Commit: f4bfd225672bf4169834393bf0ca675864a0c964
Parents: 8cebed4
Author: atomtong 
Authored: Tue Oct 17 11:22:25 2017 +0800
Committer: atomtong 
Committed: Tue Oct 17 11:28:58 2017 +0800

--
 android/sdk/build.gradle | 1 +
 android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4bfd225/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 0be69fb..a49a05f 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -127,6 +127,7 @@ android {
 targetCompatibility JavaVersion.VERSION_1_7
 }
 testOptions {
+unitTests.returnDefaultValues = true
 unitTests.all {
 maxHeapSize = "1024m"
 jvmArgs += ['-XX:-UseSplitVerifier', 
'-noverify','-Xverify:none']/* fix VerifyError  */

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4bfd225/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
--
diff --git a/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java 
b/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
index e981c69..5b6d273 100644
--- a/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
@@ -19,6 +19,7 @@
 package com.taobao.weex.utils;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.taobao.weappplus_sdk.BuildConfig;
 import com.taobao.weex.WXEnvironment;
@@ -49,7 +50,7 @@ import static org.mockito.Matchers.any;
 @RunWith(PowerMockRunner.class)
 @Config(constants = BuildConfig.class, sdk = 19)
 @PowerMockIgnore( {"org.mockito.*", "org.robolectric.*", "android.*"})
-@PrepareForTest( {WXEnvironment.class, WXViewUtils.class, WXSDKInstance.class, 
TextUtils.class})
+@PrepareForTest( {WXEnvironment.class, WXViewUtils.class, WXSDKInstance.class, 
TextUtils.class, Log.class, WXUtils.class, WXLogUtils.class})
 public class WXUtilsTest extends TestCase {
 
 public static final float TEST_DENSITY = 3.0f;

[50/50] [abbrv] incubator-weex git commit: * [branch] rebase release 0.16 code

[gurisxie]

* [branch] rebase release 0.16 code


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b3be56d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b3be56d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b3be56d1

Branch: refs/heads/release
Commit: b3be56d1cb472bbe81d2b6b58da4ed5d95099857
Parents: 05214a7 ebd058e
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 12:32:54 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:32:54 2017 +0800

--
 .github/PULL_REQUEST_TEMPLATE.md|4 +-
 .travis.yml |4 -
 CONTRIBUTING.md |   22 +-
 .../java/com/alibaba/weex/IndexActivity.java|   12 -
 android/sdk/build.gradle|1 +
 android/sdk/libs/armeabi/libweexjsb.so  |  Bin 22616 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so  |  Bin 341824 -> 335324 bytes
 android/sdk/libs/armeabi/libweexjss.so  |  Bin 6754016 -> 6754016 bytes
 android/sdk/libs/armeabi/libweexjst.so  |  Bin 0 -> 22552 bytes
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   13 +
 .../java/com/taobao/weex/bridge/WXBridge.java   |6 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 1007 +-
 .../java/com/taobao/weex/common/Constants.java  |3 +
 .../java/com/taobao/weex/common/IWXBridge.java  |2 +-
 .../java/com/taobao/weex/dom/WXDomObject.java   |4 +-
 .../dom/action/AbstractAddElementAction.java|4 +-
 .../weex/dom/action/MoveElementAction.java  |3 +
 .../ui/component/AbstractEditComponent.java |8 +
 .../taobao/weex/ui/component/WXComponent.java   |   52 +-
 .../weex/ui/component/WXComponentFactory.java   |2 -
 .../com/taobao/weex/ui/component/WXImage.java   |   10 +
 .../taobao/weex/ui/component/WXScroller.java|2 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |2 +-
 .../weex/ui/component/WXSliderNeighbor.java |2 +-
 .../taobao/weex/ui/component/WXVContainer.java  |   46 +-
 .../ui/component/list/BasicListComponent.java   |  116 +-
 .../ui/component/list/StickyHeaderHelper.java   |   43 +-
 .../taobao/weex/ui/component/list/WXCell.java   |   68 +-
 .../list/template/WXRecyclerTemplateList.java   |4 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  |   30 +-
 .../taobao/weex/utils/WXSoInstallMgrSdk.java|   25 +-
 .../java/com/taobao/weex/utils/WXViewUtils.java |   25 +-
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |   16 +-
 .../java/com/taobao/weex/utils/WXUtilsTest.java |3 +-
 .../taobao/weex/bridge/WXWebsocketBridge.java   |2 +-
 dangerfile.js   |   45 +-
 doc/source/cn/guide/contributing.md |   27 +-
 doc/source/guide/contributing.md|   26 +-
 doc/source/references/platform-difference.md|   11 +
 doc/source/references/platfrom-difference.md|   11 -
 .../references/vue/difference-with-web.md   |2 +-
 doc/themes/weex/layout/_partial/article.ejs |2 +
 doc/themes/weex/layout/index.ejs|3 +
 doc/themes/weex/layout/layout.ejs   |2 -
 doc/themes/weex/source/css/common.scss  |4 +-
 doc/themes/weex/source/css/partial/header.scss  |2 +-
 doc/themes/weex/source/css/post.scss|7 +-
 doc/themes/weex/source/css/variable.scss|2 +-
 html5/runtime/api/WeexInstance.js   |  126 +++
 html5/runtime/api/component.js  |   51 +
 html5/runtime/api/init.js   |  107 +-
 html5/runtime/api/module.js |   56 +
 html5/runtime/vdom/Element.js   |2 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |   12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m|   13 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |   16 +-
 .../Sources/Component/WXCycleSliderComponent.m  |2 +-
 .../WeexSDK/Sources/Component/WXWebComponent.m  |3 +
 .../Sources/Display/WXComponent+BoxShadow.m |9 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |6 +
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  |   29 +
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  |   57 +
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |1 +
 test/screenshot/border-android.png  |  Bin 0 -> 164260 bytes
 test/screenshot/border-ios.png  |  Bin 128088 -> 129071 bytes
 66 files changed, 1411 insertions(+), 769 deletions(-)
--

[08/50] [abbrv] incubator-weex git commit: * [android] format debug log

[gurisxie]

 * [android] format debug log


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f02c7674
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f02c7674
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f02c7674

Branch: refs/heads/release
Commit: f02c76741b0d34b074088f0b30187be16ec1dec8
Parents: 326c7b0
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Fri Oct 13 14:44:49 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 16 15:04:38 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22616 -> 22556 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 341824 -> 335100 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f02c7674/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index 1330933..c46e857 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f02c7674/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 4e76388..ec98d07 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f02c7674/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 544d41d..5a8809c 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[22/50] [abbrv] incubator-weex git commit: resolve conflicts

[gurisxie]

resolve  conflicts


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/24cf3aab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24cf3aab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24cf3aab

Branch: refs/heads/release
Commit: 24cf3aab4747fb69864be46b760f02f3169b6612
Parents: cb1df91
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Tue Oct 17 11:15:53 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 15:48:46 2017 +0800

--
 .../src/main/java/com/taobao/weex/ui/component/list/WXCell.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24cf3aab/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
index ebf81b4..925da65 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
@@ -66,8 +66,6 @@ public class WXCell extends WidgetContainer {
 private boolean hasLayout = false;
 
 
-
-
 @Deprecated
 public WXCell(WXSDKInstance instance, WXDomObject dom, WXVContainer 
parent, String instanceId, boolean isLazy) {
 super(instance, dom, parent);

[48/50] [abbrv] incubator-weex git commit: * [ios] add jserror upload method, add trigger positions

[gurisxie]

* [ios] add jserror upload method, add trigger positions


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/febb7207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/febb7207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/febb7207

Branch: refs/heads/release
Commit: febb72075e26284d2032e79ca626a7e252616b27
Parents: 65c0910 e3b9c10
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 11:59:24 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:00:54 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 8 files changed, 128 insertions(+), 11 deletions(-)
--

[2/2] incubator-weex git commit: * [ios] parse fetch response while the callback is existed

[gurisxie]

* [ios] parse fetch response while the callback is existed


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aaa1bdba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aaa1bdba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aaa1bdba

Branch: refs/heads/master
Commit: aaa1bdbada2053afe8407e776ca2bd770f87302d
Parents: ebd058e b16b976
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 12:22:55 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:23:32 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)
--

[1/2] incubator-weex git commit: * [ios] parse fetch response while the callback is existed

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/master ebd058eb1 -> aaa1bdbad


* [ios] parse fetch response while the callback is existed


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b16b9760
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b16b9760
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b16b9760

Branch: refs/heads/master
Commit: b16b9760aeb5eed40f00ce22dd38520bbe491372
Parents: b7383a4
Author: acton393 
Authored: Wed Oct 18 11:04:28 2017 +0800
Committer: acton393 
Committed: Wed Oct 18 11:09:17 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b16b9760/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m 
b/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
index 4b01cde..bd96806 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
@@ -85,20 +85,16 @@ 
WX_EXPORT_METHOD(@selector(fetchWithArrayBuffer:options:callback:progressCallbac
 };
 
 loader.onFinished = ^(const WXResourceResponse * response, NSData *data) {
-if (weakSelf) {
-[weakSelf _loadFinishWithResponse:[response copy] data:data 
callbackRsp:callbackRsp];
-if (callback) {
-callback(callbackRsp);
-}
+if (weakSelf && callback) {
+ [weakSelf _loadFinishWithResponse:[response copy] data:data 
callbackRsp:callbackRsp];
+ callback(callbackRsp);
 }
 };
 
 loader.onFailed = ^(NSError *error) {
-if (weakSelf) {
+if (weakSelf && callback) {
 [weakSelf _loadFailedWithError:error callbackRsp:callbackRsp];
-if (callback) {
-callback(callbackRsp);
-}
+callback(callbackRsp);
 }
 };
 
@@ -268,7 +264,7 @@ 
WX_EXPORT_METHOD(@selector(fetchWithArrayBuffer:options:callback:progressCallbac
 NSError * error = nil;
 id jsonObj = [WXUtility JSONObject:data error:];
 if (error) {
-WXLogError(@"%@", [error description]);
+WXLogDebug(@"%@", [error description]);
 }
 return jsonObj;
 }

[1/3] incubator-weex git commit: + [jsfm] add weex variable api in runtime

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 febb72075 -> ebd058eb1


+ [jsfm] add weex variable api in runtime


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b7383a41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7383a41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7383a41

Branch: refs/heads/release-0.16
Commit: b7383a41670a231bb24893beb0f5bed848f5be47
Parents: f5fbd4e
Author: Hanks <zhanghan...@gmail.com>
Authored: Wed Oct 11 17:19:48 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 17:27:39 2017 +0800

--
 html5/runtime/api/WeexInstance.js | 126 +
 html5/runtime/api/component.js|  51 +
 html5/runtime/api/init.js | 107 +---
 html5/runtime/api/module.js   |  56 +++
 4 files changed, 300 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7383a41/html5/runtime/api/WeexInstance.js
--
diff --git a/html5/runtime/api/WeexInstance.js 
b/html5/runtime/api/WeexInstance.js
new file mode 100644
index 000..2093f17
--- /dev/null
+++ b/html5/runtime/api/WeexInstance.js
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Document from '../vdom/Document'
+import { isRegisteredModule, getModuleDescription } from './module'
+import { isRegisteredComponent } from './component'
+
+const moduleProxies = {}
+
+function setId (weex, id) {
+  Object.defineProperty(weex, '[[CurrentInstanceId]]', { value: id })
+}
+
+function getId (weex) {
+  return weex['[[CurrentInstanceId]]']
+}
+
+function moduleGetter (module, method, taskCenter) {
+  return (...args) => taskCenter.send('module', { module, method }, args)
+}
+
+export default class WeexInstance {
+  constructor (id, config) {
+setId(this, id)
+this.config = config || {}
+this.document = new Document(id, this.config.bundleUrl)
+this.requireModule = this.requireModule.bind(this)
+this.isRegisteredModule = isRegisteredModule
+this.isRegisteredComponent = isRegisteredComponent
+  }
+
+  requireModule (moduleName) {
+const id = getId(this)
+if (!(id && this.document && this.document.taskCenter)) {
+  console.error(`[JS Framework] invalid instance id "${id}"`)
+  return
+}
+
+// warn for unknown module
+if (!isRegisteredModule(moduleName)) {
+  console.warn(`[JS Framework] using unregistered weex module 
"${moduleName}"`)
+  return
+}
+
+// create new module proxy
+if (!moduleProxies[moduleName]) {
+  const moduleDefine = getModuleDescription(moduleName)
+  const taskCenter = this.document.taskCenter
+
+  // create registered module apis
+  const moduleApis = {}
+  for (const methodName in moduleDefine) {
+Object.defineProperty(moduleApis, methodName, {
+  enumerable: true,
+  configurable: true,
+  get: () => moduleGetter(moduleName, methodName, taskCenter),
+  set (fn) {
+if (typeof fn === 'function') {
+  return taskCenter.send('module', {
+module: moduleName,
+method: methodName
+  }, [fn])
+}
+  }
+})
+  }
+
+  // create module Proxy
+  if (typeof Proxy === 'function') {
+moduleProxies[moduleName] = new Proxy(moduleApis, {
+  get (target, methodName) {
+if (methodName in target) {
+  return target[methodName]
+}
+console.warn(`[JS Framework] using unregistered method 
"${moduleName}.${methodName}"`)
+return moduleGetter(moduleName, methodName, taskCenter)
+  }
+})
+  }
+  else {
+moduleProxies[moduleName] = moduleApis
+  }
+}
+

[3/3] incubator-weex git commit: * [all] merge from release-0.16

[gurisxie]

* [all] merge from release-0.16


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ebd058eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ebd058eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ebd058eb

Branch: refs/heads/release-0.16
Commit: ebd058eb1c0ee32ff7e9bd5ca3c69806726760f2
Parents: 556cc06 febb720
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 12:17:13 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:17:56 2017 +0800

--
 .travis.yml |  4 --
 .../java/com/alibaba/weex/IndexActivity.java| 12 -
 .../main/java/com/taobao/weex/WXSDKEngine.java  |  9 +++-
 .../weex/dom/action/MoveElementAction.java  |  3 ++
 .../ui/component/AbstractEditComponent.java |  8 +++
 .../taobao/weex/ui/component/WXComponent.java   | 48 +++--
 .../com/taobao/weex/ui/component/WXImage.java   | 10 
 .../taobao/weex/ui/component/WXScroller.java|  2 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |  2 +-
 .../weex/ui/component/WXSliderNeighbor.java |  2 +-
 .../taobao/weex/ui/component/WXVContainer.java  | 46 +++-
 .../ui/component/list/BasicListComponent.java   |  2 +-
 .../list/template/WXRecyclerTemplateList.java   |  2 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  | 14 ++---
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 22 files changed, 244 insertions(+), 59 deletions(-)
--

[2/3] incubator-weex git commit: * [all] rebase commits from release-0.16

[gurisxie]

* [all] rebase commits from release-0.16


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/556cc068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/556cc068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/556cc068

Branch: refs/heads/release-0.16
Commit: 556cc0683a5532d57b40277a9ea4048a408d92ef
Parents: b7383a4 c2f1aac
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 12:11:41 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 12:16:10 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so  |  Bin 22556 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so  |  Bin 335100 -> 335324 bytes
 android/sdk/libs/armeabi/libweexjss.so  |  Bin 6754016 -> 6754016 bytes
 android/sdk/libs/armeabi/libweexjst.so  |  Bin 0 -> 22552 bytes
 .../main/java/com/taobao/weex/WXSDKEngine.java  |6 +
 .../java/com/taobao/weex/bridge/WXBridge.java   |6 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 1005 +-
 .../java/com/taobao/weex/common/IWXBridge.java  |2 +-
 .../java/com/taobao/weex/dom/WXDomObject.java   |4 +-
 .../dom/action/AbstractAddElementAction.java|4 +-
 .../weex/ui/component/WXComponentFactory.java   |2 -
 .../java/com/taobao/weex/utils/WXLogUtils.java  |   24 +-
 .../taobao/weex/utils/WXSoInstallMgrSdk.java|   25 +-
 .../java/com/taobao/weex/utils/WXViewUtils.java |   25 +-
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |   16 +-
 .../taobao/weex/bridge/WXWebsocketBridge.java   |2 +-
 dangerfile.js   |   36 +-
 test/screenshot/border-android.png  |  Bin 0 -> 164260 bytes
 test/screenshot/border-ios.png  |  Bin 128088 -> 129071 bytes
 19 files changed, 597 insertions(+), 560 deletions(-)
--

[14/18] incubator-weex git commit: * [android] fix crash when set box-shadow on horizontal scroller

[gurisxie]

* [android] fix crash when set box-shadow on horizontal scroller


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54719936
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54719936
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54719936

Branch: refs/heads/master
Commit: 54719936fa4f14d4a9680130489e7d71f347680e
Parents: fc7b90e 7f6203c
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 19:59:49 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 19:59:49 2017 +0800

--
 .../taobao/weex/ui/component/WXVContainer.java  | 35 +++-
 1 file changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54719936/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
--

[06/18] incubator-weex git commit: * [android] delete redundancy log print logic code

[gurisxie]

* [android] delete redundancy log print logic code


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ac075c70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ac075c70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ac075c70

Branch: refs/heads/master
Commit: ac075c70e9ae68a53d66fecace1a91e336f3f39a
Parents: 247ea50
Author: atomtong <tong_huab...@qq.com>
Authored: Tue Oct 17 19:43:40 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 13:04:15 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ac075c70/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 ae6e623..a120ad6 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
@@ -118,13 +118,8 @@ public class WXLogUtils {
   }
 
   public static void d(String tag, String msg) {
-if (!TextUtils.isEmpty(msg) && !TextUtils.isEmpty(tag)) {
-  log(tag, msg, LogLevel.DEBUG);
-}
 
 if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg) && 
WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0) {
-  Log.d(tag, msg);
-
   if ("jsLog".equals(tag) && jsLogWatcher != null) {
 if (msg.endsWith("__DEBUG")) {
   jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__DEBUG", ""));

[13/18] incubator-weex git commit: * [android] fix crash when set box-shadow on horizontal scroller

[gurisxie]

* [android] fix crash when set box-shadow on horizontal scroller


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f6203c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f6203c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f6203c9

Branch: refs/heads/master
Commit: 7f6203c9b6a4c398cce6584cd9da1689bb14e5ba
Parents: 61ead2a
Author: misakuo 
Authored: Wed Oct 18 19:44:50 2017 +0800
Committer: misakuo 
Committed: Wed Oct 18 19:44:50 2017 +0800

--
 .../taobao/weex/ui/component/WXVContainer.java  | 35 +++-
 1 file changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f6203c9/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 4570729..001509e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -25,10 +25,13 @@ import android.util.Pair;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
 
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.utils.WXLogUtils;
 import com.taobao.weex.utils.WXViewUtils;
 
 import java.util.ArrayList;
@@ -481,15 +484,29 @@ public abstract class WXVContainer 
extends WXComponent {
/
 
   public @Nullable View getBoxShadowHost() {
-if (mBoxShadowHost == null) {
-  mBoxShadowHost = new BoxShadowHost(getContext());
-  WXViewUtils.setBackGround(mBoxShadowHost, null);
-  mBoxShadowHost.setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT));
-  getHostView().addView(mBoxShadowHost);
-}
-getHostView().removeView(mBoxShadowHost);
-getHostView().addView(mBoxShadowHost);
-return mBoxShadowHost;
+ViewGroup hostView = getHostView();
+if (hostView == null) {
+  return null;
+}
+
+if (hostView instanceof ScrollView || hostView instanceof 
HorizontalScrollView) {
+  return hostView;
+}
+
+try {
+  if (mBoxShadowHost == null) {
+mBoxShadowHost = new BoxShadowHost(getContext());
+WXViewUtils.setBackGround(mBoxShadowHost, null);
+mBoxShadowHost.setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT));
+hostView.addView(mBoxShadowHost);
+  }
+  hostView.removeView(mBoxShadowHost);
+  hostView.addView(mBoxShadowHost);
+  return mBoxShadowHost;
+} catch (Throwable t) {
+  WXLogUtils.w("BoxShadow", t);
+}
+return hostView;
   }
 
   private class BoxShadowHost extends View {

[18/18] incubator-weex git commit: * [all] merge from release-0.16

[gurisxie]

* [all] merge from release-0.16


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ebd058eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ebd058eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ebd058eb

Branch: refs/heads/master
Commit: ebd058eb1c0ee32ff7e9bd5ca3c69806726760f2
Parents: 556cc06 febb720
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 12:17:13 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:17:56 2017 +0800

--
 .travis.yml |  4 --
 .../java/com/alibaba/weex/IndexActivity.java| 12 -
 .../main/java/com/taobao/weex/WXSDKEngine.java  |  9 +++-
 .../weex/dom/action/MoveElementAction.java  |  3 ++
 .../ui/component/AbstractEditComponent.java |  8 +++
 .../taobao/weex/ui/component/WXComponent.java   | 48 +++--
 .../com/taobao/weex/ui/component/WXImage.java   | 10 
 .../taobao/weex/ui/component/WXScroller.java|  2 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |  2 +-
 .../weex/ui/component/WXSliderNeighbor.java |  2 +-
 .../taobao/weex/ui/component/WXVContainer.java  | 46 +++-
 .../ui/component/list/BasicListComponent.java   |  2 +-
 .../list/template/WXRecyclerTemplateList.java   |  2 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  | 14 ++---
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 22 files changed, 244 insertions(+), 59 deletions(-)
--

[08/18] incubator-weex git commit: * [android] fix flicker caused by coexistence of box-shadow and border

[gurisxie]

* [android] fix flicker caused by coexistence of box-shadow and border


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/64dd40bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/64dd40bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/64dd40bc

Branch: refs/heads/master
Commit: 64dd40bc346295c32675a794c79d23e6aa8b693c
Parents: db5b1e0 61ead2a
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 15:56:38 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 15:57:08 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 48 +---
 .../taobao/weex/ui/component/WXVContainer.java  | 25 +-
 2 files changed, 56 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/64dd40bc/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--

[04/18] incubator-weex git commit: * [android] fix redundant input event

[gurisxie]

* [android] fix redundant input event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/92032689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/92032689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/92032689

Branch: refs/heads/master
Commit: 92032689e09286adda516ea2df8fec83d680bc40
Parents: 05214a7
Author: misakuo 
Authored: Mon Oct 16 11:23:00 2017 +0800
Committer: misakuo 
Committed: Mon Oct 16 11:23:00 2017 +0800

--
 .../com/taobao/weex/ui/component/AbstractEditComponent.java  | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/92032689/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
index a8d1963..4ca9d50 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
@@ -221,6 +221,14 @@ public abstract class AbstractEditComponent extends 
WXComponent {
 
   mBeforeText = s.toString();
 
+  if (getDomObject() != null && getDomObject().getAttrs() != null) {
+Object val = getDomObject().getAttrs().get(Constants.Name.VALUE);
+String valString = WXUtils.getString(val, null);
+if (mBeforeText != null && mBeforeText.equals(valString)) {
+  return;
+}
+  }
+
   if (!mIgnoreNextOnInputEvent) {
 fireEvent(Constants.Event.INPUT, s.toString());
   }

[16/18] incubator-weex git commit: * [ios] add jserror upload method, add trigger positions on sdk init, jsservice, jsbridge

[gurisxie]

* [ios] add jserror upload method, add trigger positions on sdk 
init,jsservice,jsbridge


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e3b9c10e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e3b9c10e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e3b9c10e

Branch: refs/heads/master
Commit: e3b9c10ee99b3c6236f5e67867b634fd3377d7e6
Parents: db5b1e0
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 11:45:16 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 11:45:16 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 8 files changed, 128 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e3b9c10e/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
--
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj 
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 8addaca..749cb8c 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -264,6 +264,10 @@
77E65A161C155EB5008B8775 /* WXTextComponent.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 77E65A141C155EB5008B8775 /* WXTextComponent.m 
*/; };
77E65A191C155F25008B8775 /* WXScrollerComponent.h in Headers */ 
= {isa = PBXBuildFile; fileRef = 77E65A171C155F25008B8775 /* 
WXScrollerComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
77E65A1A1C155F25008B8775 /* WXScrollerComponent.m in Sources */ 
= {isa = PBXBuildFile; fileRef = 77E65A181C155F25008B8775 /* 
WXScrollerComponent.m */; };
+   841CD1031F9739890081196D /* WXExceptionUtils.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 841CD1021F9739890081196D /* WXExceptionUtils.m 
*/; };
+   841CD1051F974DFA0081196D /* WXExceptionUtils.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 841CD1041F97399C0081196D /* WXExceptionUtils.h 
*/; settings = {ATTRIBUTES = (Public, ); }; };
+   841CD1061F974DFA0081196D /* WXExceptionUtils.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 841CD1041F97399C0081196D /* WXExceptionUtils.h 
*/; settings = {ATTRIBUTES = (Public, ); }; };
+   841CD1071F974E81196D /* WXExceptionUtils.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 841CD1021F9739890081196D /* WXExceptionUtils.m 
*/; };
C401945E1E344E8300D19C31 /* WXFloatCompareTests.m in Sources */ 
= {isa = PBXBuildFile; fileRef = C401945D1E344E8300D19C31 /* 
WXFloatCompareTests.m */; };
C41E1A971DC1FD15009C7F90 /* WXDatePickerManager.h in Headers */ 
= {isa = PBXBuildFile; fileRef = C41E1A951DC1FD15009C7F90 /* 
WXDatePickerManager.h */; };
C41E1A981DC1FD15009C7F90 /* WXDatePickerManager.m in Sources */ 
= {isa = PBXBuildFile; fileRef = C41E1A961DC1FD15009C7F90 /* 
WXDatePickerManager.m */; };
@@ -851,6 +855,8 @@
77E65A141C155EB5008B8775 /* WXTextComponent.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXTextComponent.m; sourceTree = ""; };
77E65A171C155F25008B8775 /* WXScrollerComponent.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
WXScrollerComponent.h; sourceTree = ""; };
77E65A181C155F25008B8775 /* WXScrollerComponent.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXScrollerComponent.m; sourceTree = ""; };
+   841CD1021F9739890081196D /* WXExceptionUtils.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXExceptionUtils.m; sourceTree = ""; };
+   841CD1041F97399C0081196D /* WXExceptionUtils.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
WXExceptionUtils.h; sourceTree = ""; };
C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXFloatCompareTests.m; sourceTree = ""; };
C41E1A951DC1FD15009C7F90 /* WXDatePickerManager.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastK

[09/18] incubator-weex git commit: * [android] fix redundant input event

[gurisxie]

* [android] fix redundant input event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4c494b2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c494b2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c494b2b

Branch: refs/heads/master
Commit: 4c494b2b2e653db43d2519dc180e7eff1e767997
Parents: 64dd40b 9203268
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 16:00:20 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 16:00:20 2017 +0800

--
 .../com/taobao/weex/ui/component/AbstractEditComponent.java  | 8 
 1 file changed, 8 insertions(+)
--

[17/18] incubator-weex git commit: * [ios] add jserror upload method, add trigger positions

[gurisxie]

* [ios] add jserror upload method, add trigger positions


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/febb7207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/febb7207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/febb7207

Branch: refs/heads/master
Commit: febb72075e26284d2032e79ca626a7e252616b27
Parents: 65c0910 e3b9c10
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 11:59:24 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:00:54 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 8 files changed, 128 insertions(+), 11 deletions(-)
--

[15/18] incubator-weex git commit: * [android] fix imagesave permissions

[gurisxie]

* [android] fix imagesave permissions


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/65c0910d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/65c0910d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/65c0910d

Branch: refs/heads/master
Commit: 65c0910d2ba82bf12733ba7d4cfe498d17e5b0ee
Parents: 5471993
Author: miomin <691292...@qq.com>
Authored: Thu Oct 19 11:11:25 2017 +0800
Committer: miomin <691292...@qq.com>
Committed: Thu Oct 19 11:11:25 2017 +0800

--
 .../src/main/java/com/alibaba/weex/IndexActivity.java   | 12 
 .../main/java/com/taobao/weex/ui/component/WXImage.java | 10 ++
 2 files changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/65c0910d/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
--
diff --git 
a/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java 
b/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
index 866733a..0603363 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
@@ -103,18 +103,6 @@ public class IndexActivity extends AbstractWeexActivity {
 };
 
 LocalBroadcastManager.getInstance(this).registerReceiver(mReloadReceiver, 
new IntentFilter(WXSDKEngine.JS_FRAMEWORK_RELOAD));
-
-requestWeexPermission();
-  }
-
-  private void requestWeexPermission() {
-if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
-  if (ActivityCompat.shouldShowRequestPermissionRationale(this, 
Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-Toast.makeText(this, "please give me the permission", 
Toast.LENGTH_SHORT).show();
-  } else {
-ActivityCompat.requestPermissions(this, new 
String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 
WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
-  }
-}
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/65c0910d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
index 1cf5d02..1c4d062 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
@@ -19,6 +19,7 @@
 package com.taobao.weex.ui.component;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.RectF;
@@ -27,6 +28,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.widget.ImageView;
@@ -71,6 +73,7 @@ public class WXImage extends WXComponent {
 
   public static final String SUCCEED = "success";
   public static final String ERRORDESC = "errorDesc";
+  private static final int WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 
0x2;
 
   private String mSrc;
   private int mBlurRadius;
@@ -356,6 +359,13 @@ public class WXImage extends WXComponent {
   public void save(final JSCallback saveStatuCallback) {
 
 if (ContextCompat.checkSelfPermission(getContext(), 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
+  if (getContext() instanceof Activity) {
+ActivityCompat.requestPermissions((Activity) getContext(),
+new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 
WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+  }
+}
+
+if (ContextCompat.checkSelfPermission(getContext(), 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
   if (saveStatuCallback != null) {
 Map result = new HashMap<>();
 result.put(SUCCEED, false);

[03/18] incubator-weex git commit: * [android] null judgement

[gurisxie]

* [android] null judgement


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/61ead2a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/61ead2a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/61ead2a4

Branch: refs/heads/master
Commit: 61ead2a4226ee0f17863d4c10699167b265fa0ae
Parents: d5731c2
Author: misakuo 
Authored: Wed Oct 11 19:44:16 2017 +0800
Committer: misakuo 
Committed: Wed Oct 11 19:44:16 2017 +0800

--
 .../main/java/com/taobao/weex/ui/component/WXComponent.java| 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/61ead2a4/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 3c0c870..add0205 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
@@ -43,6 +43,7 @@ import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
+import android.view.ViewOverlay;
 import android.widget.FrameLayout;
 
 import com.alibaba.fastjson.JSONArray;
@@ -912,7 +913,10 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
 }
 
 if (target != null && Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR2) {
-  target.getOverlay().clear();
+  ViewOverlay overlay = target.getOverlay();
+  if (overlay != null) {
+overlay.clear();
+  }
 }
   }
 

[01/18] incubator-weex git commit: * [android] fix flicker caused by coexistence of box-shadow and border-radius

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/master 556cc0683 -> ebd058eb1


* [android] fix flicker caused by coexistence of box-shadow and border-radius


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e777ac8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e777ac8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e777ac8d

Branch: refs/heads/master
Commit: e777ac8dd8f02805c5adee19364d87ee5c40bf9d
Parents: 045e838
Author: misakuo 
Authored: Tue Oct 10 18:20:24 2017 +0800
Committer: misakuo 
Committed: Tue Oct 10 18:20:24 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 25 +++-
 .../taobao/weex/ui/component/WXVContainer.java  | 25 +++-
 2 files changed, 33 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e777ac8d/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 d801290..74e4db4 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
@@ -759,22 +759,9 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   case Constants.Name.BORDER_TOP_RIGHT_RADIUS:
   case Constants.Name.BORDER_BOTTOM_RIGHT_RADIUS:
   case Constants.Name.BORDER_BOTTOM_LEFT_RADIUS:
-final Float radius = WXUtils.getFloat(param,null);
-final String finalKey = key;
+Float radius = WXUtils.getFloat(param,null);
 if (radius != null) {
-  if (this instanceof WXDiv && mHost != null) {
-/* Hacked by moxun
-   Set border radius on ViewGroup will cause the Overlay to be cut 
and don't know why
-   Delay setting border radius can avoid the problem, and don't 
know why too, dog science…… */
-mHost.postDelayed(new Runnable() {
-  @Override
-  public void run() {
-setBorderRadius(finalKey, radius);
-  }
-}, 64);
-  } else {
-setBorderRadius(finalKey, radius);
-  }
+  setBorderRadius(key, radius);
 }
 return true;
   case Constants.Name.BORDER_WIDTH:
@@ -898,7 +885,13 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   }
 }
   }
-  BoxShadowUtil.setBoxShadow(mHost, boxShadow.toString(), radii, 
getInstance().getInstanceViewPortWidth());
+
+  View target = mHost;
+  if (this instanceof WXVContainer) {
+target = ((WXVContainer) this).getBoxShadowHost();
+  }
+
+  BoxShadowUtil.setBoxShadow(target, boxShadow.toString(), radii, 
getInstance().getInstanceViewPortWidth());
 } else {
   WXLogUtils.w("Can not resolve styles");
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e777ac8d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 43b45a7..4570729 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -18,15 +18,19 @@
  */
 package com.taobao.weex.ui.component;
 
+import android.content.Context;
 import android.content.Intent;
-import android.util.Pair;
 import android.support.annotation.Nullable;
+import android.util.Pair;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.utils.WXViewUtils;
+
 import java.util.ArrayList;
 
 /**
@@ -36,6 +40,7 @@ public abstract class WXVContainer 
extends WXComponent {
 
   private static final String TAG="WXVContainer";
   protected ArrayList mChildren = new ArrayList<>();
+  private BoxShadowHost mBoxShadowHost;
 
   @Deprecated
   public WXVContainer(WXSDKInstance instance, WXDomObject dom, WXVContainer 
parent, String instanceId, boolean isLazy) {
@@ -474,4 +479,22 @@ public abstract class WXVContainer 
extends WXComponent {
   /
*  end hook Activity life cycle callback
/
+
+  public 

[07/18] incubator-weex git commit: * [android] fix bug if application is null log not print out

[gurisxie]

* [android] fix bug if application is null log not print out


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/247ea50a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/247ea50a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/247ea50a

Branch: refs/heads/master
Commit: 247ea50a914afe24ee30d6dafb66f6f76986e7c3
Parents: c2f1aac
Author: atomtong <tong_huab...@qq.com>
Authored: Tue Oct 17 17:00:40 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 13:04:15 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/247ea50a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index 0296379..3ea86e2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -162,7 +162,11 @@ public class WXSDKEngine {
   if(WXEnvironment.isApkDebugable()){
 WXEnvironment.sLogLevel = LogLevel.DEBUG;
   }else{
-WXEnvironment.sLogLevel = LogLevel.WARN;
+   if(WXEnvironment.sApplication != null){
+ WXEnvironment.sLogLevel = LogLevel.WARN;
+   }else {
+ WXLogUtils.e(TAG,"WXEnvironment.sApplication is " + 
WXEnvironment.sApplication);
+   }
   }
   doInitInternal(application,config);
   WXEnvironment.sSDKInitInvokeTime = System.currentTimeMillis()-start;
@@ -173,6 +177,9 @@ public class WXSDKEngine {
 
   private static void doInitInternal(final Application application,final 
InitConfig config){
 WXEnvironment.sApplication = application;
+   if(application == null){
+ WXLogUtils.e(TAG, " doInitInternal application is null");
+   }
 WXEnvironment.JsFrameworkInit = false;
 
 WXBridgeManager.getInstance().post(new Runnable() {

[2/2] incubator-weex git commit: * [ios] add jserror upload method, add trigger positions

[gurisxie]

* [ios] add jserror upload method, add trigger positions


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/febb7207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/febb7207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/febb7207

Branch: refs/heads/release-0.16
Commit: febb72075e26284d2032e79ca626a7e252616b27
Parents: 65c0910 e3b9c10
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 11:59:24 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 12:00:54 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 8 files changed, 128 insertions(+), 11 deletions(-)
--

[1/2] incubator-weex git commit: * [ios] add jserror upload method, add trigger positions on sdk init, jsservice, jsbridge

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 65c0910d2 -> febb72075


* [ios] add jserror upload method, add trigger positions on sdk 
init,jsservice,jsbridge


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e3b9c10e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e3b9c10e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e3b9c10e

Branch: refs/heads/release-0.16
Commit: e3b9c10ee99b3c6236f5e67867b634fd3377d7e6
Parents: db5b1e0
Author: gurisxie <279483...@qq.com>
Authored: Thu Oct 19 11:45:16 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Thu Oct 19 11:45:16 2017 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 12 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m| 13 +++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +++---
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|  5 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h |  6 +++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.h  | 29 ++
 .../WeexSDK/Sources/Monitor/WXExceptionUtils.m  | 57 
 ios/sdk/WeexSDK/Sources/WeexSDK.h   |  1 +
 8 files changed, 128 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e3b9c10e/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
--
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj 
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 8addaca..749cb8c 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -264,6 +264,10 @@
77E65A161C155EB5008B8775 /* WXTextComponent.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 77E65A141C155EB5008B8775 /* WXTextComponent.m 
*/; };
77E65A191C155F25008B8775 /* WXScrollerComponent.h in Headers */ 
= {isa = PBXBuildFile; fileRef = 77E65A171C155F25008B8775 /* 
WXScrollerComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
77E65A1A1C155F25008B8775 /* WXScrollerComponent.m in Sources */ 
= {isa = PBXBuildFile; fileRef = 77E65A181C155F25008B8775 /* 
WXScrollerComponent.m */; };
+   841CD1031F9739890081196D /* WXExceptionUtils.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 841CD1021F9739890081196D /* WXExceptionUtils.m 
*/; };
+   841CD1051F974DFA0081196D /* WXExceptionUtils.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 841CD1041F97399C0081196D /* WXExceptionUtils.h 
*/; settings = {ATTRIBUTES = (Public, ); }; };
+   841CD1061F974DFA0081196D /* WXExceptionUtils.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 841CD1041F97399C0081196D /* WXExceptionUtils.h 
*/; settings = {ATTRIBUTES = (Public, ); }; };
+   841CD1071F974E81196D /* WXExceptionUtils.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 841CD1021F9739890081196D /* WXExceptionUtils.m 
*/; };
C401945E1E344E8300D19C31 /* WXFloatCompareTests.m in Sources */ 
= {isa = PBXBuildFile; fileRef = C401945D1E344E8300D19C31 /* 
WXFloatCompareTests.m */; };
C41E1A971DC1FD15009C7F90 /* WXDatePickerManager.h in Headers */ 
= {isa = PBXBuildFile; fileRef = C41E1A951DC1FD15009C7F90 /* 
WXDatePickerManager.h */; };
C41E1A981DC1FD15009C7F90 /* WXDatePickerManager.m in Sources */ 
= {isa = PBXBuildFile; fileRef = C41E1A961DC1FD15009C7F90 /* 
WXDatePickerManager.m */; };
@@ -851,6 +855,8 @@
77E65A141C155EB5008B8775 /* WXTextComponent.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXTextComponent.m; sourceTree = ""; };
77E65A171C155F25008B8775 /* WXScrollerComponent.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
WXScrollerComponent.h; sourceTree = ""; };
77E65A181C155F25008B8775 /* WXScrollerComponent.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXScrollerComponent.m; sourceTree = ""; };
+   841CD1021F9739890081196D /* WXExceptionUtils.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXExceptionUtils.m; sourceTree = ""; };
+   841CD1041F97399C0081196D /* WXExceptionUtils.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
WXExceptionUtils.h; sourceTree = ""; };
C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WXFloatCompareTests.m; sourceTree = ""; };
C41E1A951DC1FD15009C7F

incubator-weex git commit: * [android] fix imagesave permissions

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 54719936f -> 65c0910d2


* [android] fix imagesave permissions


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/65c0910d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/65c0910d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/65c0910d

Branch: refs/heads/release-0.16
Commit: 65c0910d2ba82bf12733ba7d4cfe498d17e5b0ee
Parents: 5471993
Author: miomin <691292...@qq.com>
Authored: Thu Oct 19 11:11:25 2017 +0800
Committer: miomin <691292...@qq.com>
Committed: Thu Oct 19 11:11:25 2017 +0800

--
 .../src/main/java/com/alibaba/weex/IndexActivity.java   | 12 
 .../main/java/com/taobao/weex/ui/component/WXImage.java | 10 ++
 2 files changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/65c0910d/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
--
diff --git 
a/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java 
b/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
index 866733a..0603363 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
@@ -103,18 +103,6 @@ public class IndexActivity extends AbstractWeexActivity {
 };
 
 LocalBroadcastManager.getInstance(this).registerReceiver(mReloadReceiver, 
new IntentFilter(WXSDKEngine.JS_FRAMEWORK_RELOAD));
-
-requestWeexPermission();
-  }
-
-  private void requestWeexPermission() {
-if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
-  if (ActivityCompat.shouldShowRequestPermissionRationale(this, 
Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-Toast.makeText(this, "please give me the permission", 
Toast.LENGTH_SHORT).show();
-  } else {
-ActivityCompat.requestPermissions(this, new 
String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 
WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
-  }
-}
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/65c0910d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
index 1cf5d02..1c4d062 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
@@ -19,6 +19,7 @@
 package com.taobao.weex.ui.component;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.RectF;
@@ -27,6 +28,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.widget.ImageView;
@@ -71,6 +73,7 @@ public class WXImage extends WXComponent {
 
   public static final String SUCCEED = "success";
   public static final String ERRORDESC = "errorDesc";
+  private static final int WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 
0x2;
 
   private String mSrc;
   private int mBlurRadius;
@@ -356,6 +359,13 @@ public class WXImage extends WXComponent {
   public void save(final JSCallback saveStatuCallback) {
 
 if (ContextCompat.checkSelfPermission(getContext(), 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
+  if (getContext() instanceof Activity) {
+ActivityCompat.requestPermissions((Activity) getContext(),
+new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 
WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+  }
+}
+
+if (ContextCompat.checkSelfPermission(getContext(), 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
   if (saveStatuCallback != null) {
 Map result = new HashMap<>();
 result.put(SUCCEED, false);

[GitHub] incubator-weex pull request #810: * [ios] add jserror upload method, add tri...

[gurisxie]

GitHub user gurisxie opened a pull request:

https://github.com/apache/incubator-weex/pull/810

* [ios] add jserror upload method, add trigger positions on sdk init,…

I need to add a method which used to upload jserror to it that has realized 
the protocol.

it not sufficient before, I add it in some necessary address. 

**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/gurisxie/incubator-weex 
ios-feature-error-upload

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/810.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 #810


commit e3b9c10ee99b3c6236f5e67867b634fd3377d7e6
Author: gurisxie <279483...@qq.com>
Date:   2017-10-19T03:45:16Z

* [ios] add jserror upload method, add trigger positions on sdk 
init,jsservice,jsbridge




---

[1/2] incubator-weex git commit: * [android] fix crash when set box-shadow on horizontal scroller

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 fc7b90e3e -> 54719936f


* [android] fix crash when set box-shadow on horizontal scroller


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f6203c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f6203c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f6203c9

Branch: refs/heads/release-0.16
Commit: 7f6203c9b6a4c398cce6584cd9da1689bb14e5ba
Parents: 61ead2a
Author: misakuo 
Authored: Wed Oct 18 19:44:50 2017 +0800
Committer: misakuo 
Committed: Wed Oct 18 19:44:50 2017 +0800

--
 .../taobao/weex/ui/component/WXVContainer.java  | 35 +++-
 1 file changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f6203c9/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 4570729..001509e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -25,10 +25,13 @@ import android.util.Pair;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
 
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.utils.WXLogUtils;
 import com.taobao.weex.utils.WXViewUtils;
 
 import java.util.ArrayList;
@@ -481,15 +484,29 @@ public abstract class WXVContainer 
extends WXComponent {
/
 
   public @Nullable View getBoxShadowHost() {
-if (mBoxShadowHost == null) {
-  mBoxShadowHost = new BoxShadowHost(getContext());
-  WXViewUtils.setBackGround(mBoxShadowHost, null);
-  mBoxShadowHost.setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT));
-  getHostView().addView(mBoxShadowHost);
-}
-getHostView().removeView(mBoxShadowHost);
-getHostView().addView(mBoxShadowHost);
-return mBoxShadowHost;
+ViewGroup hostView = getHostView();
+if (hostView == null) {
+  return null;
+}
+
+if (hostView instanceof ScrollView || hostView instanceof 
HorizontalScrollView) {
+  return hostView;
+}
+
+try {
+  if (mBoxShadowHost == null) {
+mBoxShadowHost = new BoxShadowHost(getContext());
+WXViewUtils.setBackGround(mBoxShadowHost, null);
+mBoxShadowHost.setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT));
+hostView.addView(mBoxShadowHost);
+  }
+  hostView.removeView(mBoxShadowHost);
+  hostView.addView(mBoxShadowHost);
+  return mBoxShadowHost;
+} catch (Throwable t) {
+  WXLogUtils.w("BoxShadow", t);
+}
+return hostView;
   }
 
   private class BoxShadowHost extends View {

[1/2] incubator-weex git commit: * [Android] Fix that moveElement doesn't work when parent is not a list

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 af35b5f38 -> fc7b90e3e


* [Android] Fix that moveElement doesn't work when parent is not a list


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f4fefab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f4fefab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f4fefab6

Branch: refs/heads/release-0.16
Commit: f4fefab661c39f4eeb419587b1f7a6380c703311
Parents: 4c494b2
Author: YorkShen 
Authored: Wed Oct 18 16:13:09 2017 +0800
Committer: YorkShen 
Committed: Wed Oct 18 16:55:23 2017 +0800

--
 .../java/com/taobao/weex/dom/action/MoveElementAction.java | 3 +++
 .../src/main/java/com/taobao/weex/ui/component/WXScroller.java | 2 +-
 .../src/main/java/com/taobao/weex/ui/component/WXSlider.java   | 2 +-
 .../java/com/taobao/weex/ui/component/WXSliderNeighbor.java| 2 +-
 .../main/java/com/taobao/weex/ui/component/WXVContainer.java   | 6 +-
 .../com/taobao/weex/ui/component/list/BasicListComponent.java  | 2 +-
 .../ui/component/list/template/WXRecyclerTemplateList.java | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4fefab6/android/sdk/src/main/java/com/taobao/weex/dom/action/MoveElementAction.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/MoveElementAction.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/MoveElementAction.java
index 258da68..bbd093c 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/MoveElementAction.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/MoveElementAction.java
@@ -91,5 +91,8 @@ final class MoveElementAction implements DOMAction, 
RenderAction {
 WXVContainer oldParent = component.getParent();
 oldParent.remove(component,false);
 ((WXVContainer) newParent).addChild(component, mNewIndex);
+if(!component.isVirtualComponent()){
+  ((WXVContainer) newParent).addSubView(component.getHostView(), 
mNewIndex);
+}
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4fefab6/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 6cf784f..9e56259 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -233,7 +233,7 @@ public class WXScroller extends WXVContainer 
implements WXScrollViewL
* Intercept refresh view and loading view
*/
   @Override
-  protected void addSubView(View child, int index) {
+  public void addSubView(View child, int index) {
 if (child == null || getRealView() == null) {
   return;
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4fefab6/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index 1023e3e..ec2d73f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -173,7 +173,7 @@ public class WXSlider extends WXVContainer {
   }
 
   @Override
-  protected void addSubView(View view, int index) {
+  public void addSubView(View view, int index) {
 if (view == null || mAdapter == null) {
   return;
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4fefab6/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
index b1001b7..0899c8d 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
@@ -113,7 +113,7 @@ public class WXSliderNeighbor extends WXSlider {
 }
 
 @Override
-protected void addSubView(View view, final int index) {
+public void addSubView(View view, final int index) {
 if (view == null || mAdapter == null) {
 return;
 }

incubator-weex git commit: * [test] update travisCI , remove iOS env.

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 4c494b2b2 -> af35b5f38


* [test] update travisCI , remove iOS env.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af35b5f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af35b5f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af35b5f3

Branch: refs/heads/release-0.16
Commit: af35b5f383be592104fdbb1b57d69b0bb1c10e91
Parents: 4c494b2
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 17:40:45 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 17:40:45 2017 +0800

--
 .travis.yml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af35b5f3/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index a7bca6f..95624a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,6 @@ matrix:
   - os: linux
 env: TEST_SUITE=android
 include:
-  - os: osx
-env: TEST_SUITE=ios
-osx_image: xcode8.1
-language: objective-c
   - os: linux
 env: TEST_SUITE=android
 jdk: oraclejdk8

[2/2] incubator-weex git commit: * [android] fix redundant input event

[gurisxie]

* [android] fix redundant input event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4c494b2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c494b2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c494b2b

Branch: refs/heads/release-0.16
Commit: 4c494b2b2e653db43d2519dc180e7eff1e767997
Parents: 64dd40b 9203268
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 16:00:20 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 16:00:20 2017 +0800

--
 .../com/taobao/weex/ui/component/AbstractEditComponent.java  | 8 
 1 file changed, 8 insertions(+)
--

[1/2] incubator-weex git commit: * [android] fix redundant input event

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 64dd40bc3 -> 4c494b2b2


* [android] fix redundant input event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/92032689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/92032689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/92032689

Branch: refs/heads/release-0.16
Commit: 92032689e09286adda516ea2df8fec83d680bc40
Parents: 05214a7
Author: misakuo 
Authored: Mon Oct 16 11:23:00 2017 +0800
Committer: misakuo 
Committed: Mon Oct 16 11:23:00 2017 +0800

--
 .../com/taobao/weex/ui/component/AbstractEditComponent.java  | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/92032689/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
index a8d1963..4ca9d50 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
@@ -221,6 +221,14 @@ public abstract class AbstractEditComponent extends 
WXComponent {
 
   mBeforeText = s.toString();
 
+  if (getDomObject() != null && getDomObject().getAttrs() != null) {
+Object val = getDomObject().getAttrs().get(Constants.Name.VALUE);
+String valString = WXUtils.getString(val, null);
+if (mBeforeText != null && mBeforeText.equals(valString)) {
+  return;
+}
+  }
+
   if (!mIgnoreNextOnInputEvent) {
 fireEvent(Constants.Event.INPUT, s.toString());
   }

[3/4] incubator-weex git commit: * [android] null judgement

[gurisxie]

* [android] null judgement


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/61ead2a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/61ead2a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/61ead2a4

Branch: refs/heads/release-0.16
Commit: 61ead2a4226ee0f17863d4c10699167b265fa0ae
Parents: d5731c2
Author: misakuo 
Authored: Wed Oct 11 19:44:16 2017 +0800
Committer: misakuo 
Committed: Wed Oct 11 19:44:16 2017 +0800

--
 .../main/java/com/taobao/weex/ui/component/WXComponent.java| 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/61ead2a4/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 3c0c870..add0205 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
@@ -43,6 +43,7 @@ import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
+import android.view.ViewOverlay;
 import android.widget.FrameLayout;
 
 import com.alibaba.fastjson.JSONArray;
@@ -912,7 +913,10 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
 }
 
 if (target != null && Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR2) {
-  target.getOverlay().clear();
+  ViewOverlay overlay = target.getOverlay();
+  if (overlay != null) {
+overlay.clear();
+  }
 }
   }
 

[2/4] incubator-weex git commit: * [android] fix shadow remains after component size changed

[gurisxie]

* [android] fix shadow remains after component size changed


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d5731c2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d5731c2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d5731c2c

Branch: refs/heads/release-0.16
Commit: d5731c2caceb94f6b7cd942ae50683b38846d3c1
Parents: e777ac8
Author: misakuo 
Authored: Wed Oct 11 18:10:48 2017 +0800
Committer: misakuo 
Committed: Wed Oct 11 18:10:48 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 29 
 1 file changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d5731c2c/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 74e4db4..3c0c870 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
@@ -509,6 +509,8 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   setWidgetParams(widget, UIImp, rawOffset, realWidth, realHeight, 
realLeft, realRight, realTop,
   realBottom);
 } else if (mHost != null) {
+  // clear box shadow before host's size changed
+  clearBoxShadow();
   if (mDomObj.isFixed()) {
 setFixedHostLayoutParams(mHost, realWidth, realHeight, realLeft, 
realRight, realTop,
 realBottom);
@@ -520,6 +522,8 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   mPreRealLeft = realLeft;
   mPreRealTop = realTop;
   onFinishLayout();
+  // restore box shadow
+  updateBoxShadow();
 }
   }
 
@@ -859,6 +863,15 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
 return;
   }
 
+  View target = mHost;
+  if (this instanceof WXVContainer) {
+target = ((WXVContainer) this).getBoxShadowHost();
+  }
+
+  if (target == null) {
+return;
+  }
+
   float[] radii = new float[] {0, 0, 0, 0, 0, 0, 0, 0};
   WXStyle style = getDomObject().getStyles();
   if (style != null) {
@@ -886,17 +899,23 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
 }
   }
 
-  View target = mHost;
-  if (this instanceof WXVContainer) {
-target = ((WXVContainer) this).getBoxShadowHost();
-  }
-
   BoxShadowUtil.setBoxShadow(target, boxShadow.toString(), radii, 
getInstance().getInstanceViewPortWidth());
 } else {
   WXLogUtils.w("Can not resolve styles");
 }
   }
 
+  protected void clearBoxShadow() {
+View target = mHost;
+if (this instanceof WXVContainer) {
+  target = ((WXVContainer) this).getBoxShadowHost();
+}
+
+if (target != null && Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR2) {
+  target.getOverlay().clear();
+}
+  }
+
   @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
   protected void setAriaHidden(boolean isHidden) {
 View host = getHostView();

[4/4] incubator-weex git commit: * [android] fix flicker caused by coexistence of box-shadow and border

[gurisxie]

* [android] fix flicker caused by coexistence of box-shadow and border


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/64dd40bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/64dd40bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/64dd40bc

Branch: refs/heads/release-0.16
Commit: 64dd40bc346295c32675a794c79d23e6aa8b693c
Parents: db5b1e0 61ead2a
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 15:56:38 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 15:57:08 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 48 +---
 .../taobao/weex/ui/component/WXVContainer.java  | 25 +-
 2 files changed, 56 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/64dd40bc/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--

[1/4] incubator-weex git commit: * [android] fix flicker caused by coexistence of box-shadow and border-radius

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 db5b1e046 -> 64dd40bc3


* [android] fix flicker caused by coexistence of box-shadow and border-radius


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e777ac8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e777ac8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e777ac8d

Branch: refs/heads/release-0.16
Commit: e777ac8dd8f02805c5adee19364d87ee5c40bf9d
Parents: 045e838
Author: misakuo 
Authored: Tue Oct 10 18:20:24 2017 +0800
Committer: misakuo 
Committed: Tue Oct 10 18:20:24 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 25 +++-
 .../taobao/weex/ui/component/WXVContainer.java  | 25 +++-
 2 files changed, 33 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e777ac8d/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 d801290..74e4db4 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
@@ -759,22 +759,9 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   case Constants.Name.BORDER_TOP_RIGHT_RADIUS:
   case Constants.Name.BORDER_BOTTOM_RIGHT_RADIUS:
   case Constants.Name.BORDER_BOTTOM_LEFT_RADIUS:
-final Float radius = WXUtils.getFloat(param,null);
-final String finalKey = key;
+Float radius = WXUtils.getFloat(param,null);
 if (radius != null) {
-  if (this instanceof WXDiv && mHost != null) {
-/* Hacked by moxun
-   Set border radius on ViewGroup will cause the Overlay to be cut 
and don't know why
-   Delay setting border radius can avoid the problem, and don't 
know why too, dog science…… */
-mHost.postDelayed(new Runnable() {
-  @Override
-  public void run() {
-setBorderRadius(finalKey, radius);
-  }
-}, 64);
-  } else {
-setBorderRadius(finalKey, radius);
-  }
+  setBorderRadius(key, radius);
 }
 return true;
   case Constants.Name.BORDER_WIDTH:
@@ -898,7 +885,13 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   }
 }
   }
-  BoxShadowUtil.setBoxShadow(mHost, boxShadow.toString(), radii, 
getInstance().getInstanceViewPortWidth());
+
+  View target = mHost;
+  if (this instanceof WXVContainer) {
+target = ((WXVContainer) this).getBoxShadowHost();
+  }
+
+  BoxShadowUtil.setBoxShadow(target, boxShadow.toString(), radii, 
getInstance().getInstanceViewPortWidth());
 } else {
   WXLogUtils.w("Can not resolve styles");
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e777ac8d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 43b45a7..4570729 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -18,15 +18,19 @@
  */
 package com.taobao.weex.ui.component;
 
+import android.content.Context;
 import android.content.Intent;
-import android.util.Pair;
 import android.support.annotation.Nullable;
+import android.util.Pair;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.utils.WXViewUtils;
+
 import java.util.ArrayList;
 
 /**
@@ -36,6 +40,7 @@ public abstract class WXVContainer 
extends WXComponent {
 
   private static final String TAG="WXVContainer";
   protected ArrayList mChildren = new ArrayList<>();
+  private BoxShadowHost mBoxShadowHost;
 
   @Deprecated
   public WXVContainer(WXSDKInstance instance, WXDomObject dom, WXVContainer 
parent, String instanceId, boolean isLazy) {
@@ -474,4 +479,22 @@ public abstract class WXVContainer 
extends WXComponent {
   /
*  end hook Activity life cycle callback
/
+
+  

[GitHub] incubator-weex issue #801: * [android] fix bug if application is null log no...

[gurisxie]

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/801
  
has rebase,but bot seems broken.


---

[3/3] incubator-weex git commit: * [android] fix bug if application is null log not print out

[gurisxie]

* [android] fix bug if application is null log not print out


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/247ea50a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/247ea50a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/247ea50a

Branch: refs/heads/release-0.16
Commit: 247ea50a914afe24ee30d6dafb66f6f76986e7c3
Parents: c2f1aac
Author: atomtong <tong_huab...@qq.com>
Authored: Tue Oct 17 17:00:40 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 13:04:15 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/247ea50a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index 0296379..3ea86e2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -162,7 +162,11 @@ public class WXSDKEngine {
   if(WXEnvironment.isApkDebugable()){
 WXEnvironment.sLogLevel = LogLevel.DEBUG;
   }else{
-WXEnvironment.sLogLevel = LogLevel.WARN;
+   if(WXEnvironment.sApplication != null){
+ WXEnvironment.sLogLevel = LogLevel.WARN;
+   }else {
+ WXLogUtils.e(TAG,"WXEnvironment.sApplication is " + 
WXEnvironment.sApplication);
+   }
   }
   doInitInternal(application,config);
   WXEnvironment.sSDKInitInvokeTime = System.currentTimeMillis()-start;
@@ -173,6 +177,9 @@ public class WXSDKEngine {
 
   private static void doInitInternal(final Application application,final 
InitConfig config){
 WXEnvironment.sApplication = application;
+   if(application == null){
+ WXLogUtils.e(TAG, " doInitInternal application is null");
+   }
 WXEnvironment.JsFrameworkInit = false;
 
 WXBridgeManager.getInstance().post(new Runnable() {

[1/3] incubator-weex git commit: * [android] if not debug level then write console log

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 c2f1aac35 -> db5b1e046


* [android] if not debug level then write console log


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/db5b1e04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/db5b1e04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/db5b1e04

Branch: refs/heads/release-0.16
Commit: db5b1e0465b494ea937b381bed3b54aaea0b40ba
Parents: ac075c7
Author: atomtong <tong_huab...@qq.com>
Authored: Wed Oct 18 10:58:06 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 13:04:15 2017 +0800

--
 .../sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/db5b1e04/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 a120ad6..1f5b4b2 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
@@ -78,10 +78,11 @@ public class WXLogUtils {
 Log.println(level.getPriority(),tag, msg);
   }
 
-  if(WXEnvironment.isApkDebugable()){
-writeConsoleLog(level.getName(), msg);
-sendLog(level, msg);
-  }
+  // if not debug level then print log
+  if(WXEnvironment.isApkDebugable() && !level.getName().equals("debug")){
+   writeConsoleLog(level.getName(), msg);
+   sendLog(level, msg);
+ }
 }
   }
 

[2/3] incubator-weex git commit: * [android] delete redundancy log print logic code

[gurisxie]

* [android] delete redundancy log print logic code


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ac075c70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ac075c70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ac075c70

Branch: refs/heads/release-0.16
Commit: ac075c70e9ae68a53d66fecace1a91e336f3f39a
Parents: 247ea50
Author: atomtong <tong_huab...@qq.com>
Authored: Tue Oct 17 19:43:40 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 13:04:15 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ac075c70/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 ae6e623..a120ad6 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
@@ -118,13 +118,8 @@ public class WXLogUtils {
   }
 
   public static void d(String tag, String msg) {
-if (!TextUtils.isEmpty(msg) && !TextUtils.isEmpty(tag)) {
-  log(tag, msg, LogLevel.DEBUG);
-}
 
 if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg) && 
WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0) {
-  Log.d(tag, msg);
-
   if ("jsLog".equals(tag) && jsLogWatcher != null) {
 if (msg.endsWith("__DEBUG")) {
   jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__DEBUG", ""));

[43/50] [abbrv] incubator-weex git commit: * [test] valid protect for danger file

[gurisxie]

* [test] valid protect for danger file


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e2a373f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e2a373f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e2a373f7

Branch: refs/heads/master
Commit: e2a373f7ac9bdece27ba5b18072ecfc3b50e133a
Parents: 1c2369b
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 16:05:43 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 16:05:43 2017 +0800

--
 dangerfile.js | 36 ++--
 1 file changed, 22 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e2a373f7/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index 83a0ef1..23da68a 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -320,6 +320,7 @@ function findReviewer(resolve, reject) {
   resolve()
   return
 }
+console.log('result:'+result);
 parseDeleteAndNormalLines(result.data, fileToDeletedLinesMap, 
fileToNormalLinesMap)
 console.log('getContent')
 var promises = danger.git.modified_files.map(function(file) {
@@ -374,22 +375,29 @@ function getContent(url) {
 
 function parseDeleteAndNormalLines(diffData, fileToDeletedLinesMap, 
fileToNormalLinesMap) {
   try {
-console.log('diffData:'+diffData)
+console.log('parseDeleteAndNormalLines')
 var diffs = parseDiff(diffData)
-diffs.forEach(diff => {
-  fileToDeletedLinesMap[diff.from] = [];
-  fileToNormalLinesMap[diff.from] = [];
-  diff.chunks.forEach(chunk => {
-chunk.changes.forEach(change => {
-  if (change.del) {
-fileToDeletedLinesMap[diff.from].push(change.ln)
-  }
-  if (change.normal) {
-fileToNormalLinesMap[diff.from].push(change.ln1)
-  }
-})
+console.log('diffs:'+diffs)
+if(diffs& instanceof Array){
+  diffs.forEach(diff => {
+fileToDeletedLinesMap[diff.from] = [];
+fileToNormalLinesMap[diff.from] = [];
+if(diff&& instanceof Array){
+  diff.chunks.forEach(chunk => {
+if(chunk&& instanceof Array){
+  chunk.changes.forEach(change => {
+if (change&) {
+  fileToDeletedLinesMap[diff.from].push(change.ln)
+}
+if (change&) {
+  fileToNormalLinesMap[diff.from].push(change.ln1)
+}
+  })
+}
+  })
+}
   })
-})
+}
   } catch (error) {
 console.log(error)
   }

[30/50] [abbrv] incubator-weex git commit: bug fix for list cell add event has none affect when cell not init

[gurisxie]

bug fix for list cell add event has none affect when cell not init


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e8030992
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e8030992
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e8030992

Branch: refs/heads/master
Commit: e80309921a4934ed43e50e4bdf4c5f68c7282e40
Parents: 05214a7
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Thu Oct 12 20:23:34 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 16 14:04:13 2017 +0800

--
 .../src/main/java/com/taobao/weex/ui/component/WXComponent.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8030992/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 d801290..672f4aa 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
@@ -968,7 +968,9 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
* @param type
*/
   public void addEvent(String type) {
-if (TextUtils.isEmpty(type) || mAppendEvents.contains(type)) {
+if (TextUtils.isEmpty(type)
+|| mAppendEvents.contains(type)
+|| getRealView() == null) {
   return;
 }
 mAppendEvents.add(type);

[36/50] [abbrv] incubator-weex git commit: * [android] fix unit android test log mocked

[gurisxie]

* [android] fix unit android test log mocked


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f4bfd225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f4bfd225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f4bfd225

Branch: refs/heads/master
Commit: f4bfd225672bf4169834393bf0ca675864a0c964
Parents: 8cebed4
Author: atomtong 
Authored: Tue Oct 17 11:22:25 2017 +0800
Committer: atomtong 
Committed: Tue Oct 17 11:28:58 2017 +0800

--
 android/sdk/build.gradle | 1 +
 android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4bfd225/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 0be69fb..a49a05f 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -127,6 +127,7 @@ android {
 targetCompatibility JavaVersion.VERSION_1_7
 }
 testOptions {
+unitTests.returnDefaultValues = true
 unitTests.all {
 maxHeapSize = "1024m"
 jvmArgs += ['-XX:-UseSplitVerifier', 
'-noverify','-Xverify:none']/* fix VerifyError  */

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4bfd225/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
--
diff --git a/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java 
b/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
index e981c69..5b6d273 100644
--- a/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java
@@ -19,6 +19,7 @@
 package com.taobao.weex.utils;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.taobao.weappplus_sdk.BuildConfig;
 import com.taobao.weex.WXEnvironment;
@@ -49,7 +50,7 @@ import static org.mockito.Matchers.any;
 @RunWith(PowerMockRunner.class)
 @Config(constants = BuildConfig.class, sdk = 19)
 @PowerMockIgnore( {"org.mockito.*", "org.robolectric.*", "android.*"})
-@PrepareForTest( {WXEnvironment.class, WXViewUtils.class, WXSDKInstance.class, 
TextUtils.class})
+@PrepareForTest( {WXEnvironment.class, WXViewUtils.class, WXSDKInstance.class, 
TextUtils.class, Log.class, WXUtils.class, WXLogUtils.class})
 public class WXUtilsTest extends TestCase {
 
 public static final float TEST_DENSITY = 3.0f;

[28/50] [abbrv] incubator-weex git commit: * [android] if jsf not initialed, use weex to load page may fail and report exception in order to aovid wait exception, report creat instance failed directly

[gurisxie]

 * [android] if jsf not initialed, use weex to load page may fail and report 
exception
   in order to aovid wait exception, report creat instance failed directly and 
initFramework async


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/35a03a8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/35a03a8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/35a03a8d

Branch: refs/heads/master
Commit: 35a03a8dd460d1c5fba5e4046dfd5424f13f1ba8
Parents: 9ea8bbd
Author: yuhun-alibaba 
Authored: Wed Oct 11 22:41:33 2017 +0800
Committer: yuhun-alibaba 
Committed: Wed Oct 11 22:41:33 2017 +0800

--
 .../java/com/taobao/weex/bridge/WXBridgeManager.java   | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/35a03a8d/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 07f2381..70dfc90 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1377,6 +1377,19 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, 
"createInstance fail!");
   return;
 }
+
+// 如果没有初始化尽快返回Exception，并且异步初始化
+if (!isJSFrameworkInit()) {
+  instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, 
"createInstance fail!");
+  post(new Runnable() {
+@Override
+public void run() {
+  initFramework("");
+}
+  }, instanceId);
+  return;
+}
+
 WXModuleManager.createDomModule(instance);
 post(new Runnable() {
   @Override

[17/50] [abbrv] incubator-weex git commit: add apache license

[gurisxie]

add apache license


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/045e8386
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/045e8386
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/045e8386

Branch: refs/heads/master
Commit: 045e83863c64bd8b2727063abb32ffad37d8cf83
Parents: d5c7253
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Tue Oct 10 10:58:56 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 12:02:29 2017 +0800

--
 .../java/com/taobao/weex/dom/flex/CSSNode.java| 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/045e8386/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
index 624c4c9..0818c15 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /**
  * Copyright (c) 2014, Facebook, Inc. All rights reserved.  This source 
code is licensed under
  * the BSD-cssstyle license found in the LICENSE file in the root directory of 
this source tree. An

[22/50] [abbrv] incubator-weex git commit: init framework and insert cacheDir for debug

[gurisxie]

 init framework and insert cacheDir for debug


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/07bc5b0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/07bc5b0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/07bc5b0d

Branch: refs/heads/master
Commit: 07bc5b0dc44762603f2465835a1b3530b76f238e
Parents: dbc94f4
Author: 御魂 
Authored: Mon Oct 9 16:40:02 2017 +0800
Committer: yuhun-alibaba 
Committed: Tue Oct 10 17:23:17 2017 +0800

--
 .../java/com/taobao/weex/bridge/WXBridge.java   | 17 ++
 .../com/taobao/weex/bridge/WXBridgeManager.java | 25 -
 .../java/com/taobao/weex/common/IWXBridge.java  |  9 
 .../taobao/weex/utils/WXSoInstallMgrSdk.java| 56 
 .../taobao/weex/bridge/WXWebsocketBridge.java   | 15 ++
 5 files changed, 121 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/07bc5b0d/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
index 9d88fc2..b95c7a6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
@@ -36,6 +36,8 @@ class WXBridge implements IWXBridge {
 
   public static final String TAG = "WXBridge";
 
+  public static final boolean MULTIPROCESS = true;
+
   /**
* Init JSFrameWork
*
@@ -43,6 +45,13 @@ class WXBridge implements IWXBridge {
*/
   public native int initFramework(String framework, WXParams params);
 
+  /**
+   * Init JSFrameWork
+   *
+   * @param framework assets/main.js
+   */
+  public native int initFramework(String framework, WXParams params, String 
cacheDir, boolean onSdcard);
+
 
   /**
* Execute JavaScript function
@@ -68,6 +77,14 @@ class WXBridge implements IWXBridge {
*/
   public native void takeHeapSnapshot(String filename);
 
+
+  public int initFrameworkEnv(String framework, WXParams params, String 
cacheDir, boolean onSdcard){
+if (MULTIPROCESS) {
+  return initFramework(framework, params, cacheDir, onSdcard);
+} else {
+  return  initFramework(framework, params);
+}
+  }
   /**
* JavaScript uses this methods to call Android code
*

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/07bc5b0d/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index a949e3b..07f2381 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -19,6 +19,8 @@
 package com.taobao.weex.bridge;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Looper;
@@ -1564,7 +1566,28 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 }
 
 long start = System.currentTimeMillis();
-if(mWXBridge.initFramework(framework, 
assembleDefaultOptions())==INIT_FRAMEWORK_OK){
+String crashFile="";
+boolean installOnSdcard = false;
+try {
+  crashFile = 
WXEnvironment.getApplication().getApplicationContext().getCacheDir().getPath();
+} catch (Exception e) {
+  e.printStackTrace();
+}
+
+try {
+  PackageManager pm = 
WXEnvironment.getApplication().getApplicationContext().getPackageManager();
+  String pkgName = WXEnvironment.getApplication().getPackageName();
+  ApplicationInfo appInfo = pm.getApplicationInfo(pkgName, 0);
+  if ((appInfo.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+// App on sdcard
+installOnSdcard = true;
+  }
+} catch (Exception e) {
+  e.printStackTrace();
+}
+
+// extends initFramework
+if(mWXBridge.initFrameworkEnv(framework, assembleDefaultOptions(), 
crashFile, installOnSdcard)==INIT_FRAMEWORK_OK){
   WXEnvironment.sJSLibInitTime = System.currentTimeMillis() - start;
   WXLogUtils.renderPerformanceLog("initFramework", 
WXEnvironment.sJSLibInitTime);
   WXEnvironment.sSDKInitTime = System.currentTimeMillis() - 
WXEnvironment.sSDKInitStart;

[04/50] [abbrv] incubator-weex git commit: update so for jsf init exception

[gurisxie]

 update so for jsf init exception


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f2d6a33b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f2d6a33b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f2d6a33b

Branch: refs/heads/master
Commit: f2d6a33be7ced318b06e273f60eaa6a8a26edf39
Parents: 6492c33
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Wed Oct 4 13:13:50 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 4 16:21:39 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 325664 -> 338160 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f2d6a33b/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index c46e857..4b13b06 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f2d6a33b/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 2cde143..12f6df2 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f2d6a33b/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 13e5bc6..0187882 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[49/50] [abbrv] incubator-weex git commit: fix clipPath not works on android N 7.0

[gurisxie]

fix clipPath not works on android N 7.0


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c2f1aac3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2f1aac3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2f1aac3

Branch: refs/heads/master
Commit: c2f1aac354c3640aa47942b8828883364eec14cd
Parents: 5957426
Author: 行久 <yiyuan.zhan...@alibaba-inc.com>
Authored: Thu Oct 12 18:08:09 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 12:07:46 2017 +0800

--
 .../java/com/taobao/weex/utils/WXViewUtils.java | 25 
 1 file changed, 21 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2f1aac3/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index 7d11d5a..4a1b304 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -378,7 +378,7 @@ public class WXViewUtils {
   public static void clipCanvasWithinBorderBox(View targetView, Canvas canvas) 
{
 Drawable drawable;
 if (clipCanvasDueToAndroidVersion(canvas) &&
-clipCanvasIfAnimationExist() &&
+clipCanvasIfAnimationExist(targetView) &&
 ((drawable = targetView.getBackground()) instanceof BorderDrawable)) {
   BorderDrawable borderDrawable = (BorderDrawable) drawable;
   if (borderDrawable.isRounded()) {
@@ -394,7 +394,7 @@ public class WXViewUtils {
   public static void clipCanvasWithinBorderBox(Widget widget, Canvas canvas) {
 BorderDrawable borderDrawable;
 if (clipCanvasDueToAndroidVersion(canvas) &&
-clipCanvasIfAnimationExist() &&
+clipCanvasIfAnimationExist(null) &&
 (borderDrawable=widget.getBackgroundAndBorder())!=null ) {
   if (borderDrawable.isRounded() && 
clipCanvasIfBackgroundImageExist(widget, borderDrawable)) {
   Path path = borderDrawable.getContentPath(
@@ -424,8 +424,25 @@ public class WXViewUtils {
* As animation will not cause redraw if hardware-acceleration enabled, 
clipCanvas feature has
* to be disabled when API level is 24 without considering the animation 
property.
*/
-  private static boolean clipCanvasIfAnimationExist() {
-return Build.VERSION.SDK_INT != VERSION_CODES.N;
+  private static boolean clipCanvasIfAnimationExist(View targetView) {
+if (Build.VERSION.SDK_INT != VERSION_CODES.N) {
+  return true;
+}
+if(targetView != null &&
+targetView.getScaleX() == 1 &&
+targetView.getScaleY() == 1 &&
+targetView.getTranslationX() == 0 &&
+targetView.getTranslationY() == 0 &&
+targetView.getRotation() == 0 &&
+targetView.getRotationX() == 0 &&
+targetView.getRotationY() == 0) {
+  if(Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && 
targetView.getTranslationZ() != 0 ) {
+return false;
+  } else {
+return true;
+  }
+}
+return false;
   }
 
   /**

[14/50] [abbrv] incubator-weex git commit: * [test] bugfix for unexpected error

[gurisxie]

* [test] bugfix for unexpected error


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/361f4b61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/361f4b61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/361f4b61

Branch: refs/heads/master
Commit: 361f4b6164824335300bd38c160a2fff9e3c854f
Parents: e9ea1b2
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 10 10:13:59 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 10:13:59 2017 +0800

--
 dangerfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/361f4b61/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index 248276a..97c4146 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -418,7 +418,7 @@ function findBlameReviewers(fileToDeletedLinesMap, 
fileToNormalLinesMap, fileToB
 }
 deletedLines.forEach(lineNumber => {
   var name = blames[lineNumber]
-  if (!!reviewers) {
+  if (name && !!reviewers) {
 reviewers[name] = (reviewers[name] || 0) + 3
   }
 })
@@ -433,7 +433,7 @@ function findBlameReviewers(fileToDeletedLinesMap, 
fileToNormalLinesMap, fileToB
 }
 normalLines.forEach(lineNumber => {
   var name = blames[lineNumber]
-  if (!!reviewers) {
+  if (name && !!reviewers) {
 reviewers[name] = (reviewers[name] || 0) + 1
   }
 })

[50/50] [abbrv] incubator-weex git commit: * [all] rebase commits from release-0.16

[gurisxie]

* [all] rebase commits from release-0.16


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/556cc068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/556cc068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/556cc068

Branch: refs/heads/master
Commit: 556cc0683a5532d57b40277a9ea4048a408d92ef
Parents: b7383a4 c2f1aac
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 18 12:11:41 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 12:16:10 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so  |  Bin 22556 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so  |  Bin 335100 -> 335324 bytes
 android/sdk/libs/armeabi/libweexjss.so  |  Bin 6754016 -> 6754016 bytes
 android/sdk/libs/armeabi/libweexjst.so  |  Bin 0 -> 22552 bytes
 .../main/java/com/taobao/weex/WXSDKEngine.java  |6 +
 .../java/com/taobao/weex/bridge/WXBridge.java   |6 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 1005 +-
 .../java/com/taobao/weex/common/IWXBridge.java  |2 +-
 .../java/com/taobao/weex/dom/WXDomObject.java   |4 +-
 .../dom/action/AbstractAddElementAction.java|4 +-
 .../weex/ui/component/WXComponentFactory.java   |2 -
 .../java/com/taobao/weex/utils/WXLogUtils.java  |   24 +-
 .../taobao/weex/utils/WXSoInstallMgrSdk.java|   25 +-
 .../java/com/taobao/weex/utils/WXViewUtils.java |   25 +-
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |   16 +-
 .../taobao/weex/bridge/WXWebsocketBridge.java   |2 +-
 dangerfile.js   |   36 +-
 test/screenshot/border-android.png  |  Bin 0 -> 164260 bytes
 test/screenshot/border-ios.png  |  Bin 128088 -> 129071 bytes
 19 files changed, 597 insertions(+), 560 deletions(-)
--

[09/50] [abbrv] incubator-weex git commit: * [jsfm] upgrade weex-js-framework to 0.22.5

[gurisxie]

* [jsfm] upgrade weex-js-framework to 0.22.5


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b5b506f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b5b506f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b5b506f6

Branch: refs/heads/master
Commit: b5b506f63469855c5ee1c229d5226355df0e695a
Parents: 767d4ec
Author: Hanks 
Authored: Mon Oct 9 17:42:36 2017 +0800
Committer: Hanks 
Committed: Mon Oct 9 17:42:36 2017 +0800

--
 pre-build/native-bundle-main.js | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--

[21/50] [abbrv] incubator-weex git commit: update so for app install on sdcard

[gurisxie]

 update so for app install on sdcard


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dbc94f42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dbc94f42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dbc94f42

Branch: refs/heads/master
Commit: dbc94f421dfda8aeccea3791788a5079ff5bb923
Parents: 045e838
Author: yuhun-alibaba 
Authored: Tue Oct 10 16:21:49 2017 +0800
Committer: yuhun-alibaba 
Committed: Tue Oct 10 16:21:49 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 338160 -> 342264 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dbc94f42/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index 4b13b06..cd36273 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dbc94f42/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 12f6df2..36eae45 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dbc94f42/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 0187882..544d41d 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[11/50] [abbrv] incubator-weex git commit: * [ios] add more comments about category

[gurisxie]

* [ios] add more comments about category


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/31eb130d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/31eb130d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/31eb130d

Branch: refs/heads/master
Commit: 31eb130dc36d78a5f515be481b502c971b9fbeb8
Parents: 3589859
Author: acton393 <zhangxing610...@gmail.com>
Authored: Mon Oct 9 19:46:20 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 9 19:53:06 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/31eb130d/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index bf8021f..a7d042e 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -33,7 +33,6 @@
 @implementation WXScrollerComponnetView
 @end;
 
-// add a category compatible for new API
 @interface 
WXScrollerComponnetView(WXScrollerComponnetView_ContentInsetAdjustmentBehavior)
 @property(nonatomic, assign)NSUInteger contentInsetAdjustmentBehavior;
 @end
@@ -166,7 +165,10 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 scrollView.alwaysBounceHorizontal = _alwaysScrollableHorizontal;
 scrollView.alwaysBounceVertical = _alwaysScrollableVertical;
 if (WX_SYS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0")) {
-// now use the runtime to forbid the contentInset being Adjusted
+// now use the runtime to forbid the contentInset being Adjusted.
+// here we add a category for scoller component view class compatible 
for new API,
+// as we are concerning about weexSDK build as framework by Xcode8, 
using in Xcode9 project,
+// so the the macro __IPHONE_11_0 will be useless in this case.
 scrollView.contentInsetAdjustmentBehavior = 2;
 }
 

[37/50] [abbrv] incubator-weex git commit: * [android] add test case

[gurisxie]

* [android] add test case


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c9b5c45f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c9b5c45f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c9b5c45f

Branch: refs/heads/master
Commit: c9b5c45fbaf6c9540f2501b2716aa68f2c5d8c16
Parents: b512647
Author: zshshr 
Authored: Tue Oct 17 11:50:08 2017 +0800
Committer: zshshr 
Committed: Tue Oct 17 11:50:08 2017 +0800

--
 .../java/com/taobao/weex/utils/WXLogUtilsTest.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c9b5c45f/android/sdk/src/test/java/com/taobao/weex/utils/WXLogUtilsTest.java
--
diff --git 
a/android/sdk/src/test/java/com/taobao/weex/utils/WXLogUtilsTest.java 
b/android/sdk/src/test/java/com/taobao/weex/utils/WXLogUtilsTest.java
index 3fde10a..e249c1c 100644
--- a/android/sdk/src/test/java/com/taobao/weex/utils/WXLogUtilsTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/utils/WXLogUtilsTest.java
@@ -20,6 +20,7 @@ package com.taobao.weex.utils;
 
 import com.taobao.weappplus_sdk.BuildConfig;
 import com.taobao.weex.WXEnvironment;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -91,4 +92,17 @@ public class WXLogUtilsTest {
 Log.e("tag",new Throwable("test"));
   }
 
-}
+  @Test
+  public void testLogLevel() throws Exception {
+WXEnvironment.sLogLevel = LogLevel.DEBUG;
+Log.d("LogLevel.DEBUG", "test debug");
+Log.w("LogLevel.DEBUG", "test warning");
+Log.e("LogLevel.DEBUG", "test error");
+
+WXEnvironment.sLogLevel = LogLevel.WARN;
+
+Log.d("LogLevel.WARN", "test debug");
+Log.w("LogLevel.WARN", "test warning");
+Log.e("LogLevel.WARN", "test error");
+  }
+  }

[23/50] [abbrv] incubator-weex git commit: update x86 so

[gurisxie]

 update x86 so


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3cf15bc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3cf15bc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3cf15bc0

Branch: refs/heads/master
Commit: 3cf15bc0d435d16d2647b66a29bf3088e90bf4db
Parents: 07bc5b0
Author: yuhun-alibaba 
Authored: Tue Oct 10 18:17:43 2017 +0800
Committer: yuhun-alibaba 
Committed: Tue Oct 10 18:17:43 2017 +0800

--
 android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12126020 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cf15bc0/android/sdk/libs/x86/libweexjsc.so
--
diff --git a/android/sdk/libs/x86/libweexjsc.so 
b/android/sdk/libs/x86/libweexjsc.so
index ab27aa9..3698a49 100755
Binary files a/android/sdk/libs/x86/libweexjsc.so and 
b/android/sdk/libs/x86/libweexjsc.so differ

[24/50] [abbrv] incubator-weex git commit: * [ios] bugfix list view can not scroll

[gurisxie]

* [ios] bugfix list view can not scroll


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9833852c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9833852c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9833852c

Branch: refs/heads/master
Commit: 9833852c0758b37f85a33db7592464d21f8cddce
Parents: 3cf15bc
Author: acton393 
Authored: Wed Oct 11 11:39:53 2017 +0800
Committer: acton393 
Committed: Wed Oct 11 11:42:27 2017 +0800

--
 .../Sources/Component/WXScrollerComponent.m | 31 
 1 file changed, 19 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9833852c/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index a7d042e..b7a522a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -69,8 +69,8 @@
 CGPoint _lastContentOffset;
 CGPoint _lastScrollEventFiredOffset;
 BOOL _scrollable;
-BOOL _alwaysScrollableVertical;
-BOOL _alwaysScrollableHorizontal;
+NSString * _alwaysScrollableVertical;
+NSString * _alwaysScrollableHorizontal;
 
 // vertical & horizontal
 WXScrollDirection _scrollDirection;
@@ -119,10 +119,13 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 _lastScrollEventFiredOffset = CGPointMake(0, 0);
 _scrollDirection = attributes[@"scrollDirection"] ? [WXConvert 
WXScrollDirection:attributes[@"scrollDirection"]] : WXScrollDirectionVertical;
 _showScrollBar = attributes[@"showScrollbar"] ? [WXConvert 
BOOL:attributes[@"showScrollbar"]] : YES;
-// default value is NO;
-_alwaysScrollableVertical = 
attributes[@"alwaysScrollableVertical"]?[WXConvert 
BOOL:attributes[@"alwaysScrollableVertical"]] : NO;
-// default value is NO;
-_alwaysScrollableHorizontal = 
attributes[@"alwaysScrollableHorizontal"]?[WXConvert 
BOOL:attributes[@"alwaysScrollableHorizontal"]] : NO;
+
+if (attributes[@"alwaysScrollableVertical"]) {
+_alwaysScrollableVertical = [WXConvert 
NSString:attributes[@"alwaysScrollableVertical"]];
+}
+if (attributes[@"alwaysScrollableHorizontal"]) {
+_alwaysScrollableHorizontal = [WXConvert 
NSString:attributes[@"alwaysScrollableHorizontal"]];
+}
 _pagingEnabled = attributes[@"pagingEnabled"] ? [WXConvert 
BOOL:attributes[@"pagingEnabled"]] : NO;
 _loadMoreOffset = attributes[@"loadmoreoffset"] ? [WXConvert 
WXPixelType:attributes[@"loadmoreoffset"] 
scaleFactor:self.weexInstance.pixelScaleFactor] : 0;
 _loadmoreretry = attributes[@"loadmoreretry"] ? [WXConvert 
NSUInteger:attributes[@"loadmoreretry"]] : 0;
@@ -162,8 +165,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 scrollView.showsHorizontalScrollIndicator = _showScrollBar;
 scrollView.scrollEnabled = _scrollable;
 scrollView.pagingEnabled = _pagingEnabled;
-scrollView.alwaysBounceHorizontal = _alwaysScrollableHorizontal;
-scrollView.alwaysBounceVertical = _alwaysScrollableVertical;
+if (_alwaysScrollableHorizontal) {
+scrollView.alwaysBounceHorizontal = [WXConvert 
BOOL:_alwaysScrollableHorizontal];
+}
+if (_alwaysScrollableVertical) {
+scrollView.alwaysBounceVertical = [WXConvert 
BOOL:_alwaysScrollableVertical];
+}
 if (WX_SYS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0")) {
 // now use the runtime to forbid the contentInset being Adjusted.
 // here we add a category for scoller component view class compatible 
for new API,
@@ -232,13 +239,13 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 ((UIScrollView *)self.view).scrollEnabled = _scrollable;
 }
 if (attributes[@"alwaysScrollableHorizontal"]) {
-_alwaysScrollableHorizontal = [WXConvert 
BOOL:attributes[@"alwaysScrollableHorizontal"]];
-((UIScrollView*)self.view).alwaysBounceHorizontal = 
_alwaysScrollableHorizontal;
+_alwaysScrollableHorizontal = [WXConvert 
NSString:attributes[@"alwaysScrollableHorizontal"]];
+((UIScrollView*)self.view).alwaysBounceHorizontal = [WXConvert 
BOOL:_alwaysScrollableHorizontal];
 }
 
 if (attributes[@"alwaysScrollableVertical"]) {
-_alwaysScrollableVertical = [WXConvert 
BOOL:attributes[@"alwaysScrollableVertical"]];
-((UIScrollView*)self.view).alwaysBounceVertical = 
_alwaysScrollableVertical;
+_alwaysScrollableVertical = [WXConvert 

[41/50] [abbrv] incubator-weex git commit: resolve conflicts

[gurisxie]

resolve  conflicts


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/edbde500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/edbde500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/edbde500

Branch: refs/heads/master
Commit: edbde500e4163a155bc4b1572fe5f637f69bcf88
Parents: 37d62f9
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Tue Oct 17 11:15:53 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 15:38:09 2017 +0800

--
 .../src/main/java/com/taobao/weex/ui/component/list/WXCell.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/edbde500/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
index ebf81b4..925da65 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
@@ -66,8 +66,6 @@ public class WXCell extends WidgetContainer {
 private boolean hasLayout = false;
 
 
-
-
 @Deprecated
 public WXCell(WXSDKInstance instance, WXDomObject dom, WXVContainer 
parent, String instanceId, boolean isLazy) {
 super(instance, dom, parent);

[20/50] [abbrv] incubator-weex git commit: async layout and preload cell and quick convert parameter

[gurisxie]

async layout and preload cell and quick convert parameter


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7cc450d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7cc450d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7cc450d9

Branch: refs/heads/master
Commit: 7cc450d97bb4013f9ba03ed8a9cc66267879216f
Parents: e6061d6
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Thu Sep 28 16:32:50 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 12:02:29 2017 +0800

--
 .../java/com/taobao/weex/dom/WXDomObject.java   |   3 +
 .../com/taobao/weex/dom/WXTextDomObject.java|   3 +-
 .../weex/ui/component/binding/Layouts.java  | 101 --
 .../weex/ui/component/binding/Statements.java   |  26 -
 .../list/template/TemplateViewHolder.java   |   4 +
 .../list/template/WXRecyclerTemplateList.java   | 103 +--
 .../taobao/weex/utils/WXReflectionUtils.java|   6 ++
 7 files changed, 197 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7cc450d9/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index c766e35..001545d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -438,6 +438,9 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
   mAttributes = new WXAttr();
 }
 mAttributes.putAll(attrs);
+if(hasNewLayout()){
+   markUpdateSeen();
+}
 super.dirty();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7cc450d9/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
index 06c4e8a..3456bde 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
@@ -41,6 +41,7 @@ import android.text.style.AlignmentSpan;
 import android.text.style.ForegroundColorSpan;
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.WXThread;
 import com.taobao.weex.dom.flex.CSSConstants;
 import com.taobao.weex.dom.flex.CSSNode;
 import com.taobao.weex.dom.flex.FloatUtil;
@@ -185,7 +186,7 @@ public class WXTextDomObject extends WXDomObject {
 hasBeenMeasured = false;
 if (layout != null && !layout.equals(atomicReference.get()) &&
 Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-  if(Looper.getMainLooper().getThread().getId() != 
Thread.currentThread().getId()){
+  if(Thread.currentThread() instanceof WXThread){
   warmUpTextLayoutCache(layout);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7cc450d9/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
index f80bc1e..5b8d32c 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
@@ -21,60 +21,40 @@ package com.taobao.weex.ui.component.binding;
 
 
 import android.os.AsyncTask;
-import android.speech.tts.Voice;
+import android.util.Log;
 
+import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.WXSDKInstance;
+import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
 import com.taobao.weex.dom.flex.CSSLayoutContext;
 import com.taobao.weex.ui.component.WXComponent;
 import com.taobao.weex.ui.component.WXVContainer;
 import com.taobao.weex.ui.component.list.template.TemplateViewHolder;
+import com.taobao.weex.utils.WXLogUtils;
 
 /**
  * Created by furture on 2017/8/21.
  */
 public class Layouts {
 /**
- * do dom layout, and set layout to component
+ * do dom layout async or sync , and set layout to component on main.
+ * on first use do sync layout, when compontnet reuse do async layout
  * */
-public static void doLayout(final TemplateViewHolder templateViewHolder){
-final CSSLayoutContext layoutContext = 
temp

[34/50] [abbrv] incubator-weex git commit: * [android] modify log print

[gurisxie]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 782b16c..03f3057 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -335,9 +335,7 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
 
 int index = mDomChildren.indexOf(child);
 if (index == -1) {
-  if (WXEnvironment.isApkDebugable()) {
 WXLogUtils.e("[WXDomObject] remove function error");
-  }
   return;
 }
 mDomChildren.remove(index).parent = null;
@@ -685,7 +683,7 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
 type = TextUtils.isEmpty(result.replacedComponent) ? 
WXBasicComponentType.DIV
 : result.replacedComponent;
 json.put(TYPE, type);
-if (WXEnvironment.isApkDebugable() && result.validateInfo != null) 
{
+if (result.validateInfo != null) {
   String tag = "[WXDomObject]onComponentValidate failure. >>> " + 
result.validateInfo.toJSONString();
   WXLogUtils.e(tag);
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
index 9f35263..3fcedcb 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
@@ -96,9 +96,7 @@ public abstract class AbstractAddElementAction extends 
TraceableAction implement
 Stopwatch.split("parseDomObject");
 
 if (domObject == null || context.getDomByRef(domObject.getRef()) != null) {
-  if (WXEnvironment.isApkDebugable()) {
-WXLogUtils.e("[DOMActionContextImpl] " + getStatementName() + " 
error,DOM object is null or already registered!!");
-  }
+  WXLogUtils.e("[DOMActionContextImpl] " + getStatementName() + " 
error,DOM object is null or already registered!!");
   instance.commitUTStab(IWXUserTrackAdapter.DOM_MODULE, errCode);
   return;
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
index 4323821..4f9712f 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
@@ -59,11 +59,9 @@ public class WXComponentFactory {
 
 IFComponentHolder holder = 
WXComponentRegistry.getComponent(node.getType());
 if (holder == null) {
-  if (WXEnvironment.isApkDebugable()) {
 String tag = "WXComponentFactory error type:[" +
 node.getType() + "]" + " class not found";
 WXLogUtils.e(tag);
-  }
   //For compatible reason of JS framework, unregistered type will be 
treated as container.
   holder = 
WXComponentRegistry.getComponent(WXBasicComponentType.CONTAINER);
   if(holder == null){

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/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 1f2b4b1..ae6e623 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
@@ -71,13 +71,17 @@ public class WXLogUtils {
   }
 
   private static void log(String tag, String msg, LogLevel level){
-if (WXEnvironment.isApkDebugable() && msg != null && 
WXEnvironment.sLogLevel.compare(level) >= 0) {
-  Log.println(level.getPriority(),tag, msg);
-  writeConsoleLog(level.getName(), msg);
-  sendLog(level, msg);
-}
-if (sLogWatcher != null) {
-  sLogWatcher.onLog(level.getName(), tag, msg);
+if (msg != null && WXEnvironment.sLogLevel.compare(level) >= 0) {
+  if (sLogWatcher != null ) {
+sLogWatcher.onLog(level.getName(), tag, msg);
+  }else{
+

[25/50] [abbrv] incubator-weex git commit: * [ios] set default value to nil when the configuration is empty

[gurisxie]

* [ios] set default value to nil when the configuration is empty


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/43762056
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/43762056
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/43762056

Branch: refs/heads/master
Commit: 4376205615fdcbd4fd9f118a02961e074eb057bf
Parents: 9833852
Author: acton393 
Authored: Wed Oct 11 11:45:45 2017 +0800
Committer: acton393 
Committed: Wed Oct 11 11:45:45 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/43762056/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index b7a522a..fafc41d 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -122,9 +122,13 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 
 if (attributes[@"alwaysScrollableVertical"]) {
 _alwaysScrollableVertical = [WXConvert 
NSString:attributes[@"alwaysScrollableVertical"]];
+}else {
+_alwaysScrollableVertical = nil;
 }
 if (attributes[@"alwaysScrollableHorizontal"]) {
 _alwaysScrollableHorizontal = [WXConvert 
NSString:attributes[@"alwaysScrollableHorizontal"]];
+} else {
+_alwaysScrollableHorizontal = nil;
 }
 _pagingEnabled = attributes[@"pagingEnabled"] ? [WXConvert 
BOOL:attributes[@"pagingEnabled"]] : NO;
 _loadMoreOffset = attributes[@"loadmoreoffset"] ? [WXConvert 
WXPixelType:attributes[@"loadmoreoffset"] 
scaleFactor:self.weexInstance.pixelScaleFactor] : 0;

[19/50] [abbrv] incubator-weex git commit: improve textdom and refactor template cache and render function

[gurisxie]

improve textdom and refactor template cache and render function


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6849d52f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6849d52f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6849d52f

Branch: refs/heads/master
Commit: 6849d52f5331ed9b16b94cd03c2bf927b28af213
Parents: 7cc450d
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Wed Sep 27 11:06:45 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 12:02:29 2017 +0800

--
 .../taobao/weex/bridge/NativeInvokeHelper.java  |   2 +-
 .../main/java/com/taobao/weex/dom/WXAttr.java   |   6 +
 .../com/taobao/weex/dom/WXCellDomObject.java|  11 +
 .../java/com/taobao/weex/dom/WXDomManager.java  |   4 +
 .../java/com/taobao/weex/dom/WXDomObject.java   |   7 +-
 .../taobao/weex/dom/WXRecyclerDomObject.java|  47 +-
 .../com/taobao/weex/dom/WXTextDomObject.java|  31 +-
 .../com/taobao/weex/dom/binding/ELUtils.java|   2 +
 .../java/com/taobao/weex/dom/flex/CSSNode.java  |  14 +-
 .../taobao/weex/ui/component/WXComponent.java   |  10 +-
 .../weex/ui/component/binding/Layouts.java  |  53 ++-
 .../weex/ui/component/binding/Statements.java   | 103 +++--
 .../ui/component/list/BasicListComponent.java   |   1 -
 .../taobao/weex/ui/component/list/WXCell.java   |  30 ++
 .../list/template/CellLifecycleManager.java | 211 -
 .../component/list/template/DomTreeBuilder.java |  83 
 .../component/list/template/TemplateCache.java  |  30 ++
 .../list/template/TemplateViewHolder.java   |   2 +
 .../list/template/WXRecyclerTemplateList.java   | 443 ---
 .../ui/component/binding/StatementTest.java |   8 +-
 20 files changed, 654 insertions(+), 444 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6849d52f/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java
index 98381b5..73255db 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java
@@ -47,7 +47,7 @@ public final class NativeInvokeHelper {
   try {
 invoker.invoke(target, params);
   } catch (Exception e) {
-throw new RuntimeException(e);
+throw new RuntimeException(target + "Invoker " + 
invoker.toString() ,e);
   }
 }
   }, 0);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6849d52f/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
index c3b0399..b05d46d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
@@ -19,6 +19,7 @@
 package com.taobao.weex.dom;
 
 import static com.taobao.weex.dom.binding.ELUtils.COMPONENT_PROPS;
+import static com.taobao.weex.dom.binding.ELUtils.EXCLUDES_BINDING;
 import static java.lang.Boolean.parseBoolean;
 
 import android.support.annotation.NonNull;
@@ -477,6 +478,11 @@ public class WXAttr implements Map<String, 
Object>,Cloneable {
   ELUtils.bindingBlock(value);
   return  false;
 }
+for(String exclude : EXCLUDES_BINDING){
+ if(key.equals(exclude)){
+return  false;
+ }
+}
 if(ELUtils.isBinding(value)){
   if(mBindingAttrs == null){
   mBindingAttrs = new ArrayMap<String, Object>();

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6849d52f/android/sdk/src/main/java/com/taobao/weex/dom/WXCellDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXCellDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXCellDomObject.java
index 6d50ab6..649a09d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXCellDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXCellDomObject.java
@@ -41,11 +41,22 @@ public class WXCellDomObject extends WXDomObject {
   if (WXBasicComponentType.CELL.equals(domObject.getType())
   || 
WXBasicComponentType.CELL_SLOT.equals(domObject.getType())) {
 float w = ((WXRecyclerDomObject) parent).getColumnWidth();
+if(

[01/50] [abbrv] incubator-weex git commit: * [ios] fire accessibilityMagicTap Event

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/master b7383a416 -> 556cc0683


* [ios] fire accessibilityMagicTap Event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/52cfd68d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52cfd68d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52cfd68d

Branch: refs/heads/master
Commit: 52cfd68de679d7b0423ee2e7d2cab80b49d77b72
Parents: 06d160b
Author: acton393 <zhangxing610...@gmail.com>
Authored: Tue Oct 3 16:02:03 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 4 16:21:38 2017 +0800

--
 ios/sdk/WeexSDK/Sources/View/WXView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52cfd68d/ios/sdk/WeexSDK/Sources/View/WXView.m
--
diff --git a/ios/sdk/WeexSDK/Sources/View/WXView.m 
b/ios/sdk/WeexSDK/Sources/View/WXView.m
index 397ece3..5e099c3 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXView.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXView.m
@@ -65,7 +65,7 @@
 - (BOOL)accessibilityPerformMagicTap
 {
 if (self.wx_component->_accessibilityMagicTapEvent) {
-[self.wx_component fireEvent:@"accessibilityPerformMagicTap" 
params:nil];
+[self.wx_component fireEvent:@"accessibilityMagicTap" params:nil];
 }
 return [super accessibilityPerformMagicTap];
 }

[08/50] [abbrv] incubator-weex git commit: * [jsfm] upgrade weex-js-framework to 0.22.5

[gurisxie]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5b506f6/pre-build/native-bundle-main.js
--
diff --git a/pre-build/native-bundle-main.js b/pre-build/native-bundle-main.js
index d43b6ec..c5d06cf 100644
--- a/pre-build/native-bundle-main.js
+++ b/pre-build/native-bundle-main.js
@@ -1,8 +1,8 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.22.4, 
Build 2017-09-25 11:20."),this.getJSFMVersion=function(){return"0.22.4"};var 
global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof
 exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";function 
e(e){Hn.Document=e.Document,Hn.Element=e.Element,Hn.Comment=e.Comment,Hn.sendTasks=e.sendTasks}function
 t(e,t,n,r,o){void 0===n&&(n={}),void 0===r&&(r={}),void 0===o&&(o={});var 
i=new 
Hn.Document(e,n.bundleUrl),a={},s={id:e,data:r,document:i,callbacks:a},u=0;i.addCallback=function(e){return
 u++,a[u]=e,u},i.handleCallback=function(e,t,n){var r=a[e];return n& 
a[e],r(t)},Gn[e]=s;var 
c=Object.assign({Document:Hn.Document,Element:Hn.Element,Comment:Hn.Comment,sendTasks:function(t){return
 Hn.sendTasks(e,t,-1)},options:n,document:i},o),l=[],f=[];for(var p in 
c)l.push(p),f.push(c[p]);return l.push(t),(new(Function.prototy
 pe.bind.apply(Function,[null].concat(l.apply(void 
0,f),Hn.sendTasks(e,[{module:"dom",method:"createFinish",args:[]}],-1),s}function
 n(e){delete Gn[e]}function r(e){return Gn[e].document.body.toJSON()}function 
o(e,t){var n={fireEvent:function(e,t,n,r,o){var 
i=Gn[e],a=i.document,s=a.getRef(t);return 
a.fireEvent(s,n,r,o)},callback:function(e,t,n,r){return 
Gn[e].document.handleCallback(t,n,r)}};if((Gn[e]||{}).document&(t)){var
 r=[];return t.forEach(function(t){var 
o=n[t.method],i=[].concat(t.args);"function"==typeof 
o&&(i.unshift(e),r.push(o.apply(void 0,i)))}),r}}function i(e){return 
e&__esModule?e.default:e}function a(e,t){return 
t={exports:{}},e(t,t.exports),t.exports}function s(e){console.warn("[JS 
Framework] Vm#$ is deprecated, please use Vm#$vm instead");var 
t=this._ids[e];if(t)return t.vm}function u(e){var t=this._ids[e];if(t)return 
t.el}function c(e){var t=this._ids[e];if(t)return t.vm}function l(e){return 
this._app.differ.then(function(){e()})}function f(e,
 t){console.warn("[JS Framework] Vm#$scrollTo is deprecated, please use 
\"require('@weex-module/dom').scrollTo(el, options)\" instead");var 
n=this.$el(e);if(n){this._app.requireModule("dom").scrollToElement(n.ref,{offset:t})}}function
 p(e,t,n){var 
r=this,o=this.$el(e);if(o&&){this._app.requireModule("animation").transition(o.ref,t,function(){for(var
 
e=[],i=arguments.length;i--;)e[i]=arguments[i];r._setStyle(o,t.styles),n&(void
 0,e)})}}function d(e){var t=this._app.options;return"function"==typeof 
e&&(console.warn("[JS Framework] the callback of Vm#$getConfig(callback) is 
deprecated, this api now can directly RETURN config info."),e(t)),t}function 
h(e,t){console.warn("[JS Framework] Vm#$sendHttp is deprecated, please use 
\"require('@weex-module/stream').sendHttp(params, callback)\" 
instead"),this._app.requireModule("stream").sendHttp(e,t)}function 
v(e){console.warn("[JS Framework] Vm#$openURL is deprecated, please use 
\"require('@weex-module/event').openURL(url)\" i
 nstead"),this._app.requireModule("event").openURL(e)}function 
y(e){console.warn("[JS Framework] Vm#$setTitle is deprecated, please use 
\"require('@weex-module/pageInfo').setTitle(title)\" 
instead"),this._app.requireModule("pageInfo").setTitle(e)}function 
m(e,t){for(var n=[],r=arguments.length-2;r-- 
>0;)n[r]=arguments[r+2];console.warn("[JS Framework] Vm#$call is deprecated, 
please use \"require('@weex-module/moduleName')\" instead");var 
o=this._app.requireModule(e);o&[t]&[t].apply(o,n)}function _(e){for(var 
t=[],n=arguments.length-1;n-- >0;)t[n]=arguments[n+1];if("function"==typeof 
Object.assign)Object.assign.apply(Object,[e].concat(t));else{var 
r=t.shift();for(var o in r)e[o]=r[o];t.length&&_.apply(void 
0,[e].concat(t))}return e}function 
g(e,t,n,r){Object.defineProperty(e,t,{value:n,enumerable:!!r,writable:!0,configurable:!0})}function
 b(e,t){if(e.length){var n=e.indexOf(t);if(n>-1)return e.splice(n,1)}}function 
w(e,t){return hr.call(e,t)}function x(e,t){return function(n){var 
 r=arguments.length;return 
r?r>1?e.apply(t,arguments):e.call(t,n):e.call(t)}}function E(e){return 
null!==e&&"object"==typeof e}function O(e){return vr.call(e)===yr}function 
S(e){var t=(e+"").charCodeAt(0);return 36===t||95===t}function 
C(){return"object"==typeof nativeSet?nativeSet.create():new Jn}function 
k(e){var t=Object.prototype.toString.call(e);return 
t.substring(8,t.length-1).toLowerCase()}function j(e){return 
e.replace(_r,"").replace(gr,"")}function A(e){return e.replace(wr,"")}function 
I(){this.id=Cr++,this.subs=[]}function 
T(e){I.target&(I.target),I.target=e}function 
N(){I.target=kr.pop()}function 

[32/50] [abbrv] incubator-weex git commit: * [android] format debug log

[gurisxie]

 * [android] format debug log


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e5604834
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e5604834
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e5604834

Branch: refs/heads/master
Commit: e5604834adc1538a6a272f5d36d2db86bb323066
Parents: e803099
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Fri Oct 13 14:44:49 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 16 14:08:05 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22616 -> 22556 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 341824 -> 335100 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e5604834/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index 1330933..c46e857 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e5604834/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 4e76388..ec98d07 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e5604834/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 544d41d..5a8809c 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[16/50] [abbrv] incubator-weex git commit: reduce unused code and reuse hashmap

[gurisxie]

reduce unused code and reuse hashmap


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d5c7253f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d5c7253f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d5c7253f

Branch: refs/heads/master
Commit: d5c7253f142df6520a4708202511924453921e64
Parents: 9c1f298
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Mon Oct 9 19:52:50 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 12:02:29 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 6 +-
 .../sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java | 2 +-
 .../sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java| 2 +-
 .../main/java/com/taobao/weex/ui/component/WXComponent.java| 2 +-
 .../java/com/taobao/weex/ui/component/binding/Statements.java  | 1 +
 5 files changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d5c7253f/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index f990792..782b16c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -138,9 +138,6 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
 return mRef;
   }
 
-  public void setRef(String ref) {
-this.mRef = ref;
-  }
 
   public String getType(){
 return mType;
@@ -169,7 +166,6 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
   }
 
 
-
   public @NonNull DomContext getDomContext() {
 return mDomContext;
   }
@@ -466,7 +462,7 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
 super.dirty();
   }
 
-  /** package **/public void applyStyleToNode() {
+  /** package **/ void applyStyleToNode() {
 WXStyle stylesMap = getStyles();
 int vp = getViewPortWidth();
 if (!stylesMap.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d5c7253f/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
index 749afbd..e9a5c79 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
@@ -175,7 +175,7 @@ public class WXTextDomObject extends WXDomObject {
 spanned = createSpanned(mText);
 if(hasNewLayout()){
 if(WXEnvironment.isApkDebugable()) {
-  WXLogUtils.w("TextDom", new IllegalStateException("Previous 
csslayout was ignored! markLayoutSeen() never called"));
+  WXLogUtils.d("Previous csslayout was ignored! markLayoutSeen() never 
called");
 }
 markUpdateSeen();
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d5c7253f/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
index 79ba6e5..624c4c9 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
@@ -173,7 +173,7 @@ public class CSSNode {
   return;
 } else if (mLayoutState == LayoutState.HAS_NEW_LAYOUT) {
   if(WXEnvironment.isApkDebugable()){
-  WXLogUtils.w("weex",  new IllegalStateException("Previous csslayout 
was ignored! markLayoutSeen() never called"));
+  WXLogUtils.d("Previous csslayout was ignored! markLayoutSeen() never 
called");
   }
   markLayoutSeen();
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d5c7253f/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 1d64d5d..d801290 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
@@ -337,7 +337,7 @@ pub

[02/50] [abbrv] incubator-weex git commit: * [ios] support accessibility magic Tap event

[gurisxie]

* [ios] support accessibility magic Tap event


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/06d160be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/06d160be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/06d160be

Branch: refs/heads/master
Commit: 06d160befb9e708628fcf78ce2de3392c49939d8
Parents: 927cc65
Author: acton393 <zhangxing610...@gmail.com>
Authored: Mon Oct 2 15:09:01 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 4 16:21:38 2017 +0800

--
 .../WeexSDK/Sources/Component/WXComponent_internal.h |  2 ++
 ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m  | 15 ++-
 ios/sdk/WeexSDK/Sources/View/WXView.m|  9 +
 3 files changed, 25 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/06d160be/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h 
b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
index 5d9b687..f1163a9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -72,6 +72,8 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL 
*needUpdate);
 NSString * _accessibilityHintContent; // hint for the action
 NSString * _testId;// just for auto-test
 
+BOOL _accessibilityMagicTapEvent;
+
 /**
  *  PseudoClass
  */

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/06d160be/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m 
b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
index 6247f07..2c343f4 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
@@ -172,6 +172,7 @@ if ([removeEventName isEqualToString:@#eventName]) {\
 WX_ADD_EVENT(touchmove, addTouchMoveEvent)
 WX_ADD_EVENT(touchend, addTouchEndEvent)
 WX_ADD_EVENT(touchcancel, addTouchCancelEvent)
+WX_ADD_EVENT(accessibilityMagicTap, addAccessibilityMagicTapEvent)
 
 if(_isListenPseudoTouch) {
 self.touchGesture.listenPseudoTouch = YES;
@@ -200,7 +201,7 @@ if ([removeEventName isEqualToString:@#eventName]) {\
 WX_REMOVE_EVENT(touchmove, removeTouchMoveEvent)
 WX_REMOVE_EVENT(touchend, removeTouchEndEvent)
 WX_REMOVE_EVENT(touchcancel, removeTouchCancelEvent)
-
+WX_REMOVE_EVENT(accessibilityMagicTap, removeAccessibilityMagicTapEvent)
 if(_isListenPseudoTouch) {
 self.touchGesture.listenPseudoTouch = NO;
 }
@@ -259,6 +260,18 @@ if ([removeEventName isEqualToString:@#eventName]) {\
 [self checkRemoveTouchGesture];
 }
 
+#pragma mark - Accessibility Event
+
+- (void)addAccessibilityMagicTapEvent
+{
+_accessibilityMagicTapEvent = YES;
+}
+
+- (void)removeAccessibilityMagicTapEvent
+{
+_accessibilityMagicTapEvent = NO;
+}
+
 #pragma mark - Click Event
 
 - (void)addClickEvent

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/06d160be/ios/sdk/WeexSDK/Sources/View/WXView.m
--
diff --git a/ios/sdk/WeexSDK/Sources/View/WXView.m 
b/ios/sdk/WeexSDK/Sources/View/WXView.m
index 4619ef1..397ece3 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXView.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXView.m
@@ -20,6 +20,7 @@
 #import "WXView.h"
 #import "WXComponent.h"
 #import "WXLayer.h"
+#import "WXComponent_internal.h"
 
 @implementation WXView
 
@@ -61,4 +62,12 @@
 return nil;
 }
 
+- (BOOL)accessibilityPerformMagicTap
+{
+if (self.wx_component->_accessibilityMagicTapEvent) {
+[self.wx_component fireEvent:@"accessibilityPerformMagicTap" 
params:nil];
+}
+return [super accessibilityPerformMagicTap];
+}
+
 @end

[46/50] [abbrv] incubator-weex git commit: * [test] update border base png

[gurisxie]

* [test] update border base png


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0ea259d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0ea259d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0ea259d0

Branch: refs/heads/master
Commit: 0ea259d0b259295ea4f15a207dc672a17bfa14de
Parents: f3bfa02
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 19:31:11 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 19:31:11 2017 +0800

--
 test/screenshot/border-android.png | Bin 0 -> 164260 bytes
 test/screenshot/border-ios.png | Bin 128088 -> 129071 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ea259d0/test/screenshot/border-android.png
--
diff --git a/test/screenshot/border-android.png 
b/test/screenshot/border-android.png
new file mode 100644
index 000..d774b6b
Binary files /dev/null and b/test/screenshot/border-android.png differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ea259d0/test/screenshot/border-ios.png
--
diff --git a/test/screenshot/border-ios.png b/test/screenshot/border-ios.png
old mode 100755
new mode 100644
index 2bacdd3..992ea7d
Binary files a/test/screenshot/border-ios.png and 
b/test/screenshot/border-ios.png differ

[38/50] [abbrv] incubator-weex git commit: * [ios] web filter error

[gurisxie]

* [ios] web filter error


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f2d82803
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f2d82803
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f2d82803

Branch: refs/heads/master
Commit: f2d828037d255c22f407d8ee8eba4f11c73ea363
Parents: f4bfd22
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 14:02:01 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 14:02:01 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f2d82803/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index f66bd11..792d4c9 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@ -200,6 +200,9 @@ WX_EXPORT_METHOD(@selector(goForward))
 NSMutableDictionary *data = [self baseInfo];
 [data setObject:[error localizedDescription] forKey:@"errorMsg"];
 [data setObject:[NSString stringWithFormat:@"%ld", (long)error.code] 
forKey:@"errorCode"];
+if(error.userInfo && 
![error.userInfo[NSURLErrorFailingURLStringErrorKey] hasPrefix:@"http"]){
+return;
+}
 [self fireEvent:@"error" params:data];
 }
 }

[29/50] [abbrv] incubator-weex git commit: * [android] update so delete some debug log

[gurisxie]

 * [android] update so
 delete some debug log


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/05214a79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/05214a79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/05214a79

Branch: refs/heads/master
Commit: 05214a79dc115db0c7fc05debe0c6abae51f876e
Parents: 35a03a8
Author: yuhun-alibaba 
Authored: Thu Oct 12 11:47:06 2017 +0800
Committer: yuhun-alibaba 
Committed: Thu Oct 12 11:47:06 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22616 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 342264 -> 341824 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05214a79/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index 2d3b7b4..1330933 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05214a79/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index d4009b8..4e76388 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05214a79/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index f0bb8d4..544d41d 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[35/50] [abbrv] incubator-weex git commit: * [android] modify log print

[gurisxie]

* [android] modify log print


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b5126471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b5126471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b5126471

Branch: refs/heads/master
Commit: b5126471d1b3d9ab04e1c1e39cc636079c47cf58
Parents: 8cebed4
Author: zshshr 
Authored: Tue Oct 10 12:06:33 2017 +0800
Committer: zshshr 
Committed: Tue Oct 17 10:56:05 2017 +0800

--
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   6 +
 .../com/taobao/weex/bridge/WXBridgeManager.java | 993 +--
 .../java/com/taobao/weex/dom/WXDomObject.java   |   4 +-
 .../dom/action/AbstractAddElementAction.java|   4 +-
 .../weex/ui/component/WXComponentFactory.java   |   2 -
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  24 +-
 6 files changed, 513 insertions(+), 520 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index 3a287cc..0296379 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -93,6 +93,7 @@ import com.taobao.weex.ui.module.WXMetaModule;
 import com.taobao.weex.ui.module.WXModalUIModule;
 import com.taobao.weex.ui.module.WXTimerModule;
 import com.taobao.weex.ui.module.WXWebViewModule;
+import com.taobao.weex.utils.LogLevel;
 import com.taobao.weex.utils.WXLogUtils;
 import com.taobao.weex.utils.WXSoInstallMgrSdk;
 import com.taobao.weex.utils.batch.BatchOperationHelper;
@@ -158,6 +159,11 @@ public class WXSDKEngine {
   }
   long start = System.currentTimeMillis();
   WXEnvironment.sSDKInitStart = start;
+  if(WXEnvironment.isApkDebugable()){
+WXEnvironment.sLogLevel = LogLevel.DEBUG;
+  }else{
+WXEnvironment.sLogLevel = LogLevel.WARN;
+  }
   doInitInternal(application,config);
   WXEnvironment.sSDKInitInvokeTime = System.currentTimeMillis()-start;
   WXLogUtils.renderPerformanceLog("SDKInitInvokeTime", 
WXEnvironment.sSDKInitInvokeTime);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 713c4c2..c44d7af 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -84,26 +84,26 @@ import static 
com.taobao.weex.bridge.WXModuleManager.getDomModule;
 /**
  * Manager class for communication between JavaScript and Android.
  * 
- *   
- * Handle Android to JavaScript call, can be one of the following
- * 
- *   {@link #createInstance(String, String, Map, String)}
- *   {@link #destroyInstance(String)}
- *   {@link #refreshInstance(String, WXRefreshData)}
- *   {@link #registerModules(Map)}
- *   {@link #registerComponents(List)}
- *   {@link #invokeCallJSBatch(Message)}
- * 
- *   
- *   
- * Handle JavaScript to Android call
- *   
- *   
- * Handle next tick of message.
- *   
+ * 
+ * Handle Android to JavaScript call, can be one of the following
+ * 
+ * {@link #createInstance(String, String, Map, String)}
+ * {@link #destroyInstance(String)}
+ * {@link #refreshInstance(String, WXRefreshData)}
+ * {@link #registerModules(Map)}
+ * {@link #registerComponents(List)}
+ * {@link #invokeCallJSBatch(Message)}
+ * 
+ * 
+ * 
+ * Handle JavaScript to Android call
+ * 
+ * 
+ * Handle next tick of message.
+ * 
  * 
  */
-public class WXBridgeManager implements Callback,BactchExecutor {
+public class WXBridgeManager implements Callback, BactchExecutor {
 
   public static final String METHOD_CREATE_INSTANCE = "createInstance";
   public static final String METHOD_DESTROY_INSTANCE = "destroyInstance";
@@ -129,33 +129,28 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   public static final String KEY_PARAMS = "params";
   public static final String ARGS = "args";
   public static final String OPTIONS = "options";
+  public static final String INITLOGFILE = "/jsserver_start.log";
   private static final String NON_CALLBACK = "-1";
   private static final String UNDEFINED = "undefined";
-
   private static final int INIT_FRAMEWORK_OK = 1;
-
-  

[13/50] [abbrv] incubator-weex git commit: * [ios] update image load performance

[gurisxie]

* [ios] update image load performance


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e9ea1b27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e9ea1b27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e9ea1b27

Branch: refs/heads/master
Commit: e9ea1b27953be6b564b69ec825cb601cc634e0c2
Parents: 31eb130
Author: acton393 <zhangxing610...@gmail.com>
Authored: Mon Oct 9 21:39:16 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 9 21:48:49 2017 +0800

--
 .../Sources/Component/WXImageComponent.m| 89 ++--
 1 file changed, 45 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e9ea1b27/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index 90c29a1..4cbe4da 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -336,14 +336,17 @@ WX_EXPORT_METHOD(@selector(save:))
 
 - (void)setImageSrc:(NSString*)src
 {
-pthread_mutex_lock(&(_imageSrcMutex));
-if (![src isEqualToString:_imageSrc]) {
-_imageSrc = src;
-_imageDownloadFinish = NO;
-((UIImageView*)self.view).image = nil;
-[self updateImage];
+if ([src isEqualToString:_imageSrc]) {
+// if image src is equal to then ignore it.
+return;
 }
+pthread_mutex_lock(&(_imageSrcMutex));
+_imageSrc = src;
+_imageDownloadFinish = NO;
+((UIImageView*)self.view).image = nil;
 pthread_mutex_unlock(&(_imageSrcMutex));
+
+[self updateImage];
 }
 
 - (void)updateImage
@@ -426,45 +429,43 @@ WX_EXPORT_METHOD(@selector(save:))
 NSString * newURL = [imageSrc copy];
 WX_REWRITE_URL(imageSrc, WXResourceTypeImage, self.weexInstance)
 __weak typeof(self) weakSelf = self;
-dispatch_async(dispatch_get_main_queue(), ^{
-weakSelf.imageOperation = [[weakSelf imageLoader] 
downloadImageWithURL:newURL imageFrame:weakSelf.calculatedFrame 
userInfo:userInfo completed:^(UIImage *image, NSError *error, BOOL finished) {
-dispatch_async(dispatch_get_main_queue(), ^{
-__strong typeof(self) strongSelf = weakSelf;
-
-if (strongSelf.imageLoadEvent) {
-NSMutableDictionary *sizeDict = [NSMutableDictionary new];
-sizeDict[@"naturalWidth"] = @0;
-sizeDict[@"naturalHeight"] = @0;
-if (!error) {
-sizeDict[@"naturalWidth"] = @(image.size.width * 
image.scale);
-sizeDict[@"naturalHeight"] = @(image.size.height * 
image.scale);
-} else {
-[sizeDict setObject:[error description]?:@"" 
forKey:@"errorDesc"];
-}
-[strongSelf fireEvent:@"load" params:@{ @"success": error? 
@false : @true,@"size":sizeDict}];
-}
-if (error) {
-downloadFailedBlock(imageSrc, error);
-[strongSelf readyToRender];
-return ;
-}
-
-if (![imageSrc isEqualToString:strongSelf.imageSrc]) {
-return ;
-}
-
-if ([strongSelf isViewLoaded]) {
-strongSelf.imageDownloadFinish = YES;
-((UIImageView *)strongSelf.view).image = image;
-[strongSelf readyToRender];
-} else if (strongSelf->_isCompositingChild) {
-strongSelf.imageDownloadFinish = YES;
-strongSelf->_image = image;
-[strongSelf setNeedsDisplay];
+weakSelf.imageOperation = [[weakSelf imageLoader] 
downloadImageWithURL:newURL imageFrame:weakSelf.calculatedFrame 
userInfo:userInfo completed:^(UIImage *image, NSError *error, BOOL finished) {
+dispatch_async(dispatch_get_main_queue(), ^{
+__strong typeof(self) strongSelf = weakSelf;
+
+if (strongSelf.imageLoadEvent) {
+NSMutableDictionary *sizeDict = [NSMutableDictionary new];
+sizeDict[@"naturalWidth"] = @0;
+sizeDict[@"naturalHeight"] = @0;
+if (!error) {
+sizeDict[@"naturalWidth"] = @(image.size.width * 
image.scale);
+sizeDict[@"

[31/50] [abbrv] incubator-weex git commit: * [android] first startup, if jsf work not ready, report exception and use h5 render

[gurisxie]

 * [android] first startup, if jsf work not ready, report exception and use h5 
render


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4330ad65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4330ad65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4330ad65

Branch: refs/heads/master
Commit: 4330ad658da8c55a7659592f9d664ebb818d1f99
Parents: e560483
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Sat Oct 14 20:03:26 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 16 14:08:05 2017 +0800

--
 .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4330ad65/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 70dfc90..713c4c2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1378,8 +1378,8 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   return;
 }
 
-// 如果没有初始化尽快返回Exception，并且异步初始化
-if (!isJSFrameworkInit()) {
+// 
如果首次启动没初始化尽快返回Exception，并且异步初始化
+if (!isJSFrameworkInit() && reInitCount == 1) {
   instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, 
"createInstance fail!");
   post(new Runnable() {
 @Override

[39/50] [abbrv] incubator-weex git commit: resolve conflicts

[gurisxie]

resolve  conflicts


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0ed86c7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0ed86c7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0ed86c7e

Branch: refs/heads/master
Commit: 0ed86c7e66a164ba26fac016b2d4e9632332fdbe
Parents: f2d8280
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Tue Oct 17 11:15:53 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 15:25:12 2017 +0800

--
 .../taobao/weex/ui/component/list/WXCell.java   | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ed86c7e/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
index 4fe4bc2..c329e99 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
@@ -61,6 +61,13 @@ public class WXCell extends WidgetContainer {
 
 private boolean hasLayout = false;
 
+private Object  renderData;
+
+private boolean isSourceUsed = false;
+
+private boolean hasLayout = false;
+
+
 @Deprecated
 public WXCell(WXSDKInstance instance, WXDomObject dom, WXVContainer 
parent, String instanceId, boolean isLazy) {
 super(instance, dom, parent);
@@ -208,4 +215,29 @@ public class WXCell extends WidgetContainer 
{
 public void setHasLayout(boolean hasLayout) {
 this.hasLayout = hasLayout;
 }
+
+public Object getRenderData() {
+return renderData;
+}
+
+public void setRenderData(Object renderData) {
+this.renderData = renderData;
+}
+
+public boolean isSourceUsed() {
+return isSourceUsed;
+}
+
+public void setSourceUsed(boolean sourceUsed) {
+isSourceUsed = sourceUsed;
+}
+
+public boolean isHasLayout() {
+return hasLayout;
+}
+
+public void setHasLayout(boolean hasLayout) {
+this.hasLayout = hasLayout;
+}
+
 }

[06/50] [abbrv] incubator-weex git commit: Merge branch 'master' into release-0.16

[gurisxie]

Merge branch 'master' into release-0.16


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cab09cee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cab09cee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cab09cee

Branch: refs/heads/master
Commit: cab09ceef683df551d505f0442aadbe0591ee14b
Parents: 4622633 cbe3682
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 4 16:59:51 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 4 16:59:51 2017 +0800

--
 WeexSDK.podspec  |  2 +-
 .../Component/RecycleList/WXRecycleListComponent.m   |  7 ---
 .../Sources/Component/Recycler/WXRecyclerComponent.m |  7 ---
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m  |  7 ---
 .../WeexSDK/Sources/Component/WXScrollerComponent.m  | 15 +++
 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h   |  2 +-
 6 files changed, 9 insertions(+), 31 deletions(-)
--

[07/50] [abbrv] incubator-weex git commit: * [ios] bugfix scroll event not valid

[gurisxie]

* [ios] bugfix scroll event not valid


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/767d4ece
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/767d4ece
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/767d4ece

Branch: refs/heads/master
Commit: 767d4eceb57f1145cff42726ee16234cfa1abbcb
Parents: cab09ce
Author: gurisxie <279483...@qq.com>
Authored: Mon Oct 9 16:32:56 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 9 16:32:56 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/767d4ece/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index ae43cd6..88c934c 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -521,7 +521,7 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 distance = scrollView.contentOffset.y - 
_lastScrollEventFiredOffset.y;
 }
 if (fabs(distance) >= _offsetAccuracy) {
-//[self fireEvent:@"scroll" 
params:@{@"contentSize":contentSizeData,@"contentOffset":contentOffsetData} 
domChanges:nil];
+[self fireEvent:@"scroll" 
params:@{@"contentSize":contentSizeData,@"contentOffset":contentOffsetData} 
domChanges:nil];
 _lastScrollEventFiredOffset = scrollView.contentOffset;
 }
 }

[18/50] [abbrv] incubator-weex git commit: remove cell-slot from recycler-list dom tree reduce layout and create component time, layout async always and dom support clone this

[gurisxie]

remove cell-slot from recycler-list dom tree reduce layout and create component 
time, layout async always and dom support clone this


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9c1f2983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9c1f2983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9c1f2983

Branch: refs/heads/master
Commit: 9c1f2983e126f25956e3720b1149e1a633ea941b
Parents: 6849d52
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Tue Oct 3 20:19:24 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 12:02:29 2017 +0800

--
 .../java/com/taobao/weex/dom/WXDomObject.java   | 13 +++
 .../taobao/weex/dom/WXRecyclerDomObject.java|  3 ++
 .../com/taobao/weex/dom/WXTextDomObject.java|  7 +++-
 .../taobao/weex/ui/component/WXComponent.java   | 24 +---
 .../weex/ui/component/binding/Layouts.java  | 25 +++-
 .../component/list/template/DomTreeBuilder.java | 33 
 .../list/template/WXRecyclerTemplateList.java   | 41 +++-
 7 files changed, 94 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9c1f2983/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 8398a2d..f990792 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -104,6 +104,8 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
   public long mDomThreadNanos;
   public long mDomThreadTimestamp;
 
+  private  boolean cloneThis = false;
+
   public void traverseTree(Consumer...consumers){
 long startNanos = System.nanoTime();
 if (consumers == null) {
@@ -598,6 +600,9 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
 if (sDestroy.get()) {
   return null;
 }
+if(cloneThis){
+  return  this;
+}
 WXDomObject dom = null;
 try {
   dom = WXDomObjectFactory.newInstance(mType);
@@ -722,4 +727,12 @@ public class WXDomObject extends CSSNode implements 
Cloneable,ImmutableDomObject
   public interface Consumer{
 void accept(WXDomObject dom);
   }
+
+  public boolean isCloneThis() {
+return cloneThis;
+  }
+
+  public void setCloneThis(boolean cloneThis) {
+this.cloneThis = cloneThis;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9c1f2983/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
index 11918e8..805ef8e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
@@ -225,6 +225,9 @@ public class WXRecyclerDomObject extends WXDomObject{
 
 @Override
 public WXDomObject clone() {
+if(isCloneThis()){
+return  this;
+}
 WXRecyclerDomObject domObject = (WXRecyclerDomObject) super.clone();
 domObject.cellList = cellList;
 return domObject;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9c1f2983/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
index bdcfd39..749afbd 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
@@ -174,7 +174,9 @@ public class WXTextDomObject extends WXDomObject {
 updateStyleAndText();
 spanned = createSpanned(mText);
 if(hasNewLayout()){
-WXLogUtils.e("TextDom", new IllegalStateException("Previous csslayout 
was ignored! markLayoutSeen() never called"));
+if(WXEnvironment.isApkDebugable()) {
+  WXLogUtils.w("TextDom", new IllegalStateException("Previous 
csslayout was ignored! markLayoutSeen() never called"));
+}
 markUpdateSeen();
 }
 super.dirty();
@@ -226,6 +228,9 @@ public class WXTextDomObject extends WXDomObject {
 
   @Override
   public WXTextDomObject clone() {
+if(isCloneThis()){
+  return  th

[03/50] [abbrv] incubator-weex git commit: * [test] update travis , for message info

[gurisxie]

* [test] update travis , for message info


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/762f66b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/762f66b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/762f66b8

Branch: refs/heads/master
Commit: 762f66b84f3976270d6fda60301063bf42aa5224
Parents: f2d6a33
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 4 14:34:13 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 4 16:21:39 2017 +0800

--
 .travis.yml   | 4 +---
 dangerfile-android.js | 1 +
 dangerfile-ios.js | 3 +++
 dangerfile-jsfm.js| 1 +
 dangerfile.js | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/762f66b8/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index d0d6fd3..a7bca6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,9 +60,7 @@ before_script:
 script:
   - |
 if [[ $TEST_SUITE = "android" ]]; then
-  cd android
-  ./gradlew clean assembleDebug :weex_sdk:testDebugUnitTest --info 
-PdisableCov=true -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8 &&
-  cd $TRAVIS_BUILD_DIR
+  npm run danger -- run --dangerfile ./dangerfile-android.js
 fi
   - |
 if [[ $TEST_SUITE = "jsfm" ]]; then

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/762f66b8/dangerfile-android.js
--
diff --git a/dangerfile-android.js b/dangerfile-android.js
index 06986df..51ca400 100644
--- a/dangerfile-android.js
+++ b/dangerfile-android.js
@@ -107,3 +107,4 @@ if(hasAndroidFile){
   message('has no android file changed.')
 }
 
+message('android test finished.')

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/762f66b8/dangerfile-ios.js
--
diff --git a/dangerfile-ios.js b/dangerfile-ios.js
index e0c61e1..93c5a1e 100644
--- a/dangerfile-ios.js
+++ b/dangerfile-ios.js
@@ -106,3 +106,6 @@ if(hasIosFile){
   message('has no ios file changed.');
 }
 
+message('ios test finished.')
+
+

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/762f66b8/dangerfile-jsfm.js
--
diff --git a/dangerfile-jsfm.js b/dangerfile-jsfm.js
index 45a6a3c..2f663bd 100644
--- a/dangerfile-jsfm.js
+++ b/dangerfile-jsfm.js
@@ -104,3 +104,4 @@ if(hasJsfmFile){
   message('has no jsfm file changed.');
 }
 
+message('jsfm test finished.')

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/762f66b8/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index 2a7829f..248276a 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -461,7 +461,7 @@ function findBlameReviewers(fileToDeletedLinesMap, 
fileToNormalLinesMap, fileToB
 message("According to the blame info, we recommended " + names.join(' , ') 
+ " to be the reviewers.")
   }
 }
-
+message('danger test finished.')
 /*
  * find reviewer end
  */

[05/50] [abbrv] incubator-weex git commit: Merge branch 'release-0.16' of https://git-wip-us.apache.org/repos/asf/incubator-weex into release-0.16

[gurisxie]

Merge branch 'release-0.16' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into release-0.16


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/46226330
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/46226330
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/46226330

Branch: refs/heads/master
Commit: 46226330b3c644841e3bec923fbdabb597077121
Parents: 762f66b bb1dbef
Author: gurisxie <279483...@qq.com>
Authored: Wed Oct 4 16:23:14 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 4 16:23:14 2017 +0800

--

--

[45/50] [abbrv] incubator-weex git commit: * [android] fix WXLogUtils Log Level

[gurisxie]

* [android] fix WXLogUtils Log Level


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f3bfa02c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f3bfa02c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f3bfa02c

Branch: refs/heads/master
Commit: f3bfa02cdaf7043a6df031504cd324fc4d3cc7c8
Parents: 9a16f8b c9b5c45
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 17:03:39 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 17:03:39 2017 +0800

--
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   6 +
 .../com/taobao/weex/bridge/WXBridgeManager.java | 993 +--
 .../java/com/taobao/weex/dom/WXDomObject.java   |   4 +-
 .../dom/action/AbstractAddElementAction.java|   4 +-
 .../weex/ui/component/WXComponentFactory.java   |   2 -
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  24 +-
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |  16 +-
 7 files changed, 528 insertions(+), 521 deletions(-)
--

[15/50] [abbrv] incubator-weex git commit: fix scroll to bug and add md5 for template

[gurisxie]

fix scroll to bug and  add md5 for template


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e6061d61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e6061d61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e6061d61

Branch: refs/heads/master
Commit: e6061d61674a44968c3581b9ba47612d1976c726
Parents: 361f4b6
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Mon Oct 9 19:19:33 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 10 12:02:28 2017 +0800

--
 .../weex/ui/component/binding/Layouts.java  | 69 ++--
 .../list/template/TemplateViewHolder.java   |  3 +
 .../list/template/WXRecyclerTemplateList.java   |  3 +-
 3 files changed, 53 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e6061d61/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
index bf0abfc..f80bc1e 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java
@@ -20,11 +20,15 @@ package com.taobao.weex.ui.component.binding;
 
 
 
+import android.os.AsyncTask;
+import android.speech.tts.Voice;
+
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.dom.WXDomObject;
 import com.taobao.weex.dom.flex.CSSLayoutContext;
 import com.taobao.weex.ui.component.WXComponent;
 import com.taobao.weex.ui.component.WXVContainer;
+import com.taobao.weex.ui.component.list.template.TemplateViewHolder;
 
 /**
  * Created by furture on 2017/8/21.
@@ -33,34 +37,57 @@ public class Layouts {
 /**
  * do dom layout, and set layout to component
  * */
-public static void doLayout(WXComponent component, CSSLayoutContext 
layoutContext){
+public static void doLayout(final TemplateViewHolder templateViewHolder){
+final CSSLayoutContext layoutContext = 
templateViewHolder.getLayoutContext();
+final WXComponent component = templateViewHolder.getComponent();
 final WXSDKInstance instance = component.getInstance();
-WXDomObject domObject = (WXDomObject) component.getDomObject();
-domObject.traverseTree(new WXDomObject.Consumer() {
+final  int position = templateViewHolder.getHolderPosition();
+if(templateViewHolder.asyncTask != null){
+templateViewHolder.asyncTask.cancel(true);
+}
+AsyncTask<Void, Void, Void> asyncTask = new AsyncTask<Void, Void, 
Void>() {
 @Override
-public void accept(WXDomObject dom) {
-if(instance == null || instance.isDestroy()){
-return;
-}
-if(!dom.hasUpdate()){
-return;
+protected Void doInBackground(Void... params) {
+if(templateViewHolder.getHolderPosition() == position){
+
+WXDomObject domObject = (WXDomObject) 
component.getDomObject();
+domObject.traverseTree(new WXDomObject.Consumer() {
+@Override
+public void accept(WXDomObject dom) {
+if(instance == null || instance.isDestroy()){
+return;
+}
+if(!dom.hasUpdate()){
+return;
+}
+dom.layoutBefore();
+}
+});
+domObject.calculateLayout(layoutContext);
+domObject.traverseTree( new WXDomObject.Consumer() {
+@Override
+public void accept(WXDomObject dom) {
+if(instance == null || instance.isDestroy()){
+return;
+}
+if (dom.hasUpdate()) {
+dom.layoutAfter();
+}
+}
+});
 }
-dom.layoutBefore();
+return null;
 }
-});
-domObject.calculateLayout(layoutContext);
-domObject.traverseTree( new WXDomObject.Consumer() {
+
 @Override
-public void accept(WXDomObject dom) {
-if(instance == null || instance.isDestroy()){
-  

[27/50] [abbrv] incubator-weex git commit: update so

[gurisxie]

 update so


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9ea8bbd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9ea8bbd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9ea8bbd3

Branch: refs/heads/master
Commit: 9ea8bbd3c15fd958a5a675571c45cc20951ec814
Parents: ccf0590
Author: yuhun-alibaba 
Authored: Wed Oct 11 14:27:47 2017 +0800
Committer: yuhun-alibaba 
Committed: Wed Oct 11 14:27:47 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 342264 -> 342264 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9ea8bbd3/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index cd36273..2d3b7b4 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9ea8bbd3/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 36eae45..d4009b8 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9ea8bbd3/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 544d41d..f0bb8d4 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[26/50] [abbrv] incubator-weex git commit: Revert "* [ios] set default value to nil when the configuration is empty"

[gurisxie]

Revert "* [ios] set default value to nil when the configuration is empty"

This reverts commit 4376205615fdcbd4fd9f118a02961e074eb057bf.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ccf0590b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ccf0590b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ccf0590b

Branch: refs/heads/master
Commit: ccf0590b344c4adce40030315b7be1d22dd99ac9
Parents: 4376205
Author: acton393 
Authored: Wed Oct 11 12:25:29 2017 +0800
Committer: acton393 
Committed: Wed Oct 11 12:25:29 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ccf0590b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index fafc41d..b7a522a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -122,13 +122,9 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 
 if (attributes[@"alwaysScrollableVertical"]) {
 _alwaysScrollableVertical = [WXConvert 
NSString:attributes[@"alwaysScrollableVertical"]];
-}else {
-_alwaysScrollableVertical = nil;
 }
 if (attributes[@"alwaysScrollableHorizontal"]) {
 _alwaysScrollableHorizontal = [WXConvert 
NSString:attributes[@"alwaysScrollableHorizontal"]];
-} else {
-_alwaysScrollableHorizontal = nil;
 }
 _pagingEnabled = attributes[@"pagingEnabled"] ? [WXConvert 
BOOL:attributes[@"pagingEnabled"]] : NO;
 _loadMoreOffset = attributes[@"loadmoreoffset"] ? [WXConvert 
WXPixelType:attributes[@"loadmoreoffset"] 
scaleFactor:self.weexInstance.pixelScaleFactor] : 0;

[44/50] [abbrv] incubator-weex git commit: * [all] merge master to release-0.16, to fix conflict

[gurisxie]

* [all] merge master to release-0.16, to fix conflict


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9a16f8ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9a16f8ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9a16f8ba

Branch: refs/heads/master
Commit: 9a16f8ba3d85c859126bf820acc8c251d0f7f517
Parents: e2a373f f5fbd4e
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 16:25:06 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 16:25:06 2017 +0800

--
 .github/PULL_REQUEST_TEMPLATE.md|  4 +--
 CONTRIBUTING.md | 22 
 doc/source/cn/guide/contributing.md | 27 ++--
 doc/source/guide/contributing.md| 26 +--
 doc/source/references/platform-difference.md| 11 
 doc/source/references/platfrom-difference.md| 11 
 .../references/vue/difference-with-web.md   |  2 +-
 doc/themes/weex/layout/_partial/article.ejs |  2 ++
 doc/themes/weex/layout/index.ejs|  3 +++
 doc/themes/weex/layout/layout.ejs   |  2 --
 doc/themes/weex/source/css/common.scss  |  4 +--
 doc/themes/weex/source/css/partial/header.scss  |  2 +-
 doc/themes/weex/source/css/post.scss|  7 ++---
 doc/themes/weex/source/css/variable.scss|  2 +-
 html5/runtime/vdom/Element.js   |  2 +-
 .../Sources/Component/WXCycleSliderComponent.m  |  2 +-
 .../Sources/Display/WXComponent+BoxShadow.m |  9 ++-
 17 files changed, 75 insertions(+), 63 deletions(-)
--

[12/50] [abbrv] incubator-weex git commit: * [ios] add WXScrollerComponentView and compatible iOS 11 new API

[gurisxie]

* [ios] add WXScrollerComponentView and compatible iOS 11 new API


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/35898590
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/35898590
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/35898590

Branch: refs/heads/master
Commit: 358985901ac778900b6eefbcf716e10244c0df22
Parents: 5e85cea
Author: acton393 <zhangxing610...@gmail.com>
Authored: Mon Oct 9 18:22:56 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 9 19:53:06 2017 +0800

--
 .../WeexSDK/Sources/Component/WXScrollerComponent.m   | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/35898590/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index 88c934c..bf8021f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -26,7 +26,15 @@
 #import "WXUtility.h"
 #import "WXLoadingComponent.h"
 #import "WXRefreshComponent.h"
-@interface UIScrollView(WeexUIScrollerView_ContentInsetAdjustmentBehavior)
+
+@interface WXScrollerComponnetView:UIScrollView
+@end
+
+@implementation WXScrollerComponnetView
+@end;
+
+// add a category compatible for new API
+@interface 
WXScrollerComponnetView(WXScrollerComponnetView_ContentInsetAdjustmentBehavior)
 @property(nonatomic, assign)NSUInteger contentInsetAdjustmentBehavior;
 @end
 
@@ -139,14 +147,14 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
 
 - (UIView *)loadView
 {
-return [[UIScrollView alloc] init];
+return [[WXScrollerComponnetView alloc] init];
 }
 
 - (void)viewDidLoad
 {
 [super viewDidLoad];
 [self setContentSize:_contentSize];
-UIScrollView* scrollView = (UIScrollView *)self.view;
+WXScrollerComponnetView* scrollView = (WXScrollerComponnetView *)self.view;
 scrollView.delegate = self;
 scrollView.exclusiveTouch = YES;
 scrollView.autoresizesSubviews = NO;

[33/50] [abbrv] incubator-weex git commit: * [test] check cn source

[gurisxie]

* [test] check cn source


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8cebed47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8cebed47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8cebed47

Branch: refs/heads/master
Commit: 8cebed477f64148167770ebdd7bfd32aed24830c
Parents: 4330ad6
Author: gurisxie <279483...@qq.com>
Authored: Mon Oct 16 15:02:26 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Mon Oct 16 15:02:26 2017 +0800

--
 dangerfile.js | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8cebed47/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index 97c4146..bfa61fb 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -273,6 +273,14 @@ filesToVerifySrcHeader.forEach(filepath => {
   return;
 }
   }
+
+  // check cn for source code
+  var reg = /[\u4e00-\u9FA5]+/; 
+  var res = reg.test(content);
+  if(res){
+fail("Code file "+ filepath +" has cn source code.");
+return ;
+  }
 });
 
 

[48/50] [abbrv] incubator-weex git commit: * [android] fix code style

[gurisxie]

 * [android] fix code style


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/59574260
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/59574260
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/59574260

Branch: refs/heads/master
Commit: 595742605889077a7f107e324813d1b71859c388
Parents: 7fcfd9f
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Oct 17 21:09:54 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 22:09:45 2017 +0800

--
 .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java| 4 
 .../src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java   | 3 ---
 2 files changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/59574260/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 96f47d9..3f0b6e3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1014,7 +1014,6 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   if ("".equals(s)) {
 continue;
   }
-  // 寄存器内容裁剪
   // if (("r0:").equals(s)) {
   //  break;
   // }
@@ -1027,8 +1026,6 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   }
 } else {
   WXLogUtils.e("[WXBridgeManager] callReportCrash crash file is 
empty");
-  // 没收集到crash堆栈不上传
-  // commitJscCrashAlarmMonitor(IWXUserTrackAdapter.JS_BRIDGE,  
WXErrorCode.WX_ERR_JSC_CRASH, "crash info file empty", instanceId, url);
 }
 file.delete();
   }
@@ -1370,7 +1367,6 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   return;
 }
 
-// 
如果首次启动没初始化尽快返回Exception，并且异步初始化
 if (!isJSFrameworkInit() && reInitCount == 1) {
   instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, 
"createInstance fail!");
   post(new Runnable() {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/59574260/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index d202954..827cc94 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -224,12 +224,9 @@ public class WXSoInstallMgrSdk {
 
 File oldfile = new File(soName);
 if (oldfile.exists()) {
-  //获得原文件流
   FileInputStream inputStream = new FileInputStream(oldfile);
   byte[] data = new byte[1024];
-  //输出流
   FileOutputStream outputStream =new FileOutputStream(newfile);
-  //开始处理流
   while (inputStream.read(data) != -1) {
 outputStream.write(data);
   }

[10/50] [abbrv] incubator-weex git commit: fix scroll to bug and add md5 for template

[gurisxie]

fix scroll to bug and  add md5 for template


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e85cea9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e85cea9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e85cea9

Branch: refs/heads/master
Commit: 5e85cea995793180ff4cd0f3cd2d72f188ad75f7
Parents: b5b506f
Author: jianbai.gbj 
Authored: Mon Oct 9 19:19:33 2017 +0800
Committer: jianbai.gbj 
Committed: Mon Oct 9 19:19:33 2017 +0800

--
 .../com/taobao/weex/bridge/WXBridgeManager.java |  3 +-
 .../ui/component/list/BasicListComponent.java   | 29 +---
 .../java/com/taobao/weex/utils/WXFileUtils.java | 26 ++
 .../com/taobao/weex/utils/WXFileUtilsTest.java  |  8 ++
 4 files changed, 37 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e85cea9/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index d1ea794..a949e3b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1431,7 +1431,8 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   } catch (Throwable e) {
 instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR,
  "createInstance failed!");
-String err = "[WXBridgeManager] invokeCreateInstance " + e.getCause();
+String err = "[WXBridgeManager] invokeCreateInstance " + e.getCause()
++ " template md5 " + WXFileUtils.md5(template) + " length " + 
(template == null ? 0 : template.length());
 commitJSBridgeAlarmMonitor(instance.getInstanceId(), 
WXErrorCode.WX_ERR_INVOKE_NATIVE,err);
 WXLogUtils.e(err);
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e85cea9/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 296946a..9b8fe04 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -461,34 +461,7 @@ public abstract class BasicListComponenthttp://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e85cea9/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java
index 0083326..3921cfd 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java
@@ -29,6 +29,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 
 public class WXFileUtils {
 
@@ -130,4 +134,26 @@ public class WXFileUtils {
 }
 return false;
   }
+
+  public static String md5(String  template){
+try {
+  if(template == null){
+return  "";
+  }
+  return  md5(template.getBytes("UTF-8"));
+} catch (UnsupportedEncodingException e) {
+  return  "";
+}
+  }
+
+  public static String md5(byte[] bts){
+try {
+  MessageDigest digest = MessageDigest.getInstance("MD5");
+  digest.update(bts);
+  BigInteger bigInt = new BigInteger(1, digest.digest());
+  return  bigInt.toString(16);
+} catch (NoSuchAlgorithmException e) {;
+  return  "";
+}
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e85cea9/android/sdk/src/test/java/com/taobao/weex/utils/WXFileUtilsTest.java
--
diff --git 
a/android/sdk/src/test/java/com/taobao/weex/utils/WXFileUtilsTest.java 
b/android/sdk/src/test/java/com/taobao/weex/utils/WXFileUtilsTest.java
index 64a0720..13d47a3 100644
--- a/android/sdk/src/test/java/com/taobao/weex/utils/WXFileUtilsTest.java
+++ 

[40/50] [abbrv] incubator-weex git commit: sticky offset supported, keep position lost when insert data fix

[gurisxie]

sticky offset supported, keep position lost when insert data fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/37d62f99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/37d62f99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/37d62f99

Branch: refs/heads/master
Commit: 37d62f99882c1f6eec491ab6e2527923bf2c0b78
Parents: 0ed86c7
Author: jianbai.gbj <jianbai@alibaba-inc.com>
Authored: Mon Oct 16 13:59:17 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 15:37:02 2017 +0800

--
 .../java/com/taobao/weex/common/Constants.java  |   3 +
 .../ui/component/list/BasicListComponent.java   | 114 ++-
 .../ui/component/list/StickyHeaderHelper.java   |  43 ++-
 .../taobao/weex/ui/component/list/WXCell.java   |  92 +++
 .../list/template/WXRecyclerTemplateList.java   |   2 +-
 5 files changed, 178 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/37d62f99/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java 
b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index e74e083..730ce84 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -182,6 +182,9 @@ public class Constants {
 String ARIA_LABEL = "ariaLabel";
 String ARIA_HIDDEN = "ariaHidden";
 
+String STICKY_OFFSET = "stickyOffset";
+String HAS_FIXED_SIZE = "hasFixedSize";
+String KEEP_POSITION_LAYOUT_DELAY = "keepPositionLayoutDelay";
 
 interface  Recycler{
   String LIST_DATA = "listData";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/37d62f99/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 640a17e..5649832 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -150,6 +150,15 @@ public abstract class BasicListComponent 0 && firstVisiblePosition < 
pos && pos <= lastVisiblePosition  &&
+top <= cell.getStickyOffset())) {
   beforeFirstVisibleItem = true;
   if(pos > currentStickyPos) {
 currentStickyPos = pos;
   }
-}
-
-if(pos > fVisible){
+}else{
   removeOldSticky = true;
 }
   } else if(layoutManager instanceof StaggeredGridLayoutManager){
 int [] firstItems= new int[3];
-int fVisible = ((StaggeredGridLayoutManager) 
layoutManager).findFirstVisibleItemPositions(firstItems)[0];
+int firstVisiblePosition = ((StaggeredGridLayoutManager) 
layoutManager).findFirstVisibleItemPositions(firstItems)[0];
+int lastVisiblePosition = ((StaggeredGridLayoutManager)  
layoutManager).findLastVisibleItemPositions(firstItems)[0];
 int pos = mChildren.indexOf(cell);
 
-if (pos <= fVisible) {
+if (pos <= firstVisiblePosition || (cell.getStickyOffset() > 0 && 
firstVisiblePosition < pos && pos <= lastVisiblePosition  &&
+top <= cell.getStickyOffset())) {
   beforeFirstVisibleItem = true;
-}
-
-if(pos > fVisible){
+}else{
   removeOldSticky = true;
 }
   }
 
-  int[] location = new int[2];
-  stickyComponent.getHostView().getLocationOnScreen(location);
-  int[] parentLocation = new int[2];
-  
stickyComponent.getParentScroller().getView().getLocationOnScreen(parentLocation);
-
-  int top = location[1] - parentLocation[1];
 
-  boolean showSticky = beforeFirstVisibleItem && 
cell.getLocationFromStart() >= 0 && top <= 0 && dy >= 0;
-  boolean removeSticky = cell.getLocationFromStart() <= 0 && top > 0 
&& dy <= 0;
+  boolean showSticky = beforeFirstVisibleItem && 
cell.getLocationFromStart() >= 0 && top <= cell.getStickyOffset() && dy >= 0;
+  boolean remov

[47/50] [abbrv] incubator-weex git commit: * [android] fix on android 4.0.* platform cannot startup multiprocess since on android 4.1 use ANDROID_PIE to ensure safety on android api 15 or below use li

[gurisxie]

 * [android] fix on android 4.0.* platform cannot startup multiprocess
   since on android 4.1 use ANDROID_PIE to ensure safety
   on android api 15 or below use libweexjst.so to startup new process


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7fcfd9fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7fcfd9fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7fcfd9fd

Branch: refs/heads/master
Commit: 7fcfd9fdb5f07ec9510963d5426249fc6d06b769
Parents: 0ea259d
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Oct 17 19:48:54 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 22:09:45 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so  | Bin 22556 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 335100 -> 335324 bytes
 android/sdk/libs/armeabi/libweexjss.so  | Bin 6754016 -> 6754016 bytes
 android/sdk/libs/armeabi/libweexjst.so  | Bin 0 -> 22552 bytes
 .../java/com/taobao/weex/bridge/WXBridge.java   |   6 ++---
 .../com/taobao/weex/bridge/WXBridgeManager.java |  16 +-
 .../java/com/taobao/weex/common/IWXBridge.java  |   2 +-
 .../taobao/weex/utils/WXSoInstallMgrSdk.java|  22 ---
 .../taobao/weex/bridge/WXWebsocketBridge.java   |   2 +-
 9 files changed, 30 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index c46e857..cb739b4 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index ec98d07..7a9d85b 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 5a8809c..3efefa5 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjst.so
--
diff --git a/android/sdk/libs/armeabi/libweexjst.so 
b/android/sdk/libs/armeabi/libweexjst.so
new file mode 100755
index 000..099256c
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjst.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
index b95c7a6..9586f2a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
@@ -50,7 +50,7 @@ class WXBridge implements IWXBridge {
*
* @param framework assets/main.js
*/
-  public native int initFramework(String framework, WXParams params, String 
cacheDir, boolean onSdcard);
+  public native int initFramework(String framework, WXParams params, String 
cacheDir, boolean pieSupport);
 
 
   /**
@@ -78,9 +78,9 @@ class WXBridge implements IWXBridge {
   public native void takeHeapSnapshot(String filename);
 
 
-  public int initFrameworkEnv(String framework, WXParams params, String 
cacheDir, boolean onSdcard){
+  public int initFrameworkEnv(String framework, WXParams params, String 
cacheDir, boolean pieSupport){
 if (MULTIPROCESS) {
-  return initFramework(framework, params, cacheDir, onSdcard);
+  return initFramework(framework, params, cacheDir, pieSupport);
 } else {
   return  initFramework(framework, params);
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.jav

[42/50] [abbrv] incubator-weex git commit: * [test] add log for danger test

[gurisxie]

* [test] add log for danger test


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1c2369b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1c2369b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1c2369b4

Branch: refs/heads/master
Commit: 1c2369b4f1e706751843a55927683d78b7191fa8
Parents: edbde50
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 15:45:12 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 15:45:12 2017 +0800

--
 dangerfile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1c2369b4/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index bfa61fb..83a0ef1 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -315,8 +315,8 @@ function findReviewer(resolve, reject) {
 number: danger.github.pr.number,
 headers: {Accept: 'application/vnd.github.diff',"user-agent": "node.js"}
   }, function (err, result) {
-console.log('parseDeleteAndNormalLines')
 if ("undefined" === typeof result || "undefined" === typeof result.data || 
err) {
+  console.log('result:'+result+', error:'+err);
   resolve()
   return
 }
@@ -374,6 +374,7 @@ function getContent(url) {
 
 function parseDeleteAndNormalLines(diffData, fileToDeletedLinesMap, 
fileToNormalLinesMap) {
   try {
+console.log('diffData:'+diffData)
 var diffs = parseDiff(diffData)
 diffs.forEach(diff => {
   fileToDeletedLinesMap[diff.from] = [];

[GitHub] incubator-weex issue #790: fix clipPath not works on android N 7.0

[gurisxie]

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/790
  
has merge rebase ,but bot seems broken.


---

incubator-weex git commit: fix clipPath not works on android N 7.0

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 595742605 -> c2f1aac35


fix clipPath not works on android N 7.0


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c2f1aac3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2f1aac3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2f1aac3

Branch: refs/heads/release-0.16
Commit: c2f1aac354c3640aa47942b8828883364eec14cd
Parents: 5957426
Author: 行久 <yiyuan.zhan...@alibaba-inc.com>
Authored: Thu Oct 12 18:08:09 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 18 12:07:46 2017 +0800

--
 .../java/com/taobao/weex/utils/WXViewUtils.java | 25 
 1 file changed, 21 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2f1aac3/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index 7d11d5a..4a1b304 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -378,7 +378,7 @@ public class WXViewUtils {
   public static void clipCanvasWithinBorderBox(View targetView, Canvas canvas) 
{
 Drawable drawable;
 if (clipCanvasDueToAndroidVersion(canvas) &&
-clipCanvasIfAnimationExist() &&
+clipCanvasIfAnimationExist(targetView) &&
 ((drawable = targetView.getBackground()) instanceof BorderDrawable)) {
   BorderDrawable borderDrawable = (BorderDrawable) drawable;
   if (borderDrawable.isRounded()) {
@@ -394,7 +394,7 @@ public class WXViewUtils {
   public static void clipCanvasWithinBorderBox(Widget widget, Canvas canvas) {
 BorderDrawable borderDrawable;
 if (clipCanvasDueToAndroidVersion(canvas) &&
-clipCanvasIfAnimationExist() &&
+clipCanvasIfAnimationExist(null) &&
 (borderDrawable=widget.getBackgroundAndBorder())!=null ) {
   if (borderDrawable.isRounded() && 
clipCanvasIfBackgroundImageExist(widget, borderDrawable)) {
   Path path = borderDrawable.getContentPath(
@@ -424,8 +424,25 @@ public class WXViewUtils {
* As animation will not cause redraw if hardware-acceleration enabled, 
clipCanvas feature has
* to be disabled when API level is 24 without considering the animation 
property.
*/
-  private static boolean clipCanvasIfAnimationExist() {
-return Build.VERSION.SDK_INT != VERSION_CODES.N;
+  private static boolean clipCanvasIfAnimationExist(View targetView) {
+if (Build.VERSION.SDK_INT != VERSION_CODES.N) {
+  return true;
+}
+if(targetView != null &&
+targetView.getScaleX() == 1 &&
+targetView.getScaleY() == 1 &&
+targetView.getTranslationX() == 0 &&
+targetView.getTranslationY() == 0 &&
+targetView.getRotation() == 0 &&
+targetView.getRotationX() == 0 &&
+targetView.getRotationY() == 0) {
+  if(Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && 
targetView.getTranslationZ() != 0 ) {
+return false;
+  } else {
+return true;
+  }
+}
+return false;
   }
 
   /**

[GitHub] incubator-weex issue #790: fix clipPath not works on android N 7.0

[gurisxie]

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/790
  
@wispy316 thanks a lot for your pull request.

There are somethings wrong for all weex developers and users.
1. please not use alibaba local links that other people can't open,such as 
'mtl.alibaba-inc.com','rax.alibaba-inc.com'.
2.By the way,  if PR title is of the form [WEEX-],  is the relevant 
JIRA number,  it will be referenced to the JIRA issue automaticly.

have a better way to join weex.~


---

[GitHub] incubator-weex issue #803: * [android] fix on android 4.0.* platform cannot ...

[gurisxie]

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/803
  
has merged. but bot seems broken.


---

[2/2] incubator-weex git commit: * [android] fix on android 4.0.* platform cannot startup multiprocess since on android 4.1 use ANDROID_PIE to ensure safety on android api 15 or below use libweexjst.s

[gurisxie]

 * [android] fix on android 4.0.* platform cannot startup multiprocess
   since on android 4.1 use ANDROID_PIE to ensure safety
   on android api 15 or below use libweexjst.so to startup new process


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7fcfd9fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7fcfd9fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7fcfd9fd

Branch: refs/heads/release-0.16
Commit: 7fcfd9fdb5f07ec9510963d5426249fc6d06b769
Parents: 0ea259d
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Oct 17 19:48:54 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 22:09:45 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so  | Bin 22556 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 335100 -> 335324 bytes
 android/sdk/libs/armeabi/libweexjss.so  | Bin 6754016 -> 6754016 bytes
 android/sdk/libs/armeabi/libweexjst.so  | Bin 0 -> 22552 bytes
 .../java/com/taobao/weex/bridge/WXBridge.java   |   6 ++---
 .../com/taobao/weex/bridge/WXBridgeManager.java |  16 +-
 .../java/com/taobao/weex/common/IWXBridge.java  |   2 +-
 .../taobao/weex/utils/WXSoInstallMgrSdk.java|  22 ---
 .../taobao/weex/bridge/WXWebsocketBridge.java   |   2 +-
 9 files changed, 30 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
index c46e857..cb739b4 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and 
b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index ec98d07..7a9d85b 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 5a8809c..3efefa5 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/libs/armeabi/libweexjst.so
--
diff --git a/android/sdk/libs/armeabi/libweexjst.so 
b/android/sdk/libs/armeabi/libweexjst.so
new file mode 100755
index 000..099256c
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjst.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
index b95c7a6..9586f2a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
@@ -50,7 +50,7 @@ class WXBridge implements IWXBridge {
*
* @param framework assets/main.js
*/
-  public native int initFramework(String framework, WXParams params, String 
cacheDir, boolean onSdcard);
+  public native int initFramework(String framework, WXParams params, String 
cacheDir, boolean pieSupport);
 
 
   /**
@@ -78,9 +78,9 @@ class WXBridge implements IWXBridge {
   public native void takeHeapSnapshot(String filename);
 
 
-  public int initFrameworkEnv(String framework, WXParams params, String 
cacheDir, boolean onSdcard){
+  public int initFrameworkEnv(String framework, WXParams params, String 
cacheDir, boolean pieSupport){
 if (MULTIPROCESS) {
-  return initFramework(framework, params, cacheDir, onSdcard);
+  return initFramework(framework, params, cacheDir, pieSupport);
 } else {
   return  initFramework(framework, params);
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7fcfd9fd/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeMa

[1/2] incubator-weex git commit: * [android] fix code style

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 0ea259d0b -> 595742605


 * [android] fix code style


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/59574260
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/59574260
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/59574260

Branch: refs/heads/release-0.16
Commit: 595742605889077a7f107e324813d1b71859c388
Parents: 7fcfd9f
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Oct 17 21:09:54 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 22:09:45 2017 +0800

--
 .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java| 4 
 .../src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java   | 3 ---
 2 files changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/59574260/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 96f47d9..3f0b6e3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1014,7 +1014,6 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   if ("".equals(s)) {
 continue;
   }
-  // 寄存器内容裁剪
   // if (("r0:").equals(s)) {
   //  break;
   // }
@@ -1027,8 +1026,6 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   }
 } else {
   WXLogUtils.e("[WXBridgeManager] callReportCrash crash file is 
empty");
-  // 没收集到crash堆栈不上传
-  // commitJscCrashAlarmMonitor(IWXUserTrackAdapter.JS_BRIDGE,  
WXErrorCode.WX_ERR_JSC_CRASH, "crash info file empty", instanceId, url);
 }
 file.delete();
   }
@@ -1370,7 +1367,6 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   return;
 }
 
-// 
如果首次启动没初始化尽快返回Exception，并且异步初始化
 if (!isJSFrameworkInit() && reInitCount == 1) {
   instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, 
"createInstance fail!");
   post(new Runnable() {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/59574260/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index d202954..827cc94 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -224,12 +224,9 @@ public class WXSoInstallMgrSdk {
 
 File oldfile = new File(soName);
 if (oldfile.exists()) {
-  //获得原文件流
   FileInputStream inputStream = new FileInputStream(oldfile);
   byte[] data = new byte[1024];
-  //输出流
   FileOutputStream outputStream =new FileOutputStream(newfile);
-  //开始处理流
   while (inputStream.read(data) != -1) {
 outputStream.write(data);
   }

incubator-weex git commit: * [test] update border base png

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 f3bfa02cd -> 0ea259d0b


* [test] update border base png


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0ea259d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0ea259d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0ea259d0

Branch: refs/heads/release-0.16
Commit: 0ea259d0b259295ea4f15a207dc672a17bfa14de
Parents: f3bfa02
Author: gurisxie <279483...@qq.com>
Authored: Tue Oct 17 19:31:11 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 19:31:11 2017 +0800

--
 test/screenshot/border-android.png | Bin 0 -> 164260 bytes
 test/screenshot/border-ios.png | Bin 128088 -> 129071 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ea259d0/test/screenshot/border-android.png
--
diff --git a/test/screenshot/border-android.png 
b/test/screenshot/border-android.png
new file mode 100644
index 000..d774b6b
Binary files /dev/null and b/test/screenshot/border-android.png differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0ea259d0/test/screenshot/border-ios.png
--
diff --git a/test/screenshot/border-ios.png b/test/screenshot/border-ios.png
old mode 100755
new mode 100644
index 2bacdd3..992ea7d
Binary files a/test/screenshot/border-ios.png and 
b/test/screenshot/border-ios.png differ

[GitHub] incubator-weex issue #785: [WEEX-17] Abstract "weex" variable for each js fr...

[gurisxie]

Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/785
  
I have merged it,but bot seems broken.


---

incubator-weex git commit: + [jsfm] add weex variable api in runtime

[gurisxie]

Repository: incubator-weex
Updated Branches:
  refs/heads/master f5fbd4e20 -> b7383a416


+ [jsfm] add weex variable api in runtime


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b7383a41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7383a41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7383a41

Branch: refs/heads/master
Commit: b7383a41670a231bb24893beb0f5bed848f5be47
Parents: f5fbd4e
Author: Hanks <zhanghan...@gmail.com>
Authored: Wed Oct 11 17:19:48 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Tue Oct 17 17:27:39 2017 +0800

--
 html5/runtime/api/WeexInstance.js | 126 +
 html5/runtime/api/component.js|  51 +
 html5/runtime/api/init.js | 107 +---
 html5/runtime/api/module.js   |  56 +++
 4 files changed, 300 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7383a41/html5/runtime/api/WeexInstance.js
--
diff --git a/html5/runtime/api/WeexInstance.js 
b/html5/runtime/api/WeexInstance.js
new file mode 100644
index 000..2093f17
--- /dev/null
+++ b/html5/runtime/api/WeexInstance.js
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Document from '../vdom/Document'
+import { isRegisteredModule, getModuleDescription } from './module'
+import { isRegisteredComponent } from './component'
+
+const moduleProxies = {}
+
+function setId (weex, id) {
+  Object.defineProperty(weex, '[[CurrentInstanceId]]', { value: id })
+}
+
+function getId (weex) {
+  return weex['[[CurrentInstanceId]]']
+}
+
+function moduleGetter (module, method, taskCenter) {
+  return (...args) => taskCenter.send('module', { module, method }, args)
+}
+
+export default class WeexInstance {
+  constructor (id, config) {
+setId(this, id)
+this.config = config || {}
+this.document = new Document(id, this.config.bundleUrl)
+this.requireModule = this.requireModule.bind(this)
+this.isRegisteredModule = isRegisteredModule
+this.isRegisteredComponent = isRegisteredComponent
+  }
+
+  requireModule (moduleName) {
+const id = getId(this)
+if (!(id && this.document && this.document.taskCenter)) {
+  console.error(`[JS Framework] invalid instance id "${id}"`)
+  return
+}
+
+// warn for unknown module
+if (!isRegisteredModule(moduleName)) {
+  console.warn(`[JS Framework] using unregistered weex module 
"${moduleName}"`)
+  return
+}
+
+// create new module proxy
+if (!moduleProxies[moduleName]) {
+  const moduleDefine = getModuleDescription(moduleName)
+  const taskCenter = this.document.taskCenter
+
+  // create registered module apis
+  const moduleApis = {}
+  for (const methodName in moduleDefine) {
+Object.defineProperty(moduleApis, methodName, {
+  enumerable: true,
+  configurable: true,
+  get: () => moduleGetter(moduleName, methodName, taskCenter),
+  set (fn) {
+if (typeof fn === 'function') {
+  return taskCenter.send('module', {
+module: moduleName,
+method: methodName
+  }, [fn])
+}
+  }
+})
+  }
+
+  // create module Proxy
+  if (typeof Proxy === 'function') {
+moduleProxies[moduleName] = new Proxy(moduleApis, {
+  get (target, methodName) {
+if (methodName in target) {
+  return target[methodName]
+}
+console.warn(`[JS Framework] using unregistered method 
"${moduleName}.${methodName}"`)
+return moduleGetter(moduleName, methodName, taskCenter)
+  }
+})
+  }
+  else {
+moduleProxies[moduleName] = moduleApis
+  }
+}
+
+retu

[2/4] incubator-weex git commit: * [android] modify log print

[gurisxie]

* [android] modify log print


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b5126471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b5126471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b5126471

Branch: refs/heads/release-0.16
Commit: b5126471d1b3d9ab04e1c1e39cc636079c47cf58
Parents: 8cebed4
Author: zshshr 
Authored: Tue Oct 10 12:06:33 2017 +0800
Committer: zshshr 
Committed: Tue Oct 17 10:56:05 2017 +0800

--
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   6 +
 .../com/taobao/weex/bridge/WXBridgeManager.java | 993 +--
 .../java/com/taobao/weex/dom/WXDomObject.java   |   4 +-
 .../dom/action/AbstractAddElementAction.java|   4 +-
 .../weex/ui/component/WXComponentFactory.java   |   2 -
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  24 +-
 6 files changed, 513 insertions(+), 520 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index 3a287cc..0296379 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -93,6 +93,7 @@ import com.taobao.weex.ui.module.WXMetaModule;
 import com.taobao.weex.ui.module.WXModalUIModule;
 import com.taobao.weex.ui.module.WXTimerModule;
 import com.taobao.weex.ui.module.WXWebViewModule;
+import com.taobao.weex.utils.LogLevel;
 import com.taobao.weex.utils.WXLogUtils;
 import com.taobao.weex.utils.WXSoInstallMgrSdk;
 import com.taobao.weex.utils.batch.BatchOperationHelper;
@@ -158,6 +159,11 @@ public class WXSDKEngine {
   }
   long start = System.currentTimeMillis();
   WXEnvironment.sSDKInitStart = start;
+  if(WXEnvironment.isApkDebugable()){
+WXEnvironment.sLogLevel = LogLevel.DEBUG;
+  }else{
+WXEnvironment.sLogLevel = LogLevel.WARN;
+  }
   doInitInternal(application,config);
   WXEnvironment.sSDKInitInvokeTime = System.currentTimeMillis()-start;
   WXLogUtils.renderPerformanceLog("SDKInitInvokeTime", 
WXEnvironment.sSDKInitInvokeTime);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 713c4c2..c44d7af 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -84,26 +84,26 @@ import static 
com.taobao.weex.bridge.WXModuleManager.getDomModule;
 /**
  * Manager class for communication between JavaScript and Android.
  * 
- *   
- * Handle Android to JavaScript call, can be one of the following
- * 
- *   {@link #createInstance(String, String, Map, String)}
- *   {@link #destroyInstance(String)}
- *   {@link #refreshInstance(String, WXRefreshData)}
- *   {@link #registerModules(Map)}
- *   {@link #registerComponents(List)}
- *   {@link #invokeCallJSBatch(Message)}
- * 
- *   
- *   
- * Handle JavaScript to Android call
- *   
- *   
- * Handle next tick of message.
- *   
+ * 
+ * Handle Android to JavaScript call, can be one of the following
+ * 
+ * {@link #createInstance(String, String, Map, String)}
+ * {@link #destroyInstance(String)}
+ * {@link #refreshInstance(String, WXRefreshData)}
+ * {@link #registerModules(Map)}
+ * {@link #registerComponents(List)}
+ * {@link #invokeCallJSBatch(Message)}
+ * 
+ * 
+ * 
+ * Handle JavaScript to Android call
+ * 
+ * 
+ * Handle next tick of message.
+ * 
  * 
  */
-public class WXBridgeManager implements Callback,BactchExecutor {
+public class WXBridgeManager implements Callback, BactchExecutor {
 
   public static final String METHOD_CREATE_INSTANCE = "createInstance";
   public static final String METHOD_DESTROY_INSTANCE = "destroyInstance";
@@ -129,33 +129,28 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   public static final String KEY_PARAMS = "params";
   public static final String ARGS = "args";
   public static final String OPTIONS = "options";
+  public static final String INITLOGFILE = "/jsserver_start.log";
   private static final String NON_CALLBACK = "-1";
   private static final String UNDEFINED = "undefined";
-
   private static final int INIT_FRAMEWORK_OK =