<appbase>APK 15.1.4 release Publish.

androiddemo/build.gradle

@@ -18,15 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-	productFlavors {
-		beta {
-		}
-		stage {
-		}
-	}
-
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
@@ -36,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.0"
+        versionName "15.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -54,21 +47,25 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // 吐司类库
-    implementation 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.github.getActivity:ToastUtils:10.5'
 
     // Android 类库
-    // https://mvnrepository.com/artifact/com.android.support/support-v4
-    implementation 'com.android.support:support-v4:28.0.0'
+    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
     // https://mvnrepository.com/artifact/com.android.support/support-compat
-    implementation 'com.android.support:support-compat:28.0.0'
+    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    // https://mvnrepository.com/artifact/com.android.support/support-v4
+    api 'com.android.support:support-v4:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    implementation 'com.android.support:support-media-compat:28.0.0'
+    api 'com.android.support:support-media-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    implementation 'com.android.support:support-core-utils:28.0.0'
+    api 'com.android.support:support-core-utils:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    implementation 'com.android.support:support-core-ui:28.0.0'
+    api 'com.android.support:support-core-ui:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    implementation 'com.android.support:support-fragment:28.0.0'
+    api 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    api 'com.android.support:recyclerview-v7:28.0.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 11 18:02:14 GMT 2025
+#Wed Mar 26 07:23:51 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=1.0
-publishVersion=1.0.0
-buildCount=1
-baseBetaVersion=1.0.1
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=11
+baseBetaVersion=15.0.1

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"

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();
         }
     }
-}
+}

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);
-        
-    }
-	
-}
+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();
+    }
+}

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>
 

androidxdemo/build.gradle

@@ -18,15 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-	productFlavors {
-		beta {
-		}
-		stage {
-		}
-	}
-
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
@@ -36,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.0"
+        versionName "15.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -54,23 +47,26 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // SSH
-    implementation 'com.jcraft:jsch:0.1.55'
+    api 'com.jcraft:jsch:0.1.55'
     // Html 解析
-    implementation 'org.jsoup:jsoup:1.13.1'
+    api 'org.jsoup:jsoup:1.13.1'
     // 二维码类库
-    implementation 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
     // 应用介绍页类库
-    implementation 'io.github.medyo:android-about-page:2.0.0'
+    api 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
-    implementation 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    // Android 类库
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // AndroidX 类库
+    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'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 11 18:25:43 GMT 2025
+#Mon Mar 24 06:19:57 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=1.0
-publishVersion=1.0.0
-buildCount=4
-baseBetaVersion=1.0.1
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=8
+baseBetaVersion=15.0.1

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>
+</manifest>

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();
         }
     }
-}
+}

androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java

@@ -3,17 +3,26 @@ package cc.winboll.studio.androidxdemo;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogView;
 
 public class MainActivity extends AppCompatActivity {
-    
+
+    LogView mLogView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-		
+
 		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
-        
+
+        mLogView = findViewById(R.id.logview);
     }
-    
-}
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}

androidxdemo/src/main/res/layout/activity_main.xml

@@ -34,5 +34,18 @@
 
 	</LinearLayout>
 
+	<LinearLayout
+		android:orientation="vertical"
+		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="match_parent"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
 </LinearLayout>
 

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>

appbase/build.gradle

@@ -18,18 +18,19 @@ def genVersionName(def versionName){
 }
 
 android {
+    
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
+        versionName "15.1"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:04:35 HKT 2025
-stageCount=9
+#Fri Mar 28 20:05:24 HKT 2025
+stageCount=5
 libraryProject=libappbase
-baseVersion=15.0
-publishVersion=15.0.8
+baseVersion=15.1
+publishVersion=15.1.4
 buildCount=0
-baseBetaVersion=15.0.9
+baseBetaVersion=15.1.5

appbase/src/main/AndroidManifest.xml

@@ -8,12 +8,15 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
-        android:resizeableActivity="true">
+        android:resizeableActivity="true"
+        android:process=":App">
 
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:exported="true">
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
 
             <intent-filter>
 
@@ -29,10 +32,22 @@
 
         </activity>
 
-        <activity android:name=".GlobalApplication$CrashActivity"/>
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <activity android:name=".activities.New2Activity"
+            android:label="New2Activity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
 
         <service
             android:name=".MyTileService"
+            android:exported="true"
             android:label="@string/tileservice_name"
             android:icon="@drawable/ic_launcher"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
@@ -49,15 +64,18 @@
             android:name=".services.MainService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.appbase.services.TestDemoService"
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoService"
             android:exported="true"/>
 
         <service android:name=".services.AssistantService"/>
 
-        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver">
+        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
+            android:exported="true">
 
             <intent-filter>
 
@@ -87,7 +105,8 @@
 
         </receiver>
 
-        <receiver android:name=".receivers.APPNewsWidgetClickListener">
+        <receiver android:name=".receivers.APPNewsWidgetClickListener"
+            android:exported="true">
 
             <intent-filter>
 
@@ -103,6 +122,7 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+
     </application>
 
 </manifest>

appbase/src/main/java/cc/winboll/studio/appbase/App.java

@@ -19,7 +19,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        GlobalApplication.setIsDebuging(this, BuildConfig.DEBUG);
         mSOSCenterServiceReceiver = new SOSCenterServiceReceiver();
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(SOS.ACTION_SOS);

appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java

@@ -4,25 +4,42 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
+import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 
-public class MainActivity extends Activity {
+public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
 
-    LogView mLogView;
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    Toolbar mToolbar;
+    //LogView mLogView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,19 +47,34 @@ public class MainActivity extends Activity {
         ToastUtils.show("onCreate");
         setContentView(R.layout.activity_main);
 
-        Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
-        setActionBar(toolbar);
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
-        mLogView = findViewById(R.id.activitymainLogView1);
+        //mLogView = findViewById(R.id.activitymainLogView1);
 
-        if (GlobalApplication.isDebuging()) {
-            mLogView.start(); 
-            ToastUtils.show("LogView start.");
-        }
+//        if (GlobalApplication.isDebuging()) {
+//            mLogView.start(); 
+//            ToastUtils.show("LogView start.");
+//        }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -51,15 +83,15 @@ public class MainActivity extends Activity {
         sendBroadcast(intentAPPWidget);
     }
 
-    @Override
-    protected void onResume() {
-        LogUtils.d(TAG, "onResume");
-        super.onResume();
-        mLogView.start();
-    }
-
 	public void onSwitchDebugMode(View view) {
-        GlobalApplication.setIsDebuging(this, ((CheckBox)view).isChecked());
+        boolean isDebuging = ((CheckBox)view).isChecked();
+        GlobalApplication.setIsDebuging(isDebuging);
+    }
+   
+    public void onPreviewGlobalCrashActivity(View view) {
+        Intent intent = new Intent(this, GlobalCrashActivity.class);
+        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
+        startActivity(intent);
     }
 
     public void onStartCenter(View view) {
@@ -105,6 +137,8 @@ public class MainActivity extends Activity {
         startService(intent);
 
     }
+    
+    
 
     public void onStopTestDemoService(View view) {
         Intent intent = new Intent(this, TestDemoService.class);
@@ -140,4 +174,10 @@ public class MainActivity extends Activity {
         Intent intent = new Intent(this, TestDemoBindService.class);
         stopService(intent);
     }
+
+    public void onTestOpenNewActivity(View view) {
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
+    }
+
+    
 }

appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java

@@ -0,0 +1,82 @@
+package cc.winboll.studio.appbase;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 15:34:16
+ * @Describe 应用活动窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import cc.winboll.studio.appbase.App;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+    
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            return true;
+        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+            //moveTaskToBack(true);
+            exit();
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+    void exit() {
+        YesNoAlertDialog.show(this, "Exit " + getString(R.string.app_name), "Close all activity and exit?", new YesNoAlertDialog.OnDialogResultListener(){
+
+                @Override
+                public void onYes() {
+                    App.getWinBollActivityManager().finishAll();
+                }
+
+                @Override
+                public void onNo() {
+                }
+            });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBollActivityManager().registeRemove(this);
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java

@@ -0,0 +1,83 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 11:46:40
+ * @Describe 测试窗口2
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.WinBollActivityBase;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+
+public class New2Activity extends WinBollActivityBase implements IWinBollActivity {
+
+    public static final String TAG = "New2Activity";
+
+    Toolbar mToolbar;
+    //LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new2);
+
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //mLogView.start();
+    }
+
+    public void onCloseThisActivity(View view) {
+        GlobalApplication.getWinBollActivityManager().finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        GlobalApplication.getWinBollActivityManager().finishAll();
+    }
+
+    public void onNewActivity(View view) {
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
+    }
+    
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java

@@ -0,0 +1,81 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 05:04:22
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.WinBollActivityBase;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+
+public class NewActivity extends WinBollActivityBase implements IWinBollActivity {
+
+    public static final String TAG = "NewActivity";
+
+    Toolbar mToolbar;
+    //LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new);
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //mLogView.start();
+    }
+
+    public void onCloseThisActivity(View view) {
+        GlobalApplication.getWinBollActivityManager().finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        GlobalApplication.getWinBollActivityManager().finishAll();
+    }
+
+    public void onNew2Activity(View view) {
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, New2Activity.class);
+    }
+    
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+}

appbase/src/main/res/layout/activity_main.xml

@@ -5,10 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<android.support.v7.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -39,28 +39,41 @@
 					android:layout_height="wrap_content"
 					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
 
-				<LinearLayout
-					android:orientation="horizontal"
+				<HorizontalScrollView
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right|center_vertical">
+					android:layout_height="wrap_content">
 
-					<CheckBox
-						android:layout_width="wrap_content"
+					<LinearLayout
+						android:orientation="horizontal"
 						android:layout_height="wrap_content"
-						android:text="Debug Mode"
-						android:layout_weight="1.0"
-						android:onClick="onSwitchDebugMode"
-						android:id="@+id/activitymainCheckBox1"/>
+						android:gravity="right|center_vertical"
+						android:layout_width="wrap_content">
 
-					<Button
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="Test Application CrashReport"
-						android:textAllCaps="false"
-						android:onClick="onTestApplicationCrashReport"/>
+						<CheckBox
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Debug Mode"
+							android:layout_weight="1.0"
+							android:onClick="onSwitchDebugMode"
+							android:id="@+id/activitymainCheckBox1"/>
 
-				</LinearLayout>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Test Application CrashReport"
+							android:textAllCaps="false"
+							android:onClick="onTestApplicationCrashReport"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="PreviewGlobalCrashActivity"
+							android:textAllCaps="false"
+							android:onClick="onPreviewGlobalCrashActivity"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>
 
 				<ScrollView
 					android:layout_width="match_parent"
@@ -72,26 +85,27 @@
 						android:layout_height="wrap_content"
 						android:gravity="right">
 
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+						<LinearLayout
+							android:orientation="horizontal"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content">
 
-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StartCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStartCenter"/>
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StartCenter"
+								android:textAllCaps="false"
+								android:onClick="onStartCenter"/>
+
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StopCenter"
+								android:textAllCaps="false"
+								android:onClick="onStopCenter"/>
+
+						</LinearLayout>
 
-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StopCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStopCenter"/>
-                        </LinearLayout>
-                        
 						<HorizontalScrollView
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
@@ -160,7 +174,6 @@
 
 						</HorizontalScrollView>
 
-
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -182,6 +195,13 @@
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
 
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestOpenNewActivity"
+							android:textAllCaps="false"
+							android:onClick="onTestOpenNewActivity"/>
+
 					</LinearLayout>
 
 				</ScrollView>
@@ -192,10 +212,5 @@
 
 	</ScrollView>
 
-	<cc.winboll.studio.libappbase.LogView
-		android:layout_height="300dp"
-		android:layout_width="match_parent"
-		android:id="@+id/activitymainLogView1"/>
-
 </LinearLayout>
 

appbase/src/main/res/layout/activity_new.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+    
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="NewActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CloseThisActivity"
+        android:textAllCaps="false"
+        android:onClick="onCloseThisActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CloseAllActivity"
+        android:textAllCaps="false"
+        android:onClick="onCloseAllActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New2Activity"
+        android:textAllCaps="false"
+        android:onClick="onNew2Activity"/>
+
+    
+    
+</LinearLayout>
+

appbase/src/main/res/layout/activity_new2.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="New2Activity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseThisActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseThisActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseAllActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseAllActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="NewActivity"
+		android:textAllCaps="false"
+		android:onClick="onNewActivity"/>
+
+	
+
+</LinearLayout>
+

appbase/src/main/res/menu/toolbar_main.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    
+</menu>

apputils/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.apputils"
-        minSdkVersion 26
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0" 
+        versionName "9.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,9 +41,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
 	api project(':libapputils')
+    api 'cc.winboll.studio:libappbase:1.0.3'
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:08:19 HKT 2025
-stageCount=9
+#Sat Jan 18 13:03:10 HKT 2025
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.0
-publishVersion=15.0.8
+baseVersion=9.2
+publishVersion=9.2.1
 buildCount=0
-baseBetaVersion=15.0.9
+baseBetaVersion=9.2.2

apputils/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
-        android:theme="@style/MyUtilsTheme"
+        android:theme="@style/WinBoll.SupportThemeNoActionBar"
         android:supportsRtl="true">
 
         <activity
@@ -27,9 +27,9 @@
 
         </activity>
 
-        <activity android:name=".TestStringToQrCodeViewActivity"/>
+        <activity android:name=".TestWinBollActivity"/>
 
-        <activity android:name=".TestBBMorseCodeActivity"/>
+        <activity android:name=".TestStringToQrCodeViewActivity"/>
 
     </application>
 

apputils/src/main/java/cc/winboll/studio/apputils/App.java

@@ -5,83 +5,27 @@ package cc.winboll.studio.apputils;
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */
-import android.app.Application;
-import android.content.Context;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.app.MyActivityLifecycleCallbacks;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.bean.DebugBean;
+import android.view.Gravity;
+import cc.winboll.studio.libapputils.app.WinBollApplication;
+import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
 
-public class App extends GlobalApplication {
+public class App extends WinBollApplication {
 
     public static final String TAG = "App";
 
-    public static final String _ACTION_DEBUGVIEW = App.class.getName() + "_ACTION_DEBUGVIEW";
-
-    //static volatile WinBollApplication _WinBollApplication = null;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-
-    // 标记当前应用是否处于调试状态
-    static volatile boolean isDebug = false;
-
-    public synchronized static void setIsDebug(boolean isDebug) {
-        App.isDebug = isDebug;
-    }
-
-    public static boolean isDebug() {
-        return isDebug;
-    }
-
-    MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
-        return mMyActivityLifecycleCallbacks;
-    }
-
-    @Override
-    public Context getApplicationContext() {
-        return super.getApplicationContext();
-    }
-
-    @Override
-    public Application getApplication() {
-        return this;
-    }
+    public static final String _ACTION_DEBUGVIEW = WinBollApplication.class.getName() + "_ACTION_DEBUGVIEW";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        // 应用环境初始化, 基本调试环境
+        // 初始化 Toast 框架
         //
-        // 初始化日志模块
-        //LogUtils.init(this);
-
-        try {
-            // 初始化 Toast 框架
-//            ToastUtils.init(this);
-//            // 设置 Toast 布局样式
-//            //ToastUtils.setView(R.layout.view_toast);
-//            ToastUtils.setStyle(new WhiteToastStyle());
-//            ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-            // 设置应用调试标志
-            DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class);
-            if (debugBean == null) {
-                //ToastUtils.show("debugBean == null");
-                setIsDebug(false);
-            } else {
-                //ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")");
-                setIsDebug(debugBean.isDebuging());
-            }
-            // 应用窗口管理模块参数设置
-            //
-            mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
-            registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
-            // 设置默认 WinBoll 应用 UI 类型
-            //WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-            //ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
-        }
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
+
 }

apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java

@@ -1,83 +1,28 @@
 package cc.winboll.studio.apputils;
 
-import cc.winboll.studio.apputils.R;
-import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
-import android.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
+import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
-import cc.winboll.studio.libapputils.activities.LogActivity;
 import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
-import cc.winboll.studio.libapputils.app.AboutActivityFactory;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
 import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.AboutView;
-import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
-import java.util.List;
-import java.util.Set;
+import cc.winboll.studio.libapputils.log.LogActivity;
+import cc.winboll.studio.libapputils.log.LogUtils;
+import com.hjq.toast.ToastUtils;
 
-final public class MainActivity extends Activity implements IWinBollActivity {
+final public class MainActivity extends WinBollActivity {
 
 	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
 
-    Toolbar mToolbar;
-    LogView mLogView;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
     @Override
-    public APPInfo getAppInfo() {
-        String szBranchName = "apputils";
-
-        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
-        appInfo.setAppName("APPUtils");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-        appInfo.setAppDescription("APPUtils Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
-        appInfo.setAppAPKName("APPUtils");
-        appInfo.setAppAPKFolderName("APPUtils");
-        return appInfo;
-        //return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activitymainToolbar1);
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
+    protected boolean isEnableDisplayHomeAsUp() {
         return false;
     }
 
@@ -86,22 +31,8 @@ final public class MainActivity extends Activity implements IWinBollActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-
-        // 初始化工具栏
-        mToolbar = findViewById(R.id.activitymainToolbar1);
-        setActionBar(mToolbar);
-        if (isEnableDisplayHomeAsUp()) {
-            // 显示后退按钮
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-        getActionBar().setSubtitle(getTag());
-
-        checkResolveActivity();
-        archiveInstance();
-
-
+        //Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
+        //setActionBar(toolbar);
 
         // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
         //if (prosessIntents(getIntent())) return;
@@ -113,94 +44,44 @@ final public class MainActivity extends Activity implements IWinBollActivity {
 //        LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
     }
 
-    boolean checkResolveActivity() {
-        PackageManager packageManager = getPackageManager();
-        //Intent intent = new Intent("your_action_here");
-        Intent intent = getIntent();
-        if (intent != null) {
-            List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-            if (resolveInfoList.size() > 0) {
-                // 传入的Intent action在Activity清单的intent-filter的action节点里有定义
-                if (intent.getAction() != null) {
-                    if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
-                        App.setIsDebug(true);
-                        //ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
-
-                    }
-                }
-                return true;
-            } else {
-                // 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
-                //ToastUtils.show("false : " + intent.getAction());
-                return false;
-            }
-
-        }
-
-        // action在清单文件中没有声明
-        ToastUtils.show("false");
-        return false;
-    }
-
-    void archiveInstance() {
-        Intent intent = getIntent();
-        StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
-
-        if (intent != null) {
-            ComponentName componentName = intent.getComponent();
-            if (componentName != null) {
-                String packageName = componentName.getPackageName();
-                //Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
-                sb.append("启动本应用的应用包名: \n" + packageName);
-            }
-
-            sb.append("\nImplicit Intent Tracker ：\n接收到的 Intent 动作: \n" + intent.getAction());
-            Set<String> categories = intent.getCategories();
-            if (categories != null) {
-                for (String category : categories) {
-                    sb.append("\n接收到的 Intent 类别 :\n" + category);
-                }
-            }
-            Uri data = intent.getData();
-            if (data != null) {
-                sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
-            }
-        } else {
-            sb.append("Intent is null.");
-        }
-        sb.append("\n\n");
-        LogUtils.d(TAG, sb.toString());
-    }
-
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // 缓存当前 activity
-        //WinBollActivityManager.getInstance(this).add(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        //WinBollActivityManager.getInstance(this).registeRemove(this);
-        super.onDestroy();
-    }
-
     public void onTestLogClick(View view) {
         LogUtils.d(TAG, "onTestLogClick");
         Toast.makeText(getApplication(), "onTestLogClick", Toast.LENGTH_SHORT).show();
     }
 
     public void onLogUtilsClick(View view) {
-//        Intent intent = new Intent(this, LogActivity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//        startActivity(intent);
-
-        //WinBollActivityManager.getInstance().printAvtivityListInfo();
-        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
+        Intent intent = new Intent(this, LogActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        startActivity(intent);
     }
 
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+//        setSubTitle("");
+    }
+
+    @Override
+    public void onBackPressed() {
+//        exit();
+    }
+
+//    void exit() {
+//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+//
+//            @Override
+//            public void onYes() {
+//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+//            }
+//
+//            @Override
+//            public void onNo() {
+//            }
+//        };
+//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+//    }
+
     //
     // 处理传入的 Intent 数据
     //
@@ -245,113 +126,57 @@ final public class MainActivity extends Activity implements IWinBollActivity {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        //ToastUtils.show("onCreateOptionsMenu");
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        if (isAddWinBollToolBar()) {
-            //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
-            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
-        }
-        if (App.isDebug()) {
-            getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
-        }
+    public String getTag() {
+        return TAG;
+    }
 
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_exit) {
-            exit();
-            return true;
-        } else if (item.getItemId() == R.id.item_about) {
-            AboutActivityFactory.showAboutActivity(this, getAppInfo());
-            return true;
+        if (item.getItemId() == R.id.item_testwinboll) {
+            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestWinBollActivity.class);
         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
-            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
+            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
             Intent intent = new Intent(this, QRCodeDecodeActivity.class);
             startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
-        } else if (item.getItemId() == R.id.item_testcrashreport) {
-            for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
-                getString(i);
-            }
-            return true;
-        } else if (item.getItemId() == R.id.item_log) {
-            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
-            return true;
-        } else if (item.getItemId() == R.id.item_exitdebug) {
-            //AboutView.setApp2NormalMode(this);
-            return true;
-        } else if (item.getItemId() == android.R.id.home) {
-            //WinBollActivityManager.getInstance(this).finish(this);
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    void about() {
-//        Intent intent = new Intent(this, AboutActivity.class);
-//        intent.putExtra(AboutActivity.EXTRA_APPINFO, AboutActivityFactory.buildAPPBranchInfo(this));
-//        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
-    }
-
-    void exit() {
-        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
-
-            @Override
-            public void onYes() {
-                //WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
-            }
-
-            @Override
-            public void onNo() {
-            }
-        };
-        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
-
-    }
-
-    @Override
-    public void onBackPressed() {
-//        if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
-//            exit();
-//        } else {
-//            WinBollActivityManager.getInstance(this).finish(this);
-//            super.onBackPressed();
-//        }
-    }
-
-    public void onTestAboutActivity(View view) {
-        about();
-    }
-
     public void onTestJavascriptHtmlActivity(View view) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
         intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
-        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case REQUEST_QRCODEDECODE_ACTIVITY : {
+                    String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
+                    ToastUtils.show(text);
+                    break;
+                }
+            default : {
+                    ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
+                    super.onActivityResult(requestCode, resultCode, data);
+                }
+        }
     }
-
-    /*@Override
-     protected void onActivithyResult(int requestCode, int resultCode, Intent data) {
-     switch (requestCode) {
-     case REQUEST_QRCODEDECODE_ACTIVITY : {
-     if (data != null) {
-     String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
-     ToastUtils.show(text);
-     }
-     break;
-     }
-     default : {
-     //ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
-     super.prosessActivityResult(requestCode, resultCode, data);
-     }
-     }
-     }*/
 }

apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java

@@ -1,47 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/23 16:14:45
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public class TestBBMorseCodeActivity extends Activity implements IWinBollActivity {
-
-    public static final String TAG = "TestBBMorseCodeActivity";
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_testbbmorsecode);
-
-    }
-}

apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java

@@ -1,50 +1,37 @@
 package cc.winboll.studio.apputils;
 
+import android.os.Bundle;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.view.StringToQrCodeView;
+
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2025/01/17 19:50:46
  */
-import cc.winboll.studio.apputils.R;
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.StringToQrCodeView;
-
-public class TestStringToQrCodeViewActivity extends Activity implements IWinBollActivity {
-
+public class TestStringToQrCodeViewActivity extends WinBollActivity {
+    
     public static final String TAG = "TestStringToQrCodeViewActivity";
-
+    
     StringToQrCodeView mStringToQrCodeView;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
+    
     @Override
     public String getTag() {
         return TAG;
     }
 
     @Override
-    public Toolbar initToolBar() {
+    protected Toolbar initToolBar() {
         return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
     }
 
     @Override
-    public boolean isEnableDisplayHomeAsUp() {
+    protected boolean isEnableDisplayHomeAsUp() {
         return true;
     }
 
     @Override
-    public boolean isAddWinBollToolBar() {
+    protected boolean isAddWinBollToolBar() {
         return true;
     }
 
@@ -54,4 +41,10 @@ public class TestStringToQrCodeViewActivity extends Activity implements IWinBoll
         setContentView(R.layout.activity_teststringtoqrcodeview);
         mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
     }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setSubTitle(TAG);
+    }
 }

apputils/src/main/java/cc/winboll/studio/apputils/TestWinBollActivity.java

@@ -0,0 +1,52 @@
+package cc.winboll.studio.apputils;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2025/01/13 15:09:46
+ */
+public class TestWinBollActivity extends WinBollActivity {
+
+    public static final String TAG = "TestWinBollActivity";
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activitytestwinbollToolbar1);
+    }
+
+    @Override
+    protected boolean isEnableDisplayHomeAsUp() {
+        return true;
+    }
+
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_testwinboll);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setSubTitle(TAG);
+    }
+    
+    
+}

apputils/src/main/res/layout/activity_main.xml

@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activitymainToolbar1"/>
@@ -27,7 +27,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="TestLog"
-				android:textAllCaps="false"
+                android:textAllCaps="false"
 				android:onClick="onTestLogClick"/>
 
 			<Button
@@ -39,27 +39,20 @@
 
 		</LinearLayout>
 
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right">
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right">
 
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAllCaps="false"
-				android:text="Test Javascript Html Activity"
-				android:onClick="onTestJavascriptHtmlActivity"/>
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAllCaps="false"
+                android:text="Test Javascript Html Activity"
+                android:onClick="onTestJavascriptHtmlActivity"/>
 
-		</LinearLayout>
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:text="Button"
-			android:id="@+id/logview"
-			android:layout_weight="1.0"/>
+        </LinearLayout>
 
 	</LinearLayout>
 

apputils/src/main/res/layout/activity_testbbmorsecode.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-</LinearLayout>

apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml

@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activityteststringtoqrcodeviewToolbar1"/>

apputils/src/main/res/layout/activity_testwinboll.xml

@@ -7,7 +7,7 @@
 	android:layout_height="match_parent"
 	android:background="#FF36B5B3">
 
-	<android.widget.Toolbar
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activitytestwinbollToolbar1"/>

apputils/src/main/res/layout/view_toast.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_gradient"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="10dp">
+    
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/ic_launcher"/>
+
+        <TextView
+            android:id="@android:id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:textColor="#FF000000"
+            android:textSize="16sp"/>
+
+    </LinearLayout>
+
+</LinearLayout>

apputils/src/main/res/menu/toolbar_main.xml

@@ -3,14 +3,14 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/item_testwinboll"
-        android:title="TestWinBollActivity"/>
+        android:title="TestWinBollActivity"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/item_teststringtoqrcodeview"
-        android:title="TestStringToQrCodeViewActivity"/>
+        android:title="TestStringToQrCodeViewActivity"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
-        android:title="TestQRCodeDecodeActivity"/>
-    <item
-        android:id="@+id/item_testcrashreport"
-        android:title="TestCrashReportActivity"/>
+        android:title="TestQRCodeDecodeActivity"
+        app:showAsAction="ifRoom"/>
 </menu>

apputils/src/main/res/values/colors.xml

@@ -4,4 +4,7 @@
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>
+    <color name="colorToastFrame">#FFA9A9A9</color>
+    <color name="colorToastShadow">#FF000000</color>
+    <color name="colorToastBackgroung">#FFFFFFFF</color>
 </resources>

apputils/src/main/res/values/styles.xml

@@ -1,14 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyUtilsTheme" parent="UtilsTheme">
-        <item name="attrColorPrimary">@color/colorPrimary</item>
-        <item name="themeGlobalCrashActivity">@style/MyUtilsGlobalCrashActivityTheme</item>
-    </style>
-
-    <style name="MyUtilsGlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="colorTittle">#FFF2F2F2</item>
-        <item name="colorTittleBackgound">#FF55ABF8</item>
-        <item name="colorText">#FF55ABF8</item>
-        <item name="colorTextBackgound">#FFF2F2F2</item>
-	</style>
 </resources>

build.gradle

@@ -18,7 +18,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

libappbase/build.gradle

@@ -4,11 +4,12 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
+    
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
     }
     buildTypes {
@@ -21,4 +22,25 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // Android 类库
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        //exclude group: "com.android.support", module: "support-vector-drawable"
+        exclude group: "com.android.support:animated-vector-drawable:28.0.0"
+    }
+    // https://mvnrepository.com/artifact/com.android.support/support-compat
+    //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    // https://mvnrepository.com/artifact/com.android.support/support-v4
+    api 'com.android.support:support-v4:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
+    api 'com.android.support:support-media-compat:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
+    api 'com.android.support:support-core-utils:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
+    api 'com.android.support:support-core-ui:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-fragment
+    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'
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:04:27 HKT 2025
-stageCount=9
+#Fri Mar 28 20:05:24 HKT 2025
+stageCount=5
 libraryProject=libappbase
-baseVersion=15.0
-publishVersion=15.0.8
+baseVersion=15.1
+publishVersion=15.1.4
 buildCount=0
-baseBetaVersion=15.0.9
+baseBetaVersion=15.1.5

libappbase/src/main/AndroidManifest.xml

@@ -9,19 +9,33 @@
     <!-- 发送持久广播 -->
     <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
 
+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
     <application>
 
         <activity
             android:name=".CrashHandler$CrashActivity"
             android:label="CrashActivity"
-            android:launchMode="standard"/>
+            android:launchMode="singleInstance"
+            android:process=":CrashActivity"/>
 
         <activity
             android:name=".GlobalCrashActivity"
             android:label="GlobalCrashActivity"
-            android:launchMode="standard"/>
+            android:launchMode="singleInstance"
+            android:process=":GlobalCrashActivity"/>
 
-        <activity android:name=".LogActivity"/>
+        <activity
+            android:name=".winboll.LogActivity"
+            android:label="LogActivity"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:process=":LogActivity">
+
+        </activity>
 
         <service
             android:name=".SimpleOperateSignalCenterService"
@@ -33,7 +47,9 @@
             android:name=".services.TestService"
             android:exported="true"/>
 
-        <receiver android:name=".receiver.MyBroadcastReceiver">
+        <receiver
+            android:name=".receiver.MyBroadcastReceiver"
+            android:exported="true">
 
             <intent-filter>
 
@@ -75,7 +91,9 @@
 
         <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
 
-        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver">
+        <receiver
+            android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+            android:exported="true">
 
             <intent-filter>
 
@@ -87,4 +105,4 @@
 
     </application>
 
-</manifest>
+</manifest>

libappbase/src/main/java/cc/winboll/studio/libappbase/APPBaseModel.java

@@ -0,0 +1,73 @@
+package cc.winboll.studio.libappbase;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 02:52:46
+ * @Describe 基础应用数据模型
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class APPBaseModel extends BaseBean {
+
+    public static final String TAG = "APPBaseModel";
+
+    // 应用是否处于正在调试状态
+    //
+    boolean isDebuging = false;
+
+    public APPBaseModel() {
+        this.isDebuging = false;
+    }
+
+    public APPBaseModel(boolean isDebuging) {
+        this.isDebuging = isDebuging;
+    }
+
+    public void setIsDebuging(boolean isDebuging) {
+        this.isDebuging = isDebuging;
+    }
+
+    public boolean isDebuging() {
+        return isDebuging;
+    }
+
+    @Override
+    public String getName() {
+        return APPBaseModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isDebuging").value(isDebuging());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isDebuging")) {
+                setIsDebuging(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java

@@ -339,6 +339,7 @@ public final class CrashHandler {
                     int padding = dp2px(16);
                     message.setPadding(padding, padding, padding, padding);
                     message.setText(mLog);
+                    message.setTextColor(Color.BLACK);
                     message.setTextIsSelectable(true);
                 }
                 hw.addView(message);

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -7,75 +7,84 @@ package cc.winboll.studio.libappbase;
  */
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.MyActivityLifecycleCallbacks;
 
 public class GlobalApplication extends Application {
 
     public static final String TAG = "GlobalApplication";
 
-    final static String PREFS = GlobalApplication.class.getName() + "PREFS";
-    final static String PREFS_ISDEBUGING = "PREFS_ISDEBUGING";
-
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
+    volatile static GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
+    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
-    public static void setIsDebuging(Context context, boolean isDebuging) {
-        GlobalApplication.isDebuging = isDebuging;
-        // 获取SharedPreferences实例
-        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-        // 获取编辑器
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        // 保存数据
-        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-        // 提交更改
-        editor.apply();
+    public static void setIsDebuging(boolean isDebuging) {
+        if (_GlobalApplication != null) {
+            GlobalApplication.isDebuging = isDebuging;
+            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
+        }
+    }
+
+    public static GlobalApplication getInstance() {
+        return _GlobalApplication;
+    }
+
+    static String getAPPBaseModelFilePath() {
+        return _GlobalApplication.getDataDir().getPath() + "/APPBaseModel.json";
     }
 
     public static boolean isDebuging() {
         return isDebuging;
     }
 
-    @Override
-    public Context getApplicationContext() {
-        return super.getApplicationContext();
-    }
-
-    public Application getApplication() {
-        return this;
+    public static WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(_GlobalApplication);
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        //GlobalApplication.isDebuging = true;
-        //GlobalApplication.setIsDebuging(this, true);
+        // 保存初始实例
+        _GlobalApplication = this;
+        
+        setIsDebuging(true);
+        // 添加日志模块
         LogUtils.init(this);
         //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
         //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
         //LogUtils.setALlTAGListEnable(true);
         //LogUtils.d(TAG, "LogUtils init");
-
         // 设置应用异常处理窗口
         CrashHandler.init(this);
-
-        // 设置应用调试状态
-        //SharedPreferences sharedPreferences = getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-        //GlobalApplication.isDebuging = sharedPreferences.getBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-
         // 初始化 Toast 框架
         ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
-        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+
+        // 应用保存的调试标志
+        APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
+        if (appBaseModel == null) {
+            setIsDebuging(false);
+        } else {
+            setIsDebuging(appBaseModel.isDebuging());
+        }
+        
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // 注册窗口回调监听
+        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
+        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+    }
+
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        // 注销回调（非必须，但建议释放资源）
+        unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
     public static String getAppName(Context context) {

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java

@@ -4,26 +4,20 @@ package cc.winboll.studio.libappbase;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/11 00:14:05
  */
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.R;
 
-public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {
 
     private static final int MENUITEM_COPY = 0;
     private static final int MENUITEM_RESTART = 1;
@@ -45,10 +39,10 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
         setContentView(R.layout.activity_globalcrash);
         mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
         mGlobalCrashReportView.setReport(mLog);
-        setActionBar(mGlobalCrashReportView.getToolbar());
+        setSupportActionBar(mGlobalCrashReportView.getToolbar());
         
-        getActionBar().setTitle(CrashHandler.TITTLE);
-        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        getSupportActionBar().setTitle(CrashHandler.TITTLE);
+        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
     }
 
     @Override
@@ -98,20 +92,4 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
         mGlobalCrashReportView.updateMenuStyle();
         return true;
     }
-
-    void joinQQGroup(String key) {
-        // 创建Intent
-        Intent intent = new Intent();
-        // 设置动作
-        intent.setAction("android.intent.action.VIEW");
-        // 设置数据为网址的URI
-        Uri content_url = Uri.parse("https://www.winboll.cc");
-        intent.setData(content_url);
-        // 添加标志
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        // 设置类名和活动名
-        intent.setClassName("com.android.browser", "com.android.browser.BrowserActivity");
-        // 启动Activity
-        startActivity(intent);
-    }
 }

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java

@@ -8,6 +8,7 @@ package cc.winboll.studio.libappbase;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
@@ -16,7 +17,6 @@ import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import cc.winboll.studio.libappbase.R;
-import android.widget.Toolbar;
 
 public class GlobalCrashReportView extends LinearLayout {
 

libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java

@@ -10,6 +10,8 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,6 +20,8 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.HorizontalScrollView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -42,6 +46,7 @@ public class LogView extends RelativeLayout {
     Context mContext;
     ScrollView mScrollView;
     TextView mTextView;
+    EditText metTagSearch;
     CheckBox mSelectableCheckBox;
     CheckBox mSelectAllTAGCheckBox;
     TAGListAdapter mTAGListAdapter;
@@ -107,9 +112,41 @@ public class LogView extends RelativeLayout {
         //
         mScrollView = findViewById(cc.winboll.studio.libappbase.R.id.viewlogScrollViewLog);
         mTextView = findViewById(cc.winboll.studio.libappbase.R.id.viewlogTextViewLog);
+        metTagSearch = findViewById(cc.winboll.studio.libappbase.R.id.tagsearch_et);
         // 获取Log Level spinner实例
         mLogLevelSpinner = findViewById(cc.winboll.studio.libappbase.R.id.viewlogSpinner1);
 
+        metTagSearch.addTextChangedListener(new TextWatcher() {
+
+                @Override
+                public void afterTextChanged(Editable editable) {
+                }
+
+                @Override
+                public void beforeTextChanged(CharSequence charSequence, int p, int p1, int p2) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    LogUtils.d(TAG, s.toString());
+                    if (s.length() > 0) {
+                        scrollToTag(s.toString());
+                    } else {
+                        HorizontalScrollView hsRoot = findViewById(R.id.viewlogHorizontalScrollView1);
+                        hsRoot.smoothScrollTo(0, 0);
+                        mListViewTags.resetScrollToStart();
+                    }
+//                    mListViewTags.postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                mListViewTags.scrollToItem(5);
+//                            }
+//                        }, 100);
+                }
+                // 其他方法留空或按需实现
+            });
+
+
         (findViewById(cc.winboll.studio.libappbase.R.id.viewlogButtonClean)).setOnClickListener(new View.OnClickListener(){
 
                 @Override
@@ -233,6 +270,60 @@ public class LogView extends RelativeLayout {
         scrollLogUp();
     }
 
+    public void scrollToTag(final String prefix) {
+        if (mTAGListAdapter == null || prefix == null || prefix.length() == 0) {
+            LogUtils.d(TAG, "参数为空，无法滚动");
+            return;
+        }
+
+        final List<TAGItemModel> itemList = mTAGListAdapter.getItemList();
+
+        mListViewTags.post(new Runnable() {
+                @Override
+                public void run() {
+                    // 查找匹配的标签位置
+                    int targetPosition = -1;
+
+                    for (int i = 0; i < itemList.size(); i++) {
+                        String tag = itemList.get(i).getTag();
+                        if (tag != null && tag.toLowerCase().startsWith(prefix.toLowerCase())) {
+                            targetPosition = i;
+
+                            break;
+                        }
+                    }
+
+                    if (targetPosition != -1) {
+                        // 优化滚动逻辑
+                        //mListViewTags.setSelection(targetPosition);
+                        //mListViewTags.invalidateViews(); // 强制刷新所有可见项
+
+                        // 单独刷新目标视图
+//                        View targetView = mListViewTags.getChildAt(targetPosition);
+//                        if (targetView != null) {
+//                            targetView.requestLayout();
+//                            targetView.requestFocus();
+//                        }
+
+                        final int scrollPosition = targetPosition;
+
+                        // 延迟滚动确保布局完成
+                        mListViewTags.postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    LogUtils.d(TAG, String.format("scrollPosition %d", scrollPosition));
+                                    mListViewTags.scrollToItem(scrollPosition);
+                                }
+                            }, 100);
+                    } else {
+                        LogUtils.d(TAG, "未找到匹配的标签前缀：" + prefix);
+                    }
+                }
+            });
+    }
+
+
+
     class LogViewHandler extends Handler {
 
         final static int MSG_LOGVIEW_UPDATE = 0;
@@ -300,6 +391,30 @@ public class LogView extends RelativeLayout {
         public void setChecked(boolean checked) {
             isChecked = checked;
         }
+
+        // getter/setter...
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            TAGItemModel that = (TAGItemModel) o;
+            // 手动处理空值比较（Java 6 不支持 Objects.equals）
+            if (tag == null) {
+                return that.tag == null;
+            } else {
+                return tag.equals(that.tag);
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return tag == null ? 0 : tag.hashCode(); // 手动处理空值
+        }
     }
 
 
@@ -314,7 +429,11 @@ public class LogView extends RelativeLayout {
             mapOrigin = map;
             loadMap(mapOrigin);
         }
-        
+
+        public List<TAGItemModel> getItemList() {
+            return itemList;
+        }
+
         @Override
         public int getCount() {
             return itemList.size();
@@ -344,7 +463,7 @@ public class LogView extends RelativeLayout {
             loadMap(mapOrigin);
             super.notifyDataSetChanged();
         }
-        
+
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             ViewHolder holder;

libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java

@@ -0,0 +1,60 @@
+package cc.winboll.studio.libappbase.dialogs;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 17:40:47
+ * @Date 2024/08/12 14:46:25
+ * @Describe 询问用户确定与否的选择框
+ */
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+
+public class YesNoAlertDialog {
+
+    public static final String TAG = "YesNoAlertDialog";
+
+    public static void show(Context context, String szTitle, String szMessage, final OnDialogResultListener listener) {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+            context);
+
+        // set title
+        alertDialogBuilder.setTitle(szTitle);
+
+        // set dialog message
+        alertDialogBuilder
+            .setMessage(szMessage)
+            .setCancelable(true)
+            .setOnCancelListener(new DialogInterface.OnCancelListener(){
+                @Override
+                public void onCancel(DialogInterface dialog) {
+                    listener.onNo();
+                }
+            })
+            .setPositiveButton("YES", new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    // if this button is clicked, close
+                    // current activity
+                    listener.onYes();
+                }
+            })
+            .setNegativeButton("NO", new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    // if this button is clicked, just close
+                    // the dialog box and do nothing
+                    dialog.cancel();
+                }
+            });
+
+        // create alert dialog
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        // show it
+        alertDialog.show();
+    }
+
+    public interface OnDialogResultListener {
+        abstract void onYes();
+        abstract void onNo();
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java

@@ -9,23 +9,34 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ListView;
+import android.widget.Scroller;
 import cc.winboll.studio.libappbase.LogUtils;
 
 public class HorizontalListView extends ListView {
-
     public static final String TAG = "HorizontalListView";
-    int verticalOffset = 0;
+    private int verticalOffset = 0;
+    private Scroller scroller;
+    private int totalWidth;
 
     public HorizontalListView(Context context) {
         super(context);
+        init();
     }
 
     public HorizontalListView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        init();
     }
 
     public HorizontalListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        scroller = new Scroller(getContext());
+        setHorizontalScrollBarEnabled(true);
+        setVerticalScrollBarEnabled(false);
     }
 
     public void setVerticalOffset(int verticalOffset) {
@@ -38,28 +49,81 @@ public class HorizontalListView extends ListView {
         int childCount = getChildCount();
         int left = getPaddingLeft();
         int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
-        LogUtils.d(TAG, String.format("HorizontalListView的高度 %d", viewHeight));
-        
+        totalWidth = left;
+
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);
-            // 计算每个子视图的宽度和高度
             int width = child.getMeasuredWidth();
             int height = child.getMeasuredHeight();
-            //LogUtils.d(TAG, String.format("child : width %d , height %d", width, height));
-            // 设置子视图的位置，实现水平布局
-
             child.layout(left, verticalOffset, left + width, verticalOffset + height);
             left += width;
         }
+        totalWidth = left + getPaddingRight();
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
-        //super.onMeasure(widthMeasureSpec, newHeightMeasureSpec);
         int newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
-        //LogUtils.d(TAG, String.format("newWidthMeasureSpec %d, newHeightMeasureSpec %d", newWidthMeasureSpec, newHeightMeasureSpec));
         super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec);
     }
+
+    @Override
+    public void computeScroll() {
+        if (scroller.computeScrollOffset()) {
+            scrollTo(scroller.getCurrX(), scroller.getCurrY());
+            postInvalidate();
+        }
+    }
+
+    public void smoothScrollTo(int x, int y) {
+        int dx = x - getScrollX();
+        int dy = y - getScrollY();
+        scroller.startScroll(getScrollX(), getScrollY(), dx, dy, 300); // 300ms平滑动画
+        invalidate();
+    }
+
+    @Override
+    public int computeHorizontalScrollRange() {
+        return totalWidth;
+    }
+
+    @Override
+    public int computeHorizontalScrollOffset() {
+        return getScrollX();
+    }
+
+    @Override
+    public int computeHorizontalScrollExtent() {
+        return getWidth();
+    }
+
+    public void scrollToItem(int position) {
+        if (position < 0 || position >= getChildCount()) {
+            LogUtils.d(TAG, "无效的position: " + position);
+            return;
+        }
+
+        View targetView = getChildAt(position);
+        int targetLeft = targetView.getLeft();
+        int scrollX = targetLeft - getPaddingLeft();
+
+        // 修正最大滚动范围计算
+        int maxScrollX = totalWidth;
+        scrollX = Math.max(0, Math.min(scrollX, maxScrollX));
+
+        // 强制重新布局和绘制
+        requestLayout();
+        invalidateViews();
+        smoothScrollTo(scrollX, 0);
+        LogUtils.d(TAG, String.format("滚动到position: %d, scrollX: %d computeHorizontalScrollRange() %d", position, scrollX, computeHorizontalScrollRange()));
+    }
+    
+    public void resetScrollToStart() {
+        // 强制重新布局和绘制
+        requestLayout();
+        invalidateViews();
+        smoothScrollTo(0, 0);
+    }
 }
 

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBollActivity.java

@@ -0,0 +1,18 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 08:23:40
+ * @Describe WinBoll 活动窗口通用接口
+ */
+import android.app.Activity;
+import android.widget.Toolbar;
+
+public interface IWinBollActivity {
+
+    public static final String TAG = "IWinBollActivity";
+
+    // 获取活动窗口
+    abstract public Activity getActivity();
+    abstract public String getTag();
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java

@@ -0,0 +1,48 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 20:34:47
+ * @Describe 应用日志窗口
+ */
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.WindowManager;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.R;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+
+public class LogActivity extends Activity implements IWinBollActivity {
+
+    public static final String TAG = "LogActivity";
+
+    LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_log);
+        //ToastUtils.show("LogActivity onCreate");
+
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java

@@ -0,0 +1,98 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 04:29:19
+ */
+import android.app.Activity;
+import android.app.Application;
+import android.content.Intent;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils; 
+
+public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
+
+    public static final String TAG = "MyActivityLifecycleCallbacks";
+
+    public String mInfo = "";
+
+    public MyActivityLifecycleCallbacks() {
+
+    }
+
+    void createActivityeInfo(Activity activity) {
+        StringBuilder sb = new StringBuilder();
+        Intent receivedIntent = activity.getIntent();
+        sb.append("\nCallingActivity : \n");
+        if (activity.getCallingActivity() != null) {
+            sb.append(activity.getCallingActivity().getPackageName());
+        }
+        sb.append("\nReceived Intent Package : \n");
+        sb.append(receivedIntent.getPackage());
+
+        Bundle extras = receivedIntent.getExtras();
+        if (extras != null) {
+            for (String key : extras.keySet()) {
+                sb.append("\nIntentInfo");
+                sb.append("\n键: ");
+                sb.append(key);
+                sb.append(", 值: ");
+                sb.append(extras.get(key));
+                //Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key));
+            }
+        }
+        mInfo = sb.toString();
+        //Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage);
+    }
+
+    public void showActivityeInfo() {
+        //ToastUtils.show("ActivityeInfo : " + mInfo);
+        LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
+    }
+
+    @Override 
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) { 
+        // 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 
+        //System.out.println(activity.getLocalClassName() + " was created"); 
+        LogUtils.d(TAG, activity.getLocalClassName() + " was created");
+        createActivityeInfo(activity);
+    } 
+
+    @Override 
+    public void onActivityStarted(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was started");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was started");
+        //createActivityeInfo(activity);
+    } 
+
+    @Override 
+    public void onActivityResumed(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was resumed");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was resumed");
+        //createActivityeInfo(activity);
+    } 
+
+    @Override 
+    public void onActivityPaused(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was paused");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was paused");
+    } 
+
+    @Override 
+    public void onActivityStopped(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was stopped");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was stopped");
+    } 
+
+    @Override 
+    public void onActivitySaveInstanceState(Activity activity, Bundle outState) { 
+        // 可以在这里添加保存状态的自定义逻辑 
+    } 
+
+    @Override 
+    public void onActivityDestroyed(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was destroyed");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
+    } 
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java

@@ -0,0 +1,356 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 08:25:43
+ * @Describe 应用活动窗口管理器
+ * 参考 ：
+ * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
+ * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
+ */
+import android.app.ActivityManager;
+import android.app.TaskStackBuilder;
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class WinBollActivityManager {
+
+    public static final String TAG = "WinBollActivityManager";
+    public static final String EXTRA_TAG = "EXTRA_TAG";
+
+    public static enum WinBollUI_TYPE {
+        Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
+        Service // 退出应用后，清理所有最近任务栏任务记录窗口
+        };
+
+    // 应用类型标志
+    static volatile WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+
+    GlobalApplication mGlobalApplication;
+    static volatile WinBollActivityManager _Instance;
+    static volatile Map<String, IWinBollActivity> _mapIWinBollList;
+    volatile IWinBollActivity mFirstIWinBollActivity;
+
+    WinBollActivityManager(GlobalApplication application) {
+        mGlobalApplication = application;
+        _mapIWinBollList = new HashMap<String, IWinBollActivity>();
+    }
+
+    public static synchronized WinBollActivityManager getInstance(GlobalApplication application) {
+        LogUtils.d(TAG, "getInstance");
+        if (_Instance == null) {
+            LogUtils.d(TAG, "_Instance == null");
+            _Instance = new WinBollActivityManager(application);
+        }
+        return _Instance;
+    }
+
+    //
+    // 设置 WinBoll 应用 UI 类型
+    //
+    public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
+        _mWinBollUI_TYPE = mWinBollUI_TYPE;
+    }
+
+    //
+    // 获取 WinBoll 应用 UI 类型
+    //
+    public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
+        return _mWinBollUI_TYPE;
+    }
+
+    //
+    // 把Activity添加到管理中
+    //
+    public <T extends IWinBollActivity> void add(T iWinBoll) {
+        String tag = ((IWinBollActivity)iWinBoll).getTag();
+        LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag));
+        if (isActive(tag)) {
+            LogUtils.d(TAG, String.format("isActive(tag) is true, tag : %s.", tag));
+        } else {
+            // 设置起始活动窗口，以便最后退出时提问
+            if (mFirstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
+                LogUtils.d(TAG, "Set firstIWinBollActivity, iWinBoll.getTag() is %s" + iWinBoll.getTag());
+                mFirstIWinBollActivity = iWinBoll;
+            }
+
+            // 添加到活动窗口列表
+            _mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
+            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
+        }
+    }
+
+
+    //
+    // activity: 为 null 时，
+    // intent.putExtra 函数 EXTRA_TAG 参数为 tag
+    // activity: 不为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
+    //
+    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
+        try {
+            // 如果窗口已存在就重启窗口
+            String tag = ((IWinBollActivity)clazz.newInstance()).getTag();
+            LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Class<T> clazz) tag is %s", tag));
+            if (isActive(tag)) {
+                resumeActivity(context, tag);
+                return;
+            }
+            //ToastUtils.show("startWinBollActivity(Context context, Class<T> clazz)");
+
+            // 新建一个任务窗口
+            Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(EXTRA_TAG, tag);
+            context.startActivity(intent);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
+        try {
+            // 如果窗口已存在就重启窗口
+            String tag = ((IWinBollActivity)clazz.newInstance()).getTag();
+            LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Intent intent, Class<T> clazz) tag is %s", tag));
+            if (isActive(tag)) {
+                resumeActivity(context, tag);
+                return;
+            }
+
+            // 新建一个任务窗口
+            //Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(EXTRA_TAG, tag);
+            context.startActivity(intent);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    public <T extends IWinBollActivity> void startLogActivity(Context context) {
+        // 如果窗口已存在就重启窗口
+        String tag = LogActivity.TAG;
+        if (isActive(tag)) {
+            resumeActivity(context, tag);
+            return;
+        }
+
+        // 新建一个任务窗口
+        Intent intent = new Intent(context, LogActivity.class);
+        //打开多任务窗口 flags
+        // Define the bounds.
+//        Rect bounds = new Rect(0, 0, 800, 200);
+//        // Set the bounds as an activity option.
+//        ActivityOptions options = ActivityOptions.makeBasic();
+//        options.setLaunchBounds(bounds);
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+
+        intent.putExtra(EXTRA_TAG, tag);
+
+        //context.startActivity(intent, options.toBundle());
+        context.startActivity(intent);
+    }
+
+    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
+        return mFirstIWinBollActivity != null && mFirstIWinBollActivity == iWinBollActivity;
+    }
+
+    //
+    // 判断 tag绑定的 MyActivity是否存在
+    //
+    public boolean isActive(String tag) {
+        LogUtils.d(TAG, String.format("isActive(String tag) tag is %s", tag));
+        //printIWinBollListInfo();
+        IWinBollActivity iWinBoll = getIWinBoll(tag);
+        if (iWinBoll != null) {
+            //LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
+            //ToastUtils.show("activity != null tag " + tag);
+            //判断是否为 BaseActivity,如果已经销毁，则移除
+            if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
+                _mapIWinBollList.remove(iWinBoll.getTag());
+                //_mWinBollActivityList.remove(activity);
+                LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
+                return false;
+            } else {
+                LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
+                return true;
+            }
+        } else {
+            LogUtils.d(TAG, String.format("isActive(...) iWinBoll is null tag by %s", tag));
+            return false;
+        }
+    }
+
+    static IWinBollActivity getIWinBoll(String tag) {
+        LogUtils.d(TAG, String.format("getIWinBoll(String tag) %s", tag));
+        return _mapIWinBollList.get(tag);
+    }
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
+        LogUtils.d(TAG, "resumeActivity(Context context, String tag)");
+        T iWinBoll = (T)getIWinBoll(tag);
+        LogUtils.d(TAG, String.format("iWinBoll.getTag() %s", iWinBoll.getTag()));
+        //LogUtils.d(TAG, "activity " + activity.getTag());
+        if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+            resumeActivity(context, iWinBoll);
+        }
+    }
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
+        LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
+        ActivityManager am = (ActivityManager) mGlobalApplication.getSystemService(Context.ACTIVITY_SERVICE);
+        //返回启动它的根任务（home 或者 MainActivity）
+        Intent intent = new Intent(mGlobalApplication, iWinBoll.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mGlobalApplication);
+        stackBuilder.addNextIntentWithParentStack(intent);
+        stackBuilder.startActivities();
+        //moveTaskToFront(YourTaskId, 0);
+        //ToastUtils.show("resumeActivity am.moveTaskToFront");
+        LogUtils.d(TAG, String.format("iWinBoll.getActivity().getTaskId() %d", iWinBoll.getActivity().getTaskId()));
+        am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+        LogUtils.d(TAG, "am.moveTaskToFront");
+    }
+
+
+    //
+    // 结束所有 Activity
+    //
+    public void finishAll() {
+        try {
+            for (String key : _mapIWinBollList.keySet()) {
+                //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
+                IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
+                //ToastUtils.show("finishAll() activity");
+                if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+                    //ToastUtils.show("activity != null ...");
+                    if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) {
+                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
+                        iWinBoll.getActivity().finishAndRemoveTask();
+                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
+                    } else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) {
+                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
+                        iWinBoll.getActivity().finish();
+                        //ToastUtils.show("finishAll() activity.finish();");
+                    } else {
+                        LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
+                        //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    //
+    // 结束指定Activity
+    //
+    public <T extends IWinBollActivity> void finish(T iWinBoll) {
+        try {
+            if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+                //根据tag 移除 MyActivity
+                //String tag= activity.getTag();
+                //_mWinBollActivityList.remove(tag);
+                //ToastUtils.show("remove");
+                //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size()));
+
+                // 窗口回调规则：
+                // [] 当前窗口位置 >> 调度出的窗口位置
+                // ★：[0] 1 2 3 4 >> 1
+                // ★：0 1 [2] 3 4 >> 1
+                // ★：0 1 2 [3] 4 >> 2
+                // ★：0 1 2 3 [4] >> 3
+                // ★：[0] >> 直接关闭当前窗口
+                //LogUtils.d(TAG, "finish no yet.");
+                IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
+                iWinBoll.getActivity().finish();
+                if (preIWinBoll != null) {
+                    resumeActivity(mGlobalApplication, preIWinBoll);
+                }
+            }
+
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    //
+    // 获取窗口队列中的前一个窗口
+    //
+    IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
+        try {
+            boolean bingo = false;
+            IWinBollActivity preIWinBoll = null;
+            for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
+                if (entity.getKey().equals(iWinBoll.getTag())) {
+                    bingo = true;
+                    //LogUtils.d(TAG, "bingo");
+                    break;
+                }
+                preIWinBoll = entity.getValue();
+            }
+
+            if (bingo) {
+                return preIWinBoll;
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+
+        return null;
+    }
+
+    //
+    // 从管理列表中移除管理项
+    //
+    public <T extends IWinBollActivity> boolean registeRemove(T activity) {
+        IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
+        if (iWinBollTest != null) {
+            _mapIWinBollList.remove(activity.getTag());
+            return true;
+        }
+        return false;
+    }
+
+    //
+    // 打印管理列表项列表里的信息
+    //
+    public static void printIWinBollListInfo() {
+        //LogUtils.d(TAG, "printAvtivityListInfo");
+        if (!_mapIWinBollList.isEmpty()) {
+            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
+            Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, IWinBollActivity> entry = iterator.next();
+                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
+                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
+            }
+            sb.append("\nMap entries end.");
+            LogUtils.d(TAG, sb.toString());
+        } else {
+            LogUtils.d(TAG, "The map is empty.");
+        }
+    }
+}

libappbase/src/main/res/drawable/bg_shadow.xml

@@ -10,8 +10,8 @@
         <shape android:shape="rectangle" > 
             <gradient 
                 android:angle="270" 
-                android:endColor="@color/colorAccent" 
-                android:startColor="@color/colorAccent" /> 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
             <corners 
                 android:bottomLeftRadius="6dip" 
                 android:bottomRightRadius="6dip" 

libappbase/src/main/res/drawable/bg_toolbar_log.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="@color/colorPrimary" 
+                android:startColor="@color/colorPrimary" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="@color/colorPrimary" 
+                android:startColor="@color/colorPrimary" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

libappbase/src/main/res/drawable/ic_dev_connected.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
+
+</vector>

libappbase/src/main/res/drawable/ic_dev_disconnected.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
+
+</vector>

libappbase/src/main/res/drawable/ic_email.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
+
+</vector>

libappbase/src/main/res/drawable/ic_email_alert.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M24,7H22V13H24V7M24,15H22V17H24V15M20,6C20,4.9 19.1,4 18,4H2C0.9,4 0,4.9 0,6V18C0,19.1 0.9,20 2,20H18C19.1,20 20,19.1 20,18V6M18,6L10,11L2,6H18M18,18H2V8L10,13L18,8V18Z"/>
+
+</vector>

libappbase/src/main/res/drawable/ic_launcher.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true"
-    android:layout_width="24dp"
-	android:layout_height="24dp">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
+    android:clickable="true">
+    <item
+        android:width="256dp"
+        android:height="256dp"
         android:left="0dp" 
         android:top="0dp" 
         android:right="0dp" 
         android:bottom="0dp"
-        android:drawable="@drawable/ic_launcher_foreground"/>
+        android:drawable="@drawable/ic_winboll_logo">
+    </item>
 </layer-list>

libappbase/src/main/res/drawable/ic_launcher_background.xml

@@ -5,7 +5,7 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#FF005C12"
+        android:fillColor="@color/colorPrimary"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"

libappbase/src/main/res/drawable/ic_winboll.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item
+        android:width="256dp"
+        android:height="256dp"
+        android:left="0dp" 
+        android:top="0dp" 
+        android:right="0dp" 
+        android:bottom="0dp"
+        android:drawable="@drawable/ic_winboll_logo">
+    </item>
+</layer-list>

libappbase/src/main/res/drawable/ic_winboll_help.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FF000000"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="1.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
+</vector>

libappbase/src/main/res/drawable/ic_winboll_log.xml

@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M151.49 130.96C151.49 130.96 348.53 130.96 348.53 130.96 348.53 130.96 348.53 393.46 348.53 393.46 348.53 393.46 151.49 393.46 151.49 393.46 151.49 393.46 151.49 130.96 151.49 130.96"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M186.28 207.75C186.28 207.75 304.95 207.75 304.95 207.75 304.95 207.75 304.95 205.97 304.95 205.97 304.95 205.97 186.28 205.97 186.28 205.97 186.28 205.97 186.28 207.75 186.28 207.75"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M186.28 263.52C186.28 263.52 304.95 263.52 304.95 263.52 304.95 263.52 304.95 264.41 304.95 264.41 304.95 264.41 186.28 264.41 186.28 264.41 186.28 264.41 186.28 263.52 186.28 263.52"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M186.28 323.62C186.28 323.62 304.95 323.62 304.95 323.62 304.95 323.62 304.95 320.62 304.95 320.62 304.95 320.62 186.28 320.62 186.28 320.62 186.28 320.62 186.28 323.62 186.28 323.62"/>
+</vector>

libappbase/src/main/res/drawable/ic_winboll_logo.xml

@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="1.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M103.77 307.45C103.02 293.07 104.03 271.24 129.24 248.85 135.25 243.52 141.74 239.48 147.89 236.44 160.24 230.34 171.23 228.28 174.15 227.92 174.31 227.9 174.44 227.89 174.55 227.88 174.66 227.87 174.75 227.86 174.81 227.86 176.62 227.85 216.5 230.02 234.65 253.79 253.9 278.99 266.43 314.66 221.67 356.93 184.69 391.85 179.97 411.36 180.15 411.08"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M248.17 309.83C247.43 295.45 248.43 273.62 273.64 251.23 279.65 245.9 286.14 241.86 292.29 238.82 304.65 232.72 315.63 230.65 318.55 230.3 318.71 230.28 318.84 230.27 318.95 230.26 319.06 230.25 319.15 230.24 319.21 230.24 321.02 230.22 360.9 232.4 379.06 256.17 398.3 281.37 410.83 317.04 366.08 359.31 329.09 394.23 324.37 413.74 324.55 413.46"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
+</vector>

libappbase/src/main/res/drawable/ic_winboll_point.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="1.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
+</vector>

libappbase/src/main/res/drawable/ic_winbollbeta.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item android:drawable="@drawable/ic_launcher_background"/> 
+    <item 
+        android:left="0dp" 
+        android:top="0dp" 
+        android:right="0dp" 
+        android:bottom="0dp"
+        android:drawable="@drawable/ic_winboll_logo"/>
+</layer-list>

libappbase/src/main/res/drawable/shape_gradient.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="180"
+        android:endColor="#FFFFFFFF"
+        android:startColor="#FFFFFFFF"
+        android:type="linear" />
+
+    <corners android:radius="10dp" />
+</shape>

libappbase/src/main/res/drawable/view_border.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#000000" /> <!-- 这里可调整边框宽度和颜色 -->
+    <solid android:color="@android:color/transparent" />
+</shape>

libappbase/src/main/res/layout/activity_log.xml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-    <cc.winboll.studio.libappbase.LogView
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1.0"
-        android:id="@+id/logview"/>
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/logview"/>
 
 </LinearLayout>
+

libappbase/src/main/res/layout/view_globalcrashreport.xml

@@ -7,9 +7,9 @@
 	android:layout_height="match_parent"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">
 
-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>
 
 	<ScrollView

libappbase/src/main/res/layout/view_log.xml

@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		android:layout_alignParentTop="true"
-		android:background="@drawable/bg_shadow"
+		android:background="@drawable/bg_toolbar_log"
 		android:id="@+id/viewlogRelativeLayoutToolbar">
 
 		<Button
@@ -72,7 +72,7 @@
 		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 		android:id="@+id/viewlogLinearLayout1"
 		android:gravity="center_vertical"
-		android:background="@drawable/bg_shadow">
+		android:background="@drawable/bg_toolbar_log">
 
 		<CheckBox
 			android:layout_width="wrap_content"
@@ -83,13 +83,21 @@
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>
 
+		<EditText
+			android:layout_width="50dp"
+			android:ems="10"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:id="@+id/tagsearch_et"/>
+
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:background="@drawable/bg_border"
 			android:scrollbars="none"
 			android:padding="5dp"
-			android:layout_weight="1.0">
+			android:layout_weight="1.0"
+			android:id="@+id/viewlogHorizontalScrollView1">
 
 			<cc.winboll.studio.libappbase.views.HorizontalListView
 				android:layout_width="wrap_content"

libappbase/src/main/res/menu/toolbar_appbase.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/item_minimal"
+        android:title="MINIMAL"
+        android:icon="@drawable/ic_winboll_point"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/item_about"
+        android:title="ABOUT"
+        android:icon="@drawable/ic_winboll_logo"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/item_help"
+        android:title="HELP"
+        android:icon="@drawable/ic_winboll_help"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/item_log"
+        android:title="LOG"
+        android:icon="@drawable/ic_winboll_log"
+        app:showAsAction="always"/>
+</menu>

libappbase/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="APPBaseTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
+    <style name="APPBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
     </style>
 

libapputils/build.gradle

@@ -5,11 +5,11 @@ apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
     }
     buildTypes {
         release {
@@ -17,26 +17,28 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // 二维码类库
+    // 二维码使用的类库
     api 'com.google.zxing:core:3.4.1'
     api 'com.journeyapps:zxing-android-embedded:3.6.0'
     
-    // 网络连接类库
-    //api 'com.squareup.okhttp3:okhttp:4.4.1'
+    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
     
-    // Html 解析
-    //api 'org.jsoup:jsoup:1.13.1'
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.fragment:fragment:1.0.0'
+    api 'com.google.android.material:material:1.0.0'
     
-    // SSH
-    //api 'com.jcraft:jsch:0.1.55'
+    api 'cc.winboll.studio:libappbase:1.0.3'
     
-    // 应用介绍页类库
-    //api 'io.github.medyo:android-about-page:2.0.0'
-    
-    api 'cc.winboll.studio:libappbase:15.0.5'
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:08:19 HKT 2025
-stageCount=9
+#Sat Jan 18 13:02:39 HKT 2025
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.0
-publishVersion=15.0.8
+baseVersion=9.2
+publishVersion=9.2.1
 buildCount=0
-baseBetaVersion=15.0.9
+baseBetaVersion=9.2.2

libapputils/src/main/AndroidManifest.xml

@@ -18,9 +18,6 @@
     <!-- 拍摄照片和视频 -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
-    <!-- 拥有完全的网络访问权限 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-
     <application android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
@@ -29,7 +26,7 @@
             android:launchMode="standard"/>
 
         <activity
-            android:name=".activities.LogActivity"
+            android:name=".log.LogActivity"
             android:label="LogActivity"
             android:launchMode="standard"/>
 
@@ -48,4 +45,4 @@
 
     </application>
 
-</manifest>
+</manifest>

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java

@@ -1,80 +1,70 @@
 package cc.winboll.studio.libapputils.activities;
 
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/07/14 13:20:33
- * @Describe 应用介绍页
- */
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
 import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.AboutView;
+import cc.winboll.studio.libapputils.log.LogUtils;
 
-final public class AboutActivity extends Activity implements IWinBollActivity {
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/07/14 13:20:33
+ * @Describe AboutFragment Test
+ */
+final public class AboutActivity extends WinBollActivity {
 
     public static final String TAG = "AboutActivity";
 
-    public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
 
-
-    APPInfo mAPPInfo;
-
-    @Override
-    public Context getApplicationContext() {
-        return this;
-    }
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-    
     @Override
     public String getTag() {
         return TAG;
     }
 
     @Override
-    public boolean isEnableDisplayHomeAsUp() {
+    protected boolean isEnableDisplayHomeAsUp() {
         return true;
     }
 
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityaboutToolbar1);
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        Intent intent = getIntent();
-        if (intent != null) {
-            mAPPInfo = (APPInfo)intent.getSerializableExtra(EXTRA_APPINFO);
-        }
-        if (mAPPInfo == null) {
-            mAPPInfo = new APPInfo();
-        }
 
-        AboutView aboutView = new AboutView(this, mAPPInfo);
-        LinearLayout llMain = findViewById(R.id.activityaboutLinearLayout1);
-        llMain.addView(aboutView);
+        /*AboutView aboutView = findViewById(R.id.activityaboutAboutView1);
+         aboutView.setOnRequestDevUserInfoAutofillListener(new AboutView.OnRequestDevUserInfoAutofillListener(){
 
-        //ToastUtils.show(TAG);
+         @Override
+         public void requestAutofill(EditText etDevUserName, EditText etDevUserPassword) {
+         AutofillManager autofillManager = (AutofillManager) getSystemService(AutofillManager.class);
+         if (autofillManager!= null) {
+         //ToastUtils.show("0");
+         autofillManager.requestAutofill(findViewById(R.id.usernameEditText));
+         autofillManager.requestAutofill(findViewById(R.id.passwordEditText));
+         }
+         }
+         });*/
+
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setSubTitle(TAG);
+    }
+
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return false;
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activityaboutToolbar1);
     }
 
     @Override
@@ -83,10 +73,14 @@ final public class AboutActivity extends Activity implements IWinBollActivity {
         return super.onCreateOptionsMenu(menu);
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-//        if (item.getItemId() == R.id.item_help) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
+        if (item.getItemId() == R.id.item_help) {
+            WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
+        }
+//        else if (item.getItemId() == android.R.id.home) {
+//            WinBollActivityManager.getInstance(this).finish(this);
 //        }
         return super.onOptionsItemSelected(item);
     }

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java

@@ -5,63 +5,53 @@ package cc.winboll.studio.libapputils.activities;
  * @Date 2025/01/03 11:02:49
  * @Describe 一个可以浏览随 APP 附带的 Html 文档的窗口
  */
-import cc.winboll.studio.libapputils.R;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.R;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import cc.winboll.studio.libapputils.view.SimpleWebView;
+import com.hjq.toast.ToastUtils;
 import java.io.IOException;
 import java.io.InputStream;
+import android.os.PersistableBundle;
 
-public class AssetsHtmlActivity extends Activity implements IWinBollActivity {
+public class AssetsHtmlActivity extends WinBollActivity {
 
     public static final String TAG = "AssetsHtmlActivity";
-
+    
     public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
-
+    
     String mszHelpIndexFilePath = "";
     Uri mszHelpIndexFileUri;
     Context mContext;
 
     // Assets 文件夹里的 Html 文件的名称
     String mszHtmlFileName;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-    
     @Override
     public String getTag() {
         return TAG;
     }
 
     @Override
-    public boolean isEnableDisplayHomeAsUp() {
+    protected boolean isEnableDisplayHomeAsUp() {
         return true;
     }
 
 
     @Override
-    public boolean isAddWinBollToolBar() {
+    protected boolean isAddWinBollToolBar() {
         return false;
     }
 
     @Override
-    public Toolbar initToolBar() {
+    protected Toolbar initToolBar() {
         return findViewById(R.id.activityassetshtmlToolbar1);
     }
 
@@ -91,7 +81,7 @@ public class AssetsHtmlActivity extends Activity implements IWinBollActivity {
             if (szTemp != null && !szTemp.trim().equals("")) {
                 mszHtmlFileName = szTemp.trim();
             }
-            //ToastUtils.show(mszHtmlFileName);
+            ToastUtils.show(mszHtmlFileName);
         }
 
         // 与其他应用分享 html 帮助
@@ -117,6 +107,13 @@ public class AssetsHtmlActivity extends Activity implements IWinBollActivity {
 //        myWebView.loadUrl(mszHelpIndexFileUri.toString());
     }
 
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+        setSubTitle(mszHtmlFileName);
+        //setSubTitle(TAG);
+    }
+
     //
     void initWebViewFromAssets(String szHtmlFileName) {
         try {

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/LogActivity.java

@@ -1,68 +0,0 @@
-package cc.winboll.studio.libapputils.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/08 00:19:39
- * @Describe LogActivity
- */
-import cc.winboll.studio.libapputils.R;
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public class LogActivity extends Activity implements IWinBollActivity {
-
-    public static final String TAG = "LogActivity";
-
-    LogView mLogView;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return null;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        LogUtils.d(TAG, "onCreate");
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_log);
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-        
-    }
-
-    @Override
-    protected void onResume() {
-        LogUtils.d(TAG, "onResume");
-        super.onResume();
-    }
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java

@@ -5,40 +5,29 @@ package cc.winboll.studio.libapputils.activities;
  * @Date 2025/01/18 10:32:21
  * @Describe 二维码扫码解码窗口
  */
-import cc.winboll.studio.libapputils.R;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.widget.TextView;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import cc.winboll.studio.libapputils.R;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 import java.util.List;
 
-public class QRCodeDecodeActivity extends Activity implements IWinBollActivity {
+public class QRCodeDecodeActivity extends WinBollActivity {
 
     public static final String TAG = "QRCodeDecodeActivity";
-
     public static final String EXTRA_RESULT = "EXTRA_RESULT";
-    private static final int REQUEST_CAMERA_PERMISSION = 1;
 
+    private static final int REQUEST_CAMERA_PERMISSION = 1;
     TextView resultTextView;
     DecoratedBarcodeView barcodeView;
-
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
     
     @Override
     public String getTag() {
@@ -46,18 +35,18 @@ public class QRCodeDecodeActivity extends Activity implements IWinBollActivity {
     }
 
     @Override
-    public boolean isEnableDisplayHomeAsUp() {
+    protected boolean isEnableDisplayHomeAsUp() {
         return true;
     }
 
 
     @Override
-    public boolean isAddWinBollToolBar() {
+    protected boolean isAddWinBollToolBar() {
         return false;
     }
 
     @Override
-    public Toolbar initToolBar() {
+    protected Toolbar initToolBar() {
         return findViewById(R.id.activityqrcodedecodeToolbar1);
     }
 
@@ -68,17 +57,16 @@ public class QRCodeDecodeActivity extends Activity implements IWinBollActivity {
         resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
         barcodeView = findViewById(R.id.activityqrcodedecodeDecoratedBarcodeView1);
         // 请求相机权限
-//        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
-//            != PackageManager.PERMISSION_GRANTED) {
-//            ActivityCompat.requestPermissions(this,
-//                                              new String[]{android.Manifest.permission.CAMERA},
-//                                              REQUEST_CAMERA_PERMISSION);
-//        } else {
-//            startScanning();
-//        }
-        startScanning();
-
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
+            != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                                              new String[]{android.Manifest.permission.CAMERA},
+                                              REQUEST_CAMERA_PERMISSION);
+        } else {
+            startScanning();
+        }
 
+        
     }
 
     private void startScanning() {

libapputils/src/main/java/cc/winboll/studio/libapputils/ads/ADsView.java

@@ -0,0 +1,240 @@
+package cc.winboll.studio.libapputils.ads;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/12/09 15:37:35
+ * @Describe WinBoll 应用推广视图
+ */
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.RelativeLayout;
+import com.hjq.toast.ToastUtils;
+
+public class ADsView extends RelativeLayout {
+
+    public static final String TAG = "ADsView";
+
+    public volatile boolean mIsHandling;
+    public volatile boolean mIsAddNewLog;
+
+    Context mContext;
+    WebView mWebView;
+    //ScrollView mScrollView;
+    //TextView mTextView;
+    //CheckBox mSelectableCheckBox;
+    //LogViewThread mLogViewThread;
+    //LogViewHandler mLogViewHandler;
+    //Spinner mLogLevelSpinner;
+    //ArrayAdapter<CharSequence> mLogLevelSpinnerAdapter;
+
+    public ADsView(Context context) {
+        super(context);
+        initView(context);
+    }
+
+    public ADsView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView(context);
+    }
+
+    public ADsView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView(context);
+    }
+
+    public ADsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        initView(context);
+    }
+
+//    public void start() {
+//        mLogViewThread = new LogViewThread(LogView.this);
+//        mLogViewThread.start();
+//        // 显示日志
+//        showAndScrollLogView();
+//    }
+//
+//    public void scrollLogUp() {
+//        mScrollView.post(new Runnable() {
+//                @Override
+//                public void run() {
+//                    mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+//                    // 日志显示结束
+//                    mLogViewHandler.setIsHandling(false);
+//                    // 检查是否添加了新日志
+//                    if (mLogViewHandler.isAddNewLog()) {
+//                        // 有新日志添加，先更改新日志标志
+//                        mLogViewHandler.setIsAddNewLog(false);
+//                        // 再次发送显示日志的显示
+//                        Message message = mLogViewHandler.obtainMessage(LogViewHandler.MSG_LOGVIEW_UPDATE);
+//                        mLogViewHandler.sendMessage(message);
+//                    }
+//                }
+//            });
+//    }
+
+    void initView(Context context) {
+        mContext = context;
+
+//        mLogViewHandler = new LogViewHandler();
+        // 加载视图布局
+        View viewMain = inflate(mContext, cc.winboll.studio.libapputils.R.layout.view_ads, null);
+        mWebView = viewMain.findViewById(cc.winboll.studio.libapputils.R.id.viewadsWebView1);
+        mWebView.setWebViewClient(new WebViewClient() {
+                @Override
+                public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                    view.loadUrl(url);
+                    ToastUtils.show(url);
+                    return true;
+                }
+            });
+
+//        // 初始化日志子控件视图
+//        //
+//        mScrollView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogScrollViewLog);
+//        mTextView = findViewById(cc.winboll.studio.libapputils.R.id.viewlogTextViewLog);
+//        // 获取Log Level spinner实例
+//        mLogLevelSpinner = findViewById(cc.winboll.studio.libapputils.R.id.viewlogSpinner1);
+//
+//        (findViewById(cc.winboll.studio.libapputils.R.id.viewlogButtonClean)).setOnClickListener(new View.OnClickListener(){
+//
+//                @Override
+//                public void onClick(View v) {
+//                    LogUtils.cleanLog();
+//                    LogUtils.d(TAG, "Log is cleaned.");
+//                }
+//            });
+//        (findViewById(cc.winboll.studio.libapputils.R.id.viewlogButtonCopy)).setOnClickListener(new View.OnClickListener(){
+//
+//                @Override
+//                public void onClick(View v) {
+//
+//                    ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+//                    cm.setPrimaryClip(ClipData.newPlainText(mContext.getPackageName(), LogUtils.loadLog()));
+//                    LogUtils.d(TAG, "Log is copied.");
+//                }
+//            });
+//        mSelectableCheckBox = findViewById(cc.winboll.studio.libapputils.R.id.viewlogCheckBoxSelectable);
+//        mSelectableCheckBox.setOnClickListener(new View.OnClickListener(){
+//                @Override
+//                public void onClick(View v) {
+//                    if (mSelectableCheckBox.isChecked()) {
+//                        setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
+//                    } else {
+//                        setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+//                    }
+//                }
+//            });
+//
+//        // 设置日志级别列表
+//        ArrayList<String> adapterItems = new ArrayList<>();
+//        for (LogUtils.LOG_LEVEL e : LogUtils.LOG_LEVEL.values()) {
+//            adapterItems.add(e.name());
+//        }
+//        // 假设你有一个字符串数组作为选项列表
+//        //String[] options = {"Option 1", "Option 2", "Option 3"};
+//        // 创建一个ArrayAdapter来绑定数据到spinner
+//        mLogLevelSpinnerAdapter = ArrayAdapter.createFromResource(
+//            context, cc.winboll.studio.libapputils.R.array.enum_loglevel_array, android.R.layout.simple_spinner_item);
+//        mLogLevelSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+//
+//        // 设置适配器并将它应用到spinner上
+//        mLogLevelSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); // 设置下拉视图样式
+//        mLogLevelSpinner.setAdapter(mLogLevelSpinnerAdapter);
+//        // 为Spinner添加监听器
+//        mLogLevelSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+//                @Override
+//                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+//                    //String selectedOption = mLogLevelSpinnerAdapter.getItem(position);
+//                    // 处理选中的选项...
+//                    LogUtils.setLogLevel(LogUtils.LOG_LEVEL.values()[position]);
+//                }
+//                @Override
+//                public void onNothingSelected(AdapterView<?> parent) {
+//                    // 如果没有选择，则执行此操作...
+//                }
+//            });
+//        // 获取默认值的索引
+//        int defaultValueIndex = LogUtils.getLogLevel().ordinal();
+//
+//        if (defaultValueIndex != -1) {
+//            // 如果找到了默认值，设置默认选项
+//            mLogLevelSpinner.setSelection(defaultValueIndex);
+//        }
+//
+//        // 设置滚动时不聚焦日志
+//        setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+    }
+    
+    public void loadUrl(String url) {
+        mWebView.loadUrl(url);
+        //webView.loadUrl("https://www.winboll.cc");
+        //webView.loadUrl("https://ads.winboll.cc");
+    }
+
+//    public void updateLogView() {
+//        if (mLogViewHandler.isHandling() == true) {
+//            // 正在处理日志显示，
+//            // 就先设置一个新日志标志位
+//            // 以便日志显示完后，再次显示新日志内容
+//            mLogViewHandler.setIsAddNewLog(true);
+//        } else {
+//            //LogUtils.d(TAG, "LogListener showLog(String path)");
+//            Message message = mLogViewHandler.obtainMessage(LogViewHandler.MSG_LOGVIEW_UPDATE);
+//            mLogViewHandler.sendMessage(message);
+//            mLogViewHandler.setIsAddNewLog(false);
+//        }
+//    }
+//
+//    void showAndScrollLogView() {
+//        mTextView.setText(LogUtils.loadLog());
+//        scrollLogUp();
+//    }
+//
+//    class LogViewHandler extends Handler {
+//
+//        final static int MSG_LOGVIEW_UPDATE = 0;
+//        volatile boolean isHandling;
+//        volatile boolean isAddNewLog;
+//
+//        public LogViewHandler() {
+//            setIsHandling(false);
+//            setIsAddNewLog(false);
+//        }
+//
+//        public void setIsHandling(boolean isHandling) {
+//            this.isHandling = isHandling;
+//        }
+//
+//        public boolean isHandling() {
+//            return isHandling;
+//        }
+//
+//        public void setIsAddNewLog(boolean isAddNewLog) {
+//            this.isAddNewLog = isAddNewLog;
+//        }
+//
+//        public boolean isAddNewLog() {
+//            return isAddNewLog;
+//        }
+//
+//        public void handleMessage(Message msg) {
+//            switch (msg.what) {
+//                case MSG_LOGVIEW_UPDATE:{
+//                        if (isHandling() == false) {
+//                            setIsHandling(true);
+//                            showAndScrollLogView();
+//                        }
+//                        break;
+//                    }
+//                default:
+//                    break;
+//            }
+//            super.handleMessage(msg);
+//        }
+//    }
+
+}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/AboutActivityFactory.java

@@ -1,54 +0,0 @@
-package cc.winboll.studio.libapputils.app;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/02/06 08:45:23
- * @Describe 关于活动窗口的介绍窗口工厂
- */
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libapputils.activities.AboutActivity;
-import cc.winboll.studio.libapputils.app.AboutActivityFactory;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public class AboutActivityFactory {
-
-    public static final String TAG = "AboutActivityFactory";
-
-    public static APPInfo buildDefaultAPPInfo() {
-        String szBranchName = "";
-        
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("APP");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-        appInfo.setAppDescription("APP Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
-        appInfo.setAppAPKName("APP");
-        appInfo.setAppAPKFolderName("APP");
-        return appInfo;
-    }
-
-    public static void showAboutActivity(Context context, APPInfo appInfo) {
-        /*String szPN = ((IWinBollActivity)context).getActivityPackageName();
-        //String szPN = context.getPackageName();
-        String szBranchName = "";
-        if (szPN != null) {
-            //String szPN = "cc.winboll.studio.apputils.beta";
-            String regex = "cc\\.winboll\\.studio\\.([^.]+)\\.*";
-            Pattern pattern = Pattern.compile(regex);
-            Matcher matcher = pattern.matcher(szPN);
-            if (matcher.find()) {
-                szBranchName = matcher.group(1);
-            }
-        }*/
-        //ToastUtils.show(szPN);
-        
-        Intent intent = new Intent(context, AboutActivity.class);
-        intent.putExtra(AboutActivity.EXTRA_APPINFO, (appInfo == null) ? AboutActivityFactory.buildDefaultAPPInfo():appInfo);
-        //WinBollActivityManager.getInstance(context).startWinBollActivity(context, intent, AboutActivity.class);
-    }
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/AppVersionUtils.java

@@ -5,7 +5,7 @@ package cc.winboll.studio.libapputils.app;
  * @Date 2024/08/12 14:45:35
  * @Describe 应用版本工具集
  */
-import cc.winboll.studio.libappbase.LogUtils;
+import com.hjq.toast.ToastUtils;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -23,7 +23,6 @@ public class AppVersionUtils {
     //       true 新版本 == 当前版本
     //
     public static boolean isHasNewVersion2(String szCurrentName, String szNextName) {
-        LogUtils.d(TAG, String.format("isHasNewVersion2\nszCurrentName : %s\nszNextName : %s", szCurrentName, szNextName));
         //szCurrentName = "AES_6.2.0-beta0_3234.apk";
         //szNextName = "AES_6.1.12.apk";
         //szCurrentName = "AES_6.2.0-beta0_3234.apk";
@@ -78,9 +77,8 @@ public class AppVersionUtils {
         //LogUtils.d(TAG, "App version is the newest. ");
         return false;
     }
-
+    
     public static boolean isHasNewStageReleaseVersion(String szCurrentName, String szNextName) {
-        LogUtils.d(TAG, String.format("isHasNewStageReleaseVersion\nszCurrentName : %s\nszNextName : %s", szCurrentName, szNextName));
         //szCurrentName = "AES_6.2.12.apk";
         //szNextName = "AES_6.3.12.apk";
         if (checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName))) {
@@ -98,10 +96,6 @@ public class AppVersionUtils {
     // 返回 ：true 新版本 > 当前版本
     //
     public static Boolean checkNewVersion(String szCurrentCode, String szNextCode) {
-        if (szCurrentCode == null || szCurrentCode.equals("") || szNextCode == null || szNextCode.equals("")) {
-            LogUtils.d(TAG, String.format("checkNewVersion unexpected parameters:\nszCurrentCode : %s\nszNextCode : %s", szCurrentCode, szNextCode));
-            return false;
-        }
         boolean isNew = false;
         String[] appVersionCurrent = szCurrentCode.split("\\.");
         String[] appVersionNext = szNextCode.split("\\.");
@@ -112,7 +106,7 @@ public class AppVersionUtils {
             if (Integer.parseInt(appVersionNext[i]) > Integer.parseInt(appVersionCurrent[i])) {
                 isNew = true;
                 return isNew;
-            } else if (Integer.parseInt(appVersionNext[i]) == Integer.parseInt(appVersionCurrent[i])) {
+            } else if(Integer.parseInt(appVersionNext[i]) == Integer.parseInt(appVersionCurrent[i])) {
                 continue ;
             } else {
                 isNew = false;
@@ -128,17 +122,14 @@ public class AppVersionUtils {
     // 如 ：AppUtils_7.0.4.apk 版本号为 7.0.4
     //
     public static String getCodeInPackageName(String apkName) {
-        LogUtils.d(TAG, String.format("getCodeInPackageName apkName : %s", apkName));
         //String apkName = "AppUtils_7.0.0.apk";
         Pattern pattern = Pattern.compile("\\d+\\.\\d+\\.\\d+");
         Matcher matcher = pattern.matcher(apkName);
         if (matcher.find()) {
             String version = matcher.group();
-            LogUtils.d(TAG, String.format("version is %s", version));
             return version;
             //System.out.println("Version number: " + version); // 输出：7.0.0
         }
-        LogUtils.d(TAG, String.format("No result."));
         return "";
     }
 
@@ -158,4 +149,5 @@ public class AppVersionUtils {
         }
         return "";
     }
+
 }

libapputils/src/main/java/cc/winboll/studio/libapputils/app/IWinBollActivity.java

@@ -1,23 +0,0 @@
-package cc.winboll.studio.libapputils.app;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/08 00:15:36
- * @Describe WinBoll 活动窗口通用接口
- */
-import android.content.Context;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public interface IWinBollActivity {
-
-    public static final String TAG = "IWinBollActivity";
-
-    // 获取应用资源上下文
-    //abstract public Context getApplicationContext();
-    abstract public APPInfo getAppInfo();
-    abstract public String getTag();
-    abstract public Toolbar initToolBar();
-    abstract public boolean isEnableDisplayHomeAsUp();
-    abstract public boolean isAddWinBollToolBar();
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/MyActivityLifecycleCallbacks.java

@@ -6,19 +6,22 @@ package cc.winboll.studio.libapputils.app;
  */
 import android.app.Activity;
 import android.app.Application;
+import android.content.ComponentName;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils; 
+import cc.winboll.studio.libapputils.log.LogUtils;
+import com.hjq.toast.ToastUtils;
+import java.util.Set; 
 
 public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
 
     public static final String TAG = "MyActivityLifecycleCallbacks";
 
-    
     public String mInfo = "";
     
-    public MyActivityLifecycleCallbacks() {
+    public MyActivityLifecycleCallbacks(WinBollApplication application) {
+        
     }
 
     void createActivityeInfo(Activity activity) {

libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivity.java

@@ -0,0 +1,479 @@
+package cc.winboll.studio.libapputils.app;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/08/12 14:32:08
+ * @Describe WinBoll 活动窗口基础类
+ */
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import cc.winboll.studio.libapputils.R;
+import cc.winboll.studio.libapputils.activities.AboutActivity;
+import cc.winboll.studio.libapputils.log.LogActivity;
+import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libapputils.view.AboutView;
+import com.hjq.toast.ToastUtils;
+import java.util.List;
+import java.util.Set;
+
+abstract public class WinBollActivity extends AppCompatActivity {
+
+    public static final String TAG = "WinBollActivity";
+
+    public static final int REQUEST_LOG_ACTIVITY = 0;
+
+    Toolbar mToolBar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        checkResolveActivity();
+        LogUtils.d(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        archiveInstance();
+
+    }
+
+    boolean checkResolveActivity() {
+        PackageManager packageManager = getPackageManager();
+        //Intent intent = new Intent("your_action_here");
+        Intent intent = getIntent();
+        if (intent != null) {
+            List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+            if (resolveInfoList.size() > 0) {
+                // 传入的Intent action在Activity清单的intent-filter的action节点里有定义
+                if (intent.getAction() != null) {
+                    if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
+                        WinBollApplication.setIsDebug(true);
+                        //ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
+
+                    }
+                }
+                return true;
+            } else {
+                // 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
+                //ToastUtils.show("false : " + intent.getAction());
+                return false;
+            }
+
+            /* ResolveInfo resolveInfo = pm.resolveActivity(intent, 0);
+             if (resolveInfo != null) {
+             // action在清单文件中有声明
+
+             } else {
+
+             }*/
+        }
+
+        // action在清单文件中没有声明
+        ToastUtils.show("false");
+        return false;
+    }
+
+    void archiveInstance() {
+        Intent intent = getIntent();
+        StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
+
+        if (intent != null) {
+            ComponentName componentName = intent.getComponent();
+            if (componentName != null) {
+                String packageName = componentName.getPackageName();
+                //Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
+                sb.append("启动本应用的应用包名: \n" + packageName);
+            }
+
+            sb.append("\nImplicit Intent Tracker ：\n接收到的 Intent 动作: \n" + intent.getAction());
+            Set<String> categories = intent.getCategories();
+            if (categories != null) {
+                for (String category : categories) {
+                    sb.append("\n接收到的 Intent 类别 :\n" + category);
+                }
+            }
+            Uri data = intent.getData();
+            if (data != null) {
+                sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
+            }
+        } else {
+            sb.append("Intent is null.");
+        }
+        sb.append("\n\n");
+        LogUtils.d(TAG, sb.toString());
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        mToolBar = initToolBar();
+        setSupportActionBar(mToolBar);
+        if (isEnableDisplayHomeAsUp() && mToolBar != null) {
+            // 显示后退按钮
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
+        // 缓存当前 activity
+        LogUtils.d(TAG, "ActManager.getInstance().add(this);");
+        //ToastUtils.show("getTag() " + getTag());
+        WinBollActivityManager.getInstance(this).add(this);
+        //WinBollActivityManager.getInstance().printAvtivityListInfo();
+        //ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE());
+        //boolean isDebuging = WinBollApplication.loadDebugStatusIsDebuging();
+        //ToastUtils.show(String.valueOf(isDebuging));
+        //WinBollApplication.setIsDebug(true);
+
+        setSubTitle(getTag());
+    }
+
+    @Override
+    public void recreate() {
+        super.recreate();
+    }
+
+    @Override
+    protected void onDestroy() {
+        WinBollActivityManager.getInstance(this).registeRemove(this);
+        super.onDestroy();
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        super.setContentView(layoutResID);
+    }
+
+    @Override
+    public <T extends View> T findViewById(int id) {
+        return super.findViewById(id);
+    }
+
+    @Override
+    public MenuInflater getMenuInflater() {
+        return super.getMenuInflater();
+    }
+
+    public WinBollActivity getActivity() {
+        return this;
+    }
+
+    @Override
+    public Context getApplicationContext() {
+        return super.getApplicationContext();
+    }
+
+    public <T extends FragmentManager> T getWinBollActivitySupportFragmentManager() {
+        return (T)super.getSupportFragmentManager();
+    }
+
+    @Override
+    public ActionBar getSupportActionBar() {
+        return super.getSupportActionBar();
+    }
+
+    @Override
+    public void setSupportActionBar(Toolbar toolbar) {
+        super.setSupportActionBar(toolbar);
+    }
+
+    @Override
+    public void setActionBar(android.widget.Toolbar toolbar) {
+        super.setActionBar(toolbar);
+    }
+
+    public void setSubTitle(CharSequence title) {
+        LogUtils.d(TAG, "setSubTitle");
+        if (super.getSupportActionBar() != null) {
+            super.getSupportActionBar().setSubtitle(title);
+            LogUtils.d(TAG, String.format("setSubtitle title : %s", title));
+        }
+    }
+
+    public CharSequence getSubTitle() {
+        if (super.getSupportActionBar() != null) {
+            return super.getSupportActionBar().getSubtitle();
+        }
+        return "";
+    }
+
+    @Override
+    public void setTitle(CharSequence title) {
+        //super.setTitle(title);
+        if (super.getSupportActionBar() != null) {
+            super.getSupportActionBar().setTitle(title);
+            LogUtils.d(TAG, String.format("setSubtitle title : %s", title));
+        }
+    }
+
+    @Override
+    public void setTitle(int titleId) {
+        //super.setTitle(titleId);
+        if (super.getSupportActionBar() != null) {
+            super.getSupportActionBar().setTitle(titleId);
+            //LogUtils.d(TAG, String.format("setSubtitle title : %s", title));
+        }
+    }
+
+    @Override
+    public void setTheme(Resources.Theme theme) {
+        super.setTheme(theme);
+    }
+
+    @Override
+    public void setTheme(int resid) {
+        super.setTheme(resid);
+    }
+
+    @Override
+    public void setTitleColor(int textColor) {
+        super.setTitleColor(textColor);
+    }
+
+    @Override
+    public void setContentView(View view, ViewGroup.LayoutParams params) {
+        super.setContentView(view, params);
+    }
+
+    @Override
+    public void setContentView(View view) {
+        super.setContentView(view);
+    }
+
+    @Override
+    public SharedPreferences getSharedPreferences(String name, int mode) {
+        return super.getSharedPreferences(name, mode);
+    }
+
+
+    @Override
+    public boolean releaseInstance() {
+        return super.releaseInstance();
+    }
+
+    @Override
+    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {
+        return super.registerReceiver(receiver, filter, flags);
+    }
+
+    @Override
+    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, String broadcastPermission, Handler scheduler) {
+        return super.registerReceiver(receiver, filter, broadcastPermission, scheduler);
+    }
+
+    @Override
+    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
+        return super.registerReceiver(receiver, filter, broadcastPermission, scheduler, flags);
+    }
+
+    @Override
+    public void startActivities(Intent[] intents) {
+        super.startActivities(intents);
+    }
+
+    @Override
+    public void startActivityFromFragment(Fragment fragment, Intent intent, int requestCode) {
+        super.startActivityFromFragment(fragment, intent, requestCode);
+    }
+
+    @Override
+    public void startActivityFromFragment(android.app.Fragment fragment, Intent intent, int requestCode, Bundle options) {
+        super.startActivityFromFragment(fragment, intent, requestCode, options);
+    }
+
+    @Override
+    public void startActivityFromChild(Activity child, Intent intent, int requestCode, Bundle options) {
+        super.startActivityFromChild(child, intent, requestCode, options);
+    }
+
+    @Override
+    public void startActivities(Intent[] intents, Bundle options) {
+        super.startActivities(intents, options);
+    }
+
+    @Override
+    public boolean startActivityIfNeeded(Intent intent, int requestCode) {
+        return super.startActivityIfNeeded(intent, requestCode);
+    }
+
+    @Override
+    public boolean startActivityIfNeeded(Intent intent, int requestCode, Bundle options) {
+        return super.startActivityIfNeeded(intent, requestCode, options);
+    }
+
+    @Override
+    public void startActivityFromChild(Activity child, Intent intent, int requestCode) {
+        super.startActivityFromChild(child, intent, requestCode);
+    }
+
+    @Override
+    public ComponentName startService(Intent service) {
+        return super.startService(service);
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
+        super.startActivityForResult(intent, requestCode, options);
+    }
+
+    @Override
+    public void startActivityFromFragment(android.app.Fragment fragment, Intent intent, int requestCode) {
+        super.startActivityFromFragment(fragment, intent, requestCode);
+    }
+
+    @Override
+    public void startActivityFromFragment(Fragment requestIndex, Intent fragment, int intent, Bundle requestCode) {
+        super.startActivityFromFragment(requestIndex, fragment, intent, requestCode);
+    }
+
+    @Override
+    public void startActivity(Intent intent, Bundle options) {
+        super.startActivity(intent, options);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (isAddWinBollToolBar()) {
+            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
+        }
+        if (WinBollApplication.isDebug()) {
+            getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        LogUtils.d(TAG, "onOptionsItemSelected");
+        if (item.getItemId() == R.id.item_log) {
+            LogUtils.d(TAG, "item_log not yet.");
+            //WinBollActivityManager.getInstance().printAvtivityListInfo();
+            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
+        } else if (item.getItemId() == R.id.item_exit) {
+            WinBollActivityManager.getInstance(this).finishAll();
+        } else if (item.getItemId() == R.id.item_info) {
+            WinBollApplication application = (WinBollApplication) getApplication();
+            application.getMyActivityLifecycleCallbacks().showActivityeInfo();
+        } else if (item.getItemId() == R.id.item_exitdebug) {
+            AboutView.setApp2NormalMode(getApplicationContext());
+        } else if (item.getItemId() == R.id.item_about) {
+            startAboutActivity();
+        } else if (item.getItemId() == android.R.id.home) {
+            WinBollActivityManager.getInstance(this).finish(this);
+        }
+        // else if (item.getItemId() == android.R.id.home) {
+        // 回到主窗口速度缓慢，方法备用。现在用 WinBollActivityManager resumeActivity 和 finish 方法管理。
+        // _mMainWinBollActivity 是 WinBollActivity 的静态属性
+        // onCreate 函数下 _mMainWinBollActivity 为空时就用 _mMainWinBollActivity = this 赋值。
+        //startWinBollActivity(new Intent(_mMainWinBollActivity, _mMainWinBollActivity.getClass()), _mMainWinBollActivity.getTag(), _mMainWinBollActivity);
+        //}
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        //super.onBackPressed();
+        //ToastUtils.show("onBackPressed");
+        WinBollActivityManager.getInstance(this).finish(this);
+    }
+
+
+    /*public void getInstanse() {
+     startWinBollActivity(new Intent(), getTag(), null);
+     }*/
+
+    //
+    // activity: 为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 tag
+    // activity: 不为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
+    //
+//    protected <T extends WinBollActivity> void startWinBollActivity(Intent intent, String tag, T activity) {
+//        LogUtils.d(TAG, "startWinBollActivityForResult tag " + tag);
+//        //ToastUtils.show("startWinBollActivityForResult tag " + tag);
+//        //打开多任务窗口 flags
+//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+//        if (activity != null) {
+//            intent.putExtra("tag", activity.getTag());
+//        } else {
+//            intent.putExtra("tag", tag);
+//        }
+//        //ToastUtils.show("super.startActivityForResult(intent, requestCode); tag " + tag);
+//        LogUtils.d(TAG, "startActivityForResult(intent, requestCode);" + tag);
+//        startActivity(intent);
+//    }
+
+    //
+    // activity: 为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 tag
+    // activity: 不为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
+    //
+    protected <T extends AboutActivity> void startAboutActivity() {
+        Intent intent = new Intent(this, AboutActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        intent.putExtra("tag", AboutActivity.TAG);
+        startActivity(intent);
+    }
+
+    @Override
+    public void startActivity(Intent intent) {
+        //绑定唯一标识 tag，存在 则根据 taskId 移动到前台
+        String tag = intent.getStringExtra("tag");
+        //ToastUtils.show("startActivityForResult tag " + tag);
+        //WinBollActivityManager.getInstance(this).printAvtivityListInfo();
+        if (WinBollActivityManager.getInstance(this).isActive(tag)) {
+            //ToastUtils.show("resumeActivity");
+            LogUtils.d(TAG, "resumeActivity");
+            WinBollActivityManager.getInstance(this).resumeActivity(this, tag);
+        } else {
+            //ToastUtils.show("super.startActivity(intent);");
+            super.startActivity(intent);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int targetFragment, Intent data) {
+        LogUtils.d(TAG, "onActivityResult");
+        switch (requestCode) {
+            case REQUEST_LOG_ACTIVITY : {
+                    LogUtils.d(TAG, "REQUEST_LOG_ACTIVITY");
+                    break;
+                }
+            default : {
+                    super.onActivityResult(requestCode, targetFragment, data);
+                }
+        }
+    }
+
+    public boolean isAddWinBollInfoMenu() {
+        return true;
+    }
+
+    abstract public String getTag();
+    abstract protected Toolbar initToolBar();
+    abstract protected boolean isEnableDisplayHomeAsUp();
+    abstract protected boolean isAddWinBollToolBar();
+}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java

@@ -9,310 +9,307 @@ package cc.winboll.studio.libapputils.app;
  * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
  */
 import android.app.ActivityManager;
-import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
-import cc.winboll.studio.libappbase.LogUtils;
+import androidx.core.app.TaskStackBuilder;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
 public class WinBollActivityManager {
 
-//    public static final String TAG = "WinBollActivityManager";
-//    public static final String EXTRA_TAG = "EXTRA_TAG";
-//
-//    public static enum WinBollUI_TYPE {
-//        Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
-//        Service // 退出应用后，清理所有最近任务栏任务记录窗口
-//        };
-//
-//    // 应用类型标志
-//    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
-//
-//    Context mContext;
-//    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-//    static WinBollActivityManager _mWinBollActivityManager;
-//    static Map<String, IWinBollActivity> _mapIWinBollList;
-//    IWinBollActivity firstIWinBollActivity;
-//
-//    public WinBollActivityManager(Context context) {
-//        mContext = context;
-//        LogUtils.d(TAG, "WinBollActivityManager()");
-//        _mapIWinBollList = new HashMap<String, IWinBollActivity>();
-//    }
-//
-//    public static synchronized WinBollActivityManager getInstance(Context context) {
-//        LogUtils.d(TAG, "getInstance");
-//        if (_mWinBollActivityManager == null) {
-//            LogUtils.d(TAG, "_mWinBollActivityManager == null");
-//            _mWinBollActivityManager = new WinBollActivityManager(context);
-//        }
-//        return _mWinBollActivityManager;
-//    }
-//
-//    //
-//    // 设置 WinBoll 应用 UI 类型
-//    //
-//    public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
-//        _mWinBollUI_TYPE = mWinBollUI_TYPE;
-//    }
-//
-//    //
-//    // 获取 WinBoll 应用 UI 类型
-//    //
-//    public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
-//        return _mWinBollUI_TYPE;
-//    }
-//
-//    //
-//    // 把Activity添加到管理中
-//    //
-//    public <T extends IWinBollActivity> void add(T iWinBoll) {
-//        if (isActive(iWinBoll.getTag())) {
-//            LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
-//        } else {
-//            // 设置起始活动窗口，以便最后退出时提问
-//            if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
-//                firstIWinBollActivity = iWinBoll;
-//            }
-//
-//            // 添加到活动窗口列表
-//            _mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
-//            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
-//        }
-//    }
-//
-//
-//    //
-//    // activity: 为 null 时，
-//    // intent.putExtra 函数 EXTRA_TAG 参数为 tag
-//    // activity: 不为 null 时，
-//    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
-//    //
-//    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
-//        try {
-//            // 如果窗口已存在就重启窗口
-//            String tag = clazz.newInstance().getTag();
-//            if (isActive(tag)) {
-//                resumeActivity(context, tag);
-//                return;
-//            }
-//
-//            // 新建一个任务窗口
-//            Intent intent = new Intent(context, clazz);
-//            //打开多任务窗口 flags
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//            intent.putExtra(EXTRA_TAG, tag);
-//            mContext.startActivity(intent);
-//        } catch (InstantiationException | IllegalAccessException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
-//        try {
-//            // 如果窗口已存在就重启窗口
-//            String tag = clazz.newInstance().getTag();
-//            if (isActive(tag)) {
-//                resumeActivity(context, tag);
-//                return;
-//            }
-//
-//            // 新建一个任务窗口
-//            //Intent intent = new Intent(context, clazz);
-//            //打开多任务窗口 flags
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//            intent.putExtra(EXTRA_TAG, tag);
-//            mContext.startActivity(intent);
-//        } catch (InstantiationException | IllegalAccessException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
-//        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
-//    }
-//
-//    //
-//    // 判断 tag绑定的 MyActivity是否存在
-//    //
-//    public boolean isActive(String tag) {
-//        //printAvtivityListInfo();
-//        IWinBollActivity iWinBoll = getIWinBoll(tag);
-//        if (iWinBoll != null) {
-//            LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
-//            //ToastUtils.show("activity != null tag " + tag);
-//            //判断是否为 BaseActivity,如果已经销毁，则移除
-//            if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
-//                _mapIWinBollList.remove(iWinBoll.getTag());
-//                //_mWinBollActivityList.remove(activity);
-//                LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
-//                return false;
-//            } else {
-//                LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
-//                return true;
-//            }
-//        } else {
-//            LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag));
-//            return false;
-//        }
-//    }
-//
-//    static IWinBollActivity getIWinBoll(String tag) {
-//        return _mapIWinBollList.get(tag);
-//    }
-//
-//    //
-//    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-//    //
-//    public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
-//        LogUtils.d(TAG, "resumeActivty");
-//        T iWinBoll = (T)getIWinBoll(tag);
-//        //LogUtils.d(TAG, "activity " + activity.getTag());
-//        if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
-//            resumeActivity(context, iWinBoll);
-//        }
-//    }
-//
-//    //
-//    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-//    //
-//    public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
-//        ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-//        //返回启动它的根任务（home 或者 MainActivity）
-//        Intent intent = new Intent(context, iWinBoll.getClass());
-//        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-//        stackBuilder.addNextIntentWithParentStack(intent);
-//        stackBuilder.startActivities();
-//        //moveTaskToFront(YourTaskId, 0);
-//        LogUtils.d(TAG, "am.moveTaskToFront");
-//        //ToastUtils.show("resumeActivity am.moveTaskToFront");
-//        am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-//    }
-//
-//
-//    //
-//    // 结束所有 Activity
-//    //
-//    public void finishAll() {
-//        try {
-//            for (String key : _mapIWinBollList.keySet()) {
-//                //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
-//                IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
-//                //ToastUtils.show("finishAll() activity");
-//                if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+    public static final String TAG = "WinBollActivityManager";
+
+    Context mContext;
+    static WinBollActivityManager _mWinBollActivityManager;
+    static Map<String, WinBollActivity> _mapActivityList;
+    //static ArrayList<WinBollActivity> _mWinBollActivityList;
+
+    public WinBollActivityManager(Context context) {
+        mContext = context;
+        LogUtils.d(TAG, "WinBollActivityManager()");
+        _mapActivityList = new HashMap<String, WinBollActivity>();
+        //_mWinBollActivityList = new ArrayList<WinBollActivity>();
+    }
+
+    public static synchronized WinBollActivityManager getInstance(Context context) {
+        LogUtils.d(TAG, "getInstance");
+        if (_mWinBollActivityManager == null) {
+            LogUtils.d(TAG, "_mWinBollActivityManager == null");
+            _mWinBollActivityManager = new WinBollActivityManager(context);
+        }
+        return _mWinBollActivityManager;
+    }
+
+    /**
+     * 把Activity添加到管理中
+     */
+    public <T extends WinBollActivity> void add(T activity) {
+        /*for (int i = 0; i < _mWinBollActivityList.size(); i++) {
+         LogUtils.d(TAG, String.format("add for i %d\nget(i).getTag() %s", i, _mWinBollActivityList.get(i).getTag()));
+         if (_mWinBollActivityList.get(i).getTag().equals(activity.getTag())) {
+         _mWinBollActivityList.add(i, activity);
+         _mWinBollActivityList.remove(i);
+         LogUtils.d(TAG, String.format("Replace activity : %s\nSize %d", activity.getTag(), _mWinBollActivityList.size()));
+         return;
+         }
+         }*/
+        if (isActive(activity.getTag())) {
+            LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag()));
+        } else {
+            _mapActivityList.put(activity.getTag(), activity);
+            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", activity.getTag(), _mapActivityList.size()));
+        }
+    }
+
+
+    //
+    // activity: 为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 tag
+    // activity: 不为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
+    //
+    public <T extends WinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
+        try {
+            // 如果窗口已存在就重启窗口
+            String tag = clazz.newInstance().getTag();
+            if (isActive(tag)) {
+                resumeActivity(context, tag);
+                return;
+            }
+
+            // 新建一个任务窗口
+            Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.putExtra("tag", tag);
+            mContext.startActivity(intent);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    public <T extends WinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
+        try {
+            // 如果窗口已存在就重启窗口
+            String tag = clazz.newInstance().getTag();
+            if (isActive(tag)) {
+                resumeActivity(context, tag);
+                return;
+            }
+
+            // 新建一个任务窗口
+            //Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.putExtra("tag", tag);
+            mContext.startActivity(intent);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    /**
+     * 判断 tag绑定的 MyActivity是否存在
+     */
+    public boolean isActive(String tag) {
+        printAvtivityListInfo();
+        WinBollActivity activity = getWinBollActivity(tag);
+        if (activity != null) {
+            LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
+            //ToastUtils.show("activity != null tag " + tag);
+            //判断是否为 BaseActivity,如果已经销毁，则移除
+            if (activity.isFinishing() || activity.isDestroyed()) {
+                _mapActivityList.remove(activity.getTag());
+                //_mWinBollActivityList.remove(activity);
+                LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
+                return false;
+            } else {
+                LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
+                return true;
+            }
+        } else {
+            LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag));
+            return false;
+        }
+    }
+
+    static WinBollActivity getWinBollActivity(String tag) {
+        return _mapActivityList.get(tag);
+    }
+
+    /**
+     * 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+     */
+    public <T extends WinBollActivity> void resumeActivity(Context context, String tag) {
+        LogUtils.d(TAG, "resumeActivty");
+        T activity = (T)getWinBollActivity(tag);
+        LogUtils.d(TAG, "activity " + activity.getTag());
+        if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
+            resumeActivity(context, activity);
+        }
+    }
+
+    /**
+     * 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+     */
+    public <T extends WinBollActivity> void resumeActivity(Context context, T activity) {
+        ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
+        //返回启动它的根任务（home 或者 MainActivity）
+        Intent intent = new Intent(context, activity.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
+        stackBuilder.addNextIntentWithParentStack(intent);
+        stackBuilder.startActivities();
+        //moveTaskToFront(YourTaskId, 0);
+        LogUtils.d(TAG, "am.moveTaskToFront");
+        //ToastUtils.show("resumeActivity am.moveTaskToFront");
+        am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+    }
+
+
+    /**
+     * 结束所有 Activity
+     */
+    public void finishAll() {
+        try {
+            LogUtils.d(TAG, "finishAll no yet.");
+            //ToastUtils.show(String.format("finishAll() size : %d", _mWinBollActivityList.size()));
+//            for (int i = _mWinBollActivityList.size() - 1; i > -1; i--) {
+//                WinBollActivity activity = _mWinBollActivityList.get(i);
+//                ToastUtils.show("finishAll() activity");
+//                if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
 //                    //ToastUtils.show("activity != null ...");
-//                    if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) {
+//                    if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Service) {
 //                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
-//                        iWinBoll.getActivity().finishAndRemoveTask();
+//                        activity.finishAndRemoveTask();
 //                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-//                    } else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) {
+//                    } else if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Aplication) {
 //                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
-//                        iWinBoll.getActivity().finish();
+//                        activity.finish();
 //                        //ToastUtils.show("finishAll() activity.finish();");
 //                    } else {
-//                        LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
-//                        //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
+//                        ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
 //                    }
 //                }
 //            }
-//        } catch (Exception e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    //
-//    // 结束指定Activity
-//    //
-//    public <T extends IWinBollActivity> void finish(T iWinBoll) {
-//        try {
-//            if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
-//                //根据tag 移除 MyActivity
-//                //String tag= activity.getTag();
-//                //_mWinBollActivityList.remove(tag);
-//                //ToastUtils.show("remove");
-//                //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size()));
-//
-//                // 窗口回调规则：
-//                // [] 当前窗口位置 >> 调度出的窗口位置
-//                // ★：[0] 1 2 3 4 >> 1
-//                // ★：0 1 [2] 3 4 >> 1
-//                // ★：0 1 2 [3] 4 >> 2
-//                // ★：0 1 2 3 [4] >> 3
-//                // ★：[0] >> 直接关闭当前窗口
-//                LogUtils.d(TAG, "finish no yet.");
-//                IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
-//                iWinBoll.getActivity().finish();
-//                if (preIWinBoll != null) {
-//                    resumeActivity(mContext, preIWinBoll);
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    /**
+     * 结束指定Activity
+     */
+    public <T extends WinBollActivity> void finish(T activity) {
+        try {
+            if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
+                //根据tag 移除 MyActivity
+                //String tag= activity.getTag();
+                //_mWinBollActivityList.remove(tag);
+                //ToastUtils.show("remove");
+                //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size()));
+
+                // 窗口回调规则：
+                // [] 当前窗口位置 >> 调度出的窗口位置
+                // ★：[0] 1 2 3 4 >> 1
+                // ★：0 1 [2] 3 4 >> 1
+                // ★：0 1 2 [3] 4 >> 2
+                // ★：0 1 2 3 [4] >> 3
+                // ★：[0] >> 直接关闭当前窗口
+                LogUtils.d(TAG, "finish no yet.");
+                WinBollActivity preActivity = getPreActivity(activity);
+                activity.finish();
+                if (preActivity != null) {
+                    resumeActivity(mContext, preActivity);
+                }
+
+//                for (int i = 0; i < _mWinBollActivityList.size(); i++) {
+//                    if (_mWinBollActivityList.get(i).getTag().equals(activity.getTag())) {
+//                        //ToastUtils.show(String.format("equals i : %d\nTag : %s\nSize : %d", i, activity.getTag(), _mWinBollActivityList.size()));
+//                        if (i == 0) {
+//                            finishAll();
+//                            //ToastUtils.show("finish finishAll");
+//                            return;
+//                        }
+//                        if (i > 0) {
+//                            activity.finish();
+//                            resumeActivity(mContext, _mWinBollActivityList.get(i - 1));
+//                            return;
+//                        }
+//                    }
 //                }
+            }
+
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    WinBollActivity getPreActivity(WinBollActivity activity) {
+        try {
+            boolean bingo = false;
+            WinBollActivity preActivity = null;
+            for (Map.Entry<String, WinBollActivity> entity : _mapActivityList.entrySet()) {
+                if (entity.getKey().equals(activity.getTag())) {
+                    bingo = true;
+                    LogUtils.d(TAG, "bingo");
+                    break;
+                }
+                preActivity = entity.getValue();
+            }
+
+            if (bingo) {
+                return preActivity;
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+
+        return null;
+    }
+
+    public <T extends WinBollActivity> boolean registeRemove(T activity) {
+//        for (int i = 0; i < _mWinBollActivityList.size(); i++) {
+//            if (registeRemove(activity, i)) {
+//                return true;
 //            }
-//
-//        } catch (Exception e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
 //        }
-//    }
-//
-//    //
-//    // 获取窗口队列中的前一个窗口
-//    //
-//    IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
-//        try {
-//            boolean bingo = false;
-//            IWinBollActivity preIWinBoll = null;
-//            for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
-//                if (entity.getKey().equals(iWinBoll.getTag())) {
-//                    bingo = true;
-//                    LogUtils.d(TAG, "bingo");
-//                    break;
-//                }
-//                preIWinBoll = entity.getValue();
-//            }
-//
-//            if (bingo) {
-//                return preIWinBoll;
-//            }
-//        } catch (Exception e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//
-//        return null;
-//    }
-//
-//    //
-//    // 从管理列表中移除管理项
-//    //
-//    public <T extends IWinBollActivity> boolean registeRemove(T activity) {
-//        IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
-//        if (iWinBollTest != null) {
-//            _mapIWinBollList.remove(activity.getTag());
+        WinBollActivity activityTest = _mapActivityList.get(activity.getTag());
+        if (activityTest != null) {
+            _mapActivityList.remove(activity.getTag());
+            return true;
+        }
+        return false;
+    }
+
+//    public <T extends WinBollActivity> boolean registeRemove(T activity, int position) {
+//        if (_mWinBollActivityList.get(position) == activity) {
+//            _mWinBollActivityList.remove(position);
+//            //ToastUtils.show(String.format("registeRemove remove.\nTag %s\nposition %d", activity.getTag(), position));
 //            return true;
 //        }
 //        return false;
 //    }
-//
-//    //
-//    // 打印管理列表项列表里的信息
-//    //
-//    public static void printIWinBollListInfo() {
-//        //LogUtils.d(TAG, "printAvtivityListInfo");
-//        if (!_mapIWinBollList.isEmpty()) {
-//            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
-//            Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
-//            while (iterator.hasNext()) {
-//                Map.Entry<String, IWinBollActivity> entry = iterator.next();
-//                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
-//                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
-//            }
-//            sb.append("\nMap entries end.");
-//            LogUtils.d(TAG, sb.toString());
-//        } else {
-//            LogUtils.d(TAG, "The map is empty.");
-//        }
-//    }
+
+    public static void printAvtivityListInfo() {
+        //LogUtils.d(TAG, "printAvtivityListInfo");
+        if (!_mapActivityList.isEmpty()) {
+            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapActivityList.size()));
+            Iterator<Map.Entry<String, WinBollActivity>> iterator = _mapActivityList.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, WinBollActivity> entry = iterator.next();
+                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
+                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
+            }
+            sb.append("\nMap entries end.");
+            LogUtils.d(TAG, sb.toString());
+        } else {
+            LogUtils.d(TAG, "The map is empty.");
+        }
+    }
+
+
 }

libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollApplication.java

@@ -0,0 +1,76 @@
+package cc.winboll.studio.libapputils.app;
+
+import cc.winboll.studio.libapputils.bean.DebugBean;
+import cc.winboll.studio.libapputils.log.LogUtils;
+
+public class WinBollApplication extends cc.winboll.studio.libappbase.GlobalApplication {
+
+    public static final String TAG = "WinBollApplication";
+
+    public static enum WinBollUI_TYPE {
+        Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
+        Service // 退出应用后，清理所有最近任务栏任务记录窗口
+        };
+
+    // 应用类型标志
+    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+
+    static volatile WinBollApplication _WinBollApplication = null;
+    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
+
+    // 标记当前应用是否处于调试状态
+    static volatile boolean isDebug = false;
+
+    public static void setIsDebug(boolean isDebug) {
+        WinBollApplication.isDebug = isDebug;
+    }
+
+    public static boolean isDebug() {
+        return isDebug;
+    }
+
+    //
+    // 设置 WinBoll 应用 UI 类型
+    //
+    public static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
+        _mWinBollUI_TYPE = mWinBollUI_TYPE;
+    }
+
+    //
+    // 获取 WinBoll 应用 UI 类型
+    //
+    public static WinBollUI_TYPE getWinBollUI_TYPE() {
+        return _mWinBollUI_TYPE;
+    }
+
+    MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
+        return mMyActivityLifecycleCallbacks;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        _WinBollApplication = this;
+        // 应用环境初始化, 基本调试环境
+        //
+        CrashHandler.init(this);
+        LogUtils.init(this);
+
+        DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class);
+        if (debugBean == null) {
+            //ToastUtils.show("debugBean == null");
+            setIsDebug(false);
+        } else {
+            //ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")");
+            setIsDebug(debugBean.isDebuging());
+        }
+
+        // 应用运行状态环境设置
+        //
+        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(this);
+        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        // 设置默认 WinBoll 应用 UI 类型
+        setWinBollUI_TYPE(WinBollUI_TYPE.Service);
+        //ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());
+    }
+}

libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java

@@ -1,141 +0,0 @@
-package cc.winboll.studio.libapputils.bean;
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/20 14:19:02
- * @Describe 应用信息类
- */
-import cc.winboll.studio.libapputils.R;
-import java.io.Serializable;
-
-public class APPInfo implements Serializable {
-
-    public static final String TAG = "APPInfo";
-
-    // 应用名称
-    String appName;
-    // 应用图标
-    int appIcon;
-    // 应用描述
-    String appDescription;
-    // 应用Git仓库地址
-    String appGitName;
-    // 应用Git仓库拥有者
-    String appGitOwner;
-    // 应用Git仓库分支
-    String appGitAPPBranch;
-    // 应用Git仓库子项目文件夹
-    String appGitAPPSubProjectFolder;
-    // 应用主页
-    String appHomePage;
-    // 应用包名称
-    String appAPKName;
-    // 应用包存储文件夹名称
-    String appAPKFolderName;
-
-    public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitOwner, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) {
-        this.appName = appName;
-        this.appIcon = appIcon;
-        this.appDescription = appDescription;
-        this.appGitName = appGitName;
-        this.appGitOwner = appGitOwner;
-        this.appGitAPPBranch = appGitAPPBranch;
-        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
-        this.appHomePage = appHomePage;
-        this.appAPKName = appAPKName;
-        this.appAPKFolderName = appAPKFolderName;
-    }
-
-    public APPInfo() {
-        this.appName = "WinBoll-APP";
-        this.appIcon = R.drawable.ic_launcher;
-        this.appDescription = "WinBoll APP";
-        this.appGitName = "APP";
-        this.appGitOwner = "Studio";
-        this.appGitAPPBranch = "app";
-        this.appGitAPPSubProjectFolder = "app";
-        this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
-        this.appAPKName = "APP";
-        this.appAPKFolderName = "APP";
-    }
-
-    public void setAppGitOwner(String appGitOwner) {
-        this.appGitOwner = appGitOwner;
-    }
-
-    public String getAppGitOwner() {
-        return appGitOwner;
-    }
-
-    public void setAppGitAPPBranch(String appGitAPPBranch) {
-        this.appGitAPPBranch = appGitAPPBranch;
-    }
-
-    public String getAppGitAPPBranch() {
-        return appGitAPPBranch;
-    }
-
-    public void setAppGitAPPSubProjectFolder(String appGitAPPSubProjectFolder) {
-        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
-    }
-
-    public String getAppGitAPPSubProjectFolder() {
-        return appGitAPPSubProjectFolder;
-    }
-
-    public void setAppIcon(int appIcon) {
-        this.appIcon = appIcon;
-    }
-
-    public int getAppIcon() {
-        return appIcon;
-    }
-
-    public void setAppDescription(String appDescription) {
-        this.appDescription = appDescription;
-    }
-
-    public String getAppDescription() {
-        return appDescription;
-    }
-
-    public void setAppAPKFolderName(String appAPKFolderName) {
-        this.appAPKFolderName = appAPKFolderName;
-    }
-
-    public String getAppAPKFolderName() {
-        return appAPKFolderName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppGitName(String appGitName) {
-        this.appGitName = appGitName;
-    }
-
-    public String getAppGitName() {
-        return appGitName;
-    }
-
-    public void setAppHomePage(String appHomePage) {
-        this.appHomePage = appHomePage;
-    }
-
-    public String getAppHomePage() {
-        return appHomePage;
-    }
-
-    public void setAppAPKName(String appAPKName) {
-        this.appAPKName = appAPKName;
-    }
-
-    public String getAppAPKName() {
-        return appAPKName;
-    }
-}
-

libapputils/src/main/java/cc/winboll/studio/libapputils/bean/BaseBean.java

@@ -10,7 +10,7 @@ package cc.winboll.studio.libapputils.bean;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import cc.winboll.studio.libapputils.util.FileUtils;
 import java.io.File;
 import java.io.IOException;

libapputils/src/main/java/cc/winboll/studio/libapputils/git/IAPPFiles.java

@@ -1,6 +1,6 @@
 package cc.winboll.studio.libapputils.git;
 import android.content.Context;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;

libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java

@@ -0,0 +1,66 @@
+package cc.winboll.studio.libapputils.log;
+
+import android.os.Bundle;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.R;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.ads.ADsView;
+import cc.winboll.studio.libapputils.app.WinBollApplication;
+import android.view.View;
+import android.app.Activity;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/08/12 15:07:58
+ * @Describe WinBoll 应用日志窗口
+ */
+public class LogActivity extends Activity {
+
+    public static final String TAG = "LogActivity";
+
+    LogView mLogView;
+    //ADsView mADsView;
+
+//    @Override
+//    protected boolean isEnableDisplayHomeAsUp() {
+//        return false;
+//    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_log);
+        mLogView = findViewById(R.id.logview);
+        //mADsView = findViewById(R.id.adsview);
+        //mADsView.loadUrl("https://www.winboll.cc");
+        //mLogView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE);
+        //mADsView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE);
+        
+        if(WinBollApplication.isDebug()) { mLogView.start(); }
+    }
+
+    @Override
+    protected void onResume() {
+        LogUtils.d(TAG, "onResume");
+        super.onResume();
+        mLogView.start();
+    }
+
+//    @Override
+//    protected boolean isAddWinBollToolBar() {
+//        return false;
+//    }
+//
+//    @Override
+//    protected Toolbar initToolBar() {
+//        LogUtils.d(TAG, "initToolBar");
+//        return null;
+//    }
+//
+//    @Override
+//    public String getTag() {
+//        LogUtils.d(TAG, "getTag");
+//        return TAG;
+//    }
+}

libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogUtils.java

@@ -0,0 +1,370 @@
+package cc.winboll.studio.libapputils.log;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/08/12 13:44:06
+ * @Describe LogUtils
+ * @Describe 应用日志类
+ */
+import android.content.Context;
+import cc.winboll.studio.libapputils.app.WinBollApplication;
+import cc.winboll.studio.libapputils.util.FileUtils;
+import dalvik.system.DexFile;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+
+public class LogUtils {
+
+    public static final String TAG = "LogUtils";
+
+    public static enum LOG_LEVEL { Off, Error, Warn, Info, Debug, Verbose }
+
+    static volatile boolean _IsInited = false;
+    static Context _mContext;
+    // 日志显示时间格式
+    static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmSS]", Locale.getDefault());
+    // 应用日志文件夹
+    static File _mfLogCacheDir;
+    static File _mfLogDataDir;
+    // 应用日志文件
+    static File _mfLogCatchFile;
+    static File _mfLogUtilsBeanFile;
+    static LogUtilsBean _mLogUtilsBean;
+    public static Map<String, Boolean> mapTAGList = new HashMap<String, Boolean>();
+
+    //
+    // 初始化函数
+    //
+    public static void init(Context context) {
+        _mContext = context;
+        init(context, LOG_LEVEL.Off);
+    }
+
+    //
+    // 初始化函数
+    //
+    public static void init(Context context, LOG_LEVEL logLevel) {
+        if (WinBollApplication.isDebug()) {
+            // 初始化日志缓存文件路径
+            _mfLogCacheDir = new File(context.getApplicationContext().getExternalCacheDir(), TAG);
+            if (!_mfLogCacheDir.exists()) {
+                _mfLogCacheDir.mkdirs();
+            }
+            _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
+
+            // 初始化日志配置文件路径
+            _mfLogDataDir = context.getApplicationContext().getExternalFilesDir(TAG);
+            if (!_mfLogDataDir.exists()) {
+                _mfLogDataDir.mkdirs();
+            }
+            _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
+        } else {
+            // 初始化日志缓存文件路径
+            _mfLogCacheDir = new File(context.getApplicationContext().getCacheDir(), TAG);
+            if (!_mfLogCacheDir.exists()) {
+                _mfLogCacheDir.mkdirs();
+            }
+            _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
+
+            // 初始化日志配置文件路径
+            _mfLogDataDir = new File(context.getApplicationContext().getFilesDir(), TAG);
+            if (!_mfLogDataDir.exists()) {
+                _mfLogDataDir.mkdirs();
+            }
+            _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
+        }
+
+//        Toast.makeText(context,
+//                       "_mfLogUtilsBeanFile : " + _mfLogUtilsBeanFile
+//                       + "\n_mfLogCatchFile : " + _mfLogCatchFile,
+//                       Toast.LENGTH_SHORT).show();
+//
+        _mLogUtilsBean = LogUtilsBean.loadBeanFromFile(_mfLogUtilsBeanFile.getPath(), LogUtilsBean.class);
+        if (_mLogUtilsBean == null) {
+            _mLogUtilsBean = new LogUtilsBean();
+            _mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
+        }
+
+        // 加载当前应用下的所有类的 TAG
+        addClassTAGList();
+        loadTAGBeanSettings();
+        _IsInited = true;
+        LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
+    }
+
+    public static Map<String, Boolean> getMapTAGList() {
+        return mapTAGList;
+    }
+
+    static void loadTAGBeanSettings() {
+        ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
+        LogUtilsClassTAGBean.loadBeanList(_mContext, list, LogUtilsClassTAGBean.class);
+        for (int i = 0; i < list.size(); i++) {
+            LogUtilsClassTAGBean beanSetting = list.get(i);
+            for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
+                if (entry.getKey().equals(beanSetting.getTag())) {
+                    entry.setValue(beanSetting.getEnable());
+                }
+            }
+
+        }
+    }
+
+    static void saveTAGBeanSettings() {
+        ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
+        for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
+            list.add(new LogUtilsClassTAGBean(entry.getKey(), entry.getValue()));
+        }
+        LogUtilsClassTAGBean.saveBeanList(_mContext, list, LogUtilsClassTAGBean.class);
+    }
+
+    static void addClassTAGList() {
+        //ClassLoader classLoader = getClass().getClassLoader();
+        try {
+            //String packageName = context.getPackageName();
+            String packageNamePrefix = "cc.winboll.studio";
+            List<String> classNames = new ArrayList<>();
+            String apkPath = _mContext.getPackageCodePath();
+            //Log.d("APK_PATH", "The APK path is: " + apkPath);
+            LogUtils.d(TAG, String.format("apkPath : %s", apkPath));
+            //String apkPath = "/data/app/" + packageName + "-";
+
+            //DexFile dexfile = new DexFile(apkPath + "1/base.apk");
+            DexFile dexfile = new DexFile(apkPath);
+
+            int countTemp = 0;
+            Enumeration<String> entries = dexfile.entries();
+            while (entries.hasMoreElements()) {
+                countTemp++;
+                String className = entries.nextElement();
+                if (className.startsWith(packageNamePrefix)) {
+                    classNames.add(className);
+                }
+            }
+
+            LogUtils.d(TAG, String.format("countTemp : %d\nClassNames size : %d", countTemp, classNames.size()));
+
+            for (String className : classNames) {
+                try {
+                    Class<?> clazz = Class.forName(className);
+                    Field[] fields = clazz.getDeclaredFields();
+                    for (Field field : fields) {
+                        if (Modifier.isStatic(field.getModifiers()) && Modifier.isPublic(field.getModifiers()) && field.getType() == String.class && "TAG".equals(field.getName())) {
+                            String tagValue = (String) field.get(null);
+                            //Log.d("TAG_INFO", "Class: " + className + ", TAG value: " + tagValue);
+                            //LogUtils.d(TAG, String.format("Tag Value : %s", tagValue));
+                            //mapTAGList.put(tagValue, true);
+                            mapTAGList.put(tagValue, false);
+                        }
+                    }
+                } catch (ClassNotFoundException | IllegalAccessException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                    //Toast.makeText(context, TAG + " : " + e.getMessage(), Toast.LENGTH_SHORT).show();
+                }
+            }
+        } catch (IOException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            //Toast.makeText(context, TAG + " : " + e.getMessage(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public static void setTAGListEnable(String tag, boolean isEnable) {
+        Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, Boolean> entry = iterator.next();
+            if (tag.equals(entry.getKey())) {
+                entry.setValue(isEnable);
+                //System.out.println("Key: " + entry.getKey() + ", Value: " + entry.getValue());
+                break;
+            }
+        }
+        saveTAGBeanSettings();
+        LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
+    }
+
+    public static void setALlTAGListEnable(boolean isEnable) {
+        Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, Boolean> entry = iterator.next();
+            entry.setValue(isEnable);
+            //System.out.println("Key: " + entry.getKey() + ", Value: " + entry.getValue());
+        }
+        saveTAGBeanSettings();
+        LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
+    }
+
+    public static void setLogLevel(LOG_LEVEL logLevel) {
+        LogUtils._mLogUtilsBean.setLogLevel(logLevel);
+        _mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
+    }
+
+    public static LOG_LEVEL getLogLevel() {
+        return LogUtils._mLogUtilsBean.getLogLevel();
+    }
+
+    static boolean isLoggable(String tag, LOG_LEVEL logLevel) {
+        return _IsInited && mapTAGList.get(tag) && isInTheLevel(logLevel);
+    }
+
+    static boolean isInTheLevel(LOG_LEVEL logLevel) {
+        return (LogUtils._mLogUtilsBean.getLogLevel().ordinal() == logLevel.ordinal()
+            || LogUtils._mLogUtilsBean.getLogLevel().ordinal() > logLevel.ordinal());
+    }
+
+    //
+    // 获取应用日志文件夹
+    //
+    public static File getLogCacheDir() {
+        return _mfLogCacheDir;
+    }
+
+    //
+    // 调试日志写入函数
+    //
+    public static void e(String szTAG, String szMessage) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Error)) {
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Error, szMessage);
+        }
+    }
+
+    //
+    // 调试日志写入函数
+    //
+    public static void w(String szTAG, String szMessage) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Warn)) {
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Warn, szMessage);
+        }
+    }
+
+    //
+    // 调试日志写入函数
+    //
+    public static void i(String szTAG, String szMessage) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Info)) {
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Info, szMessage);
+        }
+    }
+
+    //
+    // 调试日志写入函数
+    //
+    public static void d(String szTAG, String szMessage) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, szMessage);
+        }
+    }
+
+    //
+    // 调试日志写入函数
+    // 包含线程调试堆栈信息
+    //
+    public static void d(String szTAG, String szMessage, StackTraceElement[] listStackTrace) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
+            StringBuilder sbMessage = new StringBuilder(szMessage);
+            sbMessage.append(" \nAt ");
+            sbMessage.append(listStackTrace[2].getMethodName());
+            sbMessage.append(" (");
+            sbMessage.append(listStackTrace[2].getFileName());
+            sbMessage.append(":");
+            sbMessage.append(listStackTrace[2].getLineNumber());
+            sbMessage.append(")");
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sbMessage.toString());
+        }
+    }
+
+    //
+    // 调试日志写入函数
+    // 包含异常信息和线程调试堆栈信息
+    //
+    public static void d(String szTAG, Exception e, StackTraceElement[] listStackTrace) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
+            StringBuilder sbMessage = new StringBuilder(e.getClass().toGenericString());
+            sbMessage.append(" : ");
+            sbMessage.append(e.getMessage());
+            sbMessage.append(" \nAt ");
+            sbMessage.append(listStackTrace[2].getMethodName());
+            sbMessage.append(" (");
+            sbMessage.append(listStackTrace[2].getFileName());
+            sbMessage.append(":");
+            sbMessage.append(listStackTrace[2].getLineNumber());
+            sbMessage.append(")");
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sbMessage.toString());
+        }
+    }
+
+    //
+    // 调试日志写入函数
+    //
+    public static void v(String szTAG, String szMessage) {
+        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Verbose)) {
+            saveLog(szTAG, LogUtils.LOG_LEVEL.Verbose, szMessage);
+        }
+    }
+
+    //
+    // 日志文件保存函数
+    //
+    static void saveLog(String szTAG, LogUtils.LOG_LEVEL logLevel, String szMessage) {
+        try {
+            BufferedWriter out = null;
+            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(_mfLogCatchFile, true), "UTF-8"));
+            out.write("[" + logLevel + "]  " + mSimpleDateFormat.format(System.currentTimeMillis()) + "  [" + szTAG + "]\n" + szMessage + "\n");
+            out.close();
+        } catch (IOException e) {
+            LogUtils.d(TAG, "IOException : " + e.getMessage());
+        }
+    }
+
+    //
+    // 历史日志加载函数
+    //
+    public static String loadLog() {
+        if (_mfLogCatchFile.exists()) {
+            StringBuffer sb = new StringBuffer();
+            try {
+                BufferedReader in = null;
+                in = new BufferedReader(new InputStreamReader(new FileInputStream(_mfLogCatchFile), "UTF-8"));
+                String line = "";
+                while ((line = in.readLine()) != null) {
+                    sb.append(line);
+                    sb.append("\n");
+                }
+            } catch (IOException e) {
+                LogUtils.d(TAG, "IOException : " + e.getMessage());
+            } 
+            return sb.toString();
+        }
+        return "";
+    }
+
+    //
+    // 清理日志函数
+    //
+    public static void cleanLog() {
+        if (_mfLogCatchFile.exists()) {
+            try {
+                FileUtils.writeStringToFile(_mfLogCatchFile.getPath(), "");
+                //LogUtils.d(TAG, "cleanLog");
+            } catch (IOException e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            }
+        }
+    }
+}

libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogUtilsBean.java

@@ -0,0 +1,71 @@
+package cc.winboll.studio.libapputils.log;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/08/23 15:39:07
+ * @Describe LogUtils 数据配置类。
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libapputils.bean.BaseBean;
+import java.io.IOException;
+public class LogUtilsBean extends BaseBean {
+
+    public static final String TAG = "LogUtilsBean";
+
+    LogUtils.LOG_LEVEL logLevel;
+
+    public LogUtilsBean() {
+        this.logLevel = LogUtils.LOG_LEVEL.Off;
+    }
+
+    public LogUtilsBean(LogUtils.LOG_LEVEL logLevel) {
+        this.logLevel = logLevel;
+    }
+
+    public void setLogLevel(LogUtils.LOG_LEVEL logLevel) {
+        this.logLevel = logLevel;
+    }
+
+    public LogUtils.LOG_LEVEL getLogLevel() {
+        return logLevel;
+    }
+
+    @Override
+    public String getName() {
+        return LogUtilsBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        LogUtilsBean bean = this;
+        jsonWriter.name("logLevel").value(bean.getLogLevel().ordinal());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("logLevel")) {
+                setLogLevel(LogUtils.LOG_LEVEL.values()[jsonReader.nextInt()]);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}

libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogUtilsClassTAGBean.java

@@ -0,0 +1,88 @@
+package cc.winboll.studio.libapputils.log;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2025/01/04 14:17:02
+ * @Describe 日志类class TAG 标签数据类
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libapputils.bean.BaseBean;
+import java.io.IOException;
+
+public class LogUtilsClassTAGBean extends BaseBean {
+
+    public static final String TAG = "LogUtilsClassTAGBean";
+
+    // 标签名
+    String tag;
+    // 是否启用
+    Boolean enable;
+
+    public LogUtilsClassTAGBean() {
+        this.tag = TAG;
+        this.enable = true;
+    }
+
+    public LogUtilsClassTAGBean(String tag, Boolean enable) {
+        this.tag = tag;
+        this.enable = enable;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    @Override
+    public String getName() {
+        return LogUtilsClassTAGBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        LogUtilsClassTAGBean bean = this;
+        jsonWriter.name("tag").value(bean.getTag());
+        jsonWriter.name("enable").value(bean.getEnable());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("tag")) {
+                setTag(jsonReader.nextString());
+            } else if (name.equals("enable")) {
+                setEnable(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}