From 3793ae32526fa7be263b2008e7f110b266156ebb Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 4 Feb 2025 08:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- .../main/java/cc/winboll/studio/appbase/App.java | 2 +- libappbase/build.gradle | 2 +- libappbase/build.properties | 4 ++-- libappbase/src/main/AndroidManifest.xml | 7 +------ .../studio/{ => libappbase}/CrashHandler.java | 2 +- .../{ => libappbase}/GlobalApplication.java | 2 +- .../studio/libappbase/LibraryActivity.java | 15 --------------- libappbase/src/main/res/layout/library.xml | 11 ----------- 9 files changed, 9 insertions(+), 40 deletions(-) rename libappbase/src/main/java/cc/winboll/studio/{ => libappbase}/CrashHandler.java (99%) rename libappbase/src/main/java/cc/winboll/studio/{ => libappbase}/GlobalApplication.java (98%) delete mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/LibraryActivity.java delete mode 100644 libappbase/src/main/res/layout/library.xml diff --git a/appbase/build.properties b/appbase/build.properties index 0fd731d..24f028c 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 14:42:52 HKT 2025 +#Tue Feb 04 00:44:30 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=1.1 publishVersion=1.1.2 -buildCount=0 +buildCount=2 baseBetaVersion=1.1.3 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/App.java b/appbase/src/main/java/cc/winboll/studio/appbase/App.java index 874e4fa..36726c5 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/App.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/App.java @@ -5,7 +5,7 @@ package cc.winboll.studio.appbase; * @Date 2025/01/05 09:54:42 * @Describe APPbase 应用类 */ - import cc.winboll.studio.GlobalApplication; +import cc.winboll.studio.libappbase.GlobalApplication; public class App extends GlobalApplication { diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 5d24dff..535c115 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -4,7 +4,7 @@ apply from: '../.winboll/winboll_lib_build.gradle' apply from: '../.winboll/winboll_lint_build.gradle' android { - namespace 'cc.winboll.studio' + namespace 'cc.winboll.studio.libappbase' compileSdkVersion 32 buildToolsVersion "33.0.3" diff --git a/libappbase/build.properties b/libappbase/build.properties index 46bcb38..24f028c 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 14:42:39 HKT 2025 +#Tue Feb 04 00:44:30 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=1.1 publishVersion=1.1.2 -buildCount=0 +buildCount=2 baseBetaVersion=1.1.3 diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml index 8a75875..7293655 100644 --- a/libappbase/src/main/AndroidManifest.xml +++ b/libappbase/src/main/AndroidManifest.xml @@ -1,17 +1,12 @@ + package="cc.winboll.studio.libappbase" > - - - diff --git a/libappbase/src/main/java/cc/winboll/studio/CrashHandler.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java similarity index 99% rename from libappbase/src/main/java/cc/winboll/studio/CrashHandler.java rename to libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java index e2d3ca6..b923a86 100644 --- a/libappbase/src/main/java/cc/winboll/studio/CrashHandler.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java @@ -1,4 +1,4 @@ -package cc.winboll.studio; +package cc.winboll.studio.libappbase; /** * @Author ZhanGSKen@QQ.COM diff --git a/libappbase/src/main/java/cc/winboll/studio/GlobalApplication.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java similarity index 98% rename from libappbase/src/main/java/cc/winboll/studio/GlobalApplication.java rename to libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java index e3b5d29..949e9ec 100644 --- a/libappbase/src/main/java/cc/winboll/studio/GlobalApplication.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java @@ -1,4 +1,4 @@ -package cc.winboll.studio; +package cc.winboll.studio.libappbase; /** * @Author ZhanGSKen@QQ.COM diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LibraryActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LibraryActivity.java deleted file mode 100644 index 0b27557..0000000 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LibraryActivity.java +++ /dev/null @@ -1,15 +0,0 @@ -package cc.winboll.studio.libappbase; - -import android.app.*; -import android.os.*; -import cc.winboll.studio.R; - -public class LibraryActivity extends Activity -{ - @Override - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.library); - } -} diff --git a/libappbase/src/main/res/layout/library.xml b/libappbase/src/main/res/layout/library.xml deleted file mode 100644 index b1d869f..0000000 --- a/libappbase/src/main/res/layout/library.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -