Merge branch 'dev' of github.com:alibaba/weex into doc

Author: Jinjiang

.eslintignore

@@ -0,0 +1,3 @@
+# do not lint test case source files
+html5/test/case/*/*.source.js
+html5/test/case/*/*.output.js

.eslintrc

@@ -16,6 +16,7 @@
     "window": false,
     "location": false,
     "callNative": false,
+    "callAddElement":false,
     "callJS": false
   },
 

.gitignore

@@ -22,10 +22,16 @@ pids
 *.pid
 *.seed
 
-# build framework options by script
-html5/runtime/config.js
-
 # e2e test
 html5/test/e2e/reports
 html5/test/e2e/screenshots
 html5/test/e2e/logs
+
+# Created by Weex Web Packer
+html5/browser/extend/packer.js
+html5/render/browser/extend/packer.js
+
+android/playground/app/gradlew
+android/playground/app/gradlew.bat
+android/playground/app/gradle/wrapper/gradle-wrapper.jar
+android/playground/app/gradle/wrapper/gradle-wrapper.properties

.wwprc

@@ -0,0 +1,36 @@
+{
+  "componentsPath": "./html5/render/browser/extend/components",
+  "apisPath": "./html5/render/browser/extend/api",
+  "loadersPath": "./html5/render/browser/extend/loader",
+  "packer": "./html5/render/browser/extend/packer.js",
+  "components": [
+    "image",
+    "text",
+    "scrollable",
+    "slider",
+    "indicator",
+    "tabheader",
+    "input",
+    "textarea",
+    "video",
+    "switch",
+    "a",
+    "embed",
+    "spinner",
+    "web"
+  ],
+  "apis": [
+    "animation",
+    "clipboard",
+    "dom",
+    "event",
+    "geolocation",
+    "globalEvent",
+    "modal",
+    "navigator",
+    "pageInfo",
+    "storage",
+    "stream",
+    "webview"
+  ]
+}

README.md

@@ -1,34 +1,37 @@
-# Weex
+# Weex    
+Android[![Download](https://api.bintray.com/packages/alibabaweex/maven/weex_sdk/images/download.svg)](https://bintray.com/alibabaweex/maven/weex_sdk/_latestVersion)
+iOS[![Pod version](https://badge.fury.io/co/WeexSDK.svg)](https://cocoapods.org/pods/WeexSDK)
+HTML5[![npm version](https://badge.fury.io/js/weex-html5.svg)](https://www.npmjs.com/package/weex-html5)
 
 > A framework for building Mobile cross-platform UI.
 
 [![CircleCI](https://circleci.com/gh/alibaba/weex/tree/dev.svg?style=svg&circle-token=b83b047a3a01f6ec26458a455530a5ddc261925f)](https://circleci.com/gh/alibaba/weex/tree/dev) [![Gitter](https://img.shields.io/gitter/room/weexteam/cn.svg?maxAge=2592000)](https://gitter.im/weexteam) <sub>(English Gitter)</sub> [![Gitter](https://img.shields.io/gitter/room/weexteam/cn.svg?maxAge=2592000)](https://gitter.im/weexteam/cn) <sub>(Chinese 中文聊天室)</sub>
 
-Support Android 4.1 (API 16) and iOS 7.0+. See [Weex website](http://alibaba.github.io/weex/) for more information. 
+Support Android 4.1 (API 16) and iOS 7.0+. See [Weex website](https://alibaba.github.io/weex/) for more information.
 
 ## For Windows
 
 Please ***INSTALL [Git for Windows](https://git-scm.com/download/win)*** and run all the following commands in git-bash.
 
 ## Meet Weex
 
-* Install [Weex Playground App](http://alibaba.github.io/weex/download.html) to see examples we already written.
+* Install [Weex Playground App](https://alibaba.github.io/weex/download.html) to see examples we already written.
 * If you want to write a demo, install [weex-toolkit](https://www.npmjs.com/package/weex-toolkit) in [Node.js](http://nodejs.org/) 4.0+ and
 * Run `weex init` to generate & start a simple project in an empty folder.
 * Follow the instructions in the project README.
 * Enjoy it.
 
 ## Use Weex
 
-* [Tutorial](http://alibaba.github.io/weex/doc/tutorial.html)
-* Doc: [English](http://alibaba.github.io/weex/doc/), [中文](https://github.com/weexteam/article/wiki/Weex%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3)
+* [Tutorial](https://alibaba.github.io/weex/doc/tutorial.html)
+* Doc: [English](https://alibaba.github.io/weex/doc/), [中文](https://github.com/weexteam/article/wiki/Weex%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3)
 
-### Android 
+### Android
 
 0. Prerequisites
     0. Install [Node.js](http://nodejs.org/) 4.0+
-    0. Under project root 
-        0. `npm install`, install project 
+    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
@@ -46,8 +49,8 @@ On Android Platform , Weex code is executed in [weex_v8core](https://github.com/
 
 0. Prerequisites
 	0. Install [Node.js](http://nodejs.org/) 4.0+
-    0. Under project root 
-        0. `npm install`, install project 
+    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)
@@ -64,16 +67,18 @@ On Android Platform , Weex code is executed in [weex_v8core](https://github.com/
 See [SCRIPTS.md](./SCRIPTS.md) for more information.
 
 
-## IDE Plugin & Syntax Highlight
+## IDE Plugin & Syntax Highlight & DevTool
 
-See [Weex Community](https://github.com/alibaba/weex/wiki/Weex-Community) Wiki page 
+See [Weex Community](https://github.com/alibaba/weex/wiki/Weex-Community) Wiki page
+
+Weex team have developed a [DevTool](https://github.com/weexteam/weex-devtool) to help you to improve `we file` debug efficiency.
 
 ## FAQ
 
-See [FAQ](http://alibaba.github.io/weex/doc/faq.html) for more information.
+See [FAQ](https://alibaba.github.io/weex/doc/faq.html) for more information.
 
 
-### Community based Weex knowledge site 
+### Community based Weex knowledge site
 
 * [weex article](https://github.com/weexteam/article/wiki) : article collection about Weex(文章集合)
 * [weex.help](http://weex.help/)  : 3rd forum about Weex(第三方Weex中文技术论坛)
@@ -82,4 +87,3 @@ See [FAQ](http://alibaba.github.io/weex/doc/faq.html) for more information.
 ## Contributing
 
 See [Weex Contributing Guide](./CONTRIBUTING.md) for more information.
-

android/commons/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.facebook.fresco:fresco:0.10.0'
 
+    provided 'com.taobao.android:weex_analyzer:0.1.0.5'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-core:1.3'

android/commons/src/main/java/com/alibaba/weex/commons/AbstractWeexActivity.java

@@ -206,8 +206,10 @@
 
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import com.alibaba.weex.commons.util.ScreenUtil;
@@ -228,11 +230,15 @@ public abstract class AbstractWeexActivity extends AppCompatActivity implements
   private ViewGroup mContainer;
   private WXSDKInstance mInstance;
 
+  protected WXAnalyzerDelegate mWxAnalyzerDelegate;
+
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     createWeexInstance();
     mInstance.onActivityCreate();
+    mWxAnalyzerDelegate = new WXAnalyzerDelegate(this);
+    mWxAnalyzerDelegate.onCreate();
   }
 
   protected final void setContainer(ViewGroup container){
@@ -307,6 +313,9 @@ public void onStart() {
     if(mInstance!=null){
       mInstance.onActivityStart();
     }
+    if(mWxAnalyzerDelegate != null){
+      mWxAnalyzerDelegate.onStart();
+    }
   }
 
   @Override
@@ -315,6 +324,9 @@ public void onResume() {
     if(mInstance!=null){
       mInstance.onActivityResume();
     }
+    if(mWxAnalyzerDelegate != null){
+      mWxAnalyzerDelegate.onResume();
+    }
   }
 
   @Override
@@ -323,6 +335,9 @@ public void onPause() {
     if(mInstance!=null){
       mInstance.onActivityPause();
     }
+    if(mWxAnalyzerDelegate != null){
+      mWxAnalyzerDelegate.onPause();
+    }
   }
 
   @Override
@@ -331,6 +346,9 @@ public void onStop() {
     if(mInstance!=null){
       mInstance.onActivityStop();
     }
+    if(mWxAnalyzerDelegate != null){
+      mWxAnalyzerDelegate.onStop();
+    }
   }
 
   @Override
@@ -339,10 +357,20 @@ public void onDestroy() {
     if(mInstance!=null){
       mInstance.onActivityDestroy();
     }
+    if(mWxAnalyzerDelegate != null){
+      mWxAnalyzerDelegate.onDestroy();
+    }
   }
 
   @Override
   public void onViewCreated(WXSDKInstance wxsdkInstance, View view) {
+    View wrappedView = null;
+    if(mWxAnalyzerDelegate != null){
+      wrappedView = mWxAnalyzerDelegate.onWeexViewCreated(wxsdkInstance,view);
+    }
+    if(wrappedView != null){
+      view = wrappedView;
+    }
     if (mContainer != null) {
       mContainer.removeAllViews();
       mContainer.addView(view);
@@ -355,4 +383,26 @@ public void onViewCreated(WXSDKInstance wxsdkInstance, View view) {
   public void onRefreshSuccess(WXSDKInstance wxsdkInstance, int i, int i1) {
 
   }
+
+  @Override
+  @CallSuper
+  public void onRenderSuccess(WXSDKInstance instance, int width, int height) {
+    if(mWxAnalyzerDelegate  != null){
+      mWxAnalyzerDelegate.onWeexRenderSuccess(instance);
+    }
+  }
+
+  @Override
+  @CallSuper
+  public void onException(WXSDKInstance instance, String errCode, String msg) {
+    if(mWxAnalyzerDelegate != null){
+      mWxAnalyzerDelegate.onException(instance,errCode,msg);
+    }
+  }
+
+  @Override
+  @CallSuper
+  public boolean onKeyUp(int keyCode, KeyEvent event) {
+    return (mWxAnalyzerDelegate != null && mWxAnalyzerDelegate.onKeyUp(keyCode,event)) || super.onKeyUp(keyCode, event);
+  }
 }

android/commons/src/main/java/com/alibaba/weex/commons/SimpleWeexActivity.java

@@ -223,11 +223,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
   @Override
   public void onRenderSuccess(WXSDKInstance instance, int width, int height) {
-
+    super.onRenderSuccess(instance,width,height);
   }
 
   @Override
   public void onException(WXSDKInstance instance, String errCode, String msg) {
-
+    super.onException(instance,errCode,msg);
   }
 }