<aes>APK 15.10.1 release Publish.

aes/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.9" 
+        versionName "15.10" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 23:40:17 HKT 2025
+#Mon Sep 29 01:18:50 HKT 2025
-stageCount=4
+stageCount=2
 libraryProject=libaes
-baseVersion=15.9
+baseVersion=15.10
-publishVersion=15.9.3
+publishVersion=15.10.1
 buildCount=0
-baseBetaVersion=15.9.4
+baseBetaVersion=15.10.2

aes/src/main/AndroidManifest.xml

@@ -33,6 +33,8 @@
 
         <activity android:name=".AboutActivity"/>
 
+        <activity android:name=".TestActivityManagerActivity"/>
+
     </application>
 
 </manifest>

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

@@ -12,12 +12,12 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.winboll.AboutView;
+import cc.winboll.studio.libaes.models.APPInfo;
-import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libaes.views.AboutView;
 
-public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -64,13 +64,13 @@ public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity
         );
         layout.addView(aboutView, params);
 
-        GlobalApplication.getWinBoLLActivityManager().add(this);
+        WinBoLLActivityManager.getInstance().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
+        WinBoLLActivityManager.getInstance().registeRemove(this);
     }
 
     public AboutView CreateAboutView() {

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

@@ -6,6 +6,7 @@ package cc.winboll.studio.aes;
  * @Describe AES应用类
  */
 import android.view.Gravity;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
 import com.hjq.toast.style.WhiteToastStyle;
@@ -18,6 +19,7 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架
         ToastUtils.init(this);

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

@@ -15,9 +15,10 @@ import android.widget.AdapterView;
 import android.widget.Toast;
 import cc.winboll.studio.aes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
 import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
 import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
 import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
@@ -25,10 +26,10 @@ import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
 import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.ToastUtils;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
-import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 
 public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
@@ -122,9 +123,10 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int nItemId = item.getItemId();
-//        if (item.getItemId() == R.id.item_log) {
+        if (item.getItemId() == R.id.item_testactivitymanager) {
-//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
+            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, TestActivityManagerActivity.class);
-//        } else 
+			//ToastUtils.show("item_testactivitymanager");
+        } else 
         if (nItemId == R.id.item_atoast) {
             Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
         } else if (nItemId == R.id.item_atoolbar) {

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

@@ -0,0 +1,33 @@
+package cc.winboll.studio.aes;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/28 21:07
+ * @Describe 窗口管理类测试窗口
+ */
+public class TestActivityManagerActivity extends WinBoLLActivity implements IWinBoLLActivity {
+    
+    public static final String TAG = "TestActivityManagerActivity";
+
+    @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_testactivitymanager);
+        
+    }
+    
+}

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

@@ -0,0 +1,60 @@
+package cc.winboll.studio.aes;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/29 00:11
+ * @Describe WinBoLL 窗口基础类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivity";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        LogUtils.d(TAG, String.format("onResume %s", getTag()));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        /*if (item.getItemId() == R.id.item_log) {
+            WinBoLLActivityManager.getInstance().startLogActivity(this);
+            return true;
+        } else if (item.getItemId() == R.id.item_home) {
+			startActivity(new Intent(this, MainActivity.class));
+            return true;
+        }*/
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        WinBoLLActivityManager.getInstance().add(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        WinBoLLActivityManager.getInstance().registeRemove(this);
+    }
+}

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

@@ -0,0 +1,15 @@
+<?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">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="窗口管理类测试窗口"/>
+
+</LinearLayout>
+

aes/src/main/res/menu/toolbar_library.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/item_testactivitymanager"
+		android:title="TestActivityManager"/>
     <item
         android:id="@+id/item_log"
         android:title="LogActivity"/>

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Sep 27 21:03:20 HKT 2025
+#Fri Sep 26 05:36:14 HKT 2025
-stageCount=10
+stageCount=9
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.9
+publishVersion=15.10.8
 buildCount=0
-baseBetaVersion=15.10.10
+baseBetaVersion=15.10.9

libaes/build.gradle

@@ -21,8 +21,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libapputils:15.8.5'
+    api 'cc.winboll.studio:libapputils:15.10.2'
-	api 'cc.winboll.studio:libappbase:15.9.5'
+	api 'cc.winboll.studio:libappbase:15.10.9'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 05:00:43 CST 2025
+#Mon Sep 29 01:18:50 HKT 2025
-stageCount=4
+stageCount=2
 libraryProject=libaes
-baseVersion=15.9
+baseVersion=15.10
-publishVersion=15.9.3
+publishVersion=15.10.1
 buildCount=0
-baseBetaVersion=15.9.4
+baseBetaVersion=15.10.2

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -23,17 +23,16 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.beans.AESThemeBean;
+import cc.winboll.studio.libaes.models.AESThemeBean;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
+import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 
-public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity,AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
 
     public static final String TAG = "DrawerFragmentActivity";
 
@@ -176,8 +175,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
             for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
                 getString(i);
             }
-//        } else if (R.id.item_log == item.getItemId()) {
-//            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
         } else if (R.id.item_about == item.getItemId()) {
             LogUtils.d(TAG, "onAbout");
         } else if (android.R.id.home == item.getItemId()) {

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

@@ -0,0 +1,60 @@
+package cc.winboll.studio.libaes.dialogs;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.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();
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/interfaces/IWinBoLLActivity.java

@@ -0,0 +1,18 @@
+package cc.winboll.studio.libaes.interfaces;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 09:34
+ * @Describe WinBoLL 窗口操作接口
+ */
+ import android.app.Activity;
+ 
+public abstract interface IWinBoLLActivity {
+
+    public static final String TAG = "IWinBoLLActivity";
+
+    public static final String ACTION_BIND = IWinBoLLActivity.class.getName() + ".ACTION_BIND";
+
+    public Activity getActivity();
+    public String getTag();
+}

libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.beans;
+package cc.winboll.studio.libaes.models;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/models/APPInfo.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.winboll;
+package cc.winboll.studio.libaes.models;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/models/DrawerMenuBean.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.beans;
+package cc.winboll.studio.libaes.models;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/models/WinBoLLClientServiceBean.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.beans;
+package cc.winboll.studio.libaes.models;
 
 /**
  * @Author ZhanGSKen

libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java

@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java

@@ -10,8 +10,8 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
 public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity  {
 

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java

@@ -10,22 +10,11 @@ import android.os.Bundle;
 import android.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class TestAToolbarActivity extends Activity implements IWinBoLLActivity {
+public class TestAToolbarActivity extends Activity {
 
     public static final String TAG = "TestAToolbarActivity";
     
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         AESThemeUtil.applyAppTheme(this);

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java

@@ -14,9 +14,9 @@ import android.widget.Toast;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import java.util.ArrayList;
 
 public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBoLLActivity {

libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java

@@ -12,7 +12,7 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.AESThemeBean;
+import cc.winboll.studio.libaes.models.AESThemeBean;
 
 public class AESThemeUtil {
 

libaes/src/main/java/cc/winboll/studio/libaes/utils/MyActivityLifecycleCallbacks.java

@@ -0,0 +1,97 @@
+package cc.winboll.studio.libaes.utils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.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; 
+
+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");
+    } 
+}

libaes/src/main/java/cc/winboll/studio/libaes/utils/WinBoLLActivityManager.java

@@ -0,0 +1,292 @@
+package cc.winboll.studio.libaes.utils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 10:02
+ * @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.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.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 enum WinBoLLUI_TYPE { Aplication, Service }
+
+    GlobalApplication mGlobalApplication;
+    volatile static WinBoLLActivityManager _mIWinBoLLActivityManager;
+    Map<String, IWinBoLLActivity> mActivityListMap;
+
+    volatile static WinBoLLUI_TYPE _WinBoLLUI_TYPE = WinBoLLUI_TYPE.Service;
+    public static void setWinBoLLUI_TYPE(WinBoLLUI_TYPE winBoLLUI_TYPE) {
+        _WinBoLLUI_TYPE = winBoLLUI_TYPE;
+    }
+
+    public static WinBoLLUI_TYPE getWinBoLLUI_TYPE() {
+        return _WinBoLLUI_TYPE;
+    }
+	
+    WinBoLLActivityManager(GlobalApplication application) {
+        mGlobalApplication = application;
+        mActivityListMap = new HashMap<String, IWinBoLLActivity>();
+    }
+
+    public static WinBoLLActivityManager getInstance() {
+        return _mIWinBoLLActivityManager;
+    }
+	
+	public static synchronized void init(GlobalApplication application) {
+        if (_mIWinBoLLActivityManager == null) {
+            _mIWinBoLLActivityManager = new WinBoLLActivityManager(application);
+        }
+    }
+
+    /**
+     * 把Activity添加到管理中
+     */
+    public <T extends IWinBoLLActivity> void add(T activity) {
+        if (isActivityActive(activity.getTag())) {
+            LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag()));
+        } else {
+            mActivityListMap.put(activity.getTag(), activity);
+            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", activity.getTag(), mActivityListMap.size()));
+        }
+    }
+
+    //
+    // activity: 为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 tag
+    // activity: 不为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
+    //
+    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Class<T> clazz) {
+        // 如果窗口已存在就重启窗口
+        if (!resumeActivity(clazz)) {
+            // 新建一个任务窗口
+            Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            //intent.putExtra("tag", tag);
+            context.startActivity(intent);
+        }
+    }
+
+    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) {
+        // 如果窗口已存在就重启窗口
+        if (!resumeActivity(clazz)) {
+            // 新建一个任务窗口
+            //Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            //intent.putExtra("tag", tag);
+            context.startActivity(intent);
+        }
+    }
+
+    public <T extends IWinBoLLActivity> void startLogActivity(Context context) {
+        // 如果窗口已存在就重启窗口
+        //if (!resumeActivity(LogActivity.class)) {
+        // 新建一个任务窗口
+        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);
+        //}
+    }
+
+    //
+    // 判断 tag 绑定的 Activity 是否已经创建
+    //
+    public boolean isActivityActive(String tag) {
+        return mActivityListMap.get(tag) != null;
+    }
+
+    Activity getActivityByTag(String tag) {
+        return (mActivityListMap.get(tag) == null) ?null: mActivityListMap.get(tag).getActivity();
+    }
+
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(Class<T> clazz) {
+        try {
+            Activity activity = getActivityByTag(clazz.newInstance().getTag());
+            if (activity != null) {
+                return resumeActivity(activity);
+            }
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(String tag) {
+        Activity activity = getActivityByTag(tag);
+        if (activity != null) {
+            return resumeActivity(activity);
+        }
+        return false;
+    }
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(Activity activity) {
+        ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
+        //返回启动它的根任务（home 或者 MainActivity）
+        //Intent intent = new Intent(mContext, activity.getClass());
+        //TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
+        //stackBuilder.addNextIntentWithParentStack(intent);
+        //stackBuilder.startActivities();
+        am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+        //ToastUtils.show("resumeActivity");
+        return true;
+    }
+
+
+    /**
+     * 结束所有 Activity
+     */
+    public void finishAll() {
+        try {
+            //ToastUtils.show(String.format("finishAll() size : %d", _mIWinBoLLActivityList.size()));
+            for (int i = mActivityListMap.size() - 1; i > -1; i--) {
+                IWinBoLLActivity iWinBoLLActivity = mActivityListMap.get(i);
+                ToastUtils.show("finishAll() activity");
+                if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
+                    //ToastUtils.show("activity != null ...");
+                    if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Service) {
+                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
+                        iWinBoLLActivity.getActivity().finishAndRemoveTask();
+                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
+                    } else if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Aplication) {
+                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
+                        iWinBoLLActivity.getActivity().finish();
+                        //ToastUtils.show("finishAll() activity.finish();");
+                    } else {
+                        ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    /**
+     * 结束指定Activity
+     */
+    public <T extends IWinBoLLActivity> void finish(T iWinBoLLActivity) {
+        try {
+            if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
+                //根据tag 移除 MyActivity
+                //String tag= activity.getTag();
+                //_mIWinBoLLActivityList.remove(tag);
+                //ToastUtils.show("remove");
+                //ToastUtils.show("_mIWinBoLLActivityArrayMap.size() " + Integer.toString(_mIWinBoLLActivityArrayMap.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] >> 直接关闭当前窗口
+                Activity preActivity = getPreActivity(iWinBoLLActivity);
+                iWinBoLLActivity.getActivity().finish();
+                if (preActivity != null) {
+                    resumeActivity(preActivity);
+                }
+            }
+
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    Activity getPreActivity(IWinBoLLActivity iWinBoLLActivity) {
+        try {
+            boolean bingo = false;
+            IWinBoLLActivity preIWinBoLLActivity = null;
+            for (Map.Entry<String, IWinBoLLActivity> entity : mActivityListMap.entrySet()) {
+                if (entity.getKey().equals(iWinBoLLActivity.getTag())) {
+                    bingo = true;
+                    LogUtils.d(TAG, "bingo");
+                    break;
+                }
+                preIWinBoLLActivity = entity.getValue();
+            }
+
+            if (bingo) {
+                return preIWinBoLLActivity.getActivity();
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+
+        return null;
+    }
+
+    public <T extends IWinBoLLActivity> boolean registeRemove(T iWinBoLLActivity) {
+        IWinBoLLActivity iWinBoLLActivityTest = mActivityListMap.get(iWinBoLLActivity.getTag());
+        if (iWinBoLLActivityTest != null) {
+            mActivityListMap.remove(iWinBoLLActivity.getTag());
+            return true;
+        }
+        return false;
+    }
+
+    public void printAvtivityListInfo() {
+        if (!mActivityListMap.isEmpty()) {
+            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(mActivityListMap.size()));
+            Iterator<Map.Entry<String, IWinBoLLActivity>> iterator = mActivityListMap.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.");
+        }
+    }
+}
+

libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.libaes.winboll;
+package cc.winboll.studio.libaes.views;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
@@ -17,10 +17,12 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.utils.AppVersionUtils;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.libapputils.utils.PrefUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.IOException;
@@ -32,7 +34,6 @@ import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import mehdi.sakout.aboutpage.BuildConfig;
 
 public class AboutView extends LinearLayout {
 
@@ -40,10 +41,10 @@ public class AboutView extends LinearLayout {
 
     public static final int MSG_APPUPDATE_CHECKED = 0;
 
-    Context mContext;
+    static Context _mContext;
     APPInfo mAPPInfo;
 
-    WinBoLLServiceStatusView mWinBoLLServiceStatusView;
+    //WinBoLLServiceStatusView mWinBoLLServiceStatusView;
     OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
     String mszAppName = "";
     String mszAppAPKFolderName = "";
@@ -64,7 +65,7 @@ public class AboutView extends LinearLayout {
 
     public AboutView(Context context, APPInfo appInfo) {
         super(context);
-        mContext = context;
+        _mContext = context;
 
         setAPPInfo(appInfo);
         initView(context);
@@ -72,7 +73,7 @@ public class AboutView extends LinearLayout {
 
     public AboutView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mContext = context;
+        _mContext = context;
 
         initView(context, attrs);
     }
@@ -110,7 +111,7 @@ public class AboutView extends LinearLayout {
         mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
 
         try {
-            mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
+            mszAppVersionName = _mContext.getPackageManager().getPackageInfo(_mContext.getPackageName(), 0).versionName;
         } catch (PackageManager.NameNotFoundException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
@@ -123,34 +124,7 @@ public class AboutView extends LinearLayout {
             mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
         }
 		
-
+		addView(createAboutPage());
-        if (GlobalApplication.isDebuging()) {
-            LayoutInflater inflater = LayoutInflater.from(mContext);
-            View addedView = inflater.inflate(R.layout.view_about_dev, this, false);
-            LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1);
-            metDevUserName = addedView.findViewById(R.id.viewaboutdevEditText1);
-            metDevUserPassword = addedView.findViewById(R.id.viewaboutdevEditText2);
-            metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", ""));
-            metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", ""));
-            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
-            mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBoLLServiceStatusView1);
-            mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
-            mWinBoLLServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
-            //llMain.addView(mDevelopHostConnectionStatusView);
-            llMain.addView(createAboutPage());
-            addView(addedView);
-        } else {
-            LayoutInflater inflater = LayoutInflater.from(mContext);
-            View addedView = inflater.inflate(R.layout.view_about_www, this, false);
-            LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1);
-            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
-            mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBoLLServiceStatusView1);
-            mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
-            mWinBoLLServiceStatusView.setAuthInfo("", "");
-            //llMain.addView(mDevelopHostConnectionStatusView);
-            llMain.addView(createAboutPage());
-            addView(addedView);
-        }
 
         // 初始化标题栏
         //setSubtitle(getContext().getString(R.string.text_about));
@@ -162,9 +136,9 @@ public class AboutView extends LinearLayout {
         String szReleaseAppVersionName = "";
         try {
             //LogUtils.d(TAG, String.format("mContext.getPackageName() %s", mContext.getPackageName()));
-            String szSubBetaSuffix = subBetaSuffix(mContext.getPackageName());
+            String szSubBetaSuffix = subBetaSuffix(_mContext.getPackageName());
             //LogUtils.d(TAG, String.format("szSubBetaSuffix : %s", szSubBetaSuffix));
-            szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
+            szReleaseAppVersionName = _mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
         } catch (PackageManager.NameNotFoundException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
@@ -205,7 +179,7 @@ public class AboutView extends LinearLayout {
                             String szMsg = "Current app is :\n[ " + mszCurrentAppPackageName
                                 + " ]\nThe last app is :\n[ " + mszNewestAppPackageName
                                 + " ]\nIs download the last app?";
-                            YesNoAlertDialog.show(mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
+                            YesNoAlertDialog.show(_mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
                         }
                         break;
                     }
@@ -216,22 +190,22 @@ public class AboutView extends LinearLayout {
     protected View createAboutPage() {
         // 定义 GitWeb 按钮
         //
-        Element elementGitWeb = new Element(mContext.getString(R.string.gitea_home), R.drawable.ic_winboll);
+        Element elementGitWeb = new Element(_mContext.getString(R.string.gitea_home), R.drawable.ic_winboll);
         elementGitWeb.setOnClickListener(mGitWebOnClickListener);
         // 定义检查更新按钮
         //
-        Element elementAppUpdate = new Element(mContext.getString(R.string.app_update), R.drawable.ic_winboll);
+        Element elementAppUpdate = new Element(_mContext.getString(R.string.app_update), R.drawable.ic_winboll);
         elementAppUpdate.setOnClickListener(mAppUpdateOnClickListener);
 
         String szAppInfo = "";
         try {
             szAppInfo = mszAppName + " "
-                + mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName
+                + _mContext.getPackageManager().getPackageInfo(_mContext.getPackageName(), 0).versionName
                 + "\n" + mszAppDescription;
         } catch (PackageManager.NameNotFoundException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
-        AboutPage aboutPage = new AboutPage(mContext);
+        AboutPage aboutPage = new AboutPage(_mContext);
         aboutPage.setDescription(szAppInfo)
             //.isRTL(false)
             //.setCustomFont(String) // or Typeface
@@ -256,10 +230,10 @@ public class AboutView extends LinearLayout {
             //
             Element elementAppMode;
             if (GlobalApplication.isDebuging()) {
-                elementAppMode = new Element(mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
+                elementAppMode = new Element(_mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
                 elementAppMode.setOnClickListener(mAppNormalOnClickListener);
             } else {
-                elementAppMode = new Element(mContext.getString(R.string.app_debug), R.drawable.ic_winboll);
+                elementAppMode = new Element(_mContext.getString(R.string.app_debug), R.drawable.ic_winboll);
                 elementAppMode.setOnClickListener(mAppDebugOnClickListener);
             }
             aboutPage.addItem(elementAppMode);
@@ -272,7 +246,7 @@ public class AboutView extends LinearLayout {
         @Override
         public void onClick(View view) {
             //ToastUtils.show("mAppDebugOnClickListener");
-            setApp2DebugMode(mContext);
+            setApp2DebugMode(_mContext);
         }
     };
 
@@ -280,7 +254,7 @@ public class AboutView extends LinearLayout {
         @Override
         public void onClick(View view) {
             //ToastUtils.show("mAppNormalOnClickListener");
-            setApp2NormalMode(mContext);
+            setApp2NormalMode(_mContext);
         }
     };
 
@@ -290,9 +264,9 @@ public class AboutView extends LinearLayout {
             //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(true);
-            GlobalApplication.saveDebugStatus();
+            GlobalApplication.saveDebugStatus(_mContext);
 
-            GlobalApplication.getWinBoLLActivityManager().finishAll();
+            WinBoLLActivityManager.getInstance().finishAll();
             context.startActivity(intent);
         } 
     }
@@ -302,9 +276,9 @@ public class AboutView extends LinearLayout {
         if (intent != null) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(false);
-            GlobalApplication.saveDebugStatus();
+            GlobalApplication.saveDebugStatus(_mContext);
 
-            GlobalApplication.getWinBoLLActivityManager().finishAll();
+            WinBoLLActivityManager.getInstance().finishAll();
             context.startActivity(intent);
         } 
     }
@@ -313,7 +287,7 @@ public class AboutView extends LinearLayout {
         @Override
         public void onClick(View view) {
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mszGitea));
-            mContext.startActivity(browserIntent);
+            _mContext.startActivity(browserIntent);
         }
     };
 
@@ -329,8 +303,8 @@ public class AboutView extends LinearLayout {
                         String credential = "";
                         if (GlobalApplication.isDebuging()) {
                             credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
-                            PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
+                            PrefUtils.saveString(_mContext, "metDevUserName", metDevUserName.getText().toString());
-                            PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
+                            PrefUtils.saveString(_mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
                         } else {
                             String username = "WinBoLL";
                             String password = "WinBoLLPowerByZhanGSKen";
@@ -387,7 +361,7 @@ public class AboutView extends LinearLayout {
         public void onYes() {
             String szUrl = mszWinBoLLServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl));
-            mContext.startActivity(browserIntent);
+            _mContext.startActivity(browserIntent);
         }
 
         @Override

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java

@@ -1,97 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/03/28 19:12:12
- * @Describe 应用主要服务组件类守护进程服务组件类
- */
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import cc.winboll.studio.libaes.beans.WinBoLLClientServiceBean;
-import cc.winboll.studio.libaes.winboll.AssistantService;
-import cc.winboll.studio.libappbase.utils.ServiceUtils;
-
-public class AssistantService extends Service {
-
-    public final static String TAG = "AssistantService";
-
-    WinBoLLClientServiceBean mWinBoLLServiceBean;
-    MyServiceConnection mMyServiceConnection;
-    volatile boolean mIsServiceRunning;
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        if (mMyServiceConnection == null) {
-            mMyServiceConnection = new MyServiceConnection();
-        }
-        // 设置运行参数
-        mIsServiceRunning = false;
-        run();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        run();
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        mIsServiceRunning = false;
-        super.onDestroy();
-    }
-
-    //
-    // 运行服务内容
-    //
-    void run() {
-        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        if (mWinBoLLServiceBean.isEnable()) {
-            if (mIsServiceRunning == false) {
-                // 设置运行状态
-                mIsServiceRunning = true;
-                // 唤醒和绑定主进程
-                wakeupAndBindMain();
-            }
-        }
-    }
-
-    //
-    // 唤醒和绑定主进程
-    //
-    void wakeupAndBindMain() {
-        if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBoLLClientService.class.getName()) == false) {
-            startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class));
-        }
-
-        bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
-    }
-
-    //
-    // 主进程与守护进程连接时需要用到此类
-    //
-    class MyServiceConnection implements ServiceConnection {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this);
-            if (mWinBoLLServiceBean.isEnable()) {
-                wakeupAndBindMain();
-            }
-        }
-    }
-}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java

@@ -1,35 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/03/28 19:11:27
- * @Describe WinBoLL UI 状态图标枚举
- */
-import cc.winboll.studio.libaes.R;
-
-public enum EWUIStatusIconDrawable {
-    NORMAL(0),
-    NEWS(1)
-    ;
-
-    static final String TAG = "WUIStatusIconDrawable";
-
-    static String[] _mlistCNName = { "正常", "新的消息" };
-
-    private int value = 0;
-    private EWUIStatusIconDrawable(int value) {    //必须是private的，否则编译错误
-        this.value = value;
-    }
-
-    public static int getIconDrawableId(EWUIStatusIconDrawable drawableId) {
-        int res;
-        switch(drawableId){
-            case NEWS :
-                res = R.drawable.ic_winbollbeta;
-                break;
-            default :
-                res = R.drawable.ic_winboll;
-        }
-        return res;
-    }
-}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java

@@ -1,21 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-/**
- * @Author ZhanGSKen
- * @Date 2025/05/03 19:28
- */
-public class WinBoLLClientService extends Service {
-    
-    public static final String TAG = "WinBoLLClientService";
-    
-    @Override
-    public IBinder onBind(Intent intent) {
-        
-        return null;
-    }
-    
-}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java

@@ -1,38 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-
-/**
- * @Author ZhanGSKen
- * @Date 2025/05/03 19:14
- */
-public class WinBoLLServiceStatusView extends LinearLayout {
-    
-    public static final String TAG = "WinBoLLServiceStatusView";
-    
-    public WinBoLLServiceStatusView(Context context) {
-        super(context);
-    }
-
-    public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-    
-    
-    void setServerHost(String szWinBoLLServerHost) {
-        
-    }
-    
-    void setAuthInfo(String szDevUserName, String szDevUserPassword) {
-        
-    }
-}

libaes/src/main/res/layout/view_about_dev.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/viewaboutdevLinearLayout1">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:layout_width="180dp"
-            android:layout_height="wrap_content"
-            android:text="DevelopUserName :"/>
-
-        <EditText
-            android:layout_width="0dp"
-            android:ems="10"
-            android:layout_height="wrap_content"
-            android:layout_weight="1.0"
-            android:id="@+id/viewaboutdevEditText1"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:layout_width="180dp"
-            android:layout_height="wrap_content"
-            android:text="DevelopUserPassword :"/>
-
-        <EditText
-            android:layout_width="0dp"
-            android:inputType="textPassword"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:layout_weight="1.0"
-            android:id="@+id/viewaboutdevEditText2"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal">
-
-        <cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/viewaboutdevWinBoLLServiceStatusView1"/>
-
-    </LinearLayout>
-
-</LinearLayout>
-

libaes/src/main/res/layout/view_about_www.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/viewaboutwwwLinearLayout1">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal">
-
-        <cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/viewaboutwwwWinBoLLServiceStatusView1"/>
-
-    </LinearLayout>
-
-</LinearLayout>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Sep 27 21:03:08 HKT 2025
+#Fri Sep 26 05:36:14 HKT 2025
-stageCount=10
+stageCount=9
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.9
+publishVersion=15.10.8
 buildCount=0
-baseBetaVersion=15.10.10
+baseBetaVersion=15.10.9

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

@@ -22,12 +22,12 @@ public class GlobalApplication extends Application {
         GlobalApplication.isDebuging = isDebuging;
     }
     
-    public static void saveDebugStatus(Context context) {
+    public static void saveDebugStatus(GlobalApplication application) {
-        APPModel.saveBeanToFile(getAPPModelFilePath(context), new APPModel(GlobalApplication.isDebuging));
+        APPModel.saveBeanToFile(application.getAPPModelFilePath(application), new APPModel(GlobalApplication.isDebuging));
     }
 	
-    static String getAPPModelFilePath(Context context) {
+    static String getAPPModelFilePath(GlobalApplication application) {
-        return context.getDataDir().getPath() + "/APPModel.json";
+        return application.getDataDir().getPath() + "/APPModel.json";
     }
 
     public static boolean isDebuging() {

powerbell/build.gradle

@@ -41,17 +41,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-	
-	// 允许使用系统隐藏API
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-    // 针对PowerProfile的依赖配置
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
 }
 
 dependencies {

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Oct 22 16:57:21 HKT 2025
+#Wed Sep 03 20:59:53 HKT 2025
-stageCount=15
+stageCount=13
 libraryProject=
 baseVersion=15.4
-publishVersion=15.4.14
+publishVersion=15.4.12
 buildCount=0
-baseBetaVersion=15.4.15
+baseBetaVersion=15.4.13

powerbell/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
     package="cc.winboll.studio.powerbell">
 
     <!-- 拍摄照片和视频 -->
@@ -25,29 +24,10 @@
     <!-- 显示通知 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <!-- PACKAGE_USAGE_STATS -->
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
-
-    <!-- BATTERY_STATS -->
-    <uses-permission android:name="android.permission.BATTERY_STATS"/>
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
     <uses-feature android:name="android.hardware.camera"/>
 
     <uses-feature android:name="android.hardware.camera.autofocus"/>
 
-	<!-- 1. 基础应用信息读取权限（Android 11 及以下） -->
-	<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
-
-	<!-- 2. Android 11+ 应用列表读取权限（必须声明，否则无法获取全部应用） -->
-	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-		tools:ignore="QueryAllPackagesPermission" />
-
-	<!-- 3. 可选：若需读取系统应用，添加此权限（部分机型需要） -->
-	<uses-permission android:name="android.permission.ACCESS_PACKAGE_USAGE_STATS"
-		tools:ignore="ProtectedPermissions" />
-	
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -143,8 +123,6 @@
 
         <activity android:name="cc.winboll.studio.powerbell.activities.PixelPickerActivity"/>
 
-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReportActivity"/>
-
     </application>
 
 </manifest>

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

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.activities.AboutActivity;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
-import cc.winboll.studio.powerbell.activities.BatteryReportActivity;
+import cc.winboll.studio.powerbell.activities.BatteryReporterActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -161,7 +161,7 @@ public class MainActivity extends WinBoLLActivity {
             startActivity(intent);
         } else if (menuItemId == R.id.action_battery_reporter) {
             Intent intent = new Intent();
-            intent.setClass(this, BatteryReportActivity.class);
+            intent.setClass(this, BatteryReporterActivity.class);
             startActivity(intent);
         } else if (menuItemId == R.id.action_clearrecord) {
             Intent intent = new Intent();

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReportActivity.java

@@ -1,520 +0,0 @@
-package cc.winboll.studio.powerbell.activities;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/10/22 13:21
- * @Describe BatteryReportActivity
- */
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.powerbell.R;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class BatteryReportActivity extends Activity {
-    public static final String TAG = "BatteryReportActivity";
-    // 目标应用包名常量（统一维护，数据计算核心标识）
-    private static final String TARGET_APP_PACKAGE = "cc.winboll.studio.mymessagemanager";
-
-    private RecyclerView rvBatteryReport;
-    private BatteryReportAdapter adapter;
-    // 数据列表：仅存储包名、耗电、时长（不存储名称，计算全程用包名）
-    private List<AppBatteryModel> dataList = new ArrayList<AppBatteryModel>(); 
-    private List<AppBatteryModel> filteredList = new ArrayList<AppBatteryModel>(); 
-    private BroadcastReceiver batteryReceiver;
-    private int batteryCapacity = 5400; // 电池容量（mAh）
-    private float lastBatteryPercent = 100.0f;
-    private long lastCheckTime = System.currentTimeMillis();
-    private EditText etSearch;
-    // 应用运行时长缓存（key：包名，value：时长ms）
-    private Map<String, Long> appRunTimeCache = new HashMap<String, Long>();
-    // 包管理工具（全局持有，避免重复获取）
-    private PackageManager mPackageManager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_batteryreport);
-        // 初始化包管理工具（仅一次，供后续查询名称使用）
-        mPackageManager = getPackageManager();
-
-        // 权限检查（Java7 传统条件判断）
-        if (!hasUsageStatsPermission(this)) {
-            Toast.makeText(this, "请进入设置-应用-权限-特殊访问权限-使用情况访问权限，开启本应用的权限", Toast.LENGTH_LONG).show();
-            startActivity(new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS));
-            return;
-        }
-
-        etSearch = (EditText) findViewById(R.id.et_search); 
-        rvBatteryReport = (RecyclerView) findViewById(R.id.rv_battery_report); 
-        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
-
-        // 1. 加载所有应用（仅存包名，不查名称）
-        loadAllAppPackage();
-        // 2. 强制添加目标应用（包名兜底）
-        //forceAddTargetPackage();
-        // 3. 首次获取运行时长（key：包名）
-        appRunTimeCache = getAppRunTime();
-        // 4. 更新时长到数据模型（用包名匹配）
-        updateAppRunTimeToModel();
-        // 5. 初始化过滤列表和适配器（传入包管理工具供显示时查名称）
-        filteredList.addAll(dataList);
-        adapter = new BatteryReportAdapter(this, filteredList, mPackageManager);
-        rvBatteryReport.setAdapter(adapter);
-
-        // 搜索监听（按包名过滤，不涉及名称）
-        etSearch.addTextChangedListener(new TextWatcher() {
-				@Override
-				public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-				@Override
-				public void onTextChanged(CharSequence s, int start, int before, int count) {
-					filterAppsByPackage(s.toString());
-				}
-
-				@Override
-				public void afterTextChanged(Editable s) {}
-			});
-
-        // 电池广播（耗电计算全程用包名）
-        batteryReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                int level = intent.getIntExtra("level", 100);
-                int scale = intent.getIntExtra("scale", 100);
-                float currentPercent = (float) level / scale * 100;
-                LogUtils.d(TAG, "电池百分比变化：" + lastBatteryPercent + " -> " + currentPercent);
-
-                // 计算电池消耗并更新数据（全程用包名）
-                if (currentPercent < lastBatteryPercent) {
-                    float dropPercent = lastBatteryPercent - currentPercent;
-                    long duration = System.currentTimeMillis() - lastCheckTime;
-                    LogUtils.d(TAG, "电池消耗：" + dropPercent + "%，时长：" + duration + "ms");
-                    // 重新获取最新运行时长（key：包名）
-                    appRunTimeCache = getAppRunTime();
-                    // 更新模型中的运行时长（包名匹配）
-                    updateAppRunTimeToModel();
-                    // 分配耗电（包名计算）
-                    distributeBatteryConsumption(dropPercent, appRunTimeCache);
-                }
-
-                lastBatteryPercent = currentPercent;
-                lastCheckTime = System.currentTimeMillis();
-            }
-        };
-        registerReceiver(batteryReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        // Java7 显式非空判断
-        if (batteryReceiver != null) {
-            unregisterReceiver(batteryReceiver);
-        }
-    }
-
-    /**
-     * 加载所有应用（仅获取包名，不查询应用名称，数据计算核心步骤）
-     */
-    private void loadAllAppPackage() {
-        List<ApplicationInfo> appList = mPackageManager.getInstalledApplications(PackageManager.GET_META_DATA);
-        dataList.clear(); // 清空列表避免重复
-
-        LogUtils.d(TAG, "开始加载应用包名列表，共找到" + appList.size() + "个应用");
-        
-        // 仅遍历包名，不处理名称（避免名称获取异常影响）
-        for (ApplicationInfo appInfo : appList) {
-            String packageName = appInfo.packageName;
-			/*if (packageName.equals("cc.winboll.studio.powerbell.beta")) {
-			//if (packageName.equals("aidepro.top")) {
-				LogUtils.d(TAG, "aidepro.top OK5");
-			}*/
-            // 模型仅存包名、初始耗电0、初始时长0（名称显示时再查）
-            dataList.add(new AppBatteryModel(packageName, "0.0", 0));
-        }
-		
-		/*for (AppBatteryModel appBatteryModel : dataList) {
-			if (appBatteryModel.getPackageName().equals("aidepro.top")) {
-				LogUtils.d(TAG, "aidepro.top OK4");
-			}
-		}*/
-
-        LogUtils.d(TAG, "应用包名列表加载完成，共添加" + dataList.size() + "个包名。" );
-    }
-
-    /**
-     * 强制添加目标包名（兜底逻辑，仅操作包名）
-     */
-    private void forceAddTargetPackage() {
-        // 1. 先检查列表中是否已存在目标包名
-        boolean isTargetExists = false;
-        for (AppBatteryModel model : dataList) {
-            if (TARGET_APP_PACKAGE.equals(model.getPackageName())) {
-                isTargetExists = true;
-                break;
-            }
-        }
-
-        if (isTargetExists) {
-            LogUtils.d(TAG, "目标包名已在列表中，无需重复添加");
-            return;
-        }
-
-        // 2. 仅用包名创建模型，强制添加（不依赖名称查询）
-        dataList.add(0, new AppBatteryModel(TARGET_APP_PACKAGE, "0.0", 0));
-        LogUtils.d(TAG, "强制添加目标包名成功：" + TARGET_APP_PACKAGE);
-    }
-
-    /**
-     * 更新运行时长到模型（用包名匹配，不涉及名称）
-     */
-    private void updateAppRunTimeToModel() {
-		/*if(appRunTimeCache.containsKey("aidepro.top"))
-		 {
-		 LogUtils.d(TAG, "aidepro.top OK2");
-		 }*/
-
-		int nCount = 0;
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-			/*if(packageName.equals("aidepro.top"))
-			 {
-			 LogUtils.d(TAG, "aidepro.top OK3");
-			 }*/
-
-            Long runTime;
-            // Java7 显式判断包名是否在缓存中
-            if (appRunTimeCache.containsKey(packageName)) {
-				/*if(packageName.equals("cc.winboll.studio.powerbell.beta")) {
-				 LogUtils.d(TAG, String.format("特殊查询 %s 查询有结果。", packageName));
-				 }*/
-                runTime = appRunTimeCache.get(packageName);
-				LogUtils.d(TAG, String.format("应用包 %s 运行时长已更新。", packageName));
-				nCount++;
-            } else {
-                runTime = 0L;
-            }
-            model.setRunTime(runTime);
-        }
-		LogUtils.d(TAG, String.format("dataList.size() %d， appRunTimeCache.size() %d。", dataList.size(), appRunTimeCache.size()));
-		LogUtils.d(TAG, String.format("updateAppRunTimeToModel() 更新的数据量为：%d", nCount));
-    }
-
-    /**
-     * 按包名过滤应用（搜索逻辑仅操作包名）
-     */
-    private void filterAppsByPackage(String keyword) {
-        filteredList.clear();
-        if (keyword == null || keyword.isEmpty()) {
-            filteredList.addAll(dataList);
-        } else {
-            String lowerKeyword = keyword.toLowerCase();
-            boolean isTargetMatched = false;
-
-            for (AppBatteryModel model : dataList) {
-                String packageNameLower = model.getPackageName().toLowerCase();
-                // 仅按包名包含关键词过滤
-                boolean isMatched = packageNameLower.contains(lowerKeyword);
-
-                if (isMatched) {
-                    filteredList.add(model);
-                    // 检查是否是目标包名
-                    if (TARGET_APP_PACKAGE.equals(model.getPackageName())) {
-                        isTargetMatched = true;
-                    }
-                }
-            }
-
-            // 兜底：目标包名未匹配时强制添加
-            if (!isTargetMatched) {
-                for (AppBatteryModel model : dataList) {
-                    if (TARGET_APP_PACKAGE.equals(model.getPackageName())) {
-                        filteredList.add(0, model);
-                        LogUtils.d(TAG, "搜索兜底：强制添加目标包名到结果列表");
-                        break;
-                    }
-                }
-            }
-        }
-        adapter.notifyDataSetChanged();
-    }
-
-    /**
-     * 获取应用运行时长（返回包名-时长映射，不处理名称）
-     */
-    private Map<String, Long> getAppRunTime() {
-        Map<String, Long> runTimeMap = new HashMap<String, Long>();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            try {
-                android.app.usage.UsageStatsManager manager =
-					(android.app.usage.UsageStatsManager) getSystemService(Context.USAGE_STATS_SERVICE);
-                long endTime = System.currentTimeMillis();
-                long startTime = endTime - 24 * 3600 * 1000; // 近24小时
-                List<android.app.usage.UsageStats> statsList = manager.queryUsageStats(
-					android.app.usage.UsageStatsManager.INTERVAL_DAILY, startTime, endTime);
-
-                // 仅存储包名和时长（不查名称）
-                for (android.app.usage.UsageStats stats : statsList) {
-                    long runTimeMs = stats.getTotalTimeInForeground();
-                    String packageName = stats.getPackageName();
-                    LogUtils.d(TAG, "包名" + packageName + "运行时长：" + formatRunTime(runTimeMs));
-                    runTimeMap.put(packageName, runTimeMs);
-					if (packageName.equals("aidepro.top")) {
-						LogUtils.d(TAG, String.format("runTimeMap.put(packageName, runTimeMs) 特殊查询 %s 查询有结果。", packageName));
-					}
-                }
-            } catch (Exception e) {
-                LogUtils.e(TAG, "获取应用运行时长失败：" + e.getMessage());
-            }
-        }
-
-		/*if(runTimeMap.containsKey("aidepro.top"))
-		 {
-		 LogUtils.d(TAG, "aidepro.top OK");
-		 }*/
-
-		LogUtils.d(TAG, String.format("应用运行时长列表数量%d。", runTimeMap.size()));
-        return runTimeMap;
-    }
-
-    /**
-     * 格式化运行时长（工具方法，与包名无关）
-     */
-    private String formatRunTime(long runTimeMs) {
-        if (runTimeMs <= 0) {
-            return "0秒";
-        }
-        long seconds = runTimeMs / 1000;
-        long hours = seconds / 3600;
-        long minutes = (seconds % 3600) / 60;
-        seconds = seconds % 60;
-
-        if (hours > 0) {
-            return String.format("%d时%d分%d秒", hours, minutes, seconds);
-        } else if (minutes > 0) {
-            return String.format("%d分%d秒", minutes, seconds);
-        } else {
-            return String.format("%d秒", seconds);
-        }
-    }
-
-    /**
-     * 分配电池消耗（全程用包名计算，不涉及名称）
-     */
-    private void distributeBatteryConsumption(float totalDropPercent, Map<String, Long> runTimeMap) {
-        long totalRunTime = 0;
-        // 遍历包名计算总时长
-        for (Map.Entry<String, Long> entry : runTimeMap.entrySet()) {
-            totalRunTime += entry.getValue();
-        }
-
-        // 按包名匹配计算各应用耗电
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            Long appRunTime;
-            // Java7 显式判断包名是否存在
-            if (runTimeMap.containsKey(packageName)) {
-                appRunTime = runTimeMap.get(packageName);
-            } else {
-                appRunTime = 0L;
-            }
-
-            float ratio = (totalRunTime > 0) ? (float) appRunTime / totalRunTime : 0;
-            float consumption = batteryCapacity * totalDropPercent / 100 * ratio;
-            model.setConsumption(String.format("%.1f", consumption));
-            model.setRunTime(appRunTime); // 同步更新时长
-        }
-
-        // 按耗电排序（用包名对应的耗电值排序）
-        Collections.sort(dataList, new Comparator<AppBatteryModel>() {
-				@Override
-				public int compare(AppBatteryModel m1, AppBatteryModel m2) {
-					float c1 = Float.parseFloat(m1.getConsumption());
-					float c2 = Float.parseFloat(m2.getConsumption());
-					return Float.compare(c2, c1); // 逆序（耗电从高到低）
-				}
-			});
-
-        // 重新应用包名过滤
-        filterAppsByPackage(etSearch.getText().toString());
-    }
-
-    /**
-     * 权限检查（仅操作系统服务，与包名无关）
-     */
-    private boolean hasUsageStatsPermission(Context context) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return false;
-        }
-
-        android.app.usage.UsageStatsManager manager =
-			(android.app.usage.UsageStatsManager) context.getSystemService(Context.USAGE_STATS_SERVICE);
-        if (manager == null) {
-            return false;
-        }
-
-        long endTime = System.currentTimeMillis();
-        long startTime = endTime - 1000 * 60;
-        List<android.app.usage.UsageStats> statsList = manager.queryUsageStats(
-			android.app.usage.UsageStatsManager.INTERVAL_DAILY, startTime, endTime);
-
-        return statsList != null && !statsList.isEmpty();
-    }
-
-    /**
-     * 数据模型（仅存储包名、耗电、时长，不存名称）
-     */
-    public static class AppBatteryModel {
-        private String packageName; // 核心标识：应用包名
-        private String consumption; // 电量消耗（mAh）
-        private long runTime;       // 运行时长（ms）
-
-        // Java7 显式构造（仅传入包名、初始耗电、初始时长）
-        public AppBatteryModel(String packageName, String consumption, long runTime) {
-            this.packageName = packageName;
-            this.consumption = consumption;
-            this.runTime = runTime;
-        }
-
-        // Getter/Setter（仅操作包名、耗电、时长）
-        public String getPackageName() {
-            return packageName;
-        }
-
-        public String getConsumption() {
-            return consumption;
-        }
-
-        public void setConsumption(String consumption) {
-            this.consumption = consumption;
-        }
-
-        public long getRunTime() {
-            return runTime;
-        }
-
-        public void setRunTime(long runTime) {
-            this.runTime = runTime;
-        }
-    }
-
-    /**
-     * RecyclerView 适配器（仅在显示时通过包名查询应用名称）
-     */
-    public static class BatteryReportAdapter extends RecyclerView.Adapter<BatteryReportAdapter.ViewHolder> {
-        private Context mContext;
-        private List<AppBatteryModel> mDataList;
-        private PackageManager mPm; // 用于显示时查询应用名称
-
-        // Java7 显式构造（传入包管理工具）
-        public BatteryReportAdapter(Context context, List<AppBatteryModel> dataList, PackageManager pm) {
-            this.mContext = context;
-            this.mDataList = dataList;
-            this.mPm = pm; // 持有包管理工具，供显示时查名称
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View itemView = LayoutInflater.from(mContext)
-				.inflate(android.R.layout.simple_list_item_2, parent, false);
-            return new ViewHolder(itemView);
-        }
-
-        // 绑定数据：核心修改——仅在此处通过包名查询应用名称并显示
-        @Override
-        public void onBindViewHolder(ViewHolder holder, int position) {
-            // Java7 显式非空判断（避免空指针）
-            if (mDataList == null || mDataList.isEmpty() || position >= mDataList.size()) {
-                holder.tvAppName.setText("未知应用");
-                holder.tvConsumption.setText("耗电：0.0 mAh | 运行时长：0秒");
-                return;
-            }
-
-            AppBatteryModel model = mDataList.get(position);
-            String packageName = model.getPackageName();
-            String appName = "";
-
-            // 关键步骤：通过包名查询应用名称（仅显示时执行，不影响数据计算）
-            try {
-                ApplicationInfo appInfo = mPm.getApplicationInfo(packageName, 0);
-                appName = mPm.getApplicationLabel(appInfo).toString();
-            } catch (PackageManager.NameNotFoundException e) {
-                // 包名不存在（如应用已卸载），用包名作为名称兜底
-                appName = packageName;
-                LogUtils.e("Adapter", "包名" + packageName + "对应的应用未找到：" + e.getMessage());
-            } catch (Exception e) {
-                // 其他异常（如权限问题），同样用包名兜底
-                appName = packageName;
-                LogUtils.e("Adapter", "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
-            }
-
-            // 显示应用名称（查询到则显示名称，否则显示包名）
-            holder.tvAppName.setText(appName);
-
-            // 格式化运行时长（调用 Activity 的工具方法）
-            String runTimeStr = ((BatteryReportActivity) mContext).formatRunTime(model.getRunTime());
-            // 显示耗电+运行时长（基于包名计算的结果）
-            String consumptionText = String.format("耗电：%s mAh | 运行时长：%s",
-												   model.getConsumption(), runTimeStr);
-            holder.tvConsumption.setText(consumptionText);
-
-            // 优化显示：目标应用文字标蓝（通过包名匹配）
-            if (BatteryReportActivity.TARGET_APP_PACKAGE.equals(packageName)) {
-                holder.tvAppName.setTextColor(mContext.getResources().getColor(android.R.color.holo_blue_dark));
-                holder.tvConsumption.setTextColor(mContext.getResources().getColor(android.R.color.holo_blue_dark));
-            } else {
-                holder.tvAppName.setTextColor(mContext.getResources().getColor(android.R.color.black));
-                holder.tvConsumption.setTextColor(mContext.getResources().getColor(android.R.color.darker_gray));
-            }
-
-            // 调整文字大小（提升可读性）
-            holder.tvAppName.setTextSize(16);
-            holder.tvConsumption.setTextSize(14);
-        }
-
-        // 获取列表长度（Java7 三元运算符）
-        @Override
-        public int getItemCount() {
-            return mDataList == null ? 0 : mDataList.size();
-        }
-
-        // ViewHolder（绑定系统布局的两个 TextView）
-        public static class ViewHolder extends RecyclerView.ViewHolder {
-            TextView tvAppName;     // 显示应用名称（通过包名查询）
-            TextView tvConsumption; // 显示耗电+运行时长（包名计算结果）
-
-            // Java7 显式构造
-            public ViewHolder(View itemView) {
-                super(itemView);
-                // 强制类型转换（系统布局控件 ID：text1 和 text2）
-                tvAppName = (TextView) itemView.findViewById(android.R.id.text1);
-                tvConsumption = (TextView) itemView.findViewById(android.R.id.text2);
-            }
-        }
-    }
-}
-

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReporterActivity.java

@@ -0,0 +1,51 @@
+package cc.winboll.studio.powerbell.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/22 14:20:15
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
+import cc.winboll.studio.powerbell.beans.BatteryData;
+import java.util.Arrays;
+import java.util.List;
+
+public class BatteryReporterActivity extends Activity {
+    public static final String TAG = "BatteryReporterActivity";
+
+    private RecyclerView rvBatteryReport;
+    private BatteryAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_battery_reporter);
+
+        rvBatteryReport = findViewById(R.id.rvBatteryReport);
+        setupRecyclerView();
+        loadSampleData();
+    }
+
+    private void setupRecyclerView() {
+        adapter = new BatteryAdapter();
+        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
+        rvBatteryReport.setAdapter(adapter);
+        rvBatteryReport.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+    }
+
+    private void loadSampleData() {
+        List<BatteryData> dataList = Arrays.asList(
+            new BatteryData(95, "01:23:45", "00:05:12"),
+            new BatteryData(80, "02:15:30", "00:10:00"),
+            new BatteryData(65, "03:45:15", "00:15:30"),
+            new BatteryData(50, "05:00:00", "00:20:45")
+        );
+        adapter.updateData(dataList);
+    }
+}
+

powerbell/src/main/res/layout/activity_battery_reporter.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="电池使用报告"
+        android:textSize="24sp"
+        android:fontFamily="sans-serif-medium"
+        android:layout_marginBottom="16dp"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvBatteryReport"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@drawable/divider_line"
+        android:dividerHeight="1dp"/>
+
+</LinearLayout>

powerbell/src/main/res/layout/activity_batteryreport.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@android:color/white">
-
-    <!-- 搜索框：使用系统兼容背景 -->
-    <EditText
-        android:id="@+id/et_search"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:padding="12dp"
-        android:hint="搜索应用包名"
-        android:background="@android:drawable/btn_default_small"
-        android:inputType="text"
-        android:textSize="16sp"/>
-
-    <!-- 应用列表：不依赖系统分割线，避免资源缺失 -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_battery_report"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"/>
-
-</LinearLayout>
-