拆分xutil-core,完善代码

xuexiangjys · Apr 27, 2018 · fad2aa1 · fad2aa1
1 parent 3c93564
commit fad2aa1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 28 deletions.
diff --git a/xutil-core/build.gradle b/xutil-core/build.gradle
@@ -28,9 +28,9 @@ dependencies {
     implementation deps.gson
 }
 
-//apply from: "https://raw.githubusercontent.com/xuexiangjys/XUtil/master/JitPackUpload.gradle"
+apply from: "https://raw.githubusercontent.com/xuexiangjys/XUtil/master/JitPackUpload.gradle"
 
-apply from: "../bintrayUpload.gradle"
+//apply from: "../bintrayUpload.gradle"
 
 //    ./gradlew install
 //    ./gradlew bintrayUpload
diff --git a/xutil-core/src/main/res/values/xutil_ids.xml b/xutil-core/src/main/res/values/xutil_ids.xml
diff --git a/xutil-sub/build.gradle b/xutil-sub/build.gradle
@@ -41,3 +41,6 @@ dependencies {
     androidTestImplementation deps.espresso.core
     compileOnly project(':xutil-core')
 }
+
+apply from: "https://raw.githubusercontent.com/xuexiangjys/XUtil/master/JitPackUpload.gradle"
+
diff --git a/xutil-sub/src/main/AndroidManifest.xml b/xutil-sub/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.xuexiang.xutil">
+    package="com.xuexiang.xutil_sub">
 
     <!-- 悬浮窗 -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

diff --git a/xutil-sub/src/main/java/com/xuexiang/xutil/system/wifi/WifiAPHelper.java b/xutil-sub/src/main/java/com/xuexiang/xutil/system/wifi/WifiAPHelper.java
@@ -21,11 +21,11 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.xuexiang.xutil.R;
 import com.xuexiang.xutil.common.StringUtils;
 import com.xuexiang.xutil.net.NetworkUtils;
 import com.xuexiang.xutil.system.ThreadPoolManager;
 import com.xuexiang.xutil.tip.ToastUtil;
+import com.xuexiang.xutil_sub.R;
 
 /**
  * <pre>

diff --git a/xutil-sub/src/main/res/values/strings.xml b/xutil-sub/src/main/res/values/strings.xml
diff --git a/...ore/src/main/res/values/xutil_strings.xml → ...sub/src/main/res/values/xutil_strings.xml b/...ore/src/main/res/values/xutil_strings.xml → ...sub/src/main/res/values/xutil_strings.xml