merge 0.1.0.9

Author: Rowandjj

README.md

@@ -1,8 +1,7 @@
 # Weex Analyzer
 
 ---
-
-[ ![Download](https://api.bintray.com/packages/rowandjj/maven/weex_analyzer/images/download.svg) ](https://bintray.com/rowandjj/maven/weex_analyzer/_latestVersion)[![GitHub release](https://img.shields.io/badge/release-v0.1.0.4-brightgreen.svg)](https://github.com/weexteam/weex-analyzer-android/releases/latest) [![GitHub release](https://img.shields.io/badge/license-%20Apache--2.0-yellowgreen.svg)](https://github.com/weexteam/weex-analyzer-android/blob/master/LICENSE)
+![](https://circleci.com/gh/weexteam/weex-analyzer-android/tree/tb_release_0.1.0.9.svg?style=shield&circle-token=cbceec1ca63c4f5dd758c55ec3f5a9c566d54514)[ ![Download](https://api.bintray.com/packages/rowandjj/maven/weex_analyzer/images/download.svg) ](https://bintray.com/rowandjj/maven/weex_analyzer/_latestVersion)[![GitHub release](https://img.shields.io/badge/release-v0.1.0.4-brightgreen.svg)](https://github.com/weexteam/weex-analyzer-android/releases/latest) [![GitHub release](https://img.shields.io/badge/license-%20Apache--2.0-yellowgreen.svg)](https://github.com/weexteam/weex-analyzer-android/blob/master/LICENSE)
 
 `Weex Analyzer`是一款运行在手机客户端上辅助开发者进行[weex开发](https://github.com/alibaba/weex)的小工具。
 接入此工具后，开发者可以在debug包中通过摇一摇打开功能选项。目前实现的功能有:

circle.yml

@@ -0,0 +1,16 @@
+machine:
+  java:
+    version: 'oraclejdk8'
+test:
+  override:
+   - cd weex_analyzer && ./run-circle-ci.sh:
+        timeout: 6000
+  post:
+    - cp -r weex_analyzer/build/reports $CIRCLE_ARTIFACTS/reports
+    - cp -r weex_analyzer/build/outputs $CIRCLE_ARTIFACTS/outputs
+dependencies:
+  pre:
+    - echo y | android update sdk --no-ui --all --filter tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-23
+    - echo y | android update sdk --no-ui --all --filter build-tools-23.0.2
+  cache_directories:
+    - ~/.m2

commons/build.gradle

@@ -15,8 +15,8 @@ repositories {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
     resourcePrefix "weexcomm"
 
     defaultConfig {
@@ -36,12 +36,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-v4:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.facebook.fresco:fresco:0.10.0'
     provided 'com.taobao.android:weex_sdk:0.9.5'

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

@@ -209,6 +209,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import com.alibaba.weex.commons.util.ScreenUtil;
@@ -360,6 +361,14 @@ public void onDestroy() {
     }
   }
 
+  @Override
+  public boolean dispatchTouchEvent(MotionEvent ev) {
+    if(mWxAnalyzerDelegate != null) {
+      mWxAnalyzerDelegate.onReceiveTouchEvent(ev);
+    }
+    return super.dispatchTouchEvent(ev);
+  }
+
   @Override
   public void onViewCreated(WXSDKInstance wxsdkInstance, View view) {
     View wrappedView = null;

commons/src/main/java/com/alibaba/weex/commons/WXAnalyzerDelegate.java

@@ -4,6 +4,7 @@
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 
 import com.taobao.weex.WXSDKInstance;
@@ -41,6 +42,16 @@ public void registerExtraOption(String optionName, int iconRes, Runnable runnabl
         }
     }
 
+    public void onReceiveTouchEvent(MotionEvent ev) {
+        if(mWXAnalyzer == null) {
+            return;
+        }
+        try {
+            Method method = mWXAnalyzer.getClass().getDeclaredMethod("onReceiveTouchEvent", MotionEvent.class);
+            method.invoke(mWXAnalyzer,ev);
+        } catch (Exception e) {
+        }
+    }
 
     public void onCreate() {
         if (mWXAnalyzer == null) {

playground/app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.alibaba.weex"
@@ -73,10 +73,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile 'com.android.support:support-annotations:23.2.1'
-    androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestCompile 'com.android.support.test:runner:0.5'
     //compile 'com.taobao.android:weex_sdk:0.4.+'
     /*source dependency*/
     compile project(':commons')
@@ -94,10 +90,10 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp-ws:2.3.0'
     compile 'com.squareup.okio:okio:1.0.1'
     compile 'com.alibaba:fastjson:1.1.46.android'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:support-annotations:23.2.1'
+    compile 'com.android.support:support-v4:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:design:25.3.0'
+    compile 'com.android.support:support-annotations:25.3.0'
     compile 'com.jakewharton.scalpel:scalpel:1.1.2'
     //compile 'com.google.android.gms:play-services-appindexing:8.1.0'
     compile 'com.taobao.android:weex_inspector:0.0.8.1'