[GitHub] incubator-weex issue #777: * [doc] Fixed typo in url

2017-10-11 Thread gurisxie
Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/777
  
@stranger26 thanks for your pull request. 
I have merge your pr at 
[here](https://github.com/apache/incubator-weex/commit/a311ae5531ba8c18f5a6b44a19e51b75cca1ae19),but
 the pr still open because of bot broken.

Can you close this pr,please? 3Q.


---


[GitHub] incubator-weex pull request #786: * [android] if jsf not initialed, use weex...

2017-10-11 Thread yuhun-alibaba
Github user yuhun-alibaba closed the pull request at:

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


---


[GitHub] incubator-weex pull request #786: * [android] if jsf not initialed, use weex...

2017-10-11 Thread yuhun-alibaba
GitHub user yuhun-alibaba reopened a pull request:

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

 * [android] if jsf not initialed, use weex to load page may fail and…

jsf not initialed or init fail , use weex to load page may fail and report 
exception
in order to aovid wait exception, report creat instance failed directly and 
initFramework async

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

$ git pull https://github.com/yuhun-alibaba/incubator-weex release-0.16

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

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


commit 35a03a8dd460d1c5fba5e4046dfd5424f13f1ba8
Author: yuhun-alibaba 
Date:   2017-10-11T14:41:33Z

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

commit 05214a79dc115db0c7fc05debe0c6abae51f876e
Author: yuhun-alibaba 
Date:   2017-10-12T03:47:06Z

 * [android] update so
 delete some debug log




---


[GitHub] incubator-weex pull request #787: * [android] fix bug js console.log not bee...

2017-10-11 Thread atomtong
GitHub user atomtong reopened a pull request:

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

* [android] fix bug js console.log  not been print out


Android bugfix js log no print out 0.16

- [x] Make sure that you add at least one unit test for the bug which you 
had fixed.



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

$ git pull https://github.com/atomtong/incubator-weex 
android-bugfix-jsLogNoPrintOut-0.16

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

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


commit 71a1c3206a3fa3de12c78719e8499dff099e0c66
Author: atomtong 
Date:   2017-10-12T03:44:50Z

* [android] fix bug js console.log  not been print out




---


[GitHub] incubator-weex pull request #787: * [android] fix bug js console.log not bee...

2017-10-11 Thread atomtong
Github user atomtong closed the pull request at:

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


---


[GitHub] incubator-weex issue #787: * [android] fix bug js console.log not been print...

2017-10-11 Thread weex-bot
Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

  :warning:
  This PR should update related documents as well. 

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




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




---


[GitHub] incubator-weex pull request #787: * [android] fix bug js console.log not bee...

2017-10-11 Thread atomtong
GitHub user atomtong opened a pull request:

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

* [android] fix bug js console.log  not been print out


Android bugfix js log no print out 0.16

- [x] Make sure that you add at least one unit test for the bug which you 
had fixed.



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

$ git pull https://github.com/atomtong/incubator-weex 
android-bugfix-jsLogNoPrintOut-0.16

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

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


commit 71a1c3206a3fa3de12c78719e8499dff099e0c66
Author: atomtong 
Date:   2017-10-12T03:44:50Z

* [android] fix bug js console.log  not been print out




---


[GitHub] incubator-weex issue #786: * [android] if jsf not initialed, use weex to loa...

2017-10-11 Thread weex-bot
Github user weex-bot commented on the issue:

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






  

  
  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 #786: * [android] if jsf not initialed, use weex...

2017-10-11 Thread yuhun-alibaba
GitHub user yuhun-alibaba opened a pull request:

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

 * [android] if jsf not initialed, use weex to load page may fail and…

jsf not initialed or init fail , use weex to load page may fail and report 
exception
in order to aovid wait exception, report creat instance failed directly and 
initFramework async

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

$ git pull https://github.com/yuhun-alibaba/incubator-weex release-0.16

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

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


commit 35a03a8dd460d1c5fba5e4046dfd5424f13f1ba8
Author: yuhun-alibaba 
Date:   2017-10-11T14:41:33Z

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




---


[GitHub] incubator-weex pull request #784: update so

2017-10-11 Thread asfgit
Github user asfgit closed the pull request at:

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


---


incubator-weex git commit: update so

2017-10-11 Thread gurisxie
Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 ccf0590b3 -> 9ea8bbd3c


 update so


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

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

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


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

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

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



[2/2] incubator-weex git commit: * [doc] Fixed article typo

2017-10-11 Thread gurisxie
* [doc] Fixed article typo

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

Branch: refs/heads/master
Commit: 7519123e87bcab4389110e4888b967cd27bb9f1d
Parents: bdf512c
Author: Ho Chin Chee 
Authored: Tue Oct 10 16:50:41 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 20:02:04 2017 +0800

--
 doc/source/references/vue/difference-with-web.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7519123e/doc/source/references/vue/difference-with-web.md
--
diff --git a/doc/source/references/vue/difference-with-web.md 
b/doc/source/references/vue/difference-with-web.md
index 2af11f9..b750591 100644
--- a/doc/source/references/vue/difference-with-web.md
+++ b/doc/source/references/vue/difference-with-web.md
@@ -9,7 +9,7 @@ version: 2.1
 
 ## Platform Differences
 
-Vue.js was designed for the Web platform at the begining. Although it can be 
based on Weex to develop native applications, there are still many differences 
between web and native. See [Platform Differences Between Weex and Web](../ 
platform-difference.html) for more details.
+Vue.js was designed for the Web platform at the begining. Although it can be 
based on Weex to develop native applications, there are still many differences 
between web and native. See [Platform Differences Between Weex and 
Web](../platform-difference.html) for more details.
 
 Due to those differences, Weex doesn't support those features in Vue.js 
(mostly are DOM-related):
 



[1/2] incubator-weex git commit: * [doc] Fixed typo in filename

2017-10-11 Thread gurisxie
Repository: incubator-weex
Updated Branches:
  refs/heads/master bdf512cf3 -> a311ae553


* [doc] Fixed typo in filename

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

Branch: refs/heads/master
Commit: a311ae5531ba8c18f5a6b44a19e51b75cca1ae19
Parents: 7519123
Author: Ho Chin Chee 
Authored: Tue Oct 10 16:51:15 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 20:02:04 2017 +0800

--
 doc/source/references/platform-difference.md | 11 +++
 doc/source/references/platfrom-difference.md | 11 ---
 2 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a311ae55/doc/source/references/platform-difference.md
--
diff --git a/doc/source/references/platform-difference.md 
b/doc/source/references/platform-difference.md
new file mode 100644
index 000..0aadfae
--- /dev/null
+++ b/doc/source/references/platform-difference.md
@@ -0,0 +1,11 @@
+---
+title: Platform Differences Between Weex and Web
+type: references
+order: 12
+version: 2.1
+has_chapter_content: true
+---
+
+# Platform Differences Between Weex and Web
+
+Work in progresss.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a311ae55/doc/source/references/platfrom-difference.md
--
diff --git a/doc/source/references/platfrom-difference.md 
b/doc/source/references/platfrom-difference.md
deleted file mode 100644
index 0aadfae..000
--- a/doc/source/references/platfrom-difference.md
+++ /dev/null
@@ -1,11 +0,0 @@

-title: Platform Differences Between Weex and Web
-type: references
-order: 12
-version: 2.1
-has_chapter_content: true

-
-# Platform Differences Between Weex and Web
-
-Work in progresss.



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

2017-10-11 Thread gurisxie
Revert "* [ios] set default value to nil when the configuration is empty"

This reverts commit 4376205615fdcbd4fd9f118a02961e074eb057bf.


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

Branch: refs/heads/master
Commit: bdf512cf39900ce8d8a3892e40d009cd3203fc7a
Parents: d94c3c7
Author: acton393 
Authored: Wed Oct 11 12:25:29 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 19:05:12 2017 +0800

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


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



[2/6] incubator-weex git commit: update so for app install on sdcard

2017-10-11 Thread gurisxie
 update so for app install on sdcard


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

Branch: refs/heads/master
Commit: d65e833ca94ac1288439a9b354ce4b08b3f1fc20
Parents: 428b0ea
Author: yuhun-alibaba 
Authored: Tue Oct 10 16:21:49 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 19:05:11 2017 +0800

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


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

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

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



[GitHub] incubator-weex issue #780: * [android] fix flicker caused by coexistence of ...

2017-10-11 Thread gurisxie
Github user gurisxie commented on the issue:

https://github.com/apache/incubator-weex/pull/780
  
@misakuo android unittest error,please have a look!

--
com.taobao.weex.ui.component.WXSwitchTest > testAddEvent FAILED
java.lang.NullPointerException
at 
com.taobao.weex.ui.component.WXComponent.clearBoxShadow(WXComponent.java:915)
at 
com.taobao.weex.ui.component.WXComponent.setComponentLayoutParams(WXComponent.java:513)
at 
com.taobao.weex.ui.component.WXComponent.setLayout(WXComponent.java:495)
at 
com.taobao.weex.ui.component.ComponentTest.create(ComponentTest.java:55)
at 
com.taobao.weex.ui.component.WXSwitchTest.setUp(WXSwitchTest.java:58)

com.taobao.weex.ui.component.WXSwitchTest > testSetProperty FAILED
java.lang.NullPointerException
at 
com.taobao.weex.ui.component.WXComponent.clearBoxShadow(WXComponent.java:915)
at 
com.taobao.weex.ui.component.WXComponent.setComponentLayoutParams(WXComponent.java:513)
at 
com.taobao.weex.ui.component.WXComponent.setLayout(WXComponent.java:495)
at 
com.taobao.weex.ui.component.ComponentTest.create(ComponentTest.java:55)
at 
com.taobao.weex.ui.component.WXSwitchTest.setUp(WXSwitchTest.java:58)



---


[3/6] incubator-weex git commit: update x86 so

2017-10-11 Thread gurisxie
 update x86 so


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

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

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


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



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

2017-10-11 Thread gurisxie
* [ios] set default value to nil when the configuration is empty


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

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

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


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



[1/6] incubator-weex git commit: init framework and insert cacheDir for debug

2017-10-11 Thread gurisxie
Repository: incubator-weex
Updated Branches:
  refs/heads/master 428b0eadc -> bdf512cf3


 init framework and insert cacheDir for debug


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

Branch: refs/heads/master
Commit: 45a9fd1d2e5afbce364809eb41c8e916bfd468c9
Parents: d65e833
Author: 御魂 
Authored: Mon Oct 9 16:40:02 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 19:05:11 2017 +0800

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


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

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

http:/

[6/6] incubator-weex git commit: update x86 so

2017-10-11 Thread gurisxie
 update x86 so


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

Branch: refs/heads/master
Commit: acb18154c015b7a48b67476ae41269c2b3114760
Parents: 45a9fd1
Author: yuhun-alibaba 
Authored: Tue Oct 10 18:17:43 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 19:05:12 2017 +0800

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


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



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

2017-10-11 Thread gurisxie
* [ios] set default value to nil when the configuration is empty


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

Branch: refs/heads/master
Commit: d94c3c76235b52f6211e5a230665a93ddb7c3b88
Parents: 38f4369
Author: acton393 
Authored: Wed Oct 11 11:45:45 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 19:05:12 2017 +0800

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


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



[3/6] incubator-weex git commit: * [ios] bugfix list view can not scroll

2017-10-11 Thread gurisxie
* [ios] bugfix list view can not scroll


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

Branch: refs/heads/master
Commit: 38f4369279f4d84e21dae6a9a1afda9daa780cae
Parents: acb1815
Author: acton393 
Authored: Wed Oct 11 11:39:53 2017 +0800
Committer: gurisxie <279483...@qq.com>
Committed: Wed Oct 11 19:05:12 2017 +0800

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


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

[1/6] incubator-weex git commit: update so for app install on sdcard

2017-10-11 Thread gurisxie
Repository: incubator-weex
Updated Branches:
  refs/heads/release 045e83863 -> ccf0590b3


 update so for app install on sdcard


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

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

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


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

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

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



[4/6] incubator-weex git commit: * [ios] bugfix list view can not scroll

2017-10-11 Thread gurisxie
* [ios] bugfix list view can not scroll


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

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

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


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

[2/6] incubator-weex git commit: init framework and insert cacheDir for debug

2017-10-11 Thread gurisxie
 init framework and insert cacheDir for debug


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

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

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


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

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

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/07bc5b0d/android/sdk/src/main/java/com/taobao/wee

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

2017-10-11 Thread gurisxie
Revert "* [ios] set default value to nil when the configuration is empty"

This reverts commit 4376205615fdcbd4fd9f118a02961e074eb057bf.


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

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

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


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



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

2017-10-11 Thread weex-bot
Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

  :warning:
  These new JS files do not have Flow enabled: 
html5/runtime/api/WeexInstance.js, html5/runtime/api/component.js, 
html5/runtime/api/module.js

  

  :warning:
  This PR should update related documents as well. 

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




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




---


[GitHub] incubator-weex pull request #785: [WEEX-17] Abstract "weex" variable for eac...

2017-10-11 Thread Hanks10100
GitHub user Hanks10100 opened a pull request:

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

[WEEX-17] Abstract "weex" variable for each js framework

Fix [WEEX-17](https://issues.apache.org/jira/browse/WEEX-17).

Pass the `weex` variable to each front-end framework in the last argument 
of `createInstance`. Its API is defined 
[here](http://weex.apache.org/references/weex-variable.html).

Both Vue and Rax can use the `weex` variable with the same implementation. 
Currently, Vue passed `weex` variable to the js bundle, but Rax doesn't pass it 
yet.

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

$ git pull https://github.com/Hanks10100/incubator-weex jsfm-feature-weex

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

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


commit 48ccea1c4edc02b7af80e81f5639243776bef077
Author: Hanks 
Date:   2017-10-11T09:19:48Z

+ [jsfm] add weex variable api in runtime




---


[GitHub] incubator-weex issue #784: update so

2017-10-11 Thread weex-bot
Github user weex-bot commented on the issue:

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





  

  
  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 #784: update so

2017-10-11 Thread yuhun-alibaba
GitHub user yuhun-alibaba opened a pull request:

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

update so

* [android] update jsc so, fix crash add a proguard

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

$ git pull https://github.com/yuhun-alibaba/incubator-weex release-0.16

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

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


commit 9ea8bbd3c15fd958a5a675571c45cc20951ec814
Author: yuhun-alibaba 
Date:   2017-10-11T06:27:47Z

 update so




---