You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/31 02:32:18 UTC

[1/5] incubator-weex git commit: [ios] fix wrong spelling caused compile error on Xcode version 8.2.1(8C1002)

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev ba19f5522 -> e4cbdc468


[ios] fix wrong spelling caused compile error on Xcode version 8.2.1(8C1002)


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

Branch: refs/heads/0.12-dev
Commit: 56b1df4c03163c9a67d4df712ad84decdabe62f6
Parents: 6e71437
Author: \u6728\u74dc <mu...@uoko.com>
Authored: Thu Mar 16 16:39:50 2017 +0800
Committer: \u6728\u74dc <mu...@uoko.com>
Committed: Thu Mar 16 16:39:50 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56b1df4c/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
index ba4846d..851194d 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
@@ -7,7 +7,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "WXSDkInstance.h"
+#import "WXSDKInstance.h"
 
 typedef NS_ENUM(int, WXSDKErrCode)
 {


[4/5] incubator-weex git commit: Merge commit 'c91c12f3a5bb4e3d927beef3701ba57581d0e5dd' into 0.12-dev

Posted by cx...@apache.org.
Merge commit 'c91c12f3a5bb4e3d927beef3701ba57581d0e5dd' into 0.12-dev


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

Branch: refs/heads/0.12-dev
Commit: 09bdb40cb0bf9eb0ffefb2df94c3acff549cbc88
Parents: 80df1aa c91c12f
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 31 10:30:53 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 31 10:30:53 2017 +0800

----------------------------------------------------------------------
 README.md | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------



[3/5] incubator-weex git commit: Update README.md

Posted by cx...@apache.org.
Update README.md

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

Branch: refs/heads/0.12-dev
Commit: c91c12f3a5bb4e3d927beef3701ba57581d0e5dd
Parents: 66e1b5a
Author: sospartan zheng <so...@apache.org>
Authored: Tue Mar 28 16:59:27 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Mar 28 16:59:27 2017 +0800

----------------------------------------------------------------------
 README.md | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c91c12f3/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ba9ae6a..7127484 100644
--- a/README.md
+++ b/README.md
@@ -29,17 +29,17 @@ Please ***INSTALL [Git for Windows](https://git-scm.com/download/win)*** and run
 
 ### Android
 
-0. Prerequisites
-    0. Install [Node.js](http://nodejs.org/) 4.0+
-    0. Under project root
-        0. `npm install`, install project
-        0. `./start`
-    0. Install [Android Environment](http://developer.android.com/training/basics/firstapp/index.html)
-0. Run playground, In Android Studio
-    0. Open `android/playground`
-    0. In `app/java/com.alibaba.weex/IndexActivity`, modify `CURRENT_IP` to your local IP
-    0. Click <img src="http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png" height="16" > (`Run` button)
-0. [Add an example](./examples/README.md#add-an-example)
+* Prerequisites
+  * Install [Node.js](http://nodejs.org/) 4.0+
+  * Under project root
+    * `npm install`, install project
+    * `./start`
+    * Install [Android Environment](http://developer.android.com/training/basics/firstapp/index.html)
+* Run playground, In Android Studio
+    * Open `android/playground`
+    * In `app/java/com.alibaba.weex/IndexActivity`, modify `CURRENT_IP` to your local IP
+    * Click <img src="http://gtms04.alicdn.com/tps/i4/TB1wCcqMpXXXXakXpXX3G7tGXXX-34-44.png" height="16" > (`Run` button)
+* [Add an example](./examples/README.md#add-an-example)
 
 #### Runtime
 
@@ -47,20 +47,20 @@ On Android Platform , Weex code is executed in [weex_v8core](https://github.com/
 
 ### iOS
 
-0. Prerequisites
-  0. Install [Node.js](http://nodejs.org/) 4.0+
-    0. Under project root
-        0. `npm install`, install project
-        0. `./start`
-    0. Install [iOS Environment](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppStoreDistributionTutorial/Setup/Setup.html)
-    0. Install [CocoaPods](https://guides.cocoapods.org/using/getting-started.html)
-0. Run playground
-    0. `cd ios/playground`
-    0. `pod install`
-    0. Open `WeexDemo.xcworkspace` in Xcode
-    0. Click <img src="http://img1.tbcdn.cn/L1/461/1/5470b677a2f2eaaecf412cc55eeae062dbc275f9" height="16" > (`Run` button) or use default shortcut `cmd + r` in Xcode
-    0. If you want to run the demo on your device, don't need to modify `CURRENT_IP` manually. ~~In `DemoDefine.h`(you can search this file by Xcode default shortcut `cmd + shift + o`), modify `CURRENT_IP` to your local IP~~
-0. [Add an example](./examples/README.md#add-an-example)
+* Prerequisites
+  * Install [Node.js](http://nodejs.org/) 4.0+
+    * Under project root
+        * `npm install`, install project
+        * `./start`
+    * Install [iOS Environment](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppStoreDistributionTutorial/Setup/Setup.html)
+    * Install [CocoaPods](https://guides.cocoapods.org/using/getting-started.html)
+* Run playground
+    * `cd ios/playground`
+    * `pod install`
+    * Open `WeexDemo.xcworkspace` in Xcode
+    * Click <img src="http://img1.tbcdn.cn/L1/461/1/5470b677a2f2eaaecf412cc55eeae062dbc275f9" height="16" > (`Run` button) or use default shortcut `cmd + r` in Xcode
+    * If you want to run the demo on your device, don't need to modify `CURRENT_IP` manually. ~~In `DemoDefine.h`(you can search this file by Xcode default shortcut `cmd + shift + o`), modify `CURRENT_IP` to your local IP~~
+* [Add an example](./examples/README.md#add-an-example)
 
 ## Scripts
 


[5/5] incubator-weex git commit: Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev

Posted by cx...@apache.org.
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev


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

Branch: refs/heads/0.12-dev
Commit: e4cbdc468c3ee7fda6e3ace16350bef1fe2df8ce
Parents: 09bdb40 ba19f55
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 31 10:32:13 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 31 10:32:13 2017 +0800

----------------------------------------------------------------------
 .eslintrc                                       |   5 +-
 android/commons/build.gradle                    |   3 +-
 .../weex/commons/AbstractWeexActivity.java      |  24 ++
 android/playground/app/build.gradle             |   3 +-
 .../playground/app/src/main/assets/animation.js |  11 +-
 .../app/src/main/assets/component/a-demo.js     |  11 +-
 .../src/main/assets/component/countdown-demo.js |  11 +-
 .../app/src/main/assets/component/image-demo.js |  11 +-
 .../app/src/main/assets/component/input-demo.js |  11 +-
 .../main/assets/component/list/list-basic.js    |   8 +
 .../assets/component/list/list-demo-horizon.js  |   8 +
 .../src/main/assets/component/list/list-demo.js |   8 +
 .../src/main/assets/component/marquee-demo.js   |  11 +-
 .../src/main/assets/component/navigator-demo.js |  15 +-
 .../main/assets/component/process-bar-demo.js   |  11 +-
 .../src/main/assets/component/scroller-demo.js  |  11 +-
 .../slider-neighbor/slider-neighbor-item.js     |   8 +
 .../slider-neighbor/slider-neighbor-page.js     |   8 +
 .../src/main/assets/component/slider/index.js   |  11 +-
 .../main/assets/component/slider/slider-item.js |   8 +
 .../main/assets/component/slider/slider-page.js |   8 +
 .../main/assets/component/tabbar/tabbar-demo.js |  15 +-
 .../main/assets/component/tabbar/tabbar-item.js |   8 +
 .../app/src/main/assets/component/text-demo.js  |  11 +-
 .../app/src/main/assets/component/video-demo.js |  11 +-
 .../app/src/main/assets/component/web-demo.js   |  11 +-
 android/playground/app/src/main/assets/hello.js |   8 +
 .../playground/app/src/main/assets/iconfont.js  |   8 +
 .../app/src/main/assets/module/clipboard.js     |  11 +-
 .../java/com/alibaba/weex/IndexActivity.java    |   6 +
 .../java/com/alibaba/weex/WXApplication.java    |   4 +
 .../extend/WXInstanceStatisticsListener.java    | 268 +++++++++++++++++
 android/sdk/build.gradle                        |   2 +
 android/sdk/libs/armeabi/libweexv8.so           | Bin 3583820 -> 3563544 bytes
 android/sdk/libs/x86/libweexv8.so               | Bin 4336768 -> 4545544 bytes
 .../com/taobao/weex/IWXStatisticsListener.java  | 252 ++++++++++++++++
 .../main/java/com/taobao/weex/InitConfig.java   |  14 +
 .../java/com/taobao/weex/WXEnvironment.java     |  18 ++
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   5 +-
 .../java/com/taobao/weex/WXSDKInstance.java     |  65 +++-
 .../main/java/com/taobao/weex/WXSDKManager.java |  72 ++++-
 .../taobao/weex/adapter/IWXSoLoaderAdapter.java | 236 +++++++++++++++
 .../java/com/taobao/weex/bridge/WXBridge.java   |   6 +
 .../com/taobao/weex/bridge/WXBridgeManager.java |  59 +++-
 .../java/com/taobao/weex/bridge/WXParams.java   |  13 +
 .../java/com/taobao/weex/common/Constants.java  |   8 +
 .../java/com/taobao/weex/common/IWXBridge.java  |   7 +
 .../taobao/weex/common/WXJSBridgeMsgType.java   |   1 +
 .../taobao/weex/ui/IExternalMoudleGetter.java   | 215 +++++++++++++
 .../java/com/taobao/weex/utils/OsVersion.java   | 233 ++++++++++++++
 .../main/java/com/taobao/weex/utils/Trace.java  | 301 +++++++++++++++++++
 .../taobao/weex/utils/WXSoInstallMgrSdk.java    |  51 +++-
 .../java/com/taobao/weex/utils/WXUtils.java     |  84 +++++-
 .../taobao/weex/bridge/WXWebsocketBridge.java   |   3 +
 build/build.js                                  |   2 +
 build/examples-banner-plugin.js                 |  65 ++++
 build/webpack.examples.config.js                |   3 +-
 html5/frameworks/legacy/app/ctrl/init.js        |  55 +++-
 html5/frameworks/legacy/static/create.js        |   5 +-
 html5/frameworks/legacy/static/life.js          |  17 ++
 60 files changed, 2291 insertions(+), 67 deletions(-)
----------------------------------------------------------------------



[2/5] incubator-weex git commit: Merge branch 'fix-capital-error' of https://github.com/lforme/incubator-weex

Posted by cx...@apache.org.
Merge branch 'fix-capital-error' of https://github.com/lforme/incubator-weex


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

Branch: refs/heads/0.12-dev
Commit: 66e1b5a395c91ee98ba039e335f2e92fdcd1cb54
Parents: 2d7b868 56b1df4
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 16 16:56:21 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 16 16:56:21 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------