From c394a37e0a635a41e90b7c00dd936b6c142e0378 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0WinBoll=E7=B1=BB=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8D=A2=E5=BA=94=E7=94=A8=E5=9F=BA=E7=B1=BB?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidxdemo/build.gradle                           | 13 ++++++++-----
 androidxdemo/build.properties                       |  4 ++--
 androidxdemo/src/main/AndroidManifest.xml           |  6 +++---
 .../{GlobalApplication.java => App.java}            | 12 ++++++------
 androidxdemo/src/main/res/values/styles.xml         |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)
 rename androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/{GlobalApplication.java => App.java} (97%)

diff --git a/androidxdemo/build.gradle b/androidxdemo/build.gradle
index b3b3c10..4b7522e 100644
--- a/androidxdemo/build.gradle
+++ b/androidxdemo/build.gradle
@@ -60,10 +60,13 @@ dependencies {
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'androidx.viewpager:viewpager:1.0.0'
-    api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    api 'androidx.fragment:fragment:1.1.0'
+    api 'androidx.appcompat:appcompat:1.0.0'
     api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }
diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties
index e65e382..91564a0 100644
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 05:27:16 GMT 2025
+#Mon Mar 24 06:15:17 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=1
+buildCount=7
 baseBetaVersion=15.0.1
diff --git a/androidxdemo/src/main/AndroidManifest.xml b/androidxdemo/src/main/AndroidManifest.xml
index 6d0c707..1b70e90 100644
--- a/androidxdemo/src/main/AndroidManifest.xml
+++ b/androidxdemo/src/main/AndroidManifest.xml
@@ -8,9 +8,9 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
-        android:name=".GlobalApplication">
+        android:name=".App">
 
         <activity
             android:name=".MainActivity"
@@ -34,4 +34,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
similarity index 97%
rename from androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java
rename to androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
index 7abaf88..baa9df1 100644
--- a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java
+++ b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
@@ -1,7 +1,6 @@
 package cc.winboll.studio.androidxdemo;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,6 +21,7 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class GlobalApplication extends Application {
+public class App extends GlobalApplication {
 
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
         super.onCreate();
-        CrashHandler.getInstance().registerGlobal(this);
-        CrashHandler.getInstance().registerPart(this);
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class GlobalApplication extends Application {
 
             private static String getKernel() {
                 try {
-                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
+                    return App.toString(new FileInputStream("/proc/version")).trim();
                 } catch (Throwable e) {
                     return e.getMessage();
                 }
@@ -331,4 +331,4 @@ public class GlobalApplication extends Application {
             restart();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/androidxdemo/src/main/res/values/styles.xml b/androidxdemo/src/main/res/values/styles.xml
index 0eb88fe..a70e242 100644
--- a/androidxdemo/src/main/res/values/styles.xml
+++ b/androidxdemo/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>