<regexputils>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
-stageCount=4
+#Mon Sep 29 13:04:18 HKT 2025
+stageCount=3
 libraryProject=libaes
-baseVersion=15.9
-publishVersion=15.9.3
+baseVersion=15.10
+publishVersion=15.10.2
 buildCount=0
-baseBetaVersion=15.9.4
+baseBetaVersion=15.10.3

aes/src/main/AndroidManifest.xml

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

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

@@ -12,18 +12,18 @@ 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.winboll.AboutView;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.APPInfo;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+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";
 
     Context mContext;
     Toolbar mToolbar;
-    
+
     @Override
     public Activity getActivity() {
         return this;
@@ -33,7 +33,7 @@ public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity
     public String getTag() {
         return TAG;
     }
-
+	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -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) {
-//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
-//        } else 
+        if (item.getItemId() == R.id.item_testactivitymanager) {
+            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, TestActivityManagerActivity.class);
+			//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
-stageCount=10
+#Fri Sep 26 05:36:14 HKT 2025
+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

build.gradle

@@ -5,16 +5,6 @@ buildscript {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
         }
-
-        //米盟通过maven接入时，要做如下配置
-        maven {
-            url "https://repos.xiaomi.com/maven"
-            credentials {
-                username 'mimo-developer'
-                password 'AKCp8ih1PFG9tV8qaLyws67dLGZi8udFM39SfsHgihN15cgsiRvHuxj8JzFmuZjaViVeNawaA'
-            }
-        }
-		
         // Nexus Maven 库地址
         // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
@@ -50,16 +40,7 @@ allprojects {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
         }
-		
-        //米盟通过maven接入时，要做如下配置
-        maven {
-            url "https://repos.xiaomi.com/maven"
-            credentials {
-                username 'mimo-developer'
-                password 'AKCp8ih1PFG9tV8qaLyws67dLGZi8udFM39SfsHgihN15cgsiRvHuxj8JzFmuZjaViVeNawaA'
-            }
-        }
-		
+        
         // Nexus Maven 库地址
         // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }

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:libappbase:15.9.5'
+    api 'cc.winboll.studio:libapputils:15.10.2'
+	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
-stageCount=4
+#Mon Sep 29 13:04:07 HKT 2025
+stageCount=3
 libraryProject=libaes
-baseVersion=15.9
-publishVersion=15.9.3
+baseVersion=15.10
+publishVersion=15.10.2
 buildCount=0
-baseBetaVersion=15.9.4
+baseBetaVersion=15.10.3

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.beans.DrawerMenuBean;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+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 <T extends GlobalApplication> void init(T 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());
         }
@@ -122,35 +123,8 @@ public class AboutView extends LinearLayout {
         } else {
             mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
         }
-
-
-        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);
-        }
+		
+		addView(createAboutPage());
 
         // 初始化标题栏
         //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, "metDevUserPassword", metDevUserPassword.getText().toString());
+                            PrefUtils.saveString(_mContext, "metDevUserName", metDevUserName.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
-stageCount=10
+#Fri Sep 26 05:36:14 HKT 2025
+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) {
-        APPModel.saveBeanToFile(getAPPModelFilePath(context), new APPModel(GlobalApplication.isDebuging));
+    public static void saveDebugStatus(GlobalApplication application) {
+        APPModel.saveBeanToFile(application.getAPPModelFilePath(application), new APPModel(GlobalApplication.isDebuging));
     }
 	
-    static String getAPPModelFilePath(Context context) {
-        return context.getDataDir().getPath() + "/APPModel.json";
+    static String getAPPModelFilePath(GlobalApplication application) {
+        return application.getDataDir().getPath() + "/APPModel.json";
     }
 
     public static boolean isDebuging() {

powerbell/build.gradle

@@ -18,22 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    
-    // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
-    compileSdkVersion 30
-
-    // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
-    buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.powerbell"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode 6
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11" 
+        versionName "15.4" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -45,41 +41,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-	
-    // 米盟
-    packagingOptions {
-         doNotStrip "*/*/libmimo_1011.so"
-    }
 }
 
 dependencies {
-	// 米盟
-	implementation 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
-     //注意：以下5个库必须要引入
-    //implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
-
-	
-    //--------------aar依赖-----------
-    /*implementation(name: 'mimo-ad-sdk', ext: 'aar')
-    //--------------Maven依赖-----------
-    //implementation 'com.miui.zeus:mimo-ad-sdk:5.3.2'
-
-    //注意：以下5个库必须要引入
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
-
-    implementation "androidx.navigation:navigation-ui:2.3.5"
-    implementation 'androidx.multidex:multidex:2.0.1'
-    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
-	*/
-	 // 应用介绍页类库
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'cc.winboll.studio:libaes:15.9.3'
+    api 'cc.winboll.studio:libapputils:15.8.5'
+    api 'cc.winboll.studio:libappbase:15.9.5'
+    
+    // 吐司提示库
+    api 'com.github.getActivity:ToastUtils:10.5'
+    // 应用介绍页类库
     api 'io.github.medyo:android-about-page:2.0.0'
     // SSH
     api 'com.jcraft:jsch:0.1.55'
@@ -99,9 +71,23 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-	implementation 'cc.winboll.studio:libaes:15.11.1'
-    implementation 'cc.winboll.studio:libappbase:15.11.0'
-	
-    //api fileTree(dir: 'libs', include: ['*.aar'])
-    api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    /*api 'cc.winboll.studio:winboll-shared:1.8.0'
+    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.fragment:fragment:1.0.0'
+    api 'com.google.android.material:material:1.0.0'
+    
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    api 'com.github.getActivity:ToastUtils:10.5'
+    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'org.jsoup:jsoup:1.13.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    api 'cc.winboll.studio:libaes:7.6.0'
+    */
 }

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Nov 18 17:03:32 HKT 2025
-stageCount=3
+#Wed Sep 03 20:59:53 HKT 2025
+stageCount=13
 libraryProject=
-baseVersion=15.11
-publishVersion=15.11.2
+baseVersion=15.4
+publishVersion=15.4.12
 buildCount=0
-baseBetaVersion=15.11.3
+baseBetaVersion=15.4.13

powerbell/proguard-rules.pro

@@ -15,6 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
-## 米盟
--keep class com.miui.zeus.** { *; }

powerbell/src/beta/res/values-zh/string.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">PowerBell☆</string>
+    <string name="app_name">能源钟☆</string>
 
 </resources>

powerbell/src/main/AndroidManifest.xml

@@ -1,27 +1,7 @@
 <?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">
-	
-	//米盟必要权限配置
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<!-- 权限会用在部分下载类广告安装应用时使用 -->
-	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
-
-	//以下为非必要权限配置，可以不申请，当您使用的米盟SDK版本大于等于5.3.1时可以选择性添加如下权限
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-	<!-- 米盟提供“获取地理位置权限”和“不给予地理位置权限，开发者传入地理位置参数”两种方式上报用户位置，两种方式均可不选，无论通过何种方式提供给米盟用户地理位置，均需向用户声明地理位置权限将应用于米盟广告投放，米盟不强制获取地理位置信息-->
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-	<!-- 米盟将通过此权限在Android 11系统上判定广告对应的应用是否在用户的app上安装，避免投放错误的广告，以此提高用户的广告体验。若添加此权限，需要在您的用户隐私文档中声明！ -->
-	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
-		
-    <!-- 通过GPS得到精确位置 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!-- 通过网络得到粗略位置 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <!-- 拍摄照片和视频 -->
     <uses-permission android:name="android.permission.CAMERA"/>
@@ -44,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"
@@ -75,10 +36,7 @@
         android:theme="@style/AppTheme_Default"
         android:persistent="true"
         android:resizeableActivity="true"
-        android:requestLegacyExternalStorage="true"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:requestLegacyExternalStorage="true">
 
         <activity
             android:name=".MainActivity"
@@ -165,8 +123,6 @@
 
         <activity android:name="cc.winboll.studio.powerbell.activities.PixelPickerActivity"/>
 
-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReportActivity"/>
-
     </application>
 
-</manifest>
+</manifest>

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

@@ -4,10 +4,10 @@ import android.content.Context;
 import android.os.Environment;
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
+import com.hjq.toast.ToastUtils;
 import java.io.File;
 
 public class App extends GlobalApplication {
@@ -50,7 +50,7 @@ public class App extends GlobalApplication {
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.toast_custom_view);
         //ToastUtils.setStyle(new WhiteToastStyle());
-        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
         // 设置数据配置存储工具
         _mAppConfigUtils = getAppConfigUtils(this);
@@ -77,13 +77,5 @@ public class App extends GlobalApplication {
     public void clearBatteryHistory() {
         _mAppCacheUtils.clearBatteryHistory();
     }
-
-	@Override
-	public void onTerminate() {
-		super.onTerminate();
-		ToastUtils.release();
-	}
-	
-	
 }
 

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

@@ -3,91 +3,41 @@ package cc.winboll.studio.powerbell;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.provider.MediaStore;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogActivity;
+import cc.winboll.studio.libaes.views.AToolbar;
 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;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
-import cc.winboll.studio.powerbell.utils.MimoUtils;
-import com.miui.zeus.mimo.sdk.ADParams;
-import com.miui.zeus.mimo.sdk.BannerAd;
-import com.miui.zeus.mimo.sdk.MimoCustomController;
-import com.miui.zeus.mimo.sdk.MimoLocation;
-import com.miui.zeus.mimo.sdk.MimoSdk;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
-import cc.winboll.studio.libaes.views.ADsBannerView;
 
-/**
- * 主活动类（修复小米广告SDK空Context崩溃问题）
- * 核心修改点：
- * 1. 添加全局Context安全校验
- * 2. 优化广告请求的生命周期判断
- * 3. 确保广告操作在主线程执行
- * 4. 完善广告资源释放逻辑
- */
 public class MainActivity extends WinBoLLActivity {
 
     public static final String TAG = "MainActivity";
-
-//    private static final String PRIVACY_FILE = "privacy_pfs";
-//    private static final String PRIVACY_VALUE = "privacy_value";//0: 拒绝，1：赞同
-//
-//    private SharedPreferences mSharedPreferences;
-//
-//    private String BANNER_POS_ID = "802e356f1726f9ff39c69308bfd6f06a";
-//    private String BANNER_POS_ID_WINBOLL_BETA = "d129ee5a263911f981a6dc7a9802e3e7";
-//    private String BANNER_POS_ID_WINBOLL = "4ec30efdb32271765b9a4efac902828b";
-
-//    private BannerAd mBannerAd;
-//    private List<BannerAd> mAllBanners = new ArrayList<>();
-//
-//    private ViewGroup mContainer;
-//
-//    private boolean mIsBiddingWin = true;
-//
-//    public static final int BACKGROUND_PICTURE_REQUEST_CODE = 0;
+    public static final int BACKGROUND_PICTURE_REQUEST_CODE = 0;
 
     public static MainActivity _mMainActivity;
-    private App mApplication;
-    private Menu mMenu;
-    private Fragment mCurrentShowFragment;
-    private MainViewFragment mMainViewFragment;
-    private Toolbar mToolbar;
-    // 新增：主线程Handler，确保广告操作在主线程执行
-    //private Handler mMainHandler;
-	ADsBannerView mADsBannerView;
+    //LogView mLogView;
+    //ArrayList<Fragment> mlistFragment;
+    App mApplication;
+    //AppConfigUtils mAppConfigUtils;
+    Menu mMenu;
+    Fragment mCurrentShowFragment;
+    MainViewFragment mMainViewFragment;
+    AToolbar mAToolbar;
 
     @Override
     public Activity getActivity() {
@@ -101,28 +51,26 @@ public class MainActivity extends WinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        LogUtils.d(TAG, "onCreate(...)");
+        //LogUtils.d(TAG, "onCreate(...)");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-		mADsBannerView = findViewById(R.id.adsbanner);
-		
-//        mContainer = findViewById(R.id.ads_container);
-//
-//        // 初始化主线程Handler（关键：确保广告操作在主线程执行）
-//        mMainHandler = new Handler(Looper.getMainLooper());
-//
-//        // 米盟模块：隐私协议弹窗
-//        showPrivacy();
 
-        _mMainActivity = this;
+        // 设置调试日志
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+//        //LogUtils.d(TAG, "LogView Start.");
+//        mLogView.updateLogView();
+
+        _mMainActivity = MainActivity.this;
         mApplication = (App) getApplication();
+        //mAppConfigUtils = AppConfigUtils.getInstance(mApplication);
 
         // 初始化工具栏
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
+        setActionBar(mAToolbar);
+        //mAToolbar.setSubtitle("Main");
+        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
 
-        // 初始化主Fragment
         if (mMainViewFragment == null) {
             FragmentTransaction tx = getFragmentManager().beginTransaction();
             mMainViewFragment = new MainViewFragment();
@@ -130,45 +78,12 @@ public class MainActivity extends WinBoLLActivity {
             tx.commit();
         }
         showFragment(mMainViewFragment);
-    }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-//        // 修复：释放广告资源，避免内存泄漏
-//        releaseAdResources();
-        // 置空静态引用，避免内存泄漏
-        _mMainActivity = null;
-//        // 移除Handler回调
-//        if (mMainHandler != null) {
-//            mMainHandler.removeCallbacksAndMessages(null);
-//        }
-		if(mADsBannerView != null) {
-			mADsBannerView.releaseAdResources();
-		}
+//        NotificationHelper notificationUtils = new NotificationHelper(this);
+//        notificationUtils.createNotificationChannels();
+
+
     }
-//
-//    /**
-//     * 释放广告资源（关键：避免内存泄漏和空Context调用）
-//     */
-//    private void releaseAdResources() {
-//        LogUtils.d(TAG, "releaseAdResources()");
-//        // 销毁所有广告实例
-//        if (mAllBanners != null && !mAllBanners.isEmpty()) {
-//            for (BannerAd ad : mAllBanners) {
-//                if (ad != null) {
-//                    ad.destroy();
-//                }
-//            }
-//            mAllBanners.clear();
-//        }
-//        // 置空当前广告引用
-//        mBannerAd = null;
-//        // 移除广告容器中的视图
-//        if (mContainer != null) {
-//            mContainer.removeAllViews();
-//        }
-//    }
 
     void showFragment(Fragment fragment) {
         FragmentTransaction tx = getFragmentManager().beginTransaction();
@@ -180,6 +95,7 @@ public class MainActivity extends WinBoLLActivity {
         mCurrentShowFragment = fragment;
     }
 
+
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
@@ -187,8 +103,7 @@ public class MainActivity extends WinBoLLActivity {
     }
 
     public static void reloadBackground() {
-        // 修复：添加非空校验，避免Activity已销毁时调用
-        if (_mMainActivity != null && !_mMainActivity.isFinishing() && !_mMainActivity.isDestroyed()) {
+        if (_mMainActivity != null) {
             _mMainActivity.mMainViewFragment.loadBackground();
         }
     }
@@ -198,88 +113,94 @@ public class MainActivity extends WinBoLLActivity {
      */
     private String getRealPathFromURI(Uri contentUri) {
         String[] proj = {MediaStore.MediaColumns.DATA};
-        Cursor cursor = getContentResolver().query(contentUri, proj, null, null, null);
-        if (cursor != null && cursor.moveToNext()) {
-            int nColumnIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
-            if (nColumnIndex > -1) {
-                String path = cursor.getString(nColumnIndex);
-                cursor.close();
-                return path;
-            } else {
-                LogUtils.d(TAG, "getRealPathFromURI nColumnIndex is -1.");
-            }
-            cursor.close();
+        Cursor cursor=getContentResolver().query(contentUri, proj, null, null, null);
+        if (cursor.moveToNext()) {
+			int nColumnIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
+			if (nColumnIndex > -1) {
+				return cursor.getString(nColumnIndex);
+			} else {
+				LogUtils.d(TAG, "getRealPathFromURI nColumnIndex is -1.");
+			}
         }
+        cursor.close();
         return null;
-    }
+	}
 
     @Override
     protected void onResume() {
         super.onResume();
+        // 回到窗口自动取消提醒消息
+        //NotificationHelper.cancelRemindNotification(this);
         reloadBackground();
-        setBackgroundColor();
-		if(mADsBannerView != null) {
-			mADsBannerView.resumeADs();
-		}
-
-//        // 修复：优化广告请求逻辑（添加生命周期判断 + 主线程执行）
-//        if (!isFinishing() && !isDestroyed()) {
-//			String privacyAgreeValue = getSharedPreferences().getString(PRIVACY_VALUE, null);
-//			if (TextUtils.equals(privacyAgreeValue, String.valueOf(1))) {
-//				LogUtils.i(TAG, "已同意隐私协议，开始播放米盟广告...");
-//				mMainHandler.postDelayed(new Runnable() {
-//						@Override
-//						public void run() {
-//							// 再次校验生命周期，避免延迟执行时Activity已销毁
-//							if (!isFinishing() && !isDestroyed()) {
-//								fetchAd();
-//							}
-//						}
-//					}, 1000); // 延迟1秒请求广告，提升页面加载体验
-//			}
-//
-//        }
+		setBackgroundColor();
     }
 
+    // Menu icons are inflated just as they were with actionbar
+    //
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
         mMenu = menu;
         getMenuInflater().inflate(R.menu.toolbar_main, mMenu);
         return true;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        super.onOptionsItemSelected(item);
+    // 回退开发者选项重设UI到初始用户状态
+    //
+    /*public void resetUI(MainActivity MainActivity) {
+     mMenu.clear();
+     getMenuInflater().inflate(R.menu.toolbar_main, mMenu);
+     }*/
+
+    @Override 
+    public boolean onOptionsItemSelected(MenuItem item) { 
+        super.onOptionsItemSelected(item); 
         int menuItemId = item.getItemId();
         if (menuItemId == R.id.action_about) {
-            startActivity(new Intent(this, AboutActivity.class));
-        } else if (menuItemId == R.id.action_battery_report) {
-            startActivity(new Intent(this, BatteryReportActivity.class));
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
+        } else if (menuItemId == R.id.action_battery_reporter) {
+            Intent intent = new Intent();
+            intent.setClass(this, BatteryReporterActivity.class);
+            startActivity(intent);
         } else if (menuItemId == R.id.action_clearrecord) {
-            startActivity(new Intent(this, ClearRecordActivity.class));
+            Intent intent = new Intent();
+            intent.setClass(this, ClearRecordActivity.class);
+            startActivity(intent);
         } else if (menuItemId == R.id.action_changepicture) {
-            startActivity(new Intent(this, BackgroundPictureActivity.class));
+            Intent intent = new Intent();
+            intent.setClass(this, BackgroundPictureActivity.class);
+            startActivity(intent);
         } else if (menuItemId == R.id.action_log) {
-            LogActivity.startLogActivity(this);
+            App.getWinBoLLActivityManager().startLogActivity(this);
         }
+
         return true;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        //LogUtils.d(TAG, "onActivityResult(...)");
+        //LogUtils.d(TAG, "requestCode is : " + Integer.toString(requestCode));
+        //LogUtils.d(TAG, "resultCode is : " + Integer.toString(resultCode));
+
         super.onActivityResult(requestCode, resultCode, data);
-//        if (requestCode == BACKGROUND_PICTURE_REQUEST_CODE) {
-//            if (resultCode == RESULT_OK) {
-//                Toast.makeText(getApplicationContext(), "OK", Toast.LENGTH_SHORT).show();
-//            }
-//        } else {
-//            String sz = "Unsolved requestCode = " + Integer.toString(requestCode);
-//            Toast.makeText(getApplicationContext(), sz, Toast.LENGTH_SHORT).show();
-//            LogUtils.d(TAG, sz);
-//        }
+        if (requestCode == BACKGROUND_PICTURE_REQUEST_CODE) {
+            // 处理选择后图片
+            if (resultCode == RESULT_OK) {
+                //mMainViewFragment.loadBackgroundPicture();
+                Toast.makeText(getApplication(), "OK", Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            String sz = "Unsolved requestCode = " + Integer.toString(requestCode);
+            Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
+            LogUtils.d(TAG, sz);
+        }
     }
 
+    /**
+     * 返回键
+     */
     @Override
     public void onBackPressed() {
         if (mCurrentShowFragment != mMainViewFragment) {
@@ -289,349 +210,11 @@ public class MainActivity extends WinBoLLActivity {
         }
     }
 
-    void setBackgroundColor() {
-        // 修复：添加Activity非空校验
-        if (isFinishing() || isDestroyed()) {
-            return;
-        }
-        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
-        BackgroundPictureBean bean = utils.getBackgroundPictureBean();
-        int nPixelColor = bean.getPixelColor();
-        RelativeLayout mainLayout = findViewById(R.id.activitymainRelativeLayout1);
-        if (mainLayout != null) {
-            mainLayout.setBackgroundColor(nPixelColor);
-        }
-    }
-//
-//    /**
-//     * 显示广告（核心修复：传递安全的Context + 生命周期校验）
-//     */
-//    private void showAd() {
-//        LogUtils.d(TAG, "showAd()");
-//        // 1. 生命周期校验：避免Activity已销毁时操作UI
-//        if (isFinishing() || isDestroyed()) {
-//            LogUtils.e(TAG, "showAd: Activity is finishing or destroyed");
-//            return;
-//        }
-//        // 2. 非空校验：广告实例和容器
-//        if (mBannerAd == null || mContainer == null) {
-//            LogUtils.e(TAG, "showAd: BannerAd or Container is null");
-//            return;
-//        }
-//        // 3. 创建广告容器（使用ApplicationContext避免内存泄漏）
-//        final FrameLayout container = new FrameLayout(getApplicationContext());
-//        container.setPadding(0, 0, 0, MimoUtils.dpToPx(this, 10));
-//        mContainer.addView(container, new FrameLayout.LayoutParams(
-//							   FrameLayout.LayoutParams.MATCH_PARENT,
-//							   FrameLayout.LayoutParams.WRAP_CONTENT
-//						   ));
-//
-//        if (mIsBiddingWin) {
-//            mBannerAd.setPrice(getPrice());
-//        }
-//        // 4. 显示广告：传递ApplicationContext，避免Activity Context失效
-//        mBannerAd.showAd(MainActivity.this, container, new BannerAd.BannerInteractionListener() {
-//				@Override
-//				public void onAdClick() {
-//					LogUtils.d(TAG, "onAdClick");
-//				}
-//
-//				@Override
-//				public void onAdShow() {
-//					LogUtils.d(TAG, "onAdShow");
-//				}
-//
-//				@Override
-//				public void onAdDismiss() {
-//					LogUtils.d(TAG, "onAdDismiss");
-//					// 修复：移除容器时校验Activity状态
-//					if (!isFinishing() && !isDestroyed() && mContainer != null) {
-//						mContainer.removeView(container);
-//					}
-//				}
-//
-//				@Override
-//				public void onRenderSuccess() {
-//					LogUtils.d(TAG, "onRenderSuccess");
-//				}
-//
-//				@Override
-//				public void onRenderFail(int code, String msg) {
-//					LogUtils.e(TAG, "onRenderFail errorCode " + code + " errorMsg " + msg);
-//					// 修复：渲染失败时移除容器
-//					if (!isFinishing() && !isDestroyed() && mContainer != null) {
-//						mContainer.removeView(container);
-//					}
-//				}
-//			});
-//    }
-//
-//    /**
-//     * 请求广告（核心修复：Context安全校验 + 异常捕获 + 资源管理）
-//     */
-//    private void fetchAd() {
-//        LogUtils.d(TAG, "fetchAd()");
-//        // 1. 双重校验：Activity未销毁 + Context非空
-//        if (isFinishing() || isDestroyed() || getApplicationContext() == null) {
-//            LogUtils.e(TAG, "fetchAd: Invalid Context or Activity state");
-//            return;
-//        }
-//        // 2. 释放之前的广告资源，避免内存泄漏
-//        if (mBannerAd != null) {
-//            mBannerAd.destroy();
-//        }
-//        // 3. 初始化广告（使用ApplicationContext，避免Activity Context失效）
-//        try {
-//            mBannerAd = new BannerAd();
-//            mAllBanners.add(mBannerAd);
-//        } catch (Exception e) {
-//            LogUtils.e(TAG, "fetchAd: Init BannerAd failed", e);
-//            return;
-//        }
-//        // 4. 设置下载监听
-//        mBannerAd.setDownLoadListener(new BannerAd.BannerDownloadListener() {
-//				@Override
-//				public void onDownloadStarted() {
-//					LogUtils.d(TAG, "onDownloadStarted");
-//				}
-//
-//				@Override
-//				public void onDownloadPaused() {
-//					LogUtils.d(TAG, "onDownloadPaused");
-//				}
-//
-//				@Override
-//				public void onDownloadFailed(int errorCode) {
-//					LogUtils.d(TAG, "onDownloadFailed, errorCode = " + errorCode);
-//				}
-//
-//				@Override
-//				public void onDownloadFinished() {
-//					LogUtils.d(TAG, "onDownloadFinished");
-//				}
-//
-//				@Override
-//				public void onDownloadProgressUpdated(int progress) {
-//					LogUtils.d(TAG, "onDownloadProgressUpdated " + progress + "%");
-//				}
-//
-//				@Override
-//				public void onInstallFailed(int errorCode) {
-//					LogUtils.d(TAG, "onInstallFailed, errorCode = " + errorCode);
-//				}
-//
-//				@Override
-//				public void onInstallStart() {
-//					LogUtils.d(TAG, "onInstallStart");
-//				}
-//
-//				@Override
-//				public void onInstallSuccess() {
-//					LogUtils.d(TAG, "onInstallSuccess");
-//				}
-//
-//				@Override
-//				public void onDownloadCancel() {
-//					LogUtils.d(TAG, "onDownloadCancel");
-//				}
-//			});
-//
-//        // 5. 构建广告参数并请求
-//        String currentAD_ID = getAD_ID();
-//        LogUtils.d(TAG, String.format("currentAD_ID = %s", currentAD_ID));
-//        ADParams params = new ADParams.Builder().setUpId(currentAD_ID).build();
-//        mBannerAd.loadAd(params, new BannerAd.BannerLoadListener() {
-//				@Override
-//				public void onBannerAdLoadSuccess() {
-//					LogUtils.d(TAG, "onBannerAdLoadSuccess()");
-//					// 修复：广告加载成功后校验Activity状态
-//					if (!isFinishing() && !isDestroyed()) {
-//						showAd();
-//					}
-//				}
-//
-//				@Override
-//				public void onAdLoadFailed(int errorCode, String errorMsg) {
-//					LogUtils.e(TAG, "onAdLoadFailed: errorCode = " + errorCode + ", errorMsg = " + errorMsg);
-//					// 修复：加载失败时移除当前广告实例
-//					if (mAllBanners.contains(mBannerAd)) {
-//						mAllBanners.remove(mBannerAd);
-//					}
-//					mBannerAd.destroy();
-//					mBannerAd = null;
-//				}
-//			});
-//    }
-//
-//    /**
-//     * 根据当前秒数获取广告ID（原逻辑保留）
-//     */
-//    private String getAD_ID() {
-//        long currentSecond = System.currentTimeMillis() / 1000;
-//        return (currentSecond % 2 == 0) ? BANNER_POS_ID :
-//			(BuildConfig.DEBUG ? BANNER_POS_ID_WINBOLL_BETA : BANNER_POS_ID_WINBOLL);
-//    }
-//
-//    /**
-//     * 获取广告价格（原逻辑保留，添加空指针校验）
-//     */
-//    private long getPrice() {
-//        if (mBannerAd == null) {
-//            return 0;
-//        }
-//        Map<String, Object> map = mBannerAd.getMediaExtraInfo();
-//        if (map == null || map.isEmpty() || !map.containsKey("price")) {
-//            LogUtils.w(TAG, "getPrice: media extra info is null or no price key");
-//            return 0;
-//        }
-//        Object priceObj = map.get("price");
-//        if (priceObj instanceof Long) {
-//            return (Long) priceObj;
-//        } else if (priceObj instanceof Integer) {
-//            return ((Integer) priceObj).longValue();
-//        } else {
-//            LogUtils.e(TAG, "getPrice: price type is invalid");
-//            return 0;
-//        }
-//    }
-//
-//    /**
-//     * 显示隐私协议弹窗（原逻辑保留，优化Context使用）
-//     */
-//    private void showPrivacy() {
-//        // 校验Activity状态，避免弹窗泄露
-//        if (isFinishing() || isDestroyed()) {
-//            return;
-//        }
-//        String privacyAgreeValue = getSharedPreferences().getString(PRIVACY_VALUE, null);
-//        if (TextUtils.equals(privacyAgreeValue, String.valueOf(0))) {
-//            LogUtils.i(TAG, "已拒绝隐私协议，广告已处于不可用状态...");
-//            Toast.makeText(getApplicationContext(), "已拒绝隐私协议，广告已处于不可用状态", Toast.LENGTH_SHORT).show();
-//            return;
-//        }
-//        if (TextUtils.equals(privacyAgreeValue, String.valueOf(1))) {
-//            LogUtils.i(TAG, "已同意隐私协议，开始初始化米盟SDK...");
-//            initMimoSdk();
-//            return;
-//        }
-//        LogUtils.i(TAG, "开始弹出隐私协议...");
-//        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//        builder.setTitle("用户须知");
-//        builder.setMessage("小米广告SDK隐私政策: https://dev.mi.com/distribute/doc/details?pId=1688, 请复制到浏览器查看");
-//        builder.setIcon(R.drawable.ic_launcher);
-//        builder.setCancelable(false); // 点击对话框以外的区域不消失
-//        builder.setPositiveButton("同意", new DialogInterface.OnClickListener() {
-//				@Override
-//				public void onClick(DialogInterface dialog, int which) {
-//					getSharedPreferences().edit()
-//                        .putString(PRIVACY_VALUE, String.valueOf(1))
-//                        .apply();
-//					initMimoSdk();
-//					dialog.dismiss();
-//				}
-//			});
-//        builder.setNegativeButton("拒绝", new DialogInterface.OnClickListener() {
-//				@Override
-//				public void onClick(DialogInterface dialog, int which) {
-//					getSharedPreferences().edit()
-//                        .putString(PRIVACY_VALUE, String.valueOf(0))
-//                        .apply();
-//					dialog.dismiss();
-//				}
-//			});
-//        AlertDialog dialog = builder.create();
-//
-//        // 配置弹窗位置（底部全屏）
-//        Window window = dialog.getWindow();
-//        if (window != null) {
-//            window.setGravity(Gravity.BOTTOM);
-//            WindowManager m = getWindowManager();
-//            Display d = m.getDefaultDisplay();
-//            WindowManager.LayoutParams p = window.getAttributes();
-//            p.width = d.getWidth();
-//            window.setAttributes(p);
-//        }
-//        dialog.show();
-//    }
-//
-//    /**
-//     * 初始化米盟SDK（核心修复：传递ApplicationContext + 异常捕获）
-//     */
-//    private void initMimoSdk() {
-//        // 1. 安全获取ApplicationContext，避免Activity Context失效
-//        Context appContext = getApplicationContext();
-//        if (appContext == null) {
-//            Log.e(TAG, "initMimoSdk: ApplicationContext is null");
-//            return;
-//        }
-//        // 2. 初始化SDK，捕获异常避免崩溃
-//        try {
-//            MimoSdk.init(appContext, new MimoCustomController() {
-//					@Override
-//					public boolean isCanUseLocation() {
-//						return true;
-//					}
-//
-//					@Override
-//					public MimoLocation getMimoLocation() {
-//						return null;
-//					}
-//
-//					@Override
-//					public boolean isCanUseWifiState() {
-//						return true;
-//					}
-//
-//					@Override
-//					public boolean alist() {
-//						return true;
-//					}
-//				}, new MimoSdk.InitCallback() {
-//					@Override
-//					public void success() {
-//						Log.d(TAG, "MimoSdk init success");
-//					}
-//
-//					@Override
-//					public void fail(int code, String msg) {
-//						Log.e(TAG, "MimoSdk init fail, code=" + code + ",msg=" + msg);
-//					}
-//				});
-//            MimoSdk.setDebugOn(true);
-//        } catch (Exception e) {
-//            Log.e(TAG, "initMimoSdk: init failed", e);
-//        }
-//    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        return super.dispatchKeyEvent(event);
-    }
-
-    @Override
-    public void setupToolbar() {
-        super.setupToolbar();
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-        }
-    }
-//
-//    /**
-//     * 获取SharedPreferences实例（原逻辑保留，添加空指针校验）
-//     */
-//    public SharedPreferences getSharedPreferences() {
-//        if (mSharedPreferences == null) {
-//            // 修复：使用ApplicationContext获取SharedPreferences，避免Activity Context泄露
-//            Context appContext = getApplicationContext();
-//            if (appContext != null) {
-//                mSharedPreferences = appContext.getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
-//            } else {
-//                Log.e(TAG, "getSharedPreferences: ApplicationContext is null");
-//                // 降级方案：若ApplicationContext为空，使用Activity Context（仅作兼容）
-//                mSharedPreferences = super.getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
-//            }
-//        }
-//        return mSharedPreferences;
-//    }
-}
-
+	void setBackgroundColor() {
+		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(MainActivity.this);
+		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		int nPixelColor = bean.getPixelColor();
+		RelativeLayout mainLayout = findViewById(R.id.activitymainRelativeLayout1);
+		mainLayout.setBackgroundColor(nPixelColor);
+	}
+} 

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

@@ -10,9 +10,9 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.libaes.views.AboutView;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.powerbell.R;
 
 public class AboutActivity extends Activity {

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

@@ -19,7 +19,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;

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

@@ -1,516 +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 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;
-    private Map<String, Long> appRunTimeCache = new HashMap<String, Long>();
-    private Map<String, String> packageToAppNameCache = new HashMap<String, String>();
-    private PackageManager mPackageManager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_battery_report);
-        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));
-
-        // 初始化流程：新增“加载24小时累计耗电”步骤
-        loadAllAppPackage();
-        preCacheAllAppNames();
-        appRunTimeCache = getAppRunTime();
-        updateAppRunTimeToModel();
-        calculateInitial24hTotalConsumption(); // 初始化时计算24小时累计耗电
-        filteredList.addAll(dataList);
-        adapter = new BatteryReportAdapter(this, filteredList, mPackageManager, packageToAppNameCache);
-        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) {
-					filterAppsByPackageAndName(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");
-                    appRunTimeCache = getAppRunTime();
-                    updateAppRunTimeToModel();
-                    calculateSingleConsumptionAndAccumulate(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);
-        }
-    }
-
-    /**
-     * 加载所有应用（仅获取包名，初始化模型时单次耗电、累计耗电均设为0）
-     */
-    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;
-            // 初始化：单次耗电（consumption）=0，累计耗电（totalConsumption）=0，运行时长=0
-            dataList.add(new AppBatteryModel(packageName, 0.0f, 0.0f, 0));
-        }
-
-        LogUtils.d(TAG, "应用包名列表加载完成，共添加" + dataList.size() + "个包名。");
-    }
-
-    /**
-     * 预缓存应用名称（逻辑不变）
-     */
-    private void preCacheAllAppNames() {
-        packageToAppNameCache.clear();
-        LogUtils.d(TAG, "开始预缓存包名-应用名称映射");
-
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            String appName = getAppNameByPackage(packageName);
-            packageToAppNameCache.put(packageName, appName);
-        }
-
-        LogUtils.d(TAG, "预缓存完成，共缓存" + packageToAppNameCache.size() + "个应用名称");
-    }
-
-    /**
-     * 通过包名获取应用名称（逻辑不变）
-     */
-    private String getAppNameByPackage(String packageName) {
-        try {
-            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName, 0);
-            return mPackageManager.getApplicationLabel(appInfo).toString();
-        } catch (PackageManager.NameNotFoundException e) {
-            LogUtils.e(TAG, "包名" + packageName + "对应的应用未找到：" + e.getMessage());
-            return packageName;
-        } catch (Exception e) {
-            LogUtils.e(TAG, "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
-            return packageName;
-        }
-    }
-
-    /**
-     * 更新运行时长到模型（逻辑不变）
-     */
-    private void updateAppRunTimeToModel() {
-        int nCount = 0;
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            Long runTime;
-            if (appRunTimeCache.containsKey(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));
-    }
-
-    /**
-     * 【新增】初始化时计算24小时累计耗电（赋值给totalConsumption）
-     * 逻辑：基于24小时运行时长占比，分配当前电池容量的理论24小时消耗
-     */
-    private void calculateInitial24hTotalConsumption() {
-        long total24hRunTime = 0;
-        // 1. 计算24小时内所有应用总运行时长
-        for (Map.Entry<String, Long> entry : appRunTimeCache.entrySet()) {
-            total24hRunTime += entry.getValue();
-        }
-        LogUtils.d(TAG, "24小时内所有应用总运行时长：" + formatRunTime(total24hRunTime));
-
-        // 2. 按运行时长占比分配24小时累计耗电（假设电池满电循环，用总容量近似24小时总消耗）
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            Long app24hRunTime = appRunTimeCache.getOrDefault(packageName, 0L);
-
-            // 计算占比与累计耗电
-            float ratio = (total24hRunTime > 0) ? (float) app24hRunTime / total24hRunTime : 0;
-            float initialTotalConsumption = batteryCapacity * ratio; // 用电池容量近似24小时总消耗
-            model.setTotalConsumption(initialTotalConsumption); // 初始化累计耗电
-            LogUtils.d(TAG, String.format("应用包 %s 24小时累计耗电初始化：%.1f mAh", packageName, initialTotalConsumption));
-        }
-    }
-
-    /**
-     * 【核心修改】计算单次耗电（赋值给consumption）+ 累加至累计耗电（totalConsumption = totalConsumption + consumption）
-     */
-    private void calculateSingleConsumptionAndAccumulate(float dropPercent, Map<String, Long> runTimeMap) {
-        long totalSingleRunTime = 0;
-        // 1. 计算本次电池下降期间的总运行时长
-        for (Map.Entry<String, Long> entry : runTimeMap.entrySet()) {
-            totalSingleRunTime += entry.getValue();
-        }
-
-        // 2. 遍历计算每个应用的“单次耗电”并“累加至累计”
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            Long appSingleRunTime = runTimeMap.getOrDefault(packageName, 0L);
-
-            // 步骤1：计算本次单次耗电（赋值给consumption）
-            float ratio = (totalSingleRunTime > 0) ? (float) appSingleRunTime / totalSingleRunTime : 0;
-            float singleConsumption = batteryCapacity * dropPercent / 100 * ratio; // 单次消耗
-            model.setConsumption(singleConsumption); // 存储单次耗电
-
-            // 步骤2：累加单次耗电到累计耗电（totalConsumption = 原有累计 + 本次单次）
-            float newTotalConsumption = model.getTotalConsumption() + singleConsumption;
-            model.setTotalConsumption(newTotalConsumption); // 更新累计耗电
-
-            // 同步运行时长
-            model.setRunTime(appSingleRunTime);
-
-            LogUtils.d(TAG, String.format("应用包 %s：单次耗电%.1f mAh，累计耗电%.1f mAh", 
-										  packageName, singleConsumption, newTotalConsumption));
-        }
-
-        // 3. 按累计耗电排序（从高到低）
-        Collections.sort(dataList, new Comparator<AppBatteryModel>() {
-				@Override
-				public int compare(AppBatteryModel m1, AppBatteryModel m2) {
-					return Float.compare(m2.getTotalConsumption(), m1.getTotalConsumption());
-				}
-			});
-
-        // 4. 重新应用过滤并刷新列表
-        filterAppsByPackageAndName(etSearch.getText().toString());
-    }
-
-    /**
-     * 双维度过滤（逻辑不变）
-     */
-    private void filterAppsByPackageAndName(String keyword) {
-        filteredList.clear();
-        if (keyword == null || keyword.isEmpty()) {
-            filteredList.addAll(dataList);
-        } else {
-            String lowerKeyword = keyword.toLowerCase();
-
-            for (AppBatteryModel model : dataList) {
-                String packageName = model.getPackageName();
-                String packageNameLower = packageName.toLowerCase();
-                String appName = packageToAppNameCache.get(packageName);
-                String appNameLower = appName.toLowerCase();
-
-                boolean isMatched = packageNameLower.contains(lowerKeyword) 
-                    || appNameLower.contains(lowerKeyword);
-
-                if (isMatched) {
-                    filteredList.add(model);
-                }
-            }
-        }
-        adapter.notifyDataSetChanged();
-    }
-
-    /**
-     * 获取应用运行时长（逻辑不变，返回24小时运行时长）
-     */
-    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 + "24小时运行时长：" + 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());
-            }
-        }
-
-        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 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();
-    }
-
-    /**
-     * 【核心修改】数据模型：明确字段含义
-     * - consumption：单次耗电（两次电池广播间的消耗，float类型便于计算）
-     * - totalConsumption：累计耗电（24小时初始化值+后续单次累加，显示用）
-     */
-    public static class AppBatteryModel {
-        private String packageName;    // 应用包名（核心标识）
-        private float consumption;     // 单次耗电（mAh，float类型）
-        private float totalConsumption;// 累计耗电（mAh，显示+排序用）
-        private long runTime;          // 运行时长（ms）
-
-		// Java7 显式构造：初始化单次耗电、累计耗电为0
-        public AppBatteryModel(String packageName, float consumption, float totalConsumption, long runTime) {
-            this.packageName = packageName;
-            this.consumption = consumption; // 单次耗电初始为0
-            this.totalConsumption = totalConsumption; // 累计耗电初始为0（后续初始化时赋值）
-            this.runTime = runTime;
-        }
-
-        // Getter/Setter：覆盖所有字段，确保数据操作正常
-        public String getPackageName() {
-            return packageName;
-        }
-
-        public float getConsumption() {
-            return consumption; // 获取单次耗电
-        }
-
-        public void setConsumption(float consumption) {
-            this.consumption = consumption; // 设置单次耗电
-        }
-
-        public float getTotalConsumption() {
-            return totalConsumption; // 获取累计耗电（显示用）
-        }
-
-        public void setTotalConsumption(float totalConsumption) {
-            this.totalConsumption = totalConsumption; // 设置累计耗电（初始化/累加用）
-        }
-
-        public long getRunTime() {
-            return runTime;
-        }
-
-        public void setRunTime(long runTime) {
-            this.runTime = runTime;
-        }
-    }
-
-    /**
-     * RecyclerView 适配器：仅显示累计耗电（totalConsumption），逻辑适配模型修改
-     */
-    public static class BatteryReportAdapter extends RecyclerView.Adapter<BatteryReportAdapter.ViewHolder> {
-        private Context mContext;
-        private List<AppBatteryModel> mDataList;
-        private PackageManager mPm;
-        private Map<String, String> mPackageToNameCache;
-
-        // Java7 显式构造：接收名称缓存，确保显示时高效获取应用名
-        public BatteryReportAdapter(Context context, List<AppBatteryModel> dataList, 
-                                    PackageManager pm, Map<String, String> packageToNameCache) {
-            this.mContext = context;
-            this.mDataList = dataList;
-            this.mPm = pm;
-            this.mPackageToNameCache = packageToNameCache;
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            // 加载系统列表项布局（text1显示应用名，text2显示累计耗电+时长）
-            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 = "";
-
-            // 优先从缓存获取应用名：减少PackageManager调用，提升性能
-            if (mPackageToNameCache != null && mPackageToNameCache.containsKey(packageName)) {
-                appName = mPackageToNameCache.get(packageName);
-            } else {
-                // 缓存无数据时兜底查询，并同步更新缓存
-                try {
-                    ApplicationInfo appInfo = mPm.getApplicationInfo(packageName, 0);
-                    appName = mPm.getApplicationLabel(appInfo).toString();
-                    if (mPackageToNameCache != null) {
-                        mPackageToNameCache.put(packageName, appName);
-                    }
-                } catch (PackageManager.NameNotFoundException e) {
-                    appName = packageName; // 包名不存在时用包名兜底
-                    LogUtils.e("Adapter", "包名" + packageName + "对应的应用未找到：" + e.getMessage());
-                } catch (Exception e) {
-                    appName = packageName; // 其他异常时用包名兜底
-                    LogUtils.e("Adapter", "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
-                }
-            }
-
-            // 显示逻辑：仅展示累计耗电（totalConsumption），隐藏单次耗电
-            holder.tvAppName.setText(appName);
-            // 格式化运行时长 + 累计耗电（保留1位小数，提升可读性）
-            String runTimeStr = ((BatteryReportActivity) mContext).formatRunTime(model.getRunTime());
-            String totalConsumptionText = String.format("累计耗电：%.1f mAh | 运行时长：%s",
-														model.getTotalConsumption(), runTimeStr);
-            holder.tvConsumption.setText(totalConsumptionText);
-
-            // 显示优化：文字颜色区分（避免所有应用均标蓝，仅示例可按需修改）
-            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：绑定系统布局控件，与显示逻辑对应
-         */
-        public static class ViewHolder extends RecyclerView.ViewHolder {
-            TextView tvAppName;     // 显示应用名称
-            TextView tvConsumption; // 显示累计耗电 + 运行时长
-
-            // Java7 显式构造：绑定控件ID（系统布局固定ID：text1、text2）
-            public ViewHolder(View itemView) {
-                super(itemView);
-                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/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java

@@ -4,12 +4,11 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Switch;
 import android.widget.TextView;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.BatteryInfoBean;
@@ -17,6 +16,7 @@ import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
 import java.util.ArrayList;
+import android.widget.Switch;
 
 public class ClearRecordActivity extends Activity {
 

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

@@ -6,7 +6,6 @@ package cc.winboll.studio.powerbell.activities;
  */
 import android.app.Activity;
 import android.app.Dialog;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
@@ -20,11 +19,11 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
@@ -234,10 +233,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-			Intent intent = new Intent();
-            intent.setClass(this, BackgroundPictureActivity.class);
-            startActivity(intent);
-            //GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), );
+            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
@@ -247,10 +243,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 	@Override
 	public void onBackPressed() {
 		super.onBackPressed();
-		Intent intent = new Intent();
-		intent.setClass(this, BackgroundPictureActivity.class);
-		startActivity(intent);
-		//GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
+		GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
 	}
 }
 

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

@@ -5,99 +5,40 @@ package cc.winboll.studio.powerbell.activities;
  * @Date 2025/06/19 20:35
  * @Describe 应用窗口基类
  */
-import android.os.Bundle;
-import android.view.MenuItem;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.Gravity;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
-import com.miui.zeus.mimo.sdk.BuildConfig;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
 
-@SuppressLint("SetTextI18n")
-public abstract class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
+public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBoLLActivity";
-	
-	protected TextView mTagView;
-	
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-		changeFullScreen(this);
-    }
-	
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        addVersionNameToContentView();
-    }
-
-    protected void addVersionNameToContentView() {
-        if (!isTagViewVisible()) {
-            return;
-        }
-        if (mTagView == null) {
-            mTagView = new TextView(this);
-            mTagView.setTextColor(Color.GRAY);
-            mTagView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
-            mTagView.setText("MIMO SDK V" + BuildConfig.VERSION_NAME);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
-            FrameLayout frameLayout = findViewById(android.R.id.content);
-            frameLayout.addView(mTagView, params);
-        }
-    }
-
-    protected boolean isTagViewVisible() {
-        return true;
-    }
-
-    public void setupToolbar() {
-        Toolbar mToolbar = findViewById(R.id.toolbar);
-        if (mToolbar != null) {
-            setSupportActionBar(mToolbar);
-            if (getSupportActionBar() != null) {
-                getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            }
-        }
     }
 
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        //GlobalApplication.getWinBoLLActivityManager().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        //GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            //GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
+            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
@@ -107,25 +48,6 @@ public abstract class WinBoLLActivity extends AppCompatActivity implements IWinB
 	@Override
 	public void onBackPressed() {
 		super.onBackPressed();
-		//GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
+		GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
 	}
-	
-	public void changeFullScreen(Activity activity) {
-        Window window =  activity.getWindow();
-        if (window == null){
-            return;
-        }
-        View decorView = window.getDecorView();
-        if (decorView == null){
-            return;
-        }
-        int flag = decorView.getSystemUiVisibility();
-        flag |= View.SYSTEM_UI_FLAG_FULLSCREEN;
-        flag |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
-        flag |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
-        flag |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
-        flag |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-        decorView.setSystemUiVisibility(flag);
-        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    }
 }

powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java

@@ -14,12 +14,10 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.os.Handler;
 import android.os.IBinder;
-import android.os.Looper;
 import android.widget.RemoteViews;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
@@ -34,6 +32,8 @@ import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.NotificationHelper;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
+import android.os.Handler;
+import android.os.Looper;
 
 public class ControlCenterService extends Service {
 
@@ -73,8 +73,8 @@ public class ControlCenterService extends Service {
         mAppConfigUtils = App.getAppConfigUtils(this);
         mAppCacheUtils = App.getAppCacheUtils(this);
         mNotificationHelper = new NotificationHelper(ControlCenterService.this);
-
-
+        
+        
         if (mMyServiceConnection == null) {
             mMyServiceConnection = new MyServiceConnection();
         }
@@ -105,7 +105,7 @@ public class ControlCenterService extends Service {
             Intent intent = new Intent(this, MainActivity.class);
             notification = helper.showForegroundNotification(intent, getString(R.string.app_name), "Service Running, Click to open app");
             startForeground(NotificationHelper.FOREGROUND_NOTIFICATION_ID, notification);
-
+            
 //            NotificationMessage notificationMessage=createNotificationMessage();
 //            //Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show();
 //            mNotificationUtils.createForegroundNotification(this, notificationMessage);
@@ -116,7 +116,7 @@ public class ControlCenterService extends Service {
                 mControlCenterServiceReceiver = new ControlCenterServiceReceiver(this);
                 mControlCenterServiceReceiver.registerAction(this);
             }
-
+            
             new Handler(Looper.getMainLooper()).postDelayed(new Runnable(){
 
                     @Override
@@ -126,7 +126,7 @@ public class ControlCenterService extends Service {
                         LogUtils.i(TAG, "Service Is Start.");
                     }
                 }, 2000);
-
+            
         }
     }
 
@@ -263,15 +263,15 @@ public class ControlCenterService extends Service {
         NotificationHelper helper = new NotificationHelper(ControlCenterService.this);
         Intent intent = new Intent(ControlCenterService.this, MainActivity.class);
         helper.showTemporaryNotification(intent, getString(R.string.app_name), msg);
-
-
-
+        
+        
+        
 //        NotificationMessage notificationMessage = createNotificationMessage();
 //        notificationMessage.setRemindMSG(szRemindMSG);
 //        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
 //        updateRemindNotification(notificationMessage);
     }
-
+    
     // 设置颜色背景
     public static RemoteViews setLinearLayoutColor(RemoteViews remoteViews, int viewId, int color) {
         remoteViews.setInt(viewId, "setBackgroundColor", color);

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/MimoUtils.java

@@ -1,33 +0,0 @@
-package cc.winboll.studio.powerbell.utils;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/14 11:14
- * @Describe 米盟 MimoUtils
- */
-public final class MimoUtils {
-	public static final String TAG = "Utils";
-
-	public static int dpToPx(Context context, float dp) {
-		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-		return (int) (dp * displayMetrics.density + 0.5f);
-	}
-
-	public static int pxToDp(Context context, float px) {
-		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-		return (int) (px / displayMetrics.density + 0.5f);
-	}
-
-	public static int pxToSp(Context context, float pxValue) {
-		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-		return (int) (pxValue / displayMetrics.scaledDensity + 0.5f);
-	}
-
-	public static int spToPx(Context context, float spValue) {
-		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-		return (int) (spValue * displayMetrics.scaledDensity + 0.5f);
-	}
-}

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

@@ -1,30 +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>

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_main.xml

@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<cc.winboll.studio.libaes.views.ASupportToolbar
+	<cc.winboll.studio.libaes.views.AToolbar
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/toolbar_height"
 		android:id="@+id/toolbar"
@@ -22,7 +22,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:id="@+id/activitymainRelativeLayout1"
-			android:background="#FFB7B7B7"/>
+			android:background="#FFEE2121"/>
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -31,10 +31,5 @@
 
 	</RelativeLayout>
 
-	<cc.winboll.studio.libaes.views.ADsBannerView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/adsbanner"/>
-
 </LinearLayout>
 

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/action_battery_report"
-        android:title="@string/item_battery_report"/>
+        android:id="@+id/action_battery_reporter"
+        android:title="@string/item_battery_reporter"/>
     <item
         android:id="@+id/action_clearrecord"
         android:title="@string/item_clearrecord"/>

powerbell/src/main/res/values-zh/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PowerBell</string>
+    <string name="app_name">能源钟</string>
     <string name="app_description">一个接收手机电量信息的应用，当电量值达到设定范围时会提醒用户。</string>
     <string name="about_crashed">本应用崩溃了，作者水平有限，敬请谅解！</string>
     <string name="item_mainview">Main View</string>

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

@@ -25,15 +25,16 @@
     <color name="colorShuiDark">#FF0072A4</color>
     <color name="colorShuiAccent">#FF33C1FF</color>
     <color name="colorXinling">#FFFCC500</color>
-    <!--<color name="colorPrimary">@color/colorShuiDark</color>
+    <color name="colorPrimary">@color/colorShuiDark</color>
     <color name="colorPrimaryDark">@color/colorFeng</color>
     <color name="colorAccent">@color/colorShui</color>
-	-->
-    <color name="colorYellow">#FFBEBE48</color>
-    <color name="colorRed">#FFC85C5C</color>
-    <color name="colorBlue">#FF2677C7</color>
+    <color name="colorYellow">#FFFFFF00</color>
+    <color name="colorRed">#FFFF0000</color>
+    <color name="colorBlue">#FF000FFF</color>
     <color name="colorBlack">#FF000000</color>
-	<color name="colorText">@color/colorBlack</color>
+    <color name="colorUsege">@color/colorHuo</color>
+    <color name="colorCurrent">@color/colorShui</color>
+    <color name="colorCharge">@color/colorXinling</color>
     <!-- 调试配置
     <color name="colorYellow">#FF630066</color>
     <color name="colorRed">#FF23244D</color>
@@ -46,19 +47,15 @@
     <color name="colorBlue">#FF000DE5</color>
     <color name="colorBlack">#FF000000</color>
     -->
-    <!-- 原色配置 -->
-    <!--<color name="colorYellow">#FFFFFF00</color>
+    <!-- 原色配置
+    <color name="colorYellow">#FFFFFF00</color>
     <color name="colorRed">#FFFF0000</color>
     <color name="colorBlue">#FF000FFF</color>
     <color name="colorBlack">#FF000000</color>
-	-->
-    <color name="colorPrimary">@color/colorShui</color>
-    <color name="colorPrimaryDark">@color/colorShuiDark</color>
-    <color name="colorAccent">@color/colorShuiAccent</color>
     <color name="colorUsege">@color/colorRed</color>
     <color name="colorCurrent">@color/colorBlue</color>
     <color name="colorCharge">@color/colorYellow</color>
-    
+    -->
     <!--CustomSlideToUnlockView控件配置-->
     <color name="colorCustomSlideToUnlockViewWhite">#FFFFFFFF</color>
     

powerbell/src/main/res/values/strings.xml

@@ -6,7 +6,7 @@
     <string name="about_crashed">This application has crashed, the author level is limited, please understand!</string>
     <string name="item_mainview">Main View</string>
     <string name="item_aboutview">About</string>
-    <string name="item_battery_report">Battery Report</string>
+    <string name="item_battery_reporter">Battery Reporter</string>
     <string name="item_clearrecord">Clear Record</string>
     <string name="item_changepicture">Change Picture</string>
     <string name="item_devoloperoptionsview">Developer View</string>

powerbell/src/main/res/xml/file_provider.xml

@@ -13,9 +13,6 @@
     <external-files-path
         name="external_file_path"
         path="." />
-	<external-files-path
-		name="files_root"
-		path="mimoDownload" />
     <!--代表app 外部存储区域根目录下的文件 Context.getExternalCacheDir目录下的目录-->
     <external-cache-path
         name="external_cache_path"

powerbell/src/main/res/xml/network_security_config.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config cleartextTrafficPermitted="true" />
-    <debug-overrides>
-        <trust-anchors>
-            <!-- Trust user added CAs while debuggable only -->
-            <certificates src="system" />
-            <certificates src="user" />
-        </trust-anchors>
-    </debug-overrides>
-</network-security-config>

regexputils/.gitignore

@@ -0,0 +1 @@
+/build

regexputils/README.md

@@ -0,0 +1,34 @@
+# RegExpUtils
+
+#### 介绍
+正则表达式工具集。这个工具可以用来测试正则表达式的匹配规则是否正确。
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh regexputils
+
+#### 使用说明
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档

regexputils/app_update_description.txt

@@ -0,0 +1 @@
+

regexputils/build.gradle

@@ -0,0 +1,49 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
+
+    defaultConfig {
+        applicationId "cc.winboll.studio.regexputils"
+        minSdkVersion 24
+        targetSdkVersion 30
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // 项目模块目录的 build.gradle 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.10" 
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}

regexputils/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Tue Oct 07 20:47:24 HKT 2025
+stageCount=2
+libraryProject=
+baseVersion=15.10
+publishVersion=15.10.1
+buildCount=0
+baseBetaVersion=15.10.2

regexputils/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

regexputils/src/beta/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application
+		tools:replace="android:icon"
+        android:icon="@drawable/ic_launcher_beta">
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+

regexputils/src/beta/res/values-zh/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">正则工具☆</string>
+
+</resources>

regexputils/src/beta/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">RegExpUtils+</string>
+
+</resources>

regexputils/src/main/AndroidManifest.xml

@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.regexputils">
+
+    <!-- 拥有完全的网络访问权限 -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application
+        android:name="cc.winboll.studio.regexputils.App"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_regexputils"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme"
+        android:resizeableActivity="true">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+        
+        <activity android:name="cc.winboll.studio.regexputils.develop.CrashHandler$CrashActiviy"/>
+
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="4.0"/>
+
+    </application>
+
+</manifest>

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

@@ -0,0 +1,11 @@
+package cc.winboll.studio.regexputils;
+
+import cc.winboll.studio.regexputils.develop.WinBollBase;
+
+public class App extends WinBollBase {
+    
+    public static final String TAG = "App";
+    
+    
+    
+}

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

@@ -0,0 +1,446 @@
+package cc.winboll.studio.regexputils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.icu.text.SimpleDateFormat;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListPopupWindow;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.regexputils.develop.LogUtils;
+import cc.winboll.studio.regexputils.develop.LogView;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MainActivity extends Activity {
+
+    public static final String TAG = MainActivity.class.getSimpleName();
+
+    TextView mtvPattern;
+    EditText metPattern;
+    TextView mtvRewrite;
+    EditText metRewrite;
+    TextView mtvMatchText;
+    EditText metMatchText;
+    TextView mtvResult;
+    TextView mtvOnlineHelp;
+    Button mbtnFavorite;
+    WebView mWebView;
+    URLEditText mURLEditText;
+    SharedPreferences mSharedPreferences;
+    Set<String> mSetStringFavorite;
+    String mszDefaultOnlineHelp;
+    LogView mLogView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mLogView = new LogView(this);
+        LinearLayout mllLog = findViewById(R.id.activitymainLinearLayout1);
+        mllLog.addView(mLogView);
+        mLogView.startWatching();
+
+        initView();
+
+        LogUtils.d(TAG, "Created");
+
+    }
+
+    void initView() {
+        //Toolbar toolbar= findViewById(R.id.toolbar);
+        //setSupportActionBar(toolbar);
+
+        mSharedPreferences = getSharedPreferences("SP", Context.MODE_PRIVATE);
+
+        mtvPattern = findViewById(R.id.activitymainTextView2);
+        metPattern = findViewById(R.id.activitymainEditText1);
+        mtvRewrite = findViewById(R.id.activitymainTextView3);
+        metRewrite = findViewById(R.id.activitymainEditText3);
+        mtvMatchText = findViewById(R.id.activitymainTextView5);
+        metMatchText = findViewById(R.id.activitymainEditText2);
+        mtvResult = findViewById(R.id.activitymainTextView1);
+        mWebView = findViewById(R.id.activitymainWebView1);
+        mtvOnlineHelp = findViewById(R.id.activitymainTextView4);
+        mURLEditText = findViewById(R.id.activitymainURLEditText1);
+        mbtnFavorite = findViewById(R.id.activitymainButton1);
+
+        mtvOnlineHelp.setText(getString(R.string.tv_onlinehelp));
+        //系统默认会通过手机浏览器打开网页，为了能够直接通过WebView显示网页，则必须设置
+        mWebView.setWebViewClient(new WebViewClient(){
+                @Override
+                public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                    //使用WebView加载显示url
+                    view.loadUrl(url);
+                    //返回true
+                    return true;
+                }
+            });
+
+        mSetStringFavorite = mSharedPreferences.getStringSet("mListFavorite", new HashSet<String>());
+        String szURL = mSharedPreferences.getString("mWebView", getString(R.string.sz_defaultonlinehelp));
+        addDefaultURLFavorite();
+        mWebView.loadUrl(szURL);
+        mWebView.setWebViewClient(new WebViewClient(){
+                @Override
+                public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                    //设定加载开始的操作
+                    mURLEditText.setText(url);
+                    for (String sz : mSetStringFavorite) {
+                        if (sz.equals(url)) {
+                            //mURLEditText.setFavoriteYes();
+                            mbtnFavorite.setText("★");
+                            return;
+                        }
+                    }
+                    mbtnFavorite.setText("☆");
+                    //mURLEditText.setFavoriteNo();
+                }
+
+            });
+        mURLEditText.setText(szURL);
+        mURLEditText.setOnEditorActionListener(
+            new TextView.OnEditorActionListener() {
+                @Override
+                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                        onGoto(null);
+                    }
+                    return false;
+                }
+            });
+        /* mURLEditText.setOnTouchListener(new View.OnTouchListener() {
+         @Override
+         public boolean onTouch(View view, MotionEvent event) {
+         final int DRAWABLE_LEFT = 0;
+         //final int DRAWABLE_TOP = 1;
+         final int DRAWABLE_RIGHT = 2;
+         //final int DRAWABLE_BOTTOM = 3;
+         if (event.getAction() == MotionEvent.ACTION_UP) {
+         if (event.getX() >= (mURLEditText.getWidth() - mURLEditText
+         .getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) {
+
+         return true;
+         } else if (event.getX() <= (mURLEditText
+         .getCompoundDrawables()[DRAWABLE_LEFT].getBounds().width())) {
+
+         return true;
+         }
+         }
+         return false;
+         }
+         });*/
+        mtvPattern.setText(getString(R.string.tv_pattern));
+        metPattern.setText(mSharedPreferences.getString("metPattern", "[^n]"));
+        metPattern.setOnEditorActionListener(
+            new TextView.OnEditorActionListener() {
+                @Override
+                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                        onRegExp(null);
+                    }
+                    return false;
+                }
+            });
+        mtvRewrite.setText(getString(R.string.tv_rewrite));
+        metRewrite.setText(mSharedPreferences.getString("metRewrite", ""));
+        metRewrite.setOnEditorActionListener(
+            new TextView.OnEditorActionListener() {
+                @Override
+                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                        onRegExpRewrite(null);
+                    }
+                    return false;
+                }
+            });
+        mtvMatchText.setText(getString(R.string.tv_matchtext));
+        metMatchText.setText(mSharedPreferences.getString("metMatchText", "Test string 123."));
+        metMatchText.setOnEditorActionListener(
+            new TextView.OnEditorActionListener() {
+                @Override
+                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                        onRegExp(null);
+                    }
+                    return false;
+                }
+            });
+
+    }
+
+    public void onEnableFavorite(View v) {
+        changeURLFavorite();
+    }
+
+    public void onShowFavoriteList(View v) {
+        showListPopulWindow();
+    }
+
+    void showListPopulWindow() {
+        final String[] list = (String[])mSetStringFavorite.toArray(new String[0]);
+        final ListPopupWindow listPopupWindow;
+        listPopupWindow = new ListPopupWindow(this);
+        listPopupWindow.setWidth(LayoutParams.WRAP_CONTENT);
+        listPopupWindow.setHeight(LayoutParams.WRAP_CONTENT);
+        listPopupWindow.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, list));//用android内置布局，或设计自己的样式
+        //设置下拉列表基准控件
+        listPopupWindow.setAnchorView(mURLEditText);
+        listPopupWindow.setModal(true);
+        // 透明度
+        //listPopupWindow.setBackgroundDrawable(new ColorDrawable(0x00ffffff));
+        listPopupWindow.setBackgroundDrawable(getDrawable(R.drawable.bg_shadow));
+
+        listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {//设置项点击监听
+                @Override
+                public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                    mURLEditText.setText(list[i]);//展示选择的内容
+                    setWebViewURL(list[i]);
+                    listPopupWindow.dismiss();//如果已经选择了，隐藏起来
+                }
+            });
+        listPopupWindow.show();//下拉列表展示出来
+    }
+
+    public void onRegExp(View v) {
+        mtvResult.setText("");
+        regExp();
+        hideKeyboard(v);
+    }
+
+    public void onRegExpRewrite(View v) {
+        mtvResult.setText("");
+        regExpRewrite();
+        hideKeyboard(v);
+    }
+
+    //隐藏虚拟键盘
+    //
+    public static void hideKeyboard(View v) {
+        InputMethodManager imm = ( InputMethodManager ) v.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm.isActive()) {
+            imm.hideSoftInputFromWindow(v.getApplicationWindowToken() , 0);
+
+        }
+    }
+
+    // 获取当前时间格式化后的字符串
+    //
+    String getCurrentTimeString() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
+        return sdf.format(System.currentTimeMillis());
+    }
+
+    ArrayList<String> regExp() {
+        ArrayList<String> listResult = new ArrayList<String>();
+
+        StringBuilder sbPrint = new StringBuilder();
+        sbPrint.append(getString(R.string.sz_patternresult));
+        sbPrint.append(" : ");
+        sbPrint.append(getCurrentTimeString());
+
+        // 输出当前累积的消息并清理 sbPrint
+        mtvResult.append(sbPrint.toString());
+        sbPrint = new StringBuilder("\n");
+
+        try {
+            String szMatchText = metMatchText.getText().toString();
+            String szPattern = metPattern.getText().toString();
+            mSharedPreferences = getSharedPreferences("SP", Context.MODE_PRIVATE);
+            mSharedPreferences.edit().putString("metPattern", metPattern.getText().toString()).commit();
+            mSharedPreferences.edit().putString("metMatchText", metMatchText.getText().toString()).commit();
+            listResult = buildRegExpList(szMatchText, szPattern);
+            if (listResult.size() > 0) {
+                sbPrint.append("\nRegExp Result : ");
+                sbPrint.append(listResult.size());
+            } else {
+                sbPrint.append("\nRegExp Result : 0");
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, "Exception : " + e.getMessage());
+        }
+
+        mtvResult.append(sbPrint.toString());
+
+        LogUtils.d(TAG, "RegExp Done.");
+        return listResult;
+    }
+
+    void regExpRewrite() {
+        StringBuilder sbPrint = new StringBuilder("\n");
+        try {
+            String szMatchText = metMatchText.getText().toString();
+            String szPattern = metPattern.getText().toString();
+            String szRewrite = metRewrite.getText().toString();
+            mSharedPreferences = getSharedPreferences("SP", Context.MODE_PRIVATE);
+            mSharedPreferences.edit().putString("metPattern", metPattern.getText().toString()).commit();
+            mSharedPreferences.edit().putString("metMatchText", metMatchText.getText().toString()).commit();
+            mSharedPreferences.edit().putString("metRewrite", metRewrite.getText().toString()).commit();
+            int nRewriteCount = regExpRewrite(szMatchText, szPattern, szRewrite);
+            if (nRewriteCount > 0) {
+                sbPrint.append("\nRewrite Result : ");
+                sbPrint.append(nRewriteCount);
+            } else {
+                sbPrint.append("\nRewrite Result : 0");
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, "Exception : " + e.getMessage());
+        }
+        mtvResult.append(sbPrint);
+        LogUtils.d(TAG, "RegExp Rewrite Done.");
+    }
+
+    // 
+    // 生成语法模板匹配到的所有字符串数组
+    //
+    ArrayList<String> buildRegExpList(String szMatchText, String szPattern) {
+        ArrayList<String> listResult = new ArrayList<String>();
+        StringBuilder sbPrint = new StringBuilder("\n");
+
+        Pattern pattern = Pattern.compile(szPattern, Pattern.MULTILINE);
+        Matcher matcher = pattern.matcher(szMatchText);
+
+        boolean isNull = true;
+        int nStart = 0;
+        while (matcher.find(nStart)) {
+            isNull = false;
+            int start = matcher.start();
+            int end = matcher.end();
+            String group = matcher.group();
+            sbPrint.append("\n");
+            sbPrint.append(getString(R.string.sz_start));
+            sbPrint.append("(");
+            sbPrint.append(Integer.toString(start));
+            sbPrint.append(") ");
+            sbPrint.append(getString(R.string.sz_end));
+            sbPrint.append("(");
+            sbPrint.append(Integer.toString(end));
+            sbPrint.append(") >>> ");
+            sbPrint.append(group);
+
+            listResult.add(group);
+            nStart = matcher.end();
+        }
+
+        mtvResult.append(sbPrint.toString());
+
+        return listResult;
+    }
+
+    int regExpRewrite(String szMatchText, String szPattern, String szRewrite) {
+        int nRewriteCount = 0;
+        ArrayList<String> listResult = regExp();
+
+        StringBuilder sbPrint = new StringBuilder("\n\n\n\n\n####################\n");
+        sbPrint.append(getString(R.string.sz_rewriteresult));
+        sbPrint.append(" : ");
+        sbPrint.append(getCurrentTimeString());
+
+        // 输出当前累积的消息并清理 sbPrint
+        mtvResult.append(sbPrint.toString());
+        sbPrint = new StringBuilder();
+
+        for (int i = 0; i < listResult.size(); i++) {
+            Pattern pattern = Pattern.compile(szPattern, Pattern.MULTILINE);
+            Matcher matcher = pattern.matcher(listResult.get(i));
+            if (matcher.find()) {
+                nRewriteCount++;
+                sbPrint.append("\n Rewrite ");
+                sbPrint.append(nRewriteCount);
+                sbPrint.append(" : \n");
+                sbPrint.append(matcher.replaceAll(szRewrite));
+                sbPrint.append(" \n");
+            }
+        }
+
+        mtvResult.append(sbPrint.toString());
+        return nRewriteCount;
+    }
+
+    @Override
+    protected void onDestroy() {
+        mLogView.stopWatching();
+
+        mSharedPreferences.edit().putString("metPattern", metPattern.getText().toString()).commit();
+        mSharedPreferences.edit().putString("metMatchText", metMatchText.getText().toString()).commit();
+        mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
+
+        super.onDestroy();
+    }
+
+    void changeURLFavorite() {
+        //String szURL = getString(R.string.webview_helpurl);
+        //setWebViewURL(szURL);
+        String url = mURLEditText.getText().toString();
+
+        // 转换收藏开关
+        for (String sz : mSetStringFavorite) {
+            if (sz.equals(url)) {
+                // 保护默认URL
+                if (!getString(R.string.sz_defaultonlinehelp).equals(url)) {
+                    mSetStringFavorite.remove(sz);
+                    //mURLEditText.setFavoriteNo();
+                    mbtnFavorite.setText("☆");
+                    mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
+                    return;
+                } else {
+                    Toast.makeText(getApplication(), "!☆", Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+        mSetStringFavorite.add(url);
+        mbtnFavorite.setText("★");
+        //mURLEditText.setFavoriteYes();
+        mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
+    }
+
+    void addDefaultURLFavorite() {
+        //String szURL = getString(R.string.webview_helpurl);
+        //setWebViewURL(szURL);
+        String szDefault = getString(R.string.sz_defaultonlinehelp);
+
+        // 转换收藏开关
+        for (String sz : mSetStringFavorite) {
+            if (sz.equals(szDefault)) {
+                return;
+            }
+        }
+        mSetStringFavorite.add(szDefault);
+        //mURLEditText.setFavoriteYes();
+        mbtnFavorite.setText("★");
+        mSharedPreferences.edit().putStringSet("mListFavorite", mSetStringFavorite).commit();
+    }
+
+    public void onGoto(View v) {
+        setWebViewURL(mURLEditText.getText().toString());
+    }
+
+    void setWebViewURL(String szURL) {
+        mSharedPreferences.edit().putString("mWebView", szURL).commit();
+        mWebView.loadUrl(szURL);
+        mURLEditText.setText(szURL);
+    }
+
+    public void onCleanLog(View view) {
+        LogUtils.cleanLog();
+        LogUtils.d(TAG, "Log cleaned");
+    }
+}

regexputils/src/main/java/cc/winboll/studio/regexputils/RegExpUtils.java

@@ -0,0 +1,13 @@
+package cc.winboll.studio.regexputils;
+
+import cc.winboll.studio.regexputils.develop.WinBollBase;
+
+public class RegExpUtils extends WinBollBase {
+
+    public static final String TAG = RegExpUtils.class.getSimpleName();
+
+    @Override
+    public void onCreate() {
+        super.onCreate();  
+    }
+}

regexputils/src/main/java/cc/winboll/studio/regexputils/URLEditText.java

@@ -0,0 +1,83 @@
+package cc.winboll.studio.regexputils;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.EditText;
+
+public class URLEditText extends EditText {
+    //Drawable drawable_r;
+    //Drawable drawable_l_no;
+    //Drawable drawable_l_yes;
+    
+    public static final String TAG = URLEditText.class.getSimpleName();
+
+    /**
+     * 在java代码里new的时候会用到
+     * @param context
+     */
+    public URLEditText(Context context) {
+        super(context);
+
+    }
+
+    /**
+     * 在xml布局文件中使用时自动调用
+     * @param context
+     */
+    public URLEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        /*TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.test);
+         String text = ta.getString(R.styleable.test_text);
+         setText(text + " ZhanGSKen.CN");
+         ta.recycle();*/
+        /*drawable_r = getResources().getDrawable(R.mipmap.dropdown);
+        //drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight());  //此为必须写的
+        drawable_r.setBounds(0, 0, 80, 80);  //此为必须写的
+        
+        drawable_l_no = getResources().getDrawable(R.mipmap.favorite_no);
+        //drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight());  //此为必须写的
+        drawable_l_no.setBounds(0, 0, 80, 80);  //此为必须写的
+        
+        drawable_l_yes = getResources().getDrawable(R.mipmap.favorite_yes);
+        //drawable_n.setBounds(0, 0, drawable_n.getMinimumWidth(),drawable_n.getMinimumHeight());  //此为必须写的
+        drawable_l_yes.setBounds(0, 0, 80, 80);  //此为必须写的
+        
+        setFavoriteNo();*/
+        //setMinWidth(100);
+        //setPadding(10,0,10,0);
+        //setPaddingRelative(0,0,0,0);
+    }
+
+    /**
+     * 不会自动调用，如果有默认style时，在第二个构造函数中调用
+     * @param context
+     * @param attrs
+     * @param defStyleAttr
+     */
+    public URLEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+
+    /**
+     * 只有在API版本>21时才会用到
+     * 不会自动调用，如果有默认style时，在第二个构造函数中调用
+     * @param context
+     * @param attrs
+     * @param defStyleAttr
+     * @param defStyleRes
+     */
+    //@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public URLEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    
+   /* public void setFavoriteNo() {
+        setCompoundDrawables(drawable_l_no, null, drawable_r, null);
+    }
+    public void setFavoriteYes() {
+        setCompoundDrawables(drawable_l_yes, null, drawable_r, null);
+    }*/
+}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/CrashHandler.java

@@ -0,0 +1,237 @@
+package cc.winboll.studio.regexputils.develop;
+
+/*
+ * 应用异常处理类
+ * 源码提供：AIDE
+ * 源码维护：ZhanGSKen@QQ.COM
+ */
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.ActivityNotFoundException;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public final class CrashHandler
+{
+
+    public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
+
+    public static void init(Application app)
+	{
+        init(app, null);
+    }
+
+    public static void init(final Application app, final String crashDir)
+	{
+        Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler(){
+
+                @Override
+                public void uncaughtException(Thread thread, Throwable throwable)
+				{
+                    try
+					{
+                        tryUncaughtException(thread, throwable);
+                    }
+					catch (Throwable e)
+					{
+                        e.printStackTrace();
+                        if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null)
+                            DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
+                    }
+                }
+
+                private void tryUncaughtException(Thread thread, Throwable throwable)
+				{
+                    final String time = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss").format(new Date());
+                    File crashFile = new File(TextUtils.isEmpty(crashDir) ? new File(app.getExternalFilesDir(null), "crash")
+                                              : new File(crashDir), "crash_" + time + ".txt");
+
+                    String versionName = "unknown";
+                    long versionCode = 0;
+                    try
+					{ 
+                        PackageInfo packageInfo = app.getPackageManager().getPackageInfo(app.getPackageName(), 0);
+                        versionName = packageInfo.versionName;
+                        versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode()
+                            : packageInfo.versionCode;
+                    }
+					catch (PackageManager.NameNotFoundException ignored)
+					{}
+
+                    String fullStackTrace; {
+                        StringWriter sw = new StringWriter(); 
+                        PrintWriter pw = new PrintWriter(sw);
+                        throwable.printStackTrace(pw);
+                        fullStackTrace = sw.toString();
+                        pw.close();
+                    }
+
+                    StringBuilder sb = new StringBuilder();
+                    sb.append("************* Crash Head ****************\n");
+                    sb.append("Time Of Crash      : ").append(time).append("\n");
+                    sb.append("Device Manufacturer: ").append(Build.MANUFACTURER).append("\n");
+                    sb.append("Device Model       : ").append(Build.MODEL).append("\n");
+                    sb.append("Android Version    : ").append(Build.VERSION.RELEASE).append("\n");
+                    sb.append("Android SDK        : ").append(Build.VERSION.SDK_INT).append("\n");
+                    sb.append("App VersionName    : ").append(versionName).append("\n");
+                    sb.append("App VersionCode    : ").append(versionCode).append("\n");
+                    sb.append("************* Crash Head ****************\n");
+                    sb.append("\n").append(fullStackTrace);
+
+                    String errorLog = sb.toString();
+
+                    try
+					{
+                        writeFile(crashFile, errorLog);
+                    }
+					catch (IOException ignored)
+					{}
+
+                    gotoCrashActiviy:
+					{
+                        Intent intent = new Intent(app, CrashActiviy.class);
+                        intent.addFlags(
+                            Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK
+                        );
+                        intent.putExtra(CrashActiviy.EXTRA_CRASH_INFO, errorLog);
+                        try
+						{
+                            app.startActivity(intent);
+                            android.os.Process.killProcess(android.os.Process.myPid());
+                            System.exit(0);
+                        }
+						catch (ActivityNotFoundException e)
+						{
+                            e.printStackTrace();
+                            if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null)
+                                DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
+                        }
+                    }
+                }
+
+                private void writeFile(File file, String content) throws IOException
+				{
+                    File parentFile = file.getParentFile();
+                    if (parentFile != null && !parentFile.exists())
+					{
+                        parentFile.mkdirs();
+                    }
+                    file.createNewFile();
+                    FileOutputStream fos = new FileOutputStream(file);
+                    fos.write(content.getBytes());
+                    try
+					{
+                        fos.close();
+                    }
+					catch (IOException e)
+					{}
+                }
+
+            });
+    }
+
+    public static final class CrashActiviy extends Activity implements MenuItem.OnMenuItemClickListener
+	{
+
+        private static final String EXTRA_CRASH_INFO = "crashInfo";
+
+        private String mLog;
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState)
+		{
+            super.onCreate(savedInstanceState);
+            mLog = getIntent().getStringExtra(EXTRA_CRASH_INFO);
+            setContentView:
+			{
+                ScrollView contentView = new ScrollView(this);
+                contentView.setFillViewport(true);
+                HorizontalScrollView hw = new HorizontalScrollView(this);
+                TextView message = new TextView(this); {
+                    int padding = dp2px(16);
+                    message.setPadding(padding, padding, padding, padding);
+                    message.setText(mLog);
+                    message.setTextIsSelectable(true);
+                }
+                hw.addView(message);
+                contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+                setContentView(contentView);
+            }
+        }
+
+        @Override
+        public void onBackPressed()
+		{
+            restart();
+        }
+
+        private void restart()
+		{
+            PackageManager pm = getPackageManager();
+            Intent intent = pm.getLaunchIntentForPackage(getPackageName());
+            if (intent != null)
+			{
+                intent.addFlags(
+                    Intent.FLAG_ACTIVITY_NEW_TASK
+                    | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK
+                );
+                startActivity(intent);
+            }
+            finish();
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        }
+
+        private int dp2px(final float dpValue)
+		{
+            final float scale = Resources.getSystem().getDisplayMetrics().density;
+            return (int) (dpValue * scale + 0.5f);
+        }
+
+        @Override
+        public boolean onMenuItemClick(MenuItem item)
+		{
+            switch (item.getItemId())
+			{
+                case android.R.id.copy: 
+                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                    break;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean onCreateOptionsMenu(Menu menu)
+		{
+            menu.add(0, android.R.id.copy, 0, android.R.string.copy).setOnMenuItemClickListener(this)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            return true;
+        }
+    }
+}
+

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/LogListener.java

@@ -0,0 +1,95 @@
+package cc.winboll.studio.regexputils.develop;
+
+/*
+ * 应用日志监听类
+ * 源码提供：https://blog.csdn.net/wuxueshuan/article/details/121852698?app_version=5.15.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22121852698%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
+ * 源码维护：ZhanGSKen@QQ.COM
+ */
+ 
+import android.os.FileObserver;
+import android.util.Log;
+
+public class LogListener extends FileObserver {
+	public final static String TAG = "LogListener";
+
+    public EventCallback callback;
+    
+    public String mLogPath;
+
+    public LogListener(String path) {
+		super(path);
+        //Log.d(TAG, "LogListener(String path) path : " + path);
+        mLogPath = path;
+    }
+    public void setEventCallback(EventCallback callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    public void onEvent(int event, String path) {
+        if (null != path && !"".equals(path)) {
+            //String substring = path.substring(path.lastIndexOf(".") + 1);
+            //Log.d(TAG, "path : " + path);
+            //Log.d(TAG, "substring : " + substring);
+            //Log.d(TAG, "event : " + event);
+
+        } else {
+            return;
+        }
+
+        int e = event & FileObserver.ALL_EVENTS;
+        //Log.d(TAG, "event->e:" + e);
+        switch (e) {
+            case FileObserver.ACCESS:
+                //Log.d(TAG, "文件操作___" + e + "__1打开文件后读取文件的操作");
+                break;
+            case FileObserver.MODIFY:
+                //Log.d(TAG, "文件操作___" + e + "__2文件被修改");
+                break;
+            case FileObserver.ATTRIB:
+                //Log.d(TAG, "文件操作___" + e + "__4属性变化");
+                break;
+            case FileObserver.CLOSE_WRITE:
+                //Log.d(TAG, "文件操作___" + e + "__8文件写入或编辑后关闭");
+				callback.onEvent(path);
+                break;
+            case FileObserver.CLOSE_NOWRITE:
+                //录音时，最后一个有效回调是这个
+                //Log.d(TAG, "文件操作___" + e + "__16只读文件被关闭");
+
+                //callback.onEvent(path);
+
+
+                break;
+            case FileObserver.OPEN:
+                //Log.d(TAG, "文件操作___" + e + "__32文件被打开");
+                break;
+            case FileObserver.MOVED_FROM:
+                //Log.d(TAG, "文件操作___" + e + "__64移出事件");//试了重命名先MOVED_FROM再MOVED_TO
+                break;
+            case FileObserver.MOVED_TO:
+                //Log.d(TAG, "文件操作___" + e + "__128移入事件");
+                break;
+            case FileObserver.CREATE:
+                //Log.d(TAG, "文件操作___" + e + "__256新建文件");//把文件移动给自己先CREATE在DELETE
+                break;
+            case FileObserver.DELETE:
+                //Log.d(TAG, "文件操作___" + e + "__512有删除文件");//把文件移出去DELETE
+                break;
+            case FileObserver.DELETE_SELF:
+                //Log.d(TAG, "文件操作___" + e + "__1024监听的这个文件夹被删除");
+                break;
+            case FileObserver.MOVE_SELF:
+                //Log.d(TAG, "文件操作___" + e + "__2048监听的这个文件夹被移走");
+                break;
+            case FileObserver.ALL_EVENTS:
+                //Log.d(TAG, "文件操作___" + e + "__4095全部操作");
+                break;
+        }
+    }
+
+	public interface EventCallback {
+        void onEvent(String path);
+    }
+
+}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/LogUtils.java

@@ -0,0 +1,74 @@
+package cc.winboll.studio.regexputils.develop;
+
+/*
+ * 应用日志类
+ * 源码维护：ZhanGSKen@QQ.COM
+ */
+
+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.text.SimpleDateFormat;
+
+public class LogUtils {
+
+    public static final String TAG = "BaseApplication";
+
+    static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
+
+    public static void d(String szTAG, String szMessage) {
+        saveLog(szTAG, szMessage);
+    }
+
+    static void saveLog(String szTAG, String szMessage) {
+        try {
+            File fLog = new File(WinBollBase._mszLogFilePath);
+            //FileWriter fw = new FileWriter(fLog, Charset.defaultCharset(), true);
+            //fw.append(mSimpleDateFormat.format(System.currentTimeMillis()) + "[" + szTAG + "]: " + szMessage + "\n");
+            //fw.close();
+            BufferedWriter out = null;
+            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fLog, true), "UTF-8"));
+            out.write(mSimpleDateFormat.format(System.currentTimeMillis()) + "[" + szTAG + "]: " + szMessage + "\n");
+            out.close();
+
+        } catch (IOException e) {
+            LogUtils.d(TAG, "IOException : " + e.getMessage());
+        }
+    }
+
+    public static String loadLog() {
+        File fLog = new File(WinBollBase._mszLogFilePath);
+        StringBuffer sb = new StringBuffer();
+        try {
+            //FileInputStream fileInputStream = new FileInputStream(fLog);
+            //int size = fileInputStream.available();
+            //for (int i = 0; i < size; i++) {
+            //    sb.append((char) fileInputStream.read());
+            //}
+            BufferedReader in = null;
+            in = new BufferedReader(new InputStreamReader(new FileInputStream(fLog), "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();
+    }
+
+    public static void cleanLog() {
+        File fLog = new File(WinBollBase._mszLogFilePath);
+        if (fLog.exists()) {
+            fLog.delete();
+        }
+    }
+
+}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/LogView.java

@@ -0,0 +1,91 @@
+package cc.winboll.studio.regexputils.develop;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import cc.winboll.studio.regexputils.develop.LogUtils;
+import java.lang.ref.WeakReference;
+
+public class LogView extends LinearLayout {
+
+    public static final String TAG = "LogView";
+    
+    final static int MSG_SHOW_LOG = 0;
+
+    LogListener mLogListener;
+    ScrollView mScrollView;
+    TextView mTextView;
+    MyHandler mMyHandler;
+
+    public LogView(Context context) {
+        super(context);
+        initView(context);
+    }
+
+    public LogView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView(context);
+    }
+
+    void initView(Context context) {
+        mScrollView = new ScrollView(context);
+        mTextView = new TextView(context);
+        mTextView.setTextColor(Color.GREEN);
+        mTextView.setTextIsSelectable(true);
+
+        mScrollView.addView(mTextView);
+        addView(mScrollView);
+        
+        mMyHandler = new MyHandler(this);
+
+        mLogListener = new LogListener(WinBollBase._mszLogFolderPath);
+        mLogListener.setEventCallback(new LogListener.EventCallback(){
+                @Override
+                public void onEvent(String path) {
+                    Message message = mMyHandler.obtainMessage(MSG_SHOW_LOG);
+                    mMyHandler.sendMessage(message);
+                    
+                }
+            });
+    }
+
+    public void startWatching() {
+        mLogListener.startWatching();
+    }
+
+    public void stopWatching() {
+        mLogListener.stopWatching();
+    }
+    
+    static class MyHandler extends Handler {
+        WeakReference<LogView> rv;  
+        MyHandler(LogView view) {  
+            rv = new WeakReference<LogView>(view);  
+        }
+        public void handleMessage(Message msg) {
+            final LogView view = rv.get();
+            switch (msg.what) {
+                case MSG_SHOW_LOG:{
+                        view.mTextView.setText(LogUtils.loadLog());
+                        view.mScrollView.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    view.mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+                                }
+                            });
+                        break;
+                }
+                    
+                    
+                default:
+                    break;
+            }
+            super.handleMessage(msg);
+        }
+	}
+}

regexputils/src/main/java/cc/winboll/studio/regexputils/develop/WinBollBase.java

@@ -0,0 +1,31 @@
+package cc.winboll.studio.regexputils.develop;
+
+/*
+ * WinBollBase
+ * WINBOLL 安卓应用基础类
+ * 源码提供：AIDE
+ * 源码维护：ZhanGSKen@QQ.COM
+ */
+
+import android.app.Application;
+
+public class WinBollBase extends Application {
+    
+    public static String _mszLogFolderPath;
+    public static String _mszLogFilePath;
+    public static String _mszLogFileName = "WinBollBase.log";
+    public static String _mszHtmlFolderPath;
+    public static String _mszHtmlFilePath;
+    public static String _mszHtmlFileName = "BaseWebViewBody.txt";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        CrashHandler.init(this);
+        _mszLogFolderPath = getExternalFilesDir("logs").toString();
+        _mszLogFilePath = _mszLogFolderPath + "/" + _mszLogFileName;
+        _mszHtmlFolderPath = getExternalFilesDir("webviews").toString();
+        _mszHtmlFilePath = _mszHtmlFolderPath + "/" + _mszHtmlFileName;
+    }
+
+}

regexputils/src/main/res/drawable/bg_shadow.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="#0F000000" 
+                android:startColor="#0F000000" /> 
+            <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="#FFFFFF" 
+                android:startColor="#FFFFFF" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

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

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

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

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>

regexputils/src/main/res/drawable/ic_launcher_beta.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="15dp" 
+        android:top="15dp" 
+        android:right="15dp" 
+        android:bottom="15dp"
+        android:drawable="@drawable/ic_regexputils"/>
+</layer-list>

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

@@ -0,0 +1,200 @@
+<?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="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:padding="10dp">
+
+	<LinearLayout
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:focusable="true"
+		android:focusableInTouchMode="true">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/activitymainTextView2"
+			style="@style/columnTitleStyle"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical">
+
+			<EditText
+				android:layout_width="0dp"
+				android:ems="10"
+				android:layout_height="wrap_content"
+				android:id="@+id/activitymainEditText1"
+				android:layout_weight="1.0"
+				android:singleLine="true"
+				android:imeOptions="actionDone"
+				style="@style/contentEditBoxStyle"/>
+
+			<Button
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:text="!"
+				android:onClick="onRegExp"/>
+
+		</LinearLayout>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/activitymainTextView3"
+			style="@style/columnTitleStyle"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<EditText
+				android:layout_width="0dp"
+				android:ems="10"
+				android:layout_height="wrap_content"
+				android:layout_weight="1.0"
+				android:singleLine="true"
+				android:imeOptions="actionDone"
+				android:id="@+id/activitymainEditText3"
+				style="@style/contentEditBoxStyle"/>
+
+			<Button
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:text="! $"
+				android:onClick="onRegExpRewrite"/>
+
+		</LinearLayout>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/activitymainTextView5"
+			style="@style/columnTitleStyle"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<EditText
+				android:layout_width="match_parent"
+				android:ems="10"
+				android:layout_height="64dp"
+				android:singleLine="false"
+				android:imeOptions="actionDone"
+				android:id="@+id/activitymainEditText2"
+				style="@style/contentEditBoxStyle"/>
+
+		</LinearLayout>
+
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="150dp"
+			android:background="#FFDBDBDB">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:textIsSelectable="true"
+				android:id="@+id/activitymainTextView1"
+				style="@style/columnTitleStyle"/>
+
+		</ScrollView>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="65dp"
+			android:gravity="center_vertical">
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1.0"
+				android:background="#FF000000"
+				android:id="@+id/activitymainLinearLayout1">
+
+			</LinearLayout>
+
+			<Button
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:text="↻"
+				android:onClick="onCleanLog"/>
+
+		</LinearLayout>
+
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1.0">
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:id="@+id/activitymainTextView4"
+					style="@style/columnTitleStyle"/>
+
+				<LinearLayout
+					android:orientation="horizontal"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<Button
+						android:layout_width="40dp"
+						android:layout_height="40dp"
+						android:text="☆"
+						android:id="@+id/activitymainButton1"
+						android:onClick="onEnableFavorite"/>
+
+					<cc.winboll.studio.regexputils.URLEditText
+						android:layout_width="0dp"
+						android:ems="10"
+						android:layout_height="wrap_content"
+						android:singleLine="true"
+						android:imeOptions="actionDone"
+						android:id="@+id/activitymainURLEditText1"
+						android:layout_weight="1.0"/>
+
+					<Button
+						android:layout_width="40dp"
+						android:layout_height="40dp"
+						android:text="▼"
+						android:onClick="onShowFavoriteList"/>
+
+					<Button
+						android:layout_width="40dp"
+						android:layout_height="40dp"
+						android:text="→"
+						android:onClick="onGoto"/>
+
+				</LinearLayout>
+
+				<WebView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:id="@+id/activitymainWebView1"/>
+
+			</LinearLayout>
+
+		</ScrollView>
+
+	</LinearLayout>
+
+</LinearLayout>
+

regexputils/src/main/res/values-v21/styles.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:navigationBarColor">?android:colorPrimary</item>
+	</style>
+</resources>

regexputils/src/main/res/values-zh/strings.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">正则工具</string>
+    <string name="tv_pattern">语法模板</string>
+    <string name="tv_rewrite">替换模板</string>
+    <string name="tv_matchtext">匹配文本</string>
+    <string name="tv_onlinehelp">联机帮助</string>
+    <string name="sz_patternresult">匹配结果</string>
+    <string name="sz_rewriteresult">替换结果</string>
+    <string name="sz_isnull">为空。</string>
+    <string name="sz_nomatcherfind">没有匹配的字符。</string>
+    <string name="sz_start">开始</string>
+    <string name="sz_end">结束</string>
+</resources>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF5771FF</color>
+    <color name="color_2C2C2C">#2C2C2C</color>
+    <color name="color_4C4E55">#4C4E55</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>

regexputils/src/main/res/values/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">RegExpUtils</string>
+    <string name="tv_pattern">Pattern</string>
+    <string name="tv_rewrite">Rewrite</string>
+    <string name="tv_matchtext">MatchText</string>
+    <string name="tv_onlinehelp">OnlineHelp</string>
+    <string name="sz_patternresult">PatternResult</string>
+    <string name="sz_rewriteresult">RewriteResult</string>
+    <string name="sz_isnull">is null.</string>
+    <string name="sz_nomatcherfind">No matcher find.</string>
+    <string name="sz_start">Start</string>
+    <string name="sz_end">End</string>
+    <string name="sz_Source">https://toscode.gitee.com/zhangsken/RegExpUtils</string>
+    <string name="sz_defaultonlinehelp">https://tool.oschina.net/uploads/apidocs/jquery/regexp.html</string>
+</resources>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+    </style>
+    <!--popMenu的Style-->
+    <style name="customPopMenuStyle" >
+        <item name="android:itemBackground">@color/color_2C2C2C</item>
+        <item name="android:dropDownListViewStyle">@style/popmenuDivier</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/popmeuText</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/popmeuText</item>
+    </style>
+    <!-- popMenu的背景色-->
+    <style name="popmenuStyle" >
+    </style>
+    <!--popmenu的字体颜色-->
+    <style name="popmeuText">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:gravity">center</item>
+    </style>
+    <!--popMenu分割线的颜色-->
+    <style name="popmenuDivier">
+        <item name="android:divider">@color/color_4C4E55</item>
+        <item name="android:dividerHeight">1px</item>
+    </style>
+    <!--分栏标题的风格-->
+    <style name="columnTitleStyle" >
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+    <!--内容编辑框的风格-->
+    <style name="contentEditBoxStyle" >
+        <item name="android:textSize">14sp</item>
+    </style>
+</resources>

regexputils/src/stage/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+

regexputils/src/stage/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+
+</resources>

settings.gradle-demo

@@ -64,4 +64,8 @@
 
 // WebPageSources 项目编译设置
 //include ':webpagesources'
-//rootProject.name = "webpagesources"
+//rootProject.name = "webpagesources"
+
+// RegExpUtils 项目编译设置
+//include ':regexputils'
+//rootProject.name = "regexputils"