优化基础窗口管理类。

aes/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.aes">
 
+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
     <application
         android:name=".App"
         android:allowBackup="true"

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -3,20 +3,29 @@ package cc.winboll.studio.aes;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.aes.R;
+import cc.winboll.studio.libaes.activitys.BaseWinBoLLActivity;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.models.APPInfo;
 import cc.winboll.studio.libappbase.views.AboutView;
 
 /**
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/11 15:16
+ * @Date 2026/01/13 11:25
  * @Describe 应用介绍窗口
  */
-public class AboutActivity extends Activity {
+public class AboutActivity extends BaseWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
+	
+	private Toolbar mToolbar;
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -24,21 +33,33 @@ public class AboutActivity extends Activity {
         setContentView(R.layout.activity_about);
 
 		// 设置工具栏
-        Toolbar toolbar = findViewById(R.id.toolbar);
-		setActionBar(toolbar);
-        getActionBar().setSubtitle(TAG);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish(); // 点击导航栏返回按钮，触发 finish()
-                }
-            });
+        initToolbar();
 
 		AboutView aboutView = findViewById(R.id.aboutview);
 		aboutView.setAPPInfo(genDefaultAppInfo());
     }
 
+	private void initToolbar() {
+        LogUtils.d(TAG, "initToolbar() 开始初始化");
+        mToolbar = findViewById(R.id.toolbar);
+        if (mToolbar == null) {
+            LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
+            return;
+        }
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(getTag());
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "导航栏 点击返回按钮");
+					WinBoLLActivityManager.getInstance().resumeActivity(MainActivity.class);
+					WinBoLLActivityManager.getInstance().finish(AboutActivity.this);
+				}
+			});
+        LogUtils.d(TAG, "initToolbar() 配置完成");
+    }
+
 	private APPInfo genDefaultAppInfo() {
         LogUtils.d(TAG, "genDefaultAppInfo() 调用");
         String branchName = "aes";

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

@@ -30,7 +30,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
 import java.util.ArrayList;
 
-public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
+public class MainActivity extends DrawerFragmentActivity {
 
 
     public static final String TAG = "MainActivity";
@@ -38,11 +38,6 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
     TestAButtonFragment mTestAButtonFragment;
     TestViewPageFragment mTestViewPageFragment;
 
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
     @Override
     public String getTag() {
         return TAG;
@@ -188,8 +183,9 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
         } else if (nItemId ==  R.id.item_about) {
-            Intent intent = new Intent(this, AboutActivity.class);
-            startActivity(intent);
+//            Intent intent = new Intent(this, AboutActivity.class);
+//            startActivity(intent);
+			WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, AboutActivity.class);
         }
 
 

aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java

@@ -55,6 +55,6 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        WinBoLLActivityManager.getInstance().registeRemove(this);
+        WinBoLLActivityManager.getInstance().finish(this);
     }
 }

aes/src/main/res/layout/activity_about.xml

@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>