* [android] update debug add class ScalpelFrameLayout

alibaba · May 25, 2016 · d956819 · d956819
1 parent b9a3b3f
commit d956819
Show file tree

Hide file tree

Showing 6 changed files with 513 additions and 5 deletions.
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -26,14 +26,14 @@
 import com.alibaba.weex.https.WXHttpTask;
 import com.alibaba.weex.https.WXRequestListener;
 import com.alibaba.weex.util.ScreenUtil;
-import com.jakewharton.scalpel.ScalpelFrameLayout;
 import com.taobao.weex.IWXRenderListener;
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.WXPrettyFish;
 import com.taobao.weex.WXSDKEngine;
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
 import com.taobao.weex.common.WXRenderStrategy;
+import com.taobao.weex.scalpel.ScalpelFrameLayout;
 import com.taobao.weex.utils.WXFileUtils;
 import com.taobao.weex.utils.WXLogUtils;
 

diff --git a/android/playground/app/src/main/res/layout/activity_wxpage.xml b/android/playground/app/src/main/res/layout/activity_wxpage.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
-<com.jakewharton.scalpel.ScalpelFrameLayout android:layout_width="match_parent"
+<com.taobao.weex.scalpel.ScalpelFrameLayout android:layout_width="match_parent"
                                             android:layout_height="match_parent"
         android:id="@+id/scalpel_frame_layout">
         <FrameLayout
@@ -43,7 +43,7 @@
 
 
         </FrameLayout>
-</com.jakewharton.scalpel.ScalpelFrameLayout>
+</com.taobao.weex.scalpel.ScalpelFrameLayout>
 
         <!--<Button-->
             <!--android:id="@+id/weex_refresh"-->

diff --git a/android/weex_debug/NOTICE b/android/weex_debug/NOTICE
@@ -0,0 +1,7 @@
+Weex Debug Android
+Copyright 2016 Alibaba Group
+
+This product includes software developed at Alibaba Group. (http://www.alibabagroup.com)
+
+This product contains software scalpel(https://github.com/JakeWharton/scalpel.git) developed
+by JakeWharton Inc., licensed under the LICENSE-2.0.
diff --git a/android/weex_debug/build.gradle b/android/weex_debug/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     provided 'com.android.support:appcompat-v7:23.1.1'
     compile (name:'prettyfish_base', ext:'aar')
     compile 'com.squareup.okhttp:okhttp-ws:2.3.0'
-    compile 'com.jakewharton.scalpel:scalpel:1.1.2'
+//    compile 'com.jakewharton.scalpel:scalpel:1.1.2'
     provided 'com.alibaba:fastjson:1.1.45'
     //compile 'com.taobao.android:weex_sdk:0.4.+'
     provided project(':weex_sdk_android')

diff --git a/android/weex_debug/src/main/java/com/taobao/weex/WXPrettyFish.java b/android/weex_debug/src/main/java/com/taobao/weex/WXPrettyFish.java
@@ -2,10 +2,10 @@
 
 import android.app.Application;
 
-import com.jakewharton.scalpel.ScalpelFrameLayout;
 import com.taobao.prettyfish.PrettyFishCommon;
 import com.taobao.prettyfish.core.comp.AbstractBaseComp;
 import com.taobao.prettyfish.core.fab.FloatWndManager;
+import com.taobao.weex.scalpel.ScalpelFrameLayout;
 
 /**
  * Created by lixinke on 16/5/4.