From a9bc3455806f72b09c665f91027e10bdb310d9c0 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 24 Mar 2025 19:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BA=94=E7=94=A8=E4=BB=8B?= =?UTF-8?q?=E7=BB=8D=E9=A1=B5=E8=A7=86=E5=9B=BE=E6=A8=A1=E5=9D=97=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- aes/src/main/java/cc/winboll/studio/aes/App.java | 1 - aes/src/main/java/cc/winboll/studio/aes/MainActivity.java | 2 +- libaes/build.gradle | 2 -- libaes/build.properties | 4 ++-- .../main/java/cc/winboll/studio/libaes/winboll/APPInfo.java | 2 +- .../winboll/studio/libaes/winboll/AboutActivityFactory.java | 3 ++- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 0169943..02abde0 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 09:20:58 GMT 2025 +#Mon Mar 24 11:34:59 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.3 -buildCount=11 +buildCount=15 baseBetaVersion=15.0.4 diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 9a764e2..df1a0a2 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -14,7 +14,6 @@ public class App extends GlobalApplication { @Override public void onCreate() { super.onCreate(); - setIsDebuging(BuildConfig.DEBUG); } } diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index 1438eae..a8485c6 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -29,8 +29,8 @@ import cc.winboll.studio.libaes.winboll.APPInfo; import cc.winboll.studio.libaes.winboll.AboutActivityFactory; import cc.winboll.studio.libaes.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.utils.ToastUtils; import com.a4455jkjh.colorpicker.ColorPickerDialog; -import com.hjq.toast.ToastUtils; import java.util.ArrayList; public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity { diff --git a/libaes/build.gradle b/libaes/build.gradle index 9be2d4c..1692db6 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -38,8 +38,6 @@ dependencies { api 'com.journeyapps:zxing-android-embedded:3.6.0' // 应用介绍页类库 api 'io.github.medyo:android-about-page:2.0.0' - // 吐司类库 - api 'com.github.getActivity:ToastUtils:10.5' // 网络连接类库 api 'com.squareup.okhttp3:okhttp:4.4.1' // AndroidX 类库 diff --git a/libaes/build.properties b/libaes/build.properties index 70bdd0b..02abde0 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 09:19:18 GMT 2025 +#Mon Mar 24 11:34:59 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.3 -buildCount=11 +buildCount=15 baseBetaVersion=15.0.4 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java index 73c4328..f27c556 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java @@ -5,7 +5,7 @@ package cc.winboll.studio.libaes.winboll; * @Date 2025/01/20 14:19:02 * @Describe 应用信息类 */ -import cc.winboll.studio.libapputils.R; +import cc.winboll.studio.libaes.R; import java.io.Serializable; public class APPInfo implements Serializable { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivityFactory.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivityFactory.java index 10b21f5..dfb510e 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivityFactory.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivityFactory.java @@ -8,6 +8,7 @@ package cc.winboll.studio.libaes.winboll; import android.content.Context; import android.content.Intent; +import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.winboll.AboutActivityFactory; public class AboutActivityFactory { @@ -19,7 +20,7 @@ public class AboutActivityFactory { APPInfo appInfo = new APPInfo(); appInfo.setAppName("APP"); - appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); + appInfo.setAppIcon(R.drawable.ic_winboll); appInfo.setAppDescription("APP Description"); appInfo.setAppGitName("APP"); appInfo.setAppGitOwner("Studio");