From 75c2f6304cfce0445b5265ede0854f5a691b7be8 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 13:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=E5=9F=BA?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androiddemo/build.gradle                      |  3 ++
 androiddemo/build.properties                  |  4 +-
 androiddemo/src/main/AndroidManifest.xml      |  2 +-
 .../{GlobalApplication.java => App.java}      | 12 +++---
 .../studio/androiddemo/MainActivity.java      | 40 ++++++++++++-------
 .../src/main/res/layout/activity_main.xml     | 33 ++++++++++++---
 6 files changed, 64 insertions(+), 30 deletions(-)
 rename androiddemo/src/main/java/cc/winboll/studio/androiddemo/{GlobalApplication.java => App.java} (97%)

diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index 5ccf9e0..ac0bdd0 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -64,4 +64,7 @@ dependencies {
     api 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.8'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
index b0b41ad..baace7d 100644
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 05:30:56 GMT 2025
+#Mon Mar 24 05:56:56 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=2
+buildCount=7
 baseBetaVersion=15.0.1
diff --git a/androiddemo/src/main/AndroidManifest.xml b/androiddemo/src/main/AndroidManifest.xml
index 43eac9a..57a1145 100644
--- a/androiddemo/src/main/AndroidManifest.xml
+++ b/androiddemo/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:resizeableActivity="true"
-        android:name=".GlobalApplication">
+        android:name=".App">
 
         <activity
             android:name=".MainActivity"
diff --git a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/App.java
similarity index 97%
rename from androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java
rename to androiddemo/src/main/java/cc/winboll/studio/androiddemo/App.java
index e13af9a..54f102f 100644
--- a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java
+++ b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/App.java
@@ -1,7 +1,6 @@
 package cc.winboll.studio.androiddemo;
 
 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/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java
index dcef375..cfde770 100644
--- a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java
+++ b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java
@@ -1,15 +1,25 @@
-package cc.winboll.studio.androiddemo;
- 
-import android.app.Activity;
-import android.os.Bundle;
-
-public class MainActivity extends Activity {
-     
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        
-    }
-	
-}
\ No newline at end of file
+package cc.winboll.studio.androiddemo;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.LogView;
+
+public class MainActivity extends Activity {
+
+    LogView mLogView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}
diff --git a/androiddemo/src/main/res/layout/activity_main.xml b/androiddemo/src/main/res/layout/activity_main.xml
index f8b9a89..40d2031 100644
--- a/androiddemo/src/main/res/layout/activity_main.xml
+++ b/androiddemo/src/main/res/layout/activity_main.xml
@@ -4,13 +4,34 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:gravity="center_vertical|center_horizontal">
+	android:orientation="vertical">
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="Android Demo"
-		android:textAppearance="?android:attr/textAppearanceLarge"/>
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:gravity="center_vertical|center_horizontal"
+		android:layout_weight="1.0">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Android Demo"
+			android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="Text"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
 
 </LinearLayout>