* [android] Merge WeexCore-master to master.

Author: miomin

android/commons/build.gradle

@@ -2,6 +2,8 @@
 apply plugin: 'com.android.library'
 
 android {
+
+    publishNonDefault  true
     compileSdkVersion project.compileSdkVersion
     buildToolsVersion project.buildToolsVersion
     resourcePrefix "weexcomm"
@@ -27,14 +29,22 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            jniDebuggable true
+            debuggable true
+
+        }
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "com.android.support:support-v4:${project.supportLibVersion}"
     compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
-    compile project(':weex_sdk')
+    // compile project(':weex_sdk')
+    debugCompile project(path: ':weex_sdk', configuration: 'debug')
+    releaseCompile project(path: ':weex_sdk', configuration: 'release')
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.facebook.fresco:fresco:0.10.0'
     compile 'com.taobao.android.weex_inspection:protocol:1.1.4.1'

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

@@ -124,8 +124,6 @@ protected void renderPage(String template,String source,String jsonInitData){
       template,
       options,
       jsonInitData,
-      ScreenUtil.getDisplayWidth(this),
-      ScreenUtil.getDisplayHeight(this),
       WXRenderStrategy.APPEND_ASYNC);
   }
 
@@ -143,8 +141,6 @@ protected void renderPageByURL(String url,String jsonInitData){
       url,
       options,
       jsonInitData,
-      ScreenUtil.getDisplayWidth(this),
-      ScreenUtil.getDisplayHeight(this),
       WXRenderStrategy.APPEND_ASYNC);
   }
 

android/commons/src/main/java/com/alibaba/weex/commons/adapter/FrescoImageComponent.java

@@ -22,7 +22,7 @@
 import android.support.annotation.NonNull;
 import android.widget.ImageView;
 import com.taobao.weex.WXSDKInstance;
-import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.ui.action.BasicComponentData;
 import com.taobao.weex.ui.component.WXImage;
 import com.taobao.weex.ui.component.WXVContainer;
 
@@ -31,8 +31,8 @@
  */
 public class FrescoImageComponent extends WXImage {
 
-  public FrescoImageComponent(WXSDKInstance instance, WXDomObject node, WXVContainer parent) {
-    super(instance, node, parent);
+  public FrescoImageComponent(WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) {
+    super(instance, parent, basicComponentData);
   }
 
   @Override

android/commons/src/main/java/com/alibaba/weex/commons/adapter/ImageAdapter.java

@@ -54,10 +54,6 @@ public void run() {
         if (url.startsWith("//")) {
           temp = "http:" + url;
         }
-        if (view.getLayoutParams().width <= 0 || view.getLayoutParams().height <= 0) {
-          return;
-        }
-
 
         if(!TextUtils.isEmpty(strategy.placeHolder)){
           Picasso.Builder builder=new Picasso.Builder(WXEnvironment.getApplication());

android/playground/app/build.gradle

@@ -11,9 +11,9 @@ android {
         versionCode 17
         versionName "0.18.0-beta-3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
         ndk{
-            abiFilters "x86"
-            abiFilters "armeabi"
+            abiFilters "armeabi","x86"
         }
     }
     applicationVariants.all { variant ->
@@ -35,7 +35,8 @@ android {
     }
     buildTypes {
         debug {
-            testCoverageEnabled false
+            jniDebuggable true
+            debuggable true
         }
     }
     sourceSets {
@@ -59,13 +60,16 @@ android {
     dexOptions {
         preDexLibraries false
     }
+
 }
 
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
     androidTestCompile 'junit:junit:4.12'
+    androidTestCompile 'org.awaitility:awaitility:3.0.0'
+    androidTestCompile 'org.awaitility:awaitility-proxy:3.0.0'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -79,15 +83,20 @@ dependencies {
     androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
     androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
     /*source dependency*/
-    compile project(':weex_sdk')
+
+    debugCompile project(path: ':commons', configuration: 'debug')
+    releaseCompile project(path: ':commons', configuration: 'release')
+
+    debugCompile project(path: ':weex_sdk', configuration: 'debug')
+    releaseCompile project(path: ':weex_sdk', configuration: 'release')
 
     //https://github.com/weexteam/weex-analyzer-android
     //Weex-Analyzer provides several convenient tools such as Memory Monitor
     // to optimize your application. It's not available by default,you can
     // set WXAnalyzerDelegate#DEBUG==true to enable it
     debugCompile 'com.taobao.android:weex_analyzer:0.1.0.5'
 
-    compile project(':commons')
+
     compile 'com.taobao.android:dexposed:0.1.8'
     compile 'com.loopj.android:android-async-http:1.4.9@aar'
     compile 'com.facebook.fresco:fresco:0.12.0+'
@@ -104,5 +113,6 @@ dependencies {
     compile 'com.jakewharton.scalpel:scalpel:1.1.2'
     compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
     compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
-    compile 'com.taobao.android:weex_inspector:0.13.5-multicontext'
-}
+    compile 'com.taobao.android:weex_inspector:0.11.0'
+    //compile project(":weex_inspector")
+}