date:20180507

[GitHub] incubator-weex pull request #1150: [WEEX-339][iOS] add componentTime/Count m...

2018-05-07 Thread lucky-chen

GitHub user lucky-chen reopened a pull request:

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

[WEEX-339][iOS] add componentTime/Count monitor

 *isNewFeature* **:**

  * [ x] Update API docs for the component.
  * [ x] Update/Add demo to demonstrate new feature.
  * [ ] Update test scripts for the feature.
  * [ ] Add unit tests for the feature.

- add 4 performance point 
  - componentCount
  - componentCreateTime
  - fsComponentCount
  - fsComponentCreateTime




You can merge this pull request into a Git repository by running:

$ git pull https://github.com/lucky-chen/incubator-weex 
ios-feature-componintTime

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

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


commit fe21eb92493d0a8625c8693b990479362985b7c9
Author: zhongcang 
Date:   2018-05-07T03:20:01Z

* [iOS] add componentTime/Count monitor

* [iOS] modify point

* [iOS] rm useless code




---

[GitHub] incubator-weex pull request #1150: [WEEX-339][iOS] add componentTime/Count m...

2018-05-07 Thread lucky-chen

Github user lucky-chen closed the pull request at:

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


---

incubator-weex git commit: * [WEEX-341] [android] add armeabi-v7a support

2018-05-07 Thread toretto

Repository: incubator-weex
Updated Branches:
  refs/heads/master feb096490 -> f4b87eb5f


* [WEEX-341] [android] add armeabi-v7a support


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

Branch: refs/heads/master
Commit: f4b87eb5ffe61e4ade2cf6cacf476444396405e2
Parents: feb0964
Author: wentao.swt 
Authored: Mon May 7 11:17:05 2018 +0800
Committer: yuhun-alibaba 
Committed: Mon May 7 18:07:58 2018 +0800

--
 android/playground/app/build.gradle|   2 +-
 android/sdk/build.gradle   |   5 -
 android/sdk/libs/armeabi-v7a/libweexjsb.so | Bin 0 -> 22620 bytes
 android/sdk/libs/armeabi-v7a/libweexjss.so | Bin 0 -> 6801432 bytes
 android/sdk/libs/armeabi-v7a/libweexjst.so | Bin 0 -> 22552 bytes
 5 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4b87eb5/android/playground/app/build.gradle
--
diff --git a/android/playground/app/build.gradle 
b/android/playground/app/build.gradle
index f8b870c..2caa695 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -13,7 +13,7 @@ android {
 testInstrumentationRunner 
"android.support.test.runner.AndroidJUnitRunner"
 multiDexEnabled true
 ndk{
-abiFilters "armeabi","x86"
+abiFilters "armeabi-v7a","armeabi","x86"
 }
 }
 applicationVariants.all { variant ->

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4b87eb5/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 1b0480b..7eed76a 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -93,12 +93,15 @@ android {
 }
 
 def ARMEABI_Size = new 
File(projectDir,"libs/armeabi/libweexjsc.so").length();
+def ARMEABIV7_Size = new 
File(projectDir,"libs/armeabi-v7/libweexjsc.so").length();
 def X86_Size = new File(projectDir,"libs/x86/libweexjsc.so").length();
 println "ARMEABI_Size: "+ARMEABI_Size;
+println "ARMEABIV7_Size:" + ARMEABIV7_Size;
 println "X86_Size:" + X86_Size;
 
 defaultConfig {
 buildConfigField "long", "ARMEABI_Size", "${ARMEABI_Size}"
+buildConfigField "long", "ARMEABIV7_Size", "${ARMEABIV7_Size}"
 buildConfigField "long", "X86_Size", "${X86_Size}"
 buildConfigField "String", "buildJavascriptFrameworkVersion", 
"\"${jsfmVersion}\""
 buildConfigField "String", "buildVersion", "\"${version}\""
@@ -110,7 +113,7 @@ android {
 versionCode 1
 versionName "1.0"
 ndk {
-abiFilters "armeabi","x86"
+abiFilters "armeabi-v7a","armeabi","x86"
 }
 
 externalNativeBuild {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4b87eb5/android/sdk/libs/armeabi-v7a/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi-v7a/libweexjsb.so 
b/android/sdk/libs/armeabi-v7a/libweexjsb.so
new file mode 100755
index 000..f0287cf
Binary files /dev/null and b/android/sdk/libs/armeabi-v7a/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4b87eb5/android/sdk/libs/armeabi-v7a/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi-v7a/libweexjss.so 
b/android/sdk/libs/armeabi-v7a/libweexjss.so
new file mode 100755
index 000..dcd78cc
Binary files /dev/null and b/android/sdk/libs/armeabi-v7a/libweexjss.so differ

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

[GitHub] incubator-weex pull request #1147: [WEEX-338][Android] Merge WeexCore-master...

2018-05-07 Thread miomin

Github user miomin closed the pull request at:

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


---

[GitHub] incubator-weex issue #1155: [WEEX-340][iOS]Fix the window problem where weex...

2018-05-07 Thread weex-bot

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1155: [WEEX-340][iOS]Fix the window problem whe...

2018-05-07 Thread x461909066

GitHub user x461909066 opened a pull request:

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

[WEEX-340][iOS]Fix the window problem where weex toast is displayed

Because the APP's keyWindow usually change with the business, weex's toast 
view should be displayed in the window where weex is located. If the window 
does not exist, it should displayed on the weex root view.

U can check this 
[EXAMPLE](http://dotwe.org/vue/3ce829a89653d651aeadf145af3f98a0)

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/x461909066/incubator-weex bugFix/toast_window

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

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


commit b7277a08c776c6c6b8bd47d7ad52c87bb66c9f5d
Author: jinxiaotong 
Date:   2018-05-07T09:23:54Z

[WEEX-340][iOS]Fix the window problem where weex toast is displayed

Because the APP's keyWindow usually change with the business, weex's toast 
view should be displayed in the window where weex is located. If the window 
does not exist, it should displayed on the weex root view.

U can check this 
[EXAMPLE](http://dotwe.org/vue/3ce829a89653d651aeadf145af3f98a0)




---

[GitHub] incubator-weex pull request #1154: [WEEX-343] [iOS] Failure of "scaleY" on a...

2018-05-07 Thread asfgit

Github user asfgit closed the pull request at:

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


---

incubator-weex git commit: [WEEX-343] [iOS] Failure of "scaleY" on animationModule

2018-05-07 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/master 02e9a1cf5 -> feb096490


[WEEX-343] [iOS] Failure of "scaleY" on animationModule

Because of a very old mistake, when parsing the transform property, the error 
scaleY is parsed, you can see demo in 
http://dotwe.org/vue/95a7067fde100e6b8f5219d4bf1913c3


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

Branch: refs/heads/master
Commit: feb096490acf378aed0ee734f963e6c09d6a59b7
Parents: 02e9a1c
Author: doumafang 
Authored: Mon May 7 16:57:28 2018 +0800
Committer: doumafang 
Committed: Mon May 7 16:57:28 2018 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/feb09649/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m 
b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
index a6e2eb5..1513416 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -245,7 +245,7 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
 WXAnimationInfo *newInfo = [info copy];
 newInfo.propertyName = @"transform.scale.y";
 newInfo.fromValue = @(oldTransform.scaleY);
-newInfo.toValue = @(wxTransform.scaleX);
+newInfo.toValue = @(wxTransform.scaleY);
 [infos addObject:newInfo];
 }

[GitHub] incubator-weex issue #1154: [WEEX-343] [iOS] Failure of "scaleY" on animatio...

2018-05-07 Thread weex-bot

Github user weex-bot commented on the issue:

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






  

  
  Messages

  
  
  :book:
  has no jsfm file changed.

  

  :book:
  jsfm test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1154: [WEEX-343] [iOS] Failure of "scaleY" on a...

2018-05-07 Thread doumafang

GitHub user doumafang opened a pull request:

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

[WEEX-343] [iOS] Failure of "scaleY" on animationModule

Because of a very old mistake, when parsing the transform property, the 
error scaleY is parsed
You can see demo in http://dotwe.org/vue/95a7067fde100e6b8f5219d4bf1913c3



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/doumafang/incubator-weex master

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

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


commit feb096490acf378aed0ee734f963e6c09d6a59b7
Author: doumafang 
Date:   2018-05-07T08:57:28Z

[WEEX-343] [iOS] Failure of "scaleY" on animationModule

Because of a very old mistake, when parsing the transform property, the 
error scaleY is parsed, you can see demo in 
http://dotwe.org/vue/95a7067fde100e6b8f5219d4bf1913c3




---

[GitHub] incubator-weex pull request #1153: [WEEX-340][iOS]fix the window problem whe...

2018-05-07 Thread x461909066

Github user x461909066 closed the pull request at:

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


---

[17/52] [abbrv] incubator-weex git commit: * [android] git cherry pick 0f294f0d4311ebb308d694accfe254e725f947e1

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/581eb3a8/pre-build/weex-main-jsfm.js
--
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index 421c2c8..066ce73 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,19146 +1,2 @@
-(this.nativeLog || function(s) {console.log(s)})('START JS FRAMEWORK 
0.26.0-beta.0, Build 2018-04-24 21:31. (Vue: 2.5.13-weex.5, Rax: 0.4.20)');
-var global=this; var process={env:{}}; var setTimeout=global.setTimeout;
-
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? 
factory() :
-   typeof define === 'function' && define.amd ? define(factory) :
-   (factory());
-}(this, (function () { 'use strict';
-
-/*
- * 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.
- */
-
-/* eslint-disable */
-
-// Production steps of ECMA-262, Edition 6, 22.1.2.1
-// Reference: 
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.from
-
-/* istanbul ignore if */
-if (!Array.from) {
-  Array.from = (function() {
-var toStr = Object.prototype.toString;
-var isCallable = function(fn) {
-  return typeof fn === 'function' || toStr.call(fn) === '[object 
Function]';
-};
-var toInteger = function(value) {
-  var number = Number(value);
-  if (isNaN(number)) {
-return 0;
-  }
-  if (number === 0 || !isFinite(number)) {
-return number;
-  }
-  return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
-};
-var maxSafeInteger = Math.pow(2, 53) - 1;
-var toLength = function(value) {
-  var len = toInteger(value);
-  return Math.min(Math.max(len, 0), maxSafeInteger);
-};
-
-// The length property of the from method is 1.
-return function from(arrayLike/* mapFn, thisArg */) {
-  // 1. Let C be the this value.
-  var C = this;
-
-  // 2. Let items be ToObject(arrayLike).
-  var items = Object(arrayLike);
-
-  // 3. ReturnIfAbrupt(items).
-  if (arrayLike == null) {
-throw new TypeError('Array.from requires an array-like object - not 
null or undefined');
-  }
-
-  // 4. If mapfn is undefined, then let mapping be false.
-  var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
-  var T;
-  if (typeof mapFn !== 'undefined') {
-// 5. else
-// 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
-if (!isCallable(mapFn)) {
-  throw new TypeError('Array.from: when provided, the second argument 
must be a function');
-}
-
-// 5. b. If thisArg was supplied, let T be thisArg; else let T be 
undefined.
-if (arguments.length > 2) {
-  T = arguments[2];
-}
-  }
-
-  // 10. Let lenValue be Get(items, "length").
-  // 11. Let len be ToLength(lenValue).
-  var len = toLength(items.length);
-
-  // 13. If IsConstructor(C) is true, then
-  // 13. a. Let A be the result of calling the [[Construct]] internal 
method of C with an argument list containing the single item len.
-  // 14. a. Else, Let A be ArrayCreate(len).
-  var A = isCallable(C) ? Object(new C(len)) : new Array(len);
-
-  // 16. Let k be 0.
-  var k = 0;
-  // 17. Repeat, while k < lenâ¦ (also steps a - h)
-  var kValue;
-  while (k < len) {
-kValue = items[k];
-if (mapFn) {
-  A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, 
kValue, k);
-} else {
-  A[k] = kValue;
-}
-k += 1;
-  }
-  // 18. Let putStatus be Put(A, "length", len, true).
-  A.length = len;
-  // 20. Return A.
-  return A;
-};
-  }());
-}
-
-function unwrapExports (x) {
-   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 
'default') ? x['default'] : x;
-}
-
-function createCommonjsModule(fn, module) {
-   return module = { exports: {} }, fn(module, module.exports), 
module.exports;
-}
-
-var _global = createCommonjsModule(function (module) {
-// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-var global = module.exports =

[12/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.1

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e90d189/pre-build/weex-rax-api.js
--
diff --git a/pre-build/weex-rax-api.js b/pre-build/weex-rax-api.js
index 22237b4..73402c3 100644
--- a/pre-build/weex-rax-api.js
+++ b/pre-build/weex-rax-api.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("Prepare Rax Environment APIs 
(0.4.20), Build 2018-04-26 16:13.");var 
global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o.w={},o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().to
 
Fixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[05/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.3

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5434e40/pre-build/weex-main-jsfm.js
--
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index 96f6039..0517f35 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.2, 
Build 2018-04-26 22:33. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
t,c,r,u;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,u=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[16/52] [abbrv] incubator-weex git commit: * [android] git cherry pick 0f294f0d4311ebb308d694accfe254e725f947e1

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/581eb3a8/pre-build/weex-rax-api.js
--
diff --git a/pre-build/weex-rax-api.js b/pre-build/weex-rax-api.js
index e532556..22237b4 100644
--- a/pre-build/weex-rax-api.js
+++ b/pre-build/weex-rax-api.js
@@ -1,2 +1,2 @@
-var global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(e){var t={};function n(r){if(t[r])return 
t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return 
e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return 
n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:r})},n.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
n.d(t,"a",t),t},n.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=3)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().toFixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof
 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE
 =3,e.exports.newNode=function(e,t,n){var 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){Object.defineProperty(t,"__esModule",{value:!0});var
 r=function(){function e(e,t){for(var n=0;n0){for(var 
n=Array(arguments.length),r=0;r

[44/52] [abbrv] incubator-weex git commit: * [android] Merge WeexCore-master to master

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b70b5b87/android/sdk/assets/main.js
--
diff --git a/android/sdk/assets/main.js b/android/sdk/assets/main.js
index 307922d..fa6fdde 100644
--- a/android/sdk/assets/main.js
+++ b/android/sdk/assets/main.js
@@ -1,2 +1,2 @@
 (this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.24.4, 
Build 2018-02-07 17:13. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
e,t,n,r;function o(e){return 
e&__esModule&(e,"default")?e.default:e}function
 i(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(e=Object.prototype.toString,t=function(t){return"function"==typeof
 t||"[object Function]"===e.call(t)},n=Math.pow(2,53)-1,r=function(e){var 
t,r=(t=Number(e),isNaN(t)?0:0!==t&(t)?(t>0?1:-1)*Math.floor(Math.abs(t)):t);return
 Math.min(Math.max(r,0),n)},function(e){var n=Object(e);if(null==e)throw new 
TypeError("Array.from requires an array-like object - not null or 
undefined");var o,i=arguments.length>1?arguments[1]:void 0;if(void 0!==i){if(!
 t(i))throw new TypeError("Array.from: when provided, the second argument must 
be a function");arguments.length>2&&(o=arguments[2])}for(var 
a,s=r(n.length),u=t(this)?Object(new this(s)):new 
Array(s),c=0;c0?F:D)(e)},V=Math.min,W=function(e){return 
e>0?V(L(e),9007199254740991):0},U=Math.max,B=Math.min,q="__core-js_shared__",J=a[q]||(a[q]={}),z=function(e){return
 J[e]||(J[e]={})},H=z("keys"),G=function(e){return 
H[e]||(H[e]=k(e))},X=(I=!1,function(e,t,n){var

[08/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.1

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3f6f7e0/pre-build/weex-main-jsfm.js
--
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index b67cb72..c22ca5b 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.1, 
Build 2018-04-26 18:09. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
t,c,r,u;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,u=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[21/52] [abbrv] incubator-weex git commit: * [android] git cherry-pick cc1ee583cce2f6e8f1fbc74f088c70cb826d4bad

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/efc2d297/android/sdk/assets/weex-rax-api.js
--
diff --git a/android/sdk/assets/weex-rax-api.js 
b/android/sdk/assets/weex-rax-api.js
index e532556..22237b4 100644
--- a/android/sdk/assets/weex-rax-api.js
+++ b/android/sdk/assets/weex-rax-api.js
@@ -1,2 +1,2 @@
-var global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(e){var t={};function n(r){if(t[r])return 
t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return 
e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return 
n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:r})},n.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
n.d(t,"a",t),t},n.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=3)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().toFixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof
 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE
 =3,e.exports.newNode=function(e,t,n){var 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){Object.defineProperty(t,"__esModule",{value:!0});var
 r=function(){function e(e,t){for(var n=0;n0){for(var 
n=Array(arguments.length),r=0;r

[45/52] [abbrv] incubator-weex git commit: * [android] Merge WeexCore-master to master

2018-05-07 Thread kyork

* [android] Merge WeexCore-master to master


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

Branch: refs/heads/master
Commit: b70b5b879a1edebe4415b307a2e650ab4b56c13b
Parents: 63d810f
Author: miomin <691292...@qq.com>
Authored: Fri May 4 16:30:27 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 android/sdk/assets/main.js  | 2 +-
 pre-build/native-bundle-main.js | 2 +-
 pre-build/weex-polyfill.js  | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
--

[28/52] [abbrv] incubator-weex git commit: * [android] update

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28274522/android/sdk/assets/weex-rax-extra-api.js
--
diff --git a/android/sdk/assets/weex-rax-extra-api.js 
b/android/sdk/assets/weex-rax-extra-api.js
index 52eb9eb..8b49e2e 100644
--- a/android/sdk/assets/weex-rax-extra-api.js
+++ b/android/sdk/assets/weex-rax-extra-api.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("Prepare Rax Environment APIs 
(0.4.20), Build 2018-04-26 22:34.");var 
global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o.w={},o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().to
 
Fixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[43/52] [abbrv] incubator-weex git commit: * [android] Merge WeexCore-master to master

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b70b5b87/pre-build/native-bundle-main.js
--
diff --git a/pre-build/native-bundle-main.js b/pre-build/native-bundle-main.js
index 307922d..fa6fdde 100644
--- a/pre-build/native-bundle-main.js
+++ b/pre-build/native-bundle-main.js
@@ -1,2 +1,2 @@
 (this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.24.4, 
Build 2018-02-07 17:13. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
e,t,n,r;function o(e){return 
e&__esModule&(e,"default")?e.default:e}function
 i(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(e=Object.prototype.toString,t=function(t){return"function"==typeof
 t||"[object Function]"===e.call(t)},n=Math.pow(2,53)-1,r=function(e){var 
t,r=(t=Number(e),isNaN(t)?0:0!==t&(t)?(t>0?1:-1)*Math.floor(Math.abs(t)):t);return
 Math.min(Math.max(r,0),n)},function(e){var n=Object(e);if(null==e)throw new 
TypeError("Array.from requires an array-like object - not null or 
undefined");var o,i=arguments.length>1?arguments[1]:void 0;if(void 0!==i){if(!
 t(i))throw new TypeError("Array.from: when provided, the second argument must 
be a function");arguments.length>2&&(o=arguments[2])}for(var 
a,s=r(n.length),u=t(this)?Object(new this(s)):new 
Array(s),c=0;c0?F:D)(e)},V=Math.min,W=function(e){return 
e>0?V(L(e),9007199254740991):0},U=Math.max,B=Math.min,q="__core-js_shared__",J=a[q]||(a[q]={}),z=function(e){return
 J[e]||(J[e]={})},H=z("keys"),G=function(e){return 
H[e]||(H[e]=k(e))},X=(I=!1,function(e,t,n){var

[42/52] [abbrv] incubator-weex git commit: * [android] Merge WeexCore-master to master

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b70b5b87/pre-build/weex-polyfill.js
--
diff --git a/pre-build/weex-polyfill.js b/pre-build/weex-polyfill.js
deleted file mode 100644
index 21a3611..000
--- a/pre-build/weex-polyfill.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var global=this,process={env:{}};!function(){"use strict";var n,a,r,s;function 
t(t,n){return 
t(n={exports:{}},n.exports),n.exports}Array.from||(Array.from=(n=Object.prototype.toString,a=function(t){return"function"==typeof
 t||"[object Function]"===n.call(t)},r=Math.pow(2,53)-1,s=function(t){var 
n,e=(n=Number(t),isNaN(n)?0:0!==n&(n)?(0

[22/52] [abbrv] incubator-weex git commit: * [android] git cherry-pick cc1ee583cce2f6e8f1fbc74f088c70cb826d4bad

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/efc2d297/android/sdk/assets/weex-main-jsfm.js
--
diff --git a/android/sdk/assets/weex-main-jsfm.js 
b/android/sdk/assets/weex-main-jsfm.js
index 1457ec4..066ce73 100644
--- a/android/sdk/assets/weex-main-jsfm.js
+++ b/android/sdk/assets/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.24.5, 
Build 2018-02-26 19:31. (Vue: 2.5.11-weex.1, Rax: 0.4.20)");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";var 
e,t,n,r;function o(e){return 
e&__esModule&(e,"default")?e.default:e}function
 i(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(e=Object.prototype.toString,t=function(t){return"function"==typeof
 t||"[object Function]"===e.call(t)},n=Math.pow(2,53)-1,r=function(e){var 
t,r=(t=Number(e),isNaN(t)?0:0!==t&(t)?(t>0?1:-1)*Math.floor(Math.abs(t)):t);return
 Math.min(Math.max(r,0),n)},function(e){var n=Object(e);if(null==e)throw new 
TypeError("Array.from requires an array-like object - not null or 
undefined");var o,i=arguments.length>1?arguments[1]:void 0;if(void 0!==i){if(!
 t(i))throw new TypeError("Array.from: when provided, the second argument must 
be a function");arguments.length>2&&(o=arguments[2])}for(var 
a,s=r(n.length),c=t(this)?Object(new this(s)):new 
Array(s),u=0;u0?R:D)(e)},L=Math.min,J=function(e){return 
e>0?L(V(e),9007199254740991):0},U=Math.max,q=Math.min,B="__core-js_shared__",z=a[B]||(a[B]={}),W=function(e){return
 z[e]||(z[e]={})},H=W("keys"),X=function(e){return 
H[e]||(H[e]=C(e))},G=($=!1,function(e,t,n){var

[01/52] [abbrv] incubator-weex git commit: * [android] update

2018-05-07 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/master 089b7a785 -> 02e9a1cf5


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1917421d/android/sdk/assets/weex-rax-extra-api.js
--
diff --git a/android/sdk/assets/weex-rax-extra-api.js 
b/android/sdk/assets/weex-rax-extra-api.js
index 0043d13..52eb9eb 100644
--- a/android/sdk/assets/weex-rax-extra-api.js
+++ b/android/sdk/assets/weex-rax-extra-api.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("Prepare Rax Environment APIs 
(0.4.20), Build 2018-04-26 21:14.");var 
global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o.w={},o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().to
 
Fixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[13/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.1

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e90d189/pre-build/weex-main-jsfm.js
--
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index 066ce73..b67cb72 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.0, 
Build 2018-04-26 16:13. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
t,c,r,u;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,u=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[29/52] [abbrv] incubator-weex git commit: * [android] update

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28274522/android/sdk/assets/weex-main-jsfm.js
--
diff --git a/android/sdk/assets/weex-main-jsfm.js 
b/android/sdk/assets/weex-main-jsfm.js
index 96f6039..0517f35 100644
--- a/android/sdk/assets/weex-main-jsfm.js
+++ b/android/sdk/assets/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.2, 
Build 2018-04-26 22:33. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
t,c,r,u;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,u=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[04/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.3

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5434e40/pre-build/weex-rax-extra-api.js
--
diff --git a/pre-build/weex-rax-extra-api.js b/pre-build/weex-rax-extra-api.js
index 52eb9eb..8b49e2e 100644
--- a/pre-build/weex-rax-extra-api.js
+++ b/pre-build/weex-rax-extra-api.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("Prepare Rax Environment APIs 
(0.4.20), Build 2018-04-26 22:34.");var 
global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o.w={},o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().to
 
Fixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[09/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.1

2018-05-07 Thread kyork

* [jsfm] upgrade js framework to v0.26.1


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

Branch: refs/heads/master
Commit: a3f6f7e0bffd3e059c9107b7b3725ec3b10d2358
Parents: 1e90d18
Author: Hanks 
Authored: Thu Apr 26 20:25:59 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 pre-build/weex-main-jsfm.js | 2 +-
 pre-build/weex-rax-api.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[46/52] [abbrv] incubator-weex git commit: * [core] Remove libweexjsc.so

2018-05-07 Thread kyork

* [core] Remove libweexjsc.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/0d9ad65b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0d9ad65b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0d9ad65b

Branch: refs/heads/master
Commit: 0d9ad65bf5d9301379d52fe7b96948aba61edd66
Parents: b70b5b8
Author: miomin <691292...@qq.com>
Authored: Fri May 4 16:33:15 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0d9ad65b/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
deleted file mode 100644
index 44da9a4..000
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and /dev/null differ

[33/52] [abbrv] incubator-weex git commit: * [Core] Open FlatGUI

2018-05-07 Thread kyork

* [Core] Open FlatGUI


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

Branch: refs/heads/master
Commit: 0c9dfa3347f73086ff1804cbe2fb81cf10a45cb1
Parents: bf3c83d
Author: miomin <691292...@qq.com>
Authored: Sat Apr 28 16:41:35 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0c9dfa33/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
index 16f1d62..b161c78 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
@@ -48,7 +48,7 @@ public class FlatGUIContext implements Destroyable {
   private Map widgetToComponent = new ArrayMap<>();
 
   public boolean isFlatUIEnabled(WXComponent component) {
-return false;
+return component.isFlatUIEnabled();
   }
 
   public void register(@NonNull WXComponent descendant, @NonNull 
WidgetContainer ancestor) {

[31/52] [abbrv] incubator-weex git commit: * [android] update so

2018-05-07 Thread kyork

 * [android] 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/66268d42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/66268d42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/66268d42

Branch: refs/heads/master
Commit: 66268d4279ec39b0c1360984647d11a12ca66599
Parents: 2827452
Author: wentao.swt 
Authored: Sat Apr 28 11:54:56 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 android/sdk/libs/armeabi/libweexjss.so | Bin 6801432 -> 6802008 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/66268d42/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index dcd78cc..85a722a 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[49/52] [abbrv] incubator-weex git commit: * [android] Update weex_sdk version code.

2018-05-07 Thread kyork

* [android] Update weex_sdk version 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/99f1c047
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/99f1c047
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/99f1c047

Branch: refs/heads/master
Commit: 99f1c047004e8c7f4c08961411c342301418a2f9
Parents: a951660
Author: miomin <691292...@qq.com>
Authored: Fri May 4 11:42:21 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 android/sdk/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/99f1c047/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 6486c5e..34bad9b 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -36,7 +36,7 @@ checkstyle {
 }
 
 
-version = "Devtool-WeexCore-1.0.3-SNAPSHOT"
+version = "0.18.13.25"
 
 android {

[47/52] [abbrv] incubator-weex git commit: *[Core] fix ContentBoxMeasurement getWidth & Height value error when release.

2018-05-07 Thread kyork

*[Core] fix ContentBoxMeasurement getWidth & Height value error when release.


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

Branch: refs/heads/master
Commit: 46ce1c5d75b95982c3cef6f7c3d674c990c46d1c
Parents: b2d22b9
Author: é©±å½± 
Authored: Thu May 3 16:00:13 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../impl/content_box_measurement_impl_android.cpp | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/46ce1c5d/weex_core/Source/android/bridge/impl/content_box_measurement_impl_android.cpp
--
diff --git 
a/weex_core/Source/android/bridge/impl/content_box_measurement_impl_android.cpp 
b/weex_core/Source/android/bridge/impl/content_box_measurement_impl_android.cpp
index 376d85a..d9c8f53 100644
--- 
a/weex_core/Source/android/bridge/impl/content_box_measurement_impl_android.cpp
+++ 
b/weex_core/Source/android/bridge/impl/content_box_measurement_impl_android.cpp
@@ -23,7 +23,7 @@
 
 namespace WeexCore {
   bool RegisterJNIContentBoxMeasurement(JNIEnv *env) {
-RegisterNativesImpl(env);
+  return RegisterNativesImpl(env);
   }
 
   void cumsmeasure_Imple_Android(JNIEnv *env, jobject measureFunc_Impl_Android,
@@ -43,12 +43,16 @@ namespace WeexCore {
   }
 
   float GetLayoutWidth(JNIEnv *env, jobject measureFunc_impl_android) {
-if (measureFunc_impl_android != nullptr)
-  Java_ContentBoxMeasurement_getWidth(env, measureFunc_impl_android);
+if (measureFunc_impl_android != nullptr) {
+return Java_ContentBoxMeasurement_getWidth(env, 
measureFunc_impl_android);
+}
+return 0.0;
   }
 
   float GetLayoutHeight(JNIEnv *env, jobject measureFunc_impl_android) {
-if (measureFunc_impl_android != nullptr)
-  Java_ContentBoxMeasurement_getHeight(env, measureFunc_impl_android);
+if (measureFunc_impl_android != nullptr) {
+return Java_ContentBoxMeasurement_getHeight(env, 
measureFunc_impl_android);
+}
+return 0.0;
   }
 }

[48/52] [abbrv] incubator-weex git commit: * [Core] Rename layer-limit

2018-05-07 Thread kyork

* [Core] Rename layer-limit


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

Branch: refs/heads/master
Commit: 9689fae579977491c604123317141feb93c3ee71
Parents: 0d3d966
Author: miomin <691292...@qq.com>
Authored: Wed May 2 16:08:22 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../main/java/com/taobao/weex/common/Constants.java   |  2 +-
 .../com/taobao/weex/ui/component/WXComponent.java | 11 ++-
 .../main/java/com/taobao/weex/ui/component/WXDiv.java | 14 +++---
 .../com/taobao/weex/ui/component/WXVContainer.java|  4 ++--
 .../java/com/taobao/weex/ui/view/WXFrameLayout.java   |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9689fae5/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 cd50b3f..c423ad1 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
@@ -189,7 +189,7 @@ public class Constants {
 String ARIA_HIDDEN = "ariaHidden";
 String ROLE = "role";
 
-String STACKSIZE_LIMIT = "stacksizeLimit";
+String LAYER_LIMIT = "layer-limit";
 
 String DIRECTION = "direction";
 String RTL = "rtl";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9689fae5/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 4f28a7f..add5921 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
@@ -63,6 +63,7 @@ import android.support.v4.view.AccessibilityDelegateCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.Pair;
 import android.view.Menu;
 import android.view.View;
@@ -170,14 +171,14 @@ public abstract class WXComponent extends 
WXBasicComponent imple
 
   private boolean waste = false;
 
-  private boolean hasStackSizeLimit = false;
+  private boolean hasLayerLimit = false;
 
-  protected void setStackSizeLimit(boolean hasStackSizeLimit) {
-this.hasStackSizeLimit = hasStackSizeLimit;
+  protected void setLayerLimit(boolean hasLayerLimit) {
+this.hasLayerLimit = hasLayerLimit;
   }
 
-  public boolean isStackSizeLimit() {
-return hasStackSizeLimit;
+  public boolean isLayerLimit() {
+return hasLayerLimit;
   }
 
   private ContentBoxMeasurement contentBoxMeasurement;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9689fae5/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
index b485db5..9ebd7d8 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
@@ -21,7 +21,7 @@ package com.taobao.weex.ui.component;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
-import android.widget.ImageView;
+import android.util.Log;
 
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.annotation.Component;
@@ -119,18 +119,18 @@ public class WXDiv extends WidgetContainer 
implements FlatCompone
 return !promoteToView(true);
   }
 
-  @WXComponentProp(name = Constants.Name.STACKSIZE_LIMIT)
-  public void setStackSizeLimitModle(String stackSizeLimit) {
-setStackSizeLimit(getStackSizeLimit(stackSizeLimit));
+  @WXComponentProp(name = Constants.Name.LAYER_LIMIT)
+  public void setLayerLimitModle(String layerLimit) {
+setLayerLimit(getLayerLimit(layerLimit));
   }
 
-  private boolean getStackSizeLimit(String stackSizeLimit) {
+  private boolean getLayerLimit(String layerLimit) {
 boolean ret = false;
-if (TextUtils.isEmpty(stackSizeLimit)) {
+if (TextUtils.isEmpty(layerLimit)) {
   return ret;
 }
 
-

[34/52] [abbrv] incubator-weex git commit: [Weex][Android] 7.7.5 weex-core transition not start bugfix http://dotwe.org/vue/73f432adf4d115456bcdd8fd4ce924f1

2018-05-07 Thread kyork

[Weex][Android] 7.7.5 weex-core  transition not start bugfix  
http://dotwe.org/vue/73f432adf4d115456bcdd8fd4ce924f1


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

Branch: refs/heads/master
Commit: 1f78f8c346f47f31924afdab1cc12af930b9c91a
Parents: b4fb9d3
Author: jianbai.gbj 
Authored: Sat Apr 28 15:10:01 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../ui/action/GraphicActionAbstractAddElement.java|  2 +-
 .../weex/ui/action/GraphicActionUpdateStyle.java  | 14 --
 2 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1f78f8c3/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java
index a26c39e..7128dc1 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java
@@ -57,7 +57,7 @@ public abstract class GraphicActionAbstractAddElement extends 
BasicGraphicAction
 
 WXComponent component = WXComponentFactory.newInstance(instance, parent, 
basicComponentData);
 
WXSDKManager.getInstance().getWXRenderManager().registerComponent(getPageId(), 
getRef(), component);
-if(mStyle.containsKey(Constants.Name.TRANSFORM)) {
+if(mStyle.containsKey(Constants.Name.TRANSFORM) && 
component.getTransition() == null) {
   Map animationMap = new ArrayMap<>(2);
   animationMap.put(Constants.Name.TRANSFORM, 
mStyle.get(Constants.Name.TRANSFORM));
   animationMap

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1f78f8c3/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java
index 90525e7..fffed20 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java
@@ -58,7 +58,7 @@ public class GraphicActionUpdateStyle extends 
BasicGraphicAction {
 }
 if (null != mStyle) {
   component.addStyle(mStyle, mIsCausedByPesudo);
-  if(style.containsKey(Constants.Name.TRANSFORM)) {
+  if(style.containsKey(Constants.Name.TRANSFORM) && 
component.getTransition() == null) {
 Map animationMap = new ArrayMap<>(2);
 animationMap.put(Constants.Name.TRANSFORM, 
style.get(Constants.Name.TRANSFORM));
 animationMap
@@ -95,11 +95,13 @@ public class GraphicActionUpdateStyle extends 
BasicGraphicAction {
 }
 if (null != mStyle) {
   component.addStyle(mStyle, mIsCausedByPesudo);
-  Map animationMap = new ArrayMap<>(2);
-  animationMap.put(Constants.Name.TRANSFORM, 
style.get(Constants.Name.TRANSFORM));
-  animationMap.put(Constants.Name.TRANSFORM_ORIGIN, 
style.get(Constants.Name.TRANSFORM_ORIGIN));
-  component.addAnimationForElement(animationMap);
-  WXBridgeManager.getInstance().markDirty(component.getInstanceId(), 
component.getRef(), true);
+  if(style.containsKey(Constants.Name.TRANSFORM) && 
component.getTransition() == null){
+Map animationMap = new ArrayMap<>(2);
+animationMap.put(Constants.Name.TRANSFORM, 
style.get(Constants.Name.TRANSFORM));
+animationMap.put(Constants.Name.TRANSFORM_ORIGIN, 
style.get(Constants.Name.TRANSFORM_ORIGIN));
+component.addAnimationForElement(animationMap);
+WXBridgeManager.getInstance().markDirty(component.getInstanceId(), 
component.getRef(), true);
+  }
 }
 
 if (null != paddings) {

[11/52] [abbrv] incubator-weex git commit: *[Core] fix page close won’t clean msg in handler.

2018-05-07 Thread kyork

*[Core] fix page close wonât clean msg in handler.


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

Branch: refs/heads/master
Commit: 413b065b5aa9988bd14c2afd00903ad6d56f1d30
Parents: 9e1455d
Author: é©±å½± 
Authored: Thu Apr 26 11:36:03 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 .../src/main/java/com/taobao/weex/ui/WXRenderHandler.java| 3 ++-
 .../src/main/java/com/taobao/weex/ui/WXRenderManager.java| 8 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/413b065b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java
index 99cba05..2bfb685 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java
@@ -30,7 +30,8 @@ class WXRenderHandler extends Handler {
 
 public final boolean post(String instanceId, Runnable r) {
 Message msg = Message.obtain(this, r);
-msg.obj = instanceId.hashCode();
+// Use what to match runnable. Make sure don't override callback 
method.
+msg.what = instanceId.hashCode();
 return sendMessageDelayed(msg, 0);
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/413b065b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
index 143265c..e91fb08 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
@@ -99,8 +99,12 @@ public class WXRenderManager {
 if (statement != null) {
   statement.destroy();
 }
-final Object token = instanceId == null ? null : instanceId.hashCode();
-mWXRenderHandler.removeCallbacksAndMessages(token);
+if(instanceId == null) {
+  mWXRenderHandler.removeCallbacksAndMessages(null);
+} else {
+  // use hashCode to match message's what.
+  mWXRenderHandler.removeMessages(instanceId.hashCode());
+}
   }
 
   public void postGraphicAction(final String instanceId, final 
BasicGraphicAction action) {

[14/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.1

2018-05-07 Thread kyork

* [jsfm] upgrade js framework to v0.26.1


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

Branch: refs/heads/master
Commit: 1e90d1895f563e2945bee1a062a6685e6d35fe10
Parents: 59edbc1
Author: Hanks 
Authored: Thu Apr 26 19:06:19 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 pre-build/weex-main-jsfm.js | 2 +-
 pre-build/weex-rax-api.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[52/52] [abbrv] incubator-weex git commit: * [android] Turn off flatgui.

2018-05-07 Thread kyork

* [android] Turn off flatgui.


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

Branch: refs/heads/master
Commit: a9516603860818aba1837683d231c759bc6bb69f
Parents: 52e84f2
Author: miomin <691292...@qq.com>
Authored: Fri May 4 11:41:22 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9516603/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
index b161c78..16f1d62 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
@@ -48,7 +48,7 @@ public class FlatGUIContext implements Destroyable {
   private Map widgetToComponent = new ArrayMap<>();
 
   public boolean isFlatUIEnabled(WXComponent component) {
-return component.isFlatUIEnabled();
+return false;
   }
 
   public void register(@NonNull WXComponent descendant, @NonNull 
WidgetContainer ancestor) {

[35/52] [abbrv] incubator-weex git commit: * [Core] Fix crash NPE.

2018-05-07 Thread kyork

* [Core] Fix crash NPE.


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

Branch: refs/heads/master
Commit: bf3c83d990418df4a9b1ec05bc76a61f1570c5ef
Parents: 16d4eb8
Author: miomin <691292...@qq.com>
Authored: Sat Apr 28 16:41:01 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../com/taobao/weex/ui/component/list/BasicListComponent.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf3c83d9/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 742f164..fb57c32 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
@@ -476,8 +476,10 @@ public abstract class BasicListComponent

[40/52] [abbrv] incubator-weex git commit: * [Core] Add Copyright for jniheader.

2018-05-07 Thread kyork

* [Core] Add Copyright for jniheader.


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

Branch: refs/heads/master
Commit: 3aeb64020447ff2cd70e7d652a7d084d01aa3109
Parents: 0d9ad65
Author: miomin <691292...@qq.com>
Authored: Fri May 4 16:41:00 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../jniprebuild/jniheader/ContentBoxMeasurement_jni.h|  3 +--
 .../android/jniprebuild/jniheader/MeasureMode_jni.h  |  3 +--
 .../jniprebuild/jniheader/SystemMessageHandler_jni.h |  3 +--
 .../Source/android/jniprebuild/jniheader/WXBridge_jni.h  |  3 +--
 .../android/jniprebuild/jniheader/WXJsFunctions_jni.h| 11 ---
 5 files changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3aeb6402/weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
--
diff --git 
a/weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h 
b/weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
index 871e32d..38bc77b 100644
--- a/weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
+++ b/weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 // This file is autogenerated by
-// /Users/miomin/Desktop/workspace/alibaba/WeexCore-dev/WeexCore-
-//
dev/android/weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
+// 
weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
 // For
 // com/taobao/weex/layout/ContentBoxMeasurement
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3aeb6402/weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h
--
diff --git a/weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h 
b/weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h
index c707ab1..0c47f6c 100644
--- a/weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h
+++ b/weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 // This file is autogenerated by
-// /Users/miomin/Desktop/workspace/alibaba/WeexCore-dev/WeexCore-
-//
dev/android/weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
+// 
weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
 // For
 // com/taobao/weex/layout/MeasureMode
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3aeb6402/weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
--
diff --git 
a/weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h 
b/weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
index 6f5849a..12666f7 100644
--- a/weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
+++ b/weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 // This file is autogenerated by
-// /Users/miomin/Desktop/workspace/alibaba/WeexCore-dev/WeexCore-
-//
dev/android/weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
+// 
weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
 // For
 // com/taobao/weex/base/SystemMessageHandler
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3aeb6402/weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
--
diff --git a/weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h 
b/weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
index f55f8a1..c3b99c3 100644
--- a/weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
+++ b/weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 // This file is autogenerated by
-// /Users/miomin/Desktop/workspace/alibaba/WeexCore-dev/WeexCore-
-//
dev/android/weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
+// 
weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py
 // For
 // com/taobao/weex/bridge/WXBridge

[18/52] [abbrv] incubator-weex git commit: * [android] git cherry pick 0f294f0d4311ebb308d694accfe254e725f947e1

2018-05-07 Thread kyork

* [android] git cherry pick 0f294f0d4311ebb308d694accfe254e725f947e1


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

Branch: refs/heads/master
Commit: 581eb3a8d832a0280b752b2eaa1ac66f88416806
Parents: 79f1f7c
Author: Hanks 
Authored: Thu Apr 26 16:15:14 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 pre-build/weex-main-jsfm.js | 19148 +
 pre-build/weex-rax-api.js   | 2 +-
 2 files changed, 3 insertions(+), 19147 deletions(-)
--

[07/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.1

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a3f6f7e0/pre-build/weex-rax-api.js
--
diff --git a/pre-build/weex-rax-api.js b/pre-build/weex-rax-api.js
index 73402c3..8ebe5e1 100644
--- a/pre-build/weex-rax-api.js
+++ b/pre-build/weex-rax-api.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("Prepare Rax Environment APIs 
(0.4.20), Build 2018-04-26 18:10.");var 
global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o.w={},o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().to
 
Fixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof 
e&!==e};e.exports.LISTENERS=r("listeners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[50/52] [abbrv] incubator-weex git commit: * [android] Report layer overflow limit error on android 4.x.

2018-05-07 Thread kyork

* [android] Report layer overflow limit error on android 4.x.


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

Branch: refs/heads/master
Commit: 52e84f2d8ae3bd7a82bf9c884bf2c41afb0a6a57
Parents: 46ce1c5
Author: miomin <691292...@qq.com>
Authored: Fri May 4 11:39:07 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../java/com/taobao/weex/WXSDKInstance.java | 10 ++
 .../java/com/taobao/weex/common/Constants.java  |  1 +
 .../com/taobao/weex/common/WXErrorCode.java |  5 ++-
 .../taobao/weex/ui/component/WXComponent.java   | 10 --
 .../com/taobao/weex/ui/component/WXDiv.java | 31 ++---
 .../com/taobao/weex/ui/component/WXEmbed.java   | 10 --
 .../taobao/weex/ui/component/WXVContainer.java  |  3 --
 .../com/taobao/weex/ui/view/WXFrameLayout.java  | 36 ++--
 8 files changed, 63 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52e84f2d/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 3904f78..9354949 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -171,6 +171,16 @@ public class WXSDKInstance implements 
IWXActivityStateListener,View.OnLayoutChan
   private ComponentObserver mComponentObserver;
   private Map inactiveAddElementAction = new 
ArrayMap<>();
 
+  private boolean hasLayerLimit = false;
+
+  public void setLayerLimit(boolean hasLayerLimit) {
+this.hasLayerLimit = hasLayerLimit;
+  }
+
+  public boolean isLayerLimit() {
+return hasLayerLimit;
+  }
+
   /**
* set open SandBox
* @param flag

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52e84f2d/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 c423ad1..d5e4ee1 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
@@ -189,6 +189,7 @@ public class Constants {
 String ARIA_HIDDEN = "ariaHidden";
 String ROLE = "role";
 
+String LAYERLIMIT = "layerLimit";
 String LAYER_LIMIT = "layer-limit";
 
 String DIRECTION = "direction";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52e84f2d/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java 
b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
index 0f77ec9..838b42f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
@@ -201,7 +201,6 @@ public enum WXErrorCode {
   WX_KEY_EXCEPTION_DOM_MODULEINVO("-9317", "[WX_KEY_EXCEPTION_DOM_MODULEINVO] 
details",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
 
 
-
   /**
* WX Key Exception Commit RT JsBridge eg. js excute runtime error
*/
@@ -212,8 +211,8 @@ public enum WXErrorCode {
* renderErrorCode
*/
   WX_RENDER_ERR_JS_CREATE_INSTANCE("-9600", 
"WX_RENDER_ERR_JS_CREATE_INSTANCE",ErrorType.RENDER_ERROR,ErrorGroup.JS),
-  WX_RENDER_ERR_JS_RUNTIME("-9601", "WX_RENDER_ERR for js 
error",ErrorType.RENDER_ERROR,
-  ErrorGroup.JS),
+  WX_RENDER_ERR_JS_RUNTIME("-9601", "WX_RENDER_ERR for js 
error",ErrorType.RENDER_ERROR, ErrorGroup.JS),
+  WX_RENDER_ERR_LAYER_OVERFLOW("-9602", "WX_RENDER_ERR_LAYER_OVERFLOW", 
ErrorType.RENDER_ERROR, ErrorGroup.JS),
 
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/52e84f2d/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 add5921..86f6347 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
@@ -171,16 +171,6 @@ public

[32/52] [abbrv] incubator-weex git commit: * [Core] Turn off FlatGUI.

2018-05-07 Thread kyork

* [Core] Turn off FlatGUI.


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

Branch: refs/heads/master
Commit: a8e2cd9d5103b26021b6fab8ee5fdaa7c6ff9866
Parents: 66268d4
Author: miomin <691292...@qq.com>
Authored: Sat Apr 28 12:14:19 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../com/taobao/weex/ui/view/WXFrameLayout.java  | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a8e2cd9d/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
index fce7dcc..fdf4eb0 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
@@ -94,22 +94,22 @@ public class WXFrameLayout extends FrameLayout implements 
WXGestureObservable,IR
 return mWidgets != null || super.verifyDrawable(who);
   }
 
-  @Override
-  protected void dispatchDraw(Canvas canvas) {
-try {
-  if (mWidgets != null) {
-canvas.save();
-canvas.translate(getPaddingLeft(), getPaddingTop());
-for (Widget widget : mWidgets) {
-  widget.draw(canvas);
-}
-canvas.restore();
-  } else {
-WXViewUtils.clipCanvasWithinBorderBox(this, canvas);
-super.dispatchDraw(canvas);
-  }
-}catch (Throwable e){
-  WXLogUtils.e("FlatGUI Crashed when dispatchDraw", 
WXLogUtils.getStackTrace(e));
-}
-  }
+//  @Override
+//  protected void dispatchDraw(Canvas canvas) {
+//try {
+//  if (mWidgets != null) {
+//canvas.save();
+//canvas.translate(getPaddingLeft(), getPaddingTop());
+//for (Widget widget : mWidgets) {
+//  widget.draw(canvas);
+//}
+//canvas.restore();
+//  } else {
+//WXViewUtils.clipCanvasWithinBorderBox(this, canvas);
+//super.dispatchDraw(canvas);
+//  }
+//}catch (Throwable e){
+//  WXLogUtils.e("FlatGUI Crashed when dispatchDraw", 
WXLogUtils.getStackTrace(e));
+//}
+//  }
 }

[37/52] [abbrv] incubator-weex git commit: * [core] Add license

2018-05-07 Thread kyork

* [core] Add 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/63d810f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/63d810f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/63d810f0

Branch: refs/heads/master
Commit: 63d810f07cfdbadf9472b192405c315ed640da3c
Parents: 6d2337d
Author: miomin <691292...@qq.com>
Authored: Fri May 4 16:28:48 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../bridge/impl/jsfunction_impl_android.cpp   | 18 ++
 .../android/bridge/impl/jsfunction_impl_android.h | 18 ++
 .../render_action_appendtree_createfinish.cpp | 18 ++
 .../render_action_appendtree_createfinish.h   | 18 ++
 4 files changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/63d810f0/weex_core/Source/android/bridge/impl/jsfunction_impl_android.cpp
--
diff --git a/weex_core/Source/android/bridge/impl/jsfunction_impl_android.cpp 
b/weex_core/Source/android/bridge/impl/jsfunction_impl_android.cpp
index 468eb96..453e99a 100644
--- a/weex_core/Source/android/bridge/impl/jsfunction_impl_android.cpp
+++ b/weex_core/Source/android/bridge/impl/jsfunction_impl_android.cpp
@@ -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.
+ */
 //
 // Created by Darin on 27/03/2018.
 //

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/63d810f0/weex_core/Source/android/bridge/impl/jsfunction_impl_android.h
--
diff --git a/weex_core/Source/android/bridge/impl/jsfunction_impl_android.h 
b/weex_core/Source/android/bridge/impl/jsfunction_impl_android.h
index 1dd74cb..0c2d8bc 100644
--- a/weex_core/Source/android/bridge/impl/jsfunction_impl_android.h
+++ b/weex_core/Source/android/bridge/impl/jsfunction_impl_android.h
@@ -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.
+ */
 //
 // Created by Darin on 27/03/2018.
 //

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/63d810f0/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
--
diff --git 
a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp 
b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
index 9dbaeee..42d3d49 100644
--- 
a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
+++ 
b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
@@ -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

[23/52] [abbrv] incubator-weex git commit: * [android] git cherry-pick cc1ee583cce2f6e8f1fbc74f088c70cb826d4bad

2018-05-07 Thread kyork

* [android] git cherry-pick cc1ee583cce2f6e8f1fbc74f088c70cb826d4bad


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

Branch: refs/heads/master
Commit: efc2d297986f1abceac168ffb1ba592f8b282f0b
Parents: 8a636a1
Author: miomin <691292...@qq.com>
Authored: Thu Apr 26 16:48:01 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 android/sdk/assets/weex-main-jsfm.js   |   2 +-
 android/sdk/assets/weex-rax-api.js |   2 +-
 android/sdk/libs/armeabi/libweexjsc.so | Bin 0 -> 1748292 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--

[19/52] [abbrv] incubator-weex git commit: [WeexCore] merge devTool

2018-05-07 Thread kyork

[WeexCore] merge devTool


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

Branch: refs/heads/master
Commit: 454de5c0f0f8e72f0aa832584e46ecf10012268d
Parents: 581eb3a
Author: ç«ç 
Authored: Thu Apr 26 16:22:54 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 .../jniprebuild/jniheader/WXJsFunctions_jni.h   | 171 +++
 1 file changed, 171 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/454de5c0/weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h
--
diff --git a/weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h 
b/weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h
new file mode 100644
index 000..3cb0ec6
--- /dev/null
+++ b/weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h
@@ -0,0 +1,171 @@
+//
+// Created by Darin on 27/03/2018.
+//
+
+#ifndef WEEX_PROJECT_WXJSFUNCTIONS_JNI_H
+#define WEEX_PROJECT_WXJSFUNCTIONS_JNI_H
+
+#include 
+#include "../../base/jni/android_jni.h"
+
+namespace {
+const char kWXJsFunctionClassPath[] = 
"com/taobao/weex/bridge/WXJsFunctions";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_WXJsFunction_clazz = NULL;
+#define WXJsFunction_clazz(env) g_WXJsFunction_clazz
+
+}  // namespace
+
+static void initWxBridge(JNIEnv *env, jobject object, jobject bridge, jstring 
className);
+
+static void jsHandleSetJSVersion(JNIEnv *env, jobject object, jstring 
jsVersion);
+
+static void jsHandleReportException(JNIEnv *env, jobject object, jstring 
instanceId, jstring func,
+jstring exceptionjstring);
+
+static void jsHandleCallNative(JNIEnv *env, jobject object, jstring 
instanceId, jbyteArray tasks,
+   jstring callback);
+
+static void
+jsHandleCallNativeModule(JNIEnv *env, jobject object, jstring instanceId, 
jstring module,
+ jstring method, jbyteArray
+ arguments, jbyteArray options);
+
+static void
+jsHandleCallNativeComponent(JNIEnv *env, jobject object, jstring instanceId, 
jstring componentRef,
+jstring method,
+jbyteArray arguments, jbyteArray options);
+
+static void
+jsHandleCallAddElement(JNIEnv *env, jobject object, jstring instanceId, 
jstring ref, jstring dom,
+   jstring index);
+
+static void jsHandleSetTimeout(JNIEnv *env, jobject object, jstring 
callbackId, jstring time);
+
+static void jsHandleCallNativeLog(JNIEnv *env, jobject object, jbyteArray 
str_array);
+
+static void jsFunctionCallCreateBody(JNIEnv *env, jobject object, jstring 
pageId, jstring domStr);
+
+static void
+jsFunctionCallUpdateFinish(JNIEnv *env, jobject object, jstring instanceId, 
jbyteArray tasks,
+   jstring callback);
+
+static void jsFunctionCallCreateFinish(JNIEnv *env, jobject object, jstring 
pageId);
+
+static void
+jsFunctionCallRefreshFinish(JNIEnv *env, jobject object, jstring instanceId, 
jbyteArray tasks,
+jstring callback);
+
+static void
+jsFunctionCallUpdateAttrs(JNIEnv *env, jobject object, jstring pageId, jstring 
ref, jstring data);
+
+static void
+jsFunctionCallUpdateStyle(JNIEnv *env, jobject object, jstring pageId, jstring 
ref, jstring data);
+
+static void jsFunctionCallRemoveElement(JNIEnv *env, jobject object, jstring 
pageId, jstring ref);
+
+static void
+jsFunctionCallMoveElement(JNIEnv *env, jobject object, jstring pageId, jstring 
ref,
+  jstring parentRef, jstring index_str);
+
+static void
+jsFunctionCallAddEvent(JNIEnv *env, jobject object, jstring pageId, jstring 
ref, jstring event);
+
+static void
+jsFunctionCallRemoveEvent(JNIEnv *env, jobject object, jstring pageId, jstring 
ref, jstring event);
+
+static void jsHandleSetInterval(JNIEnv *env, jobject object, jstring 
instanceId, jstring callbackId,
+jstring time);
+
+static void
+jsHandleClearInterval(JNIEnv *env, jobject object, jstring instanceId, jstring 
callbackId);
+
+static void jsHandleCallGCanvasLinkNative(JNIEnv *env, jobject object, jstring 
contextId, int type,
+  jstring val);
+
+
+static const JNINativeMethod kMethodsWXJsFunctions[] = {
+{"initWxBridge",
+"(Ljava/lang/Object;Ljava/lang/String;)V",
+reinterpret_cast(initWxBridge)},
+

[15/52] [abbrv] incubator-weex git commit: *[android] fix register module fail bug

2018-05-07 Thread kyork

 *[android] fix register module fail bug


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

Branch: refs/heads/master
Commit: 8a636a14d2b04a8264b59f1983808e124a913877
Parents: 454de5c
Author: wentao.swt 
Authored: Thu Apr 26 16:25:11 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 .../sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a636a14/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 0bf0051..33d1df2 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
@@ -1840,7 +1840,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
 post(new Runnable() {
   @Override
   public void run() {
-invokeRegisterModules(modules, mRegisterComponentFailList);
+invokeRegisterModules(modules, mRegisterModuleFailList);
   }
 }, null);
   }

[36/52] [abbrv] incubator-weex git commit: * [Core] Update textContentBoxMeasurement to avoid crash

2018-05-07 Thread kyork

* [Core] Update textContentBoxMeasurement to avoid crash


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

Branch: refs/heads/master
Commit: 16d4eb896f9d61375fedb78804447d32a75d14b1
Parents: 3f29907
Author: YorkShen 
Authored: Sat Apr 28 15:32:25 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../measurefunc/TextContentBoxMeasurement.java  | 44 +++-
 .../com/taobao/weex/ui/WXRenderManager.java |  6 +++
 2 files changed, 30 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/16d4eb89/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java
 
b/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java
index 2a5ba3f..1f7789c 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java
@@ -37,6 +37,7 @@ import android.text.style.AbsoluteSizeSpan;
 import android.text.style.AlignmentSpan;
 import android.text.style.ForegroundColorSpan;
 
+import com.taobao.weex.WXSDKManager;
 import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.TextDecorationSpan;
 import com.taobao.weex.dom.WXAttr;
@@ -167,30 +168,33 @@ public class TextContentBoxMeasurement extends 
ContentBoxMeasurement {
**/
   @Override
   public void layoutAfter(float computedWidth, float computedHeight) {
-if (hasBeenMeasured) {
-  if (layout != null &&
-  WXDomUtils.getContentWidth(mComponent.getPadding(), 
mComponent.getBorder(), computedWidth)
-  != previousWidth) {
+if(mComponent!=null) {
+  if (hasBeenMeasured) {
+if (layout != null &&
+WXDomUtils
+.getContentWidth(mComponent.getPadding(), 
mComponent.getBorder(), computedWidth)
+!= previousWidth) {
+  recalculateLayout(computedWidth);
+}
+  } else {
+updateStyleAndText();
 recalculateLayout(computedWidth);
   }
-} else {
-  updateStyleAndText();
-  recalculateLayout(computedWidth);
-}
-hasBeenMeasured = false;
-if (layout != null && !layout.equals(atomicReference.get()) &&
-Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-  if (Thread.currentThread() != Looper.getMainLooper().getThread()) {
-warmUpTextLayoutCache(layout);
+  hasBeenMeasured = false;
+  if (layout != null && !layout.equals(atomicReference.get()) &&
+  Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+if (Thread.currentThread() != Looper.getMainLooper().getThread()) {
+  warmUpTextLayoutCache(layout);
+}
   }
+  swap();
+  WXSDKManager.getInstance().getWXRenderManager().postOnUiThread(new 
Runnable() {
+@Override
+public void run() {
+  mComponent.updateExtra(atomicReference.get());
+}
+  }, mComponent.getInstanceId());
 }
-swap();
-mComponent.getInstance().runOnUiThread(new Runnable() {
-  @Override
-  public void run() {
-mComponent.updateExtra(atomicReference.get());
-  }
-});
   }
 
   private void updateStyleAndText() {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/16d4eb89/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
index e91fb08..c9b4beb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
@@ -71,11 +71,17 @@ public class WXRenderManager {
 return statement.getWXSDKInstance();
   }
 
+  @RestrictTo(Scope.LIBRARY)
   public void postOnUiThread(Runnable runnable, long delayMillis) {
 mWXRenderHandler.postDelayed(WXThread.secure(runnable), delayMillis);
   }
 
   @RestrictTo(Scope.LIBRARY)
+  public void postOnUiThread(Runnable runnable,final String instanceId){
+mWXRenderHandler.post(instanceId, WXThread.secure(runnable));
+  }
+
+  @RestrictTo(Scope.LIBRARY)
   public void postOnUiThread(Runnable runnable){

[27/52] [abbrv] incubator-weex git commit: * [android] Add stacksize-limit for overdraw.

2018-05-07 Thread kyork

* [android] Add stacksize-limit for overdraw.


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

Branch: refs/heads/master
Commit: cddba7fe326e7471d00cb49fc2c34dc31d24ad75
Parents: 0c9dfa3
Author: miomin <691292...@qq.com>
Authored: Sat Apr 28 17:54:17 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../java/com/taobao/weex/common/Constants.java  |  2 ++
 .../taobao/weex/ui/component/WXComponent.java   | 10 ++
 .../com/taobao/weex/ui/component/WXDiv.java | 28 
 .../taobao/weex/ui/component/WXVContainer.java  |  3 ++
 .../com/taobao/weex/ui/view/WXFrameLayout.java  | 34 
 5 files changed, 64 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cddba7fe/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 8f4b440..cd50b3f 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
@@ -189,6 +189,8 @@ public class Constants {
 String ARIA_HIDDEN = "ariaHidden";
 String ROLE = "role";
 
+String STACKSIZE_LIMIT = "stacksizeLimit";
+
 String DIRECTION = "direction";
 String RTL = "rtl";
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cddba7fe/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 55fd843..4f28a7f 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
@@ -170,6 +170,16 @@ public abstract class WXComponent extends 
WXBasicComponent imple
 
   private boolean waste = false;
 
+  private boolean hasStackSizeLimit = false;
+
+  protected void setStackSizeLimit(boolean hasStackSizeLimit) {
+this.hasStackSizeLimit = hasStackSizeLimit;
+  }
+
+  public boolean isStackSizeLimit() {
+return hasStackSizeLimit;
+  }
+
   private ContentBoxMeasurement contentBoxMeasurement;
   private WXTransition mTransition;
   private GraphicSize mPseudoResetGraphicSize;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cddba7fe/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
index b9f5ada..b485db5 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java
@@ -20,8 +20,12 @@ package com.taobao.weex.ui.component;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.annotation.Component;
+import com.taobao.weex.common.Constants;
 import com.taobao.weex.ui.ComponentCreator;
 import com.taobao.weex.ui.action.BasicComponentData;
 import com.taobao.weex.ui.flat.FlatComponent;
@@ -114,4 +118,28 @@ public class WXDiv extends WidgetContainer 
implements FlatCompone
   public boolean isVirtualComponent() {
 return !promoteToView(true);
   }
+
+  @WXComponentProp(name = Constants.Name.STACKSIZE_LIMIT)
+  public void setStackSizeLimitModle(String stackSizeLimit) {
+setStackSizeLimit(getStackSizeLimit(stackSizeLimit));
+  }
+
+  private boolean getStackSizeLimit(String stackSizeLimit) {
+boolean ret = false;
+if (TextUtils.isEmpty(stackSizeLimit)) {
+  return ret;
+}
+
+switch (stackSizeLimit) {
+  case "true":
+ret = true;
+break;
+  case "false":
+ret = false;
+break;
+  default:
+break;
+}
+return ret;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cddba7fe/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

[02/52] [abbrv] incubator-weex git commit: * [android] update

2018-05-07 Thread kyork

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1917421d/android/sdk/assets/weex-main-jsfm.js
--
diff --git a/android/sdk/assets/weex-main-jsfm.js 
b/android/sdk/assets/weex-main-jsfm.js
index cf4d20c..96f6039 100644
--- a/android/sdk/assets/weex-main-jsfm.js
+++ b/android/sdk/assets/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.2, 
Build 2018-04-26 21:14. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");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";var 
t,c,r,u;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,u=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[41/52] [abbrv] incubator-weex git commit: Revert " * [android] update so"

2018-05-07 Thread kyork

Revert " * [android] update so"

This reverts commit 7556443c7b293398e8796d6ccbc95673b67a4238.


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

Branch: refs/heads/master
Commit: 0d3d9664a3f546f8674ec6a64b8a1cae7ec9cef7
Parents: 1995af4
Author: wentao.swt 
Authored: Wed May 2 15:26:51 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 android/sdk/libs/armeabi/libweexjss.so | Bin 6802008 -> 6801432 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0d3d9664/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index 85a722a..dcd78cc 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[38/52] [abbrv] incubator-weex git commit: * [android] Add function for report layer overflow error.

2018-05-07 Thread kyork

* [android] Add function for report layer overflow 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/6d2337d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6d2337d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6d2337d0

Branch: refs/heads/master
Commit: 6d2337d098e1b36f635afa49acabde901cf95674
Parents: 99f1c04
Author: miomin <691292...@qq.com>
Authored: Fri May 4 11:46:04 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../com/taobao/weex/ui/view/WXFrameLayout.java| 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6d2337d0/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
index cfb1ec6..eb3d676 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
@@ -105,23 +105,29 @@ public class WXFrameLayout extends FrameLayout implements 
WXGestureObservable,IR
   try {
 dispatchDrawInterval(canvas);
   } catch (StackOverflowError e) {
-int deep = calLayerDeep(this, 0);
-
WXExceptionUtils.commitCriticalExceptionRT(getComponent().getInstanceId(),
-WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW,
-"draw android view",
-WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW.getErrorMsg() + 
"Layer overflow limit error: " + deep + " layers!",
-null);
+int deep = reportLayerOverFlowError();
 throw new LayerOverFlowLimitException("Layer overflow limit error: " + 
deep + " layers!");
   }
 } else {
   try {
 dispatchDrawInterval(canvas);
   } catch (StackOverflowError e){
+reportLayerOverFlowError();
 WXLogUtils.e("FlatGUI Crashed when dispatchDraw", 
WXLogUtils.getStackTrace(e));
   }
 }
   }
 
+  private int reportLayerOverFlowError() {
+int deep = calLayerDeep(this, 0);
+WXExceptionUtils.commitCriticalExceptionRT(getComponent().getInstanceId(),
+WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW,
+"draw android view",
+WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW.getErrorMsg() + "Layer 
overflow limit error: " + deep + " layers!",
+null);
+return deep;
+  }
+
   private void dispatchDrawInterval(Canvas canvas) {
 if (mWidgets != null) {
   canvas.save();

[51/52] [abbrv] incubator-weex git commit: * [Core] Add callback for append tree createfinish.

2018-05-07 Thread kyork

* [Core] Add callback for append tree createfinish.


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

Branch: refs/heads/master
Commit: b2d22b9a436a13d48a6fb499380b65488ba86492
Parents: 9689fae
Author: miomin <691292...@qq.com>
Authored: Wed May 2 18:09:53 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 .../java/com/taobao/weex/bridge/WXBridge.java   | 11 +
 .../com/taobao/weex/bridge/WXBridgeManager.java | 36 ---
 .../java/com/taobao/weex/common/IWXBridge.java  |  2 +
 .../GraphicActionAppendTreeCreateFinish.java| 47 
 .../taobao/weex/ui/component/WXVContainer.java  |  5 +++
 weex_core/Source/CMakeLists.txt |  1 +
 .../android/bridge/impl/bridge_impl_android.cpp | 25 +++
 .../android/bridge/impl/bridge_impl_android.h   |  2 +
 weex_core/Source/core/bridge/bridge.h   |  2 +
 weex_core/Source/core/css/constants_name.h  |  1 +
 .../render_action_appendtree_createfinish.cpp   | 14 ++
 .../render_action_appendtree_createfinish.h | 21 +
 .../Source/core/render/node/render_object.h |  8 
 .../Source/core/render/page/render_page.cpp | 22 +++--
 weex_core/Source/core/render/page/render_page.h |  4 +-
 15 files changed, 191 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2d22b9a/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 0ea12f4..a0023f5 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
@@ -482,6 +482,17 @@ public class WXBridge implements IWXBridge {
   }
 
   @Override
+  public int callAppendTreeCreateFinish(String instanceId, String ref) {
+int errorCode = IWXBridge.INSTANCE_RENDERING;
+try {
+  errorCode = 
WXBridgeManager.getInstance().callAppendTreeCreateFinish(instanceId, ref);
+} catch (Throwable e) {
+  WXLogUtils.e(TAG, "callAppendTreeCreateFinish throw exception:" + 
e.getMessage());
+}
+return errorCode;
+  }
+
+  @Override
   public int callHasTransitionPros(String instanceId, String ref, 
HashMap styles) {
 int errorCode = IWXBridge.INSTANCE_RENDERING;
 try {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2d22b9a/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 c394ef4..611260e 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
@@ -59,6 +59,7 @@ import com.taobao.weex.ui.action.ActionReloadPage;
 import com.taobao.weex.ui.action.BasicGraphicAction;
 import com.taobao.weex.ui.action.GraphicActionAddElement;
 import com.taobao.weex.ui.action.GraphicActionAddEvent;
+import com.taobao.weex.ui.action.GraphicActionAppendTreeCreateFinish;
 import com.taobao.weex.ui.action.GraphicActionCreateBody;
 import com.taobao.weex.ui.action.GraphicActionCreateFinish;
 import com.taobao.weex.ui.action.GraphicActionLayout;
@@ -2538,7 +2539,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
 } catch (Exception e) {
   WXLogUtils.e("[WXBridgeManager] callLayout exception: ", e);
   WXExceptionUtils.commitCriticalExceptionRT(pageId,
-  WXErrorCode.WX_KEY_EXCEPTION_INVOKE, "callUpdateAttrs",
+  WXErrorCode.WX_KEY_EXCEPTION_INVOKE, "callLayout",
   WXLogUtils.getStackTrace(e), null);
 }
 
@@ -2546,6 +2547,31 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
 return IWXBridge.INSTANCE_RENDERING;
   }
 
+  public int callAppendTreeCreateFinish(String instanceId, String ref) {
+if (WXEnvironment.isApkDebugable() && BRIDGE_LOG_SWITCH) {
+  mLodBuilder.append("[WXBridgeManager] callAppendTreeCreateFinish  
instanceId:").append(instanceId)
+  .append(", ref:").append(ref);
+  WXLogUtils.d(mLodBuilder.substring(0));
+  mLodBuilder.setLength(0);
+}
+
+if (mDestroyedInstanceId != null && 
mDestroyedInstanceId.contains(instanceId)) {
+  return

[10/52] [abbrv] incubator-weex git commit: [WeexCore] merge devTool

2018-05-07 Thread kyork

[WeexCore] merge devTool


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

Branch: refs/heads/master
Commit: f4cdc0f4713c4c66438fe87ad4abfde673a9aa99
Parents: 413b065
Author: ç«ç 
Authored: Thu Apr 26 15:40:22 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 .../gradle/wrapper/gradle-wrapper.properties|   2 +-
 weex_core/Source/CMakeLists.txt |   1 +
 .../bridge/impl/WXJsFunction_Impl_Android.cpp   | 253 +++
 .../bridge/impl/WXJsFunction_Impl_Android.h |  13 +
 .../Source/android/jniprebuild/jni_load.cc  |   2 +
 5 files changed, 270 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4cdc0f4/android/sdk/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/android/sdk/gradle/wrapper/gradle-wrapper.properties 
b/android/sdk/gradle/wrapper/gradle-wrapper.properties
index d649982..73990aa 100644
--- a/android/sdk/gradle/wrapper/gradle-wrapper.properties
+++ b/android/sdk/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http://gw.alicdn.com/bao/uploaded/LB1J5WLJVcMXpXX.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4cdc0f4/weex_core/Source/CMakeLists.txt
--
diff --git a/weex_core/Source/CMakeLists.txt b/weex_core/Source/CMakeLists.txt
index 92ce3ae..a3ff046 100644
--- a/weex_core/Source/CMakeLists.txt
+++ b/weex_core/Source/CMakeLists.txt
@@ -35,6 +35,7 @@ add_library(weexjsc SHARED
 ./android/bridge/impl/weexcore_impl_android.cpp
 ./android/bridge/impl/measure_mode_impl_android.cpp
 ./android/bridge/impl/content_box_measurement_impl_android.cpp
+./android/bridge/impl/WXJsFunction_Impl_Android.cpp
 
 ./android/jsengine/multiprocess/WeexJSConnection.cpp
 ./android/jsengine/multiprocess/WeexProxy.cpp

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4cdc0f4/weex_core/Source/android/bridge/impl/WXJsFunction_Impl_Android.cpp
--
diff --git a/weex_core/Source/android/bridge/impl/WXJsFunction_Impl_Android.cpp 
b/weex_core/Source/android/bridge/impl/WXJsFunction_Impl_Android.cpp
new file mode 100644
index 000..f391654
--- /dev/null
+++ b/weex_core/Source/android/bridge/impl/WXJsFunction_Impl_Android.cpp
@@ -0,0 +1,253 @@
+//
+// Created by Darin on 27/03/2018.
+//
+
+#include "WXJsFunction_Impl_Android.h"
+#include "../../base/string/string_utils.h"
+#include "../../jniprebuild/jniheader/WXJsFunctions_jni.h"
+#include "bridge_impl_android.h"
+#include "../../../core/render/manager/render_manager.h"
+
+using namespace WeexCore;
+
+extern jobject jThis;
+extern jclass jBridgeClazz;
+
+namespace WeexCore {
+bool RegisterWXJsFunction(JNIEnv *env) {
+RegisterNativesImpl(env);
+}
+}
+
+static const char *getCharFromJByte(JNIEnv *env, jbyteArray jbyteArray1) {
+if (jbyteArray1 == nullptr)
+return "";
+
+return jByteArray2Str(env, jbyteArray1).c_str();
+}
+
+static const char *getCharFromJString(JNIEnv *env, jstring string) {
+if (string == nullptr)
+return "";
+return env->GetStringUTFChars(string, nullptr);
+}
+
+void initWxBridge(JNIEnv *env, jobject object, jobject bridge, jstring 
className) {
+jThis = env->NewGlobalRef(bridge);
+const char *classNameChar = env->GetStringUTFChars(className, 0);
+jclass tempClass = env->FindClass(classNameChar);
+jBridgeClazz = (jclass) env->NewGlobalRef(tempClass);
+Bridge_Impl_Android::getInstance()->setGlobalRef(jThis);
+}
+
+void jsHandleSetJSVersion(JNIEnv *env, jobject object, jstring jsVersion) {
+Bridge_Impl_Android::getInstance()->setJSVersion(getCharFromJString(env, 
jsVersion));
+}
+
+void jsHandleReportException(JNIEnv *env, jobject object, jstring instanceId, 
jstring func,
+ jstring exceptionjstring) {
+
Bridge_Impl_Android::getInstance()->reportException(getCharFromJString(env, 
instanceId),
+
getCharFromJString(env, func),
+getCharFromJString(env,
+

[25/52] [abbrv] incubator-weex git commit: * [Core] Turn off FlatGUI.

2018-05-07 Thread kyork

* [Core] Turn off FlatGUI.


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

Branch: refs/heads/master
Commit: 3f29907e8cc2b7dda3bf8978198ca5bf9692bbc9
Parents: 1f78f8c
Author: miomin <691292...@qq.com>
Authored: Sat Apr 28 15:11:04 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3f29907e/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
index b161c78..16f1d62 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java
@@ -48,7 +48,7 @@ public class FlatGUIContext implements Destroyable {
   private Map widgetToComponent = new ArrayMap<>();
 
   public boolean isFlatUIEnabled(WXComponent component) {
-return component.isFlatUIEnabled();
+return false;
   }
 
   public void register(@NonNull WXComponent descendant, @NonNull 
WidgetContainer ancestor) {

[26/52] [abbrv] incubator-weex git commit: * [Core] Fix switch measurement

2018-05-07 Thread kyork

* [Core] Fix switch measurement


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

Branch: refs/heads/master
Commit: 1995af4b09219363f35c92e8e6ee40c12c9511b2
Parents: cddba7f
Author: miomin <691292...@qq.com>
Authored: Wed May 2 12:10:49 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1995af4b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
index a617507..714986e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
@@ -53,6 +53,8 @@ public class WXSwitch extends WXComponent {
   /** uiThread = false **/
   @Override
   public void measureInternal(float width, float height, int 
widthMeasureMode, int heightMeasureMode) {
+mMeasureWidth = 0;
+mMeasureHeight = 0;
 try {
   WXSwitchView wxSwitchView = new WXSwitchView(instance.getContext());
   int widthSpec, heightSpec;
@@ -69,8 +71,6 @@ public class WXSwitch extends WXComponent {
 } catch (RuntimeException e) {
   WXLogUtils.e(WXLogUtils.getStackTrace(e));
 }
-mMeasureWidth = 0;
-mMeasureHeight = 0;
   }
 
   /** uiThread = false **/

[24/52] [abbrv] incubator-weex git commit: Revert "* [Core] Turn off FlatGUI."

2018-05-07 Thread kyork

Revert "* [Core] Turn off FlatGUI."

This reverts commit d75a181d27e75ba7b506fa325f265eb85f0ce0d9.


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

Branch: refs/heads/master
Commit: b4fb9d37c7a82f63f1dc5cf765f912550680e7d5
Parents: a8e2cd9
Author: miomin <691292...@qq.com>
Authored: Sat Apr 28 14:45:14 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 .../com/taobao/weex/ui/view/WXFrameLayout.java  | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b4fb9d37/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
index fdf4eb0..fce7dcc 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
@@ -94,22 +94,22 @@ public class WXFrameLayout extends FrameLayout implements 
WXGestureObservable,IR
 return mWidgets != null || super.verifyDrawable(who);
   }
 
-//  @Override
-//  protected void dispatchDraw(Canvas canvas) {
-//try {
-//  if (mWidgets != null) {
-//canvas.save();
-//canvas.translate(getPaddingLeft(), getPaddingTop());
-//for (Widget widget : mWidgets) {
-//  widget.draw(canvas);
-//}
-//canvas.restore();
-//  } else {
-//WXViewUtils.clipCanvasWithinBorderBox(this, canvas);
-//super.dispatchDraw(canvas);
-//  }
-//}catch (Throwable e){
-//  WXLogUtils.e("FlatGUI Crashed when dispatchDraw", 
WXLogUtils.getStackTrace(e));
-//}
-//  }
+  @Override
+  protected void dispatchDraw(Canvas canvas) {
+try {
+  if (mWidgets != null) {
+canvas.save();
+canvas.translate(getPaddingLeft(), getPaddingTop());
+for (Widget widget : mWidgets) {
+  widget.draw(canvas);
+}
+canvas.restore();
+  } else {
+WXViewUtils.clipCanvasWithinBorderBox(this, canvas);
+super.dispatchDraw(canvas);
+  }
+}catch (Throwable e){
+  WXLogUtils.e("FlatGUI Crashed when dispatchDraw", 
WXLogUtils.getStackTrace(e));
+}
+  }
 }

[30/52] [abbrv] incubator-weex git commit: * [android] update

2018-05-07 Thread kyork

 * [android] update


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

Branch: refs/heads/master
Commit: 282745222a0d795fd9702030aedacdae46a3cc10
Parents: f5434e4
Author: wentao.swt 
Authored: Fri Apr 27 17:10:10 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:08 2018 +0800

--
 android/sdk/assets/weex-main-jsfm.js | 2 +-
 android/sdk/assets/weex-rax-extra-api.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[06/52] [abbrv] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.3

2018-05-07 Thread kyork

* [jsfm] upgrade js framework to v0.26.3


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

Branch: refs/heads/master
Commit: f5434e40239ebacdf35c38323f8b4ef3af420792
Parents: 0e0eac9
Author: Hanks 
Authored: Fri Apr 27 14:53:31 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 pre-build/weex-main-jsfm.js | 2 +-
 pre-build/weex-rax-extra-api.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[39/52] [abbrv] incubator-weex git commit: * [core] open BUILD_TYPE=Release.

2018-05-07 Thread kyork

* [core] open BUILD_TYPE=Release.


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

Branch: refs/heads/master
Commit: 02e9a1cf5bce2aa88698ef15bc9ab21f2bc25e1e
Parents: 3aeb640
Author: é©±å½± 
Authored: Mon May 7 11:55:15 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:09 2018 +0800

--
 android/sdk/build.gradle   |   3 +-
 android/sdk/libs/armeabi/libweexjsc.so | Bin 0 -> 1748292 bytes
 weex_core/Source/core/css/css_value_getter.cpp |  68 +++-
 weex_core/Source/core/css/css_value_getter.h   |  12 ++--
 4 files changed, 45 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/02e9a1cf/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 34bad9b..1b0480b 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -117,7 +117,8 @@ android {
 cmake {
 arguments '-DANDROID_PLATFORM=android-19',
 '-DANDROID_TOOLCHAIN=gcc',
-'-DANDROID_STL=c++_static'
+'-DANDROID_STL=c++_static',
+'-DCMAKE_BUILD_TYPE=Release'
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/02e9a1cf/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
new file mode 100644
index 000..fb1b9a6
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/02e9a1cf/weex_core/Source/core/css/css_value_getter.cpp
--
diff --git a/weex_core/Source/core/css/css_value_getter.cpp 
b/weex_core/Source/core/css/css_value_getter.cpp
index ff7cd6d..ea78c96 100644
--- a/weex_core/Source/core/css/css_value_getter.cpp
+++ b/weex_core/Source/core/css/css_value_getter.cpp
@@ -23,82 +23,88 @@
 
 namespace WeexCore {
 
-  const WXCoreFlexDirection (const std::string ) {
-if (value == COLUMN) {
+  const WXCoreFlexDirection GetWXCoreFlexDirection(const std::string ) {
+const char *c_value = value.c_str();
+if(strcmp(c_value, COLUMN) == 0) {
   return WeexCore::kFlexDirectionColumn;
-} else if (value == ROW) {
+} else if (strcmp(c_value, ROW) == 0) {
   return WeexCore::kFlexDirectionRow;
-} else if (value == COLUMN_REVERSE) {
+} else if (strcmp(c_value, COLUMN_REVERSE) == 0) {
   return WeexCore::kFlexDirectionColumnReverse;
-} else if (value == ROW_REVERSE) {
+} else if (strcmp(c_value, ROW_REVERSE) == 0) {
   return WeexCore::kFlexDirectionRowReverse;
 }
 return WeexCore::kFlexDirectionColumn;
   }
 
-  const WXCoreJustifyContent (const std::string 
) {
-if (value == FLEX_START) {
+  const WXCoreJustifyContent GetWXCoreJustifyContent(const std::string ) 
{
+const char *c_value = value.c_str();
+if (strcmp(c_value, FLEX_START) == 0) {
   return WeexCore::kJustifyFlexStart;
-} else if (value == FLEX_END) {
+} else if (strcmp(c_value, FLEX_END) == 0) {
   return WeexCore::kJustifyFlexEnd;
-} else if (value == CENTER) {
+} else if (strcmp(c_value, CENTER) == 0) {
   return WeexCore::kJustifyCenter;
-} else if (value == SPACE_BETWEEN) {
+} else if (strcmp(c_value, SPACE_BETWEEN) == 0) {
   return WeexCore::kJustifySpaceBetween;
-} else if (value == SPACE_AROUND) {
+} else if (strcmp(c_value, SPACE_AROUND) == 0) {
   return WeexCore::kJustifySpaceAround;
 }
 return WeexCore::kJustifyFlexStart;
   }
 
-  const WXCoreAlignItems (const std::string ) {
-if (value == STRETCH) {
+  const WXCoreAlignItems GetWXCoreAlignItem(const std::string ) {
+const char *c_value = value.c_str();
+if (strcmp(c_value, STRETCH) == 0) {
   return WeexCore::kAlignItemsStretch;
-} else if (value == FLEX_START) {
+} else if (strcmp(c_value, FLEX_START) == 0) {
   return WeexCore::kAlignItemsFlexStart;
-} else if (value == FLEX_END) {
+} else if (strcmp(c_value, FLEX_END) == 0) {
   return WeexCore::kAlignItemsFlexEnd;
-} else if (value == CENTER) {
+} else if (strcmp(c_value, CENTER) == 0) {
   return WeexCore::kAlignItemsCenter;
 }
 return WeexCore::kAlignItemsStretch;
   }
 
-  const WXCoreFlexWrap (const

[03/52] [abbrv] incubator-weex git commit: * [android] update

2018-05-07 Thread kyork

 * [android] update


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

Branch: refs/heads/master
Commit: 1917421d28f0a18f2164aba7ded176f60889e6cf
Parents: ea8dd78
Author: wentao.swt 
Authored: Thu Apr 26 23:03:14 2018 +0800
Committer: YorkShen 
Committed: Mon May 7 15:52:07 2018 +0800

--
 android/sdk/assets/weex-main-jsfm.js | 2 +-
 android/sdk/assets/weex-rax-extra-api.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[GitHub] incubator-weex pull request #1148: [WEEX-309][iOS]fill up context informatio...

2018-05-07 Thread asfgit

Github user asfgit closed the pull request at:

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


---

incubator-weex git commit: [WEEX-309][iOS]fill up context information when javaScript runtime exception occurs

2018-05-07 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/master 9425cc92d -> 089b7a785


[WEEX-309][iOS]fill up context information when javaScript runtime exception 
occurs

[WEEX-309][iOS]fill up context information when javaScript runtime exception 
occurs

Bug:309
close #1148


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

Branch: refs/heads/master
Commit: 089b7a7856ac530627138c89ee16d2d0623db203
Parents: 9425cc9
Author: acton393 
Authored: Fri May 4 18:37:50 2018 +0800
Committer: acton393 
Committed: Mon May 7 15:43:39 2018 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/089b7a78/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m 
b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
index e50e15a..a44c27d 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -982,7 +982,7 @@ _Pragma("clang diagnostic pop") \
 
 if (instance) {
 bundleUrl = instance.pageName?:([instance.scriptURL 
absoluteString]?:@"WX_KEY_EXCEPTION_WXBRIDGE");
-message = [NSString stringWithFormat:@"[WX_KEY_EXCEPTION_WXBRIDGE] 
[%@:%@:%@] %@\n%@\n%@", exception[@"sourceURL"], exception[@"line"], 
exception[@"column"], [exception toString], [exception[@"stack"] toObject], 
instance.scriptURL.absoluteString];
+message = [NSString stringWithFormat:@"[WX_KEY_EXCEPTION_WXBRIDGE] 
[%@:%@:%@] %@\n%@\n%@\n%@\n%@\n%@", exception[@"sourceURL"], 
exception[@"line"], exception[@"column"], [exception toString], 
[exception[@"stack"] toObject], instance.scriptURL.absoluteString, 
instance.callCreateInstanceContext?:@"", 
instance.createInstanceContextResult?:@"", instance.executeRaxApiResult?:@""];
 userInfo = 
@{@"jsMainBundleStringContentLength":instance.userInfo[@"jsMainBundleStringContentLength"]?:@"",
  
@"jsMainBundleStringContentMd5":instance.userInfo[@"jsMainBundleStringContentMd5"]?:@""};
 }

64 matches

Mail list logo