完善代码

yangchong211 · Dec 26, 2021 · 73d63f7 · 73d63f7
1 parent 2fda8d1
commit 73d63f7
Show file tree

Hide file tree

Showing 47 changed files with 67 additions and 25 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/Common/AppStatusLib/build.gradle b/Common/AppStatusLib/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
-
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Common/LibraryLayer/src/main/java/com/yc/library/base/config/AppConfig.java b/Common/LibraryLayer/src/main/java/com/yc/library/base/config/AppConfig.java
@@ -8,7 +8,6 @@
 import com.pedaily.yc.ycdialoglib.toast.ToastUtils;
 import com.yc.configlayer.constant.Constant;
 import com.yc.toolutils.activity.ActivityManager;
-import com.yc.library.BuildConfig;
 import com.yc.library.base.callback.LogCallback;
 
 import cn.ycbjie.ycthreadpoollib.PoolThread;
@@ -93,12 +92,10 @@ public void closeExecutor(){
 
 
     private void initARouter(){
-        if (BuildConfig.IS_DEBUG) {
-            //打印日志
-            ARouter.openLog();
-            //开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险)
-            ARouter.openDebug();
-        }
+        //打印日志
+        ARouter.openLog();
+        //开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险)
+        ARouter.openDebug();
         //推荐在Application中初始化
         ARouter.init(Utils.getApp());
     }

diff --git a/Common/ToolUtilsLib/build.gradle b/Common/ToolUtilsLib/build.gradle
@@ -2,6 +2,9 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
+
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Server/NfcServer/build.gradle b/Server/NfcServer/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'com.android.library'
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Server/ShareServer/build.gradle b/Server/ShareServer/build.gradle
@@ -1,4 +1,8 @@
 apply plugin: 'com.android.library'
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
+
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Server/XlogServer/build.gradle b/Server/XlogServer/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
-
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Tool/AnimatorToolLib/build.gradle b/Tool/AnimatorToolLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Tool/CountTimerLib/build.gradle b/Tool/CountTimerLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Tool/SerialTaskLib/build.gradle b/Tool/SerialTaskLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Tool/SocketIoLib/build.gradle b/Tool/SocketIoLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Tool/WebSocketLib/build.gradle b/Tool/WebSocketLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Tool/ZxingServerLib/build.gradle b/Tool/ZxingServerLib/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'com.android.library'
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Widget/BannerWidget/.gitignore → Widget/BannerViewLib/.gitignore b/Widget/BannerWidget/.gitignore → Widget/BannerViewLib/.gitignore
diff --git a/Widget/BannerWidget/build.gradle → Widget/BannerViewLib/build.gradle b/Widget/BannerWidget/build.gradle → Widget/BannerViewLib/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'com.android.library'
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
@@ -26,6 +29,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    api(rootProject.ext.dependencies["appcompat-v7"])
-    api(rootProject.ext.dependencies["annotations"])
+    implementation(rootProject.ext.dependencies["appcompat-v7"])
+    implementation(rootProject.ext.dependencies["annotations"])
 }
diff --git a/Widget/BannerWidget/consumer-rules.pro → Widget/BannerViewLib/consumer-rules.pro b/Widget/BannerWidget/consumer-rules.pro → Widget/BannerViewLib/consumer-rules.pro
diff --git a/Widget/BannerWidget/proguard-rules.pro → Widget/BannerViewLib/proguard-rules.pro b/Widget/BannerWidget/proguard-rules.pro → Widget/BannerViewLib/proguard-rules.pro
diff --git a/...BannerWidget/src/main/AndroidManifest.xml → ...annerViewLib/src/main/AndroidManifest.xml b/...BannerWidget/src/main/AndroidManifest.xml → ...annerViewLib/src/main/AndroidManifest.xml
diff --git a/.../yc/banner/listener/OnBannerListener.java → .../yc/banner/listener/OnBannerListener.java b/.../yc/banner/listener/OnBannerListener.java → .../yc/banner/listener/OnBannerListener.java
diff --git a/...ava/com/yc/banner/loader/ImageLoader.java → ...ava/com/yc/banner/loader/ImageLoader.java b/...ava/com/yc/banner/loader/ImageLoader.java → ...ava/com/yc/banner/loader/ImageLoader.java
diff --git a/...c/banner/loader/ImageLoaderInterface.java → ...c/banner/loader/ImageLoaderInterface.java b/...c/banner/loader/ImageLoaderInterface.java → ...c/banner/loader/ImageLoaderInterface.java
diff --git a/.../banner/transformer/ABaseTransformer.java → .../banner/transformer/ABaseTransformer.java b/.../banner/transformer/ABaseTransformer.java → .../banner/transformer/ABaseTransformer.java
diff --git a/...anner/transformer/DefaultTransformer.java → ...anner/transformer/DefaultTransformer.java b/...anner/transformer/DefaultTransformer.java → ...anner/transformer/DefaultTransformer.java
diff --git a/...va/com/yc/banner/util/BannerConstant.java → ...va/com/yc/banner/util/BannerConstant.java b/...va/com/yc/banner/util/BannerConstant.java → ...va/com/yc/banner/util/BannerConstant.java
diff --git a/.../java/com/yc/banner/util/WeakHandler.java → .../java/com/yc/banner/util/WeakHandler.java b/.../java/com/yc/banner/util/WeakHandler.java → .../java/com/yc/banner/util/WeakHandler.java
diff --git a/...n/java/com/yc/banner/view/BannerView.java → ...n/java/com/yc/banner/view/BannerView.java b/...n/java/com/yc/banner/view/BannerView.java → ...n/java/com/yc/banner/view/BannerView.java
diff --git a/...a/com/yc/banner/view/BannerViewPager.java → ...a/com/yc/banner/view/BannerViewPager.java b/...a/com/yc/banner/view/BannerViewPager.java → ...a/com/yc/banner/view/BannerViewPager.java
diff --git a/...rc/main/res/drawable/black_background.xml → ...rc/main/res/drawable/black_background.xml b/...rc/main/res/drawable/black_background.xml → ...rc/main/res/drawable/black_background.xml
diff --git a/...get/src/main/res/drawable/gray_radius.xml → ...Lib/src/main/res/drawable/gray_radius.xml b/...get/src/main/res/drawable/gray_radius.xml → ...Lib/src/main/res/drawable/gray_radius.xml
diff --git a/...et/src/main/res/drawable/white_radius.xml → ...ib/src/main/res/drawable/white_radius.xml b/...et/src/main/res/drawable/white_radius.xml → ...ib/src/main/res/drawable/white_radius.xml
diff --git a/...idget/src/main/res/layout/banner_view.xml → ...ewLib/src/main/res/layout/banner_view.xml b/...idget/src/main/res/layout/banner_view.xml → ...ewLib/src/main/res/layout/banner_view.xml
diff --git a/...annerWidget/src/main/res/values/attrs.xml → ...nnerViewLib/src/main/res/values/attrs.xml b/...annerWidget/src/main/res/values/attrs.xml → ...nnerViewLib/src/main/res/values/attrs.xml
diff --git a/Widget/BlurView/.gitignore → Widget/BlurViewLib/.gitignore b/Widget/BlurView/.gitignore → Widget/BlurViewLib/.gitignore
diff --git a/Widget/BlurView/build.gradle → Widget/BlurViewLib/build.gradle b/Widget/BlurView/build.gradle → Widget/BlurViewLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Widget/BlurView/consumer-rules.pro → Widget/BlurViewLib/consumer-rules.pro b/Widget/BlurView/consumer-rules.pro → Widget/BlurViewLib/consumer-rules.pro
diff --git a/Widget/BlurView/proguard-rules.pro → Widget/BlurViewLib/proguard-rules.pro b/Widget/BlurView/proguard-rules.pro → Widget/BlurViewLib/proguard-rules.pro
diff --git a/Widget/BlurView/src/main/AndroidManifest.xml → .../BlurViewLib/src/main/AndroidManifest.xml b/Widget/BlurView/src/main/AndroidManifest.xml → .../BlurViewLib/src/main/AndroidManifest.xml
diff --git a/...ava/com/yc/blurview/RealTimeBlurView.java → ...ava/com/yc/blurview/RealTimeBlurView.java b/...ava/com/yc/blurview/RealTimeBlurView.java → ...ava/com/yc/blurview/RealTimeBlurView.java
diff --git a/...java/com/yc/blurview/blur/BlurBehind.java → ...java/com/yc/blurview/blur/BlurBehind.java b/...java/com/yc/blurview/blur/BlurBehind.java → ...java/com/yc/blurview/blur/BlurBehind.java
diff --git a/...java/com/yc/blurview/blur/CustomBlur.java → ...java/com/yc/blurview/blur/CustomBlur.java b/...java/com/yc/blurview/blur/CustomBlur.java → ...java/com/yc/blurview/blur/CustomBlur.java
diff --git a/...et/BlurView/src/main/res/values/attrs.xml → ...BlurViewLib/src/main/res/values/attrs.xml b/...et/BlurView/src/main/res/values/attrs.xml → ...BlurViewLib/src/main/res/values/attrs.xml
diff --git a/Widget/FragmentLib/build.gradle b/Widget/FragmentLib/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.library'
 }
 apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Widget/PhotoWidget/build.gradle b/Widget/PhotoWidget/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'com.android.library'
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]

diff --git a/Widget/ZoomImageLib/build.gradle b/Widget/ZoomImageLib/build.gradle
@@ -1,14 +1,18 @@
 apply plugin: 'com.android.library'
+apply from: rootProject.projectDir.absolutePath + "/yc.gradle"
+//迁移到jitpack
+apply plugin: 'com.github.dcendents.android-maven'
+
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 15
-        versionName "1.1.5"
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+        versionCode rootProject.ext.android["versionCode"]
+        versionName rootProject.ext.android["versionName"]
     }
 
     buildTypes {
@@ -22,7 +26,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    api(rootProject.ext.dependencies["appcompat-v7"])
+    api(rootProject.ext.dependencies["annotations"])
 }
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -208,6 +208,9 @@ dependencies {
     implementation project(path: ':ZxingServerLib')
     implementation project(path: ':NfcServer')
     implementation project(path: ':LongevityLib')
+
+    implementation project(path: ':BannerViewLib')
+    implementation project(path: ':BlurViewLib')
 }
 
 

diff --git a/settings.gradle b/settings.gradle
@@ -30,13 +30,13 @@ project(':ToolUtilsLib').projectDir = new File('Common/ToolUtilsLib')
 
 
 /* +++++++++ 框架view基础组件层 +++++++++ */
-include ':BannerWidget', ':PhotoWidget', ':CustomWidget', ':BlurView',
+include ':BannerViewLib', ':PhotoWidget', ':CustomWidget', ':BlurViewLib',
         ':FragmentLib',':WidgetViewLib',':ZoomImageLib', ':LargeImageLib',
         ':SwipeBackLib'
-project(':BannerWidget').projectDir = new File('Widget/BannerWidget')
+project(':BannerViewLib').projectDir = new File('Widget/BannerViewLib')
 project(':PhotoWidget').projectDir = new File('Widget/PhotoWidget')
 project(':CustomWidget').projectDir = new File('Widget/CustomWidget')
-project(':BlurView').projectDir = new File('Widget/BlurView')
+project(':BlurViewLib').projectDir = new File('Widget/BlurViewLib')
 project(':FragmentLib').projectDir = new File('Widget/FragmentLib')
 project(':WidgetViewLib').projectDir = new File('Widget/WidgetViewLib')
 project(':ZoomImageLib').projectDir = new File('Widget/ZoomImageLib')