合并 AES 项目

.winboll/bashMergeProjects-to-Projects_Keeper.sh

@@ -1,5 +1,5 @@
 #!/system/bin/sh
-## 合并其他项目分支的模块源码到projects-keeper分支。
+## 合并其他项目分支的模块源码到projects_keeper分支。
 
 # ====================== 0. 进入目标目录 ======================
 TARGET_DIR="/sdcard/AppProjects/Projects_Keeper"
@@ -36,7 +36,7 @@ fi
 
 # ====================== 3. Git 分支检查 ======================
 CUR_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
-TARGET_BRANCH="projects-keeper"
+TARGET_BRANCH="projects_keeper"
 
 if [ "$CUR_BRANCH" != "$TARGET_BRANCH" ]; then
     echo "错误：当前不在 $TARGET_BRANCH 分支！"

.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh

@@ -1,145 +0,0 @@
-#!/system/bin/sh
-## 逻辑：按时间取最新标签 → 拉取该标签目录合并
-
-# 按创建时间取模块最新标签（最新打的标签排最后）
-get_latest_module_tag(){
-    local mod=$1
-    git for-each-ref --sort=-creatordate --format='%(refname)' refs/tags/${mod}-* \
-    | grep -v '\^{}' \
-    | head -1 \
-    | sed 's/refs\/tags\///'
-}
-
-# 通过标签获取commit
-get_commit_from_tag(){
-    local tag=$1
-    git rev-parse --short "${tag}^{commit}"
-}
-
-# 工作目录
-TARGET_DIR="/sdcard/AppProjects/Projects_Keeper_Tag"
-echo "进入目录：${TARGET_DIR}"
-cd "${TARGET_DIR}" || exit 1
-
-# 同步远程
-echo "========================================"
-echo "同步远程分支与全部版本标签"
-echo "========================================"
-git fetch origin --prune
-git fetch origin --tags
-echo "同步完成"
-echo ""
-
-# 校验目标分支
-NOW_BRANCH=$(git symbolic-ref --short HEAD)
-TARGET_BRANCH="projects_keeper_tag"
-if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
-    echo "错误：请先切换到 ${TARGET_BRANCH} 分支"
-    exit 1
-fi
-
-# 目录结构校验
-MERGE_OBJECTS_LIST=(
-.git
-.gitignore
-.gitmodules
-.winboll
-GenKeyStore
-LICENSE
-LICENSE-Private-Demo
-LICENSE-Private-Demo_docs
-README.md
-aes
-appbase
-autonfc
-build.gradle
-contacts
-debugtemp
-gallery
-gpsrelaysentinel
-gradle
-gradle.properties-android-demo
-gradle.properties-androidx-demo
-gradlew
-libaes
-libappbase
-libdebugtemp
-libgpsrelaysentinel
-libwinboll
-local.properties-demo
-mymessagemanager
-positions
-powerbell
-settings.gradle-demo
-winboll
-winboll.properties-demo
-)
-
-REAL_ITEMS=()
-while IFS= read -r line; do
-    [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
-done < <(ls -a)
-
-check_diff(){
-    local miss=() extra=()
-    for i in "${MERGE_OBJECTS_LIST[@]}";do
-        [[ ! " ${REAL_ITEMS[@]} " =~ " ${i} " ]] && miss+=("$i")
-    done
-    for i in "${REAL_ITEMS[@]}";do
-        [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
-    done
-    if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
-        echo "本地目录结构不一致，终止运行"
-        exit 1
-    fi
-}
-check_diff
-
-echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
-
-# 应用型模块
-MERGE_APP_PROJECT_LIST=(DemoAPP)
-echo -e "---------- 应用型模块 ----------"
-for name in "${MERGE_APP_PROJECT_LIST[@]}";do
-    low_name=$(echo "$name" | tr 'A-Z' 'a-z')
-    tag=$(get_latest_module_tag "${low_name}")
-    if [[ -z "${tag}" ]];then
-        echo "跳过 ${low_name}：无远程标签"
-        continue
-    fi
-    commit=$(get_commit_from_tag "${tag}")
-    if [[ -z "${commit}" ]];then
-        echo "跳过 ${low_name}：标签无有效提交点"
-        continue
-    fi
-    echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
-    # 强制拉取覆盖
-    git checkout -f "${tag}" -- "${low_name}"
-    git add "${low_name}"
-    git commit -m "合并模块${name} 同步最新时间标签${tag}"
-done
-
-# 类库模块
-MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
-echo -e "---------- 类库模块 ----------"
-for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
-    low_name=$(echo "$name" | tr 'A-Z' 'a-z')
-    tag=$(get_latest_module_tag "${low_name}")
-    if [[ -z "${tag}" ]];then
-        echo "跳过 ${low_name}：无远程标签"
-        continue
-    fi
-    commit=$(get_commit_from_tag "${tag}")
-    if [[ -z "${commit}" ]];then
-        echo "跳过 ${low_name}：标签无有效提交点"
-        continue
-    fi
-    echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
-    git checkout -f "${tag}" -- "${low_name}" "lib${low_name}"
-    git add "${low_name}" "lib${low_name}"
-    git commit -m "合并模块${name} 同步最新时间标签${tag}"
-done
-
-echo "全部模块合并执行完毕"
-echo "执行推送：git push"
-git push

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 07:07:27 HKT 2026
-stageCount=15
+#Wed Jun 03 20:29:52 HKT 2026
+stageCount=16
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.14
+publishVersion=15.20.15
 buildCount=0
-baseBetaVersion=15.20.15
+baseBetaVersion=15.20.16

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

@@ -7,7 +7,7 @@ package cc.winboll.studio.aes;
  */
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.CrashHandler;
+import cc.winboll.studio.libappbase.CrashActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
@@ -36,7 +36,7 @@ public class App extends GlobalApplication {
 				this,
 				getPackageName(),
 				stackTraceStr,
-				CrashHandler.CrashActivity.class
+				CrashActivity.class
 			);
 		}
 

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 06:52:38 HKT 2026
-stageCount=26
+#Wed Jun 03 20:17:17 HKT 2026
+stageCount=27
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.25
+publishVersion=15.20.26
 buildCount=0
-baseBetaVersion=15.20.26
+baseBetaVersion=15.20.27

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

@@ -1,6 +1,6 @@
 package cc.winboll.studio.appbase;
 
-import cc.winboll.studio.libappbase.CrashHandler;
+import cc.winboll.studio.libappbase.CrashActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
@@ -39,7 +39,7 @@ public class App extends GlobalApplication {
                 this,
                 getPackageName(),
                 stackTraceStr,
-                CrashHandler.CrashActivity.class
+                CrashActivity.class
             );
         }
     }

libaes/build.gradle

@@ -66,9 +66,9 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.25'
+    api 'cc.winboll.studio:libappbase:15.20.26'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.25'
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.26'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 07:07:27 HKT 2026
-stageCount=15
+#Wed Jun 03 20:29:39 HKT 2026
+stageCount=16
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.14
+publishVersion=15.20.15
 buildCount=0
-baseBetaVersion=15.20.15
+baseBetaVersion=15.20.16

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 06:52:38 HKT 2026
-stageCount=26
+#Wed Jun 03 20:17:02 HKT 2026
+stageCount=27
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.25
+publishVersion=15.20.26
 buildCount=0
-baseBetaVersion=15.20.26
+baseBetaVersion=15.20.27

libappbase/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
-            android:name=".CrashHandler$CrashActivity"
+            android:name=".CrashActivity"
             android:label="CrashActivity"
             android:launchMode="singleInstance"
             android:process=":CrashActivity"/>

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

@@ -0,0 +1,109 @@
+package cc.winboll.studio.libappbase;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+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 android.widget.Toast;
+
+public final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+    private static final int MENUITEM_COPY = 0;
+    private static final int MENUITEM_RESTART = 1;
+
+    private String mLog;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
+        mLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
+        setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+        initLayout();
+    }
+
+    private void initLayout() {
+        ScrollView contentView = new ScrollView(this);
+        contentView.setFillViewport(true);
+
+        HorizontalScrollView hw = new HorizontalScrollView(this);
+        hw.setBackgroundColor(0xFFF5F5F5);
+
+        TextView message = new TextView(this);
+        final int padding = dp2px(16);
+        message.setPadding(padding, padding, padding, padding);
+        message.setText(mLog);
+        message.setTextColor(0xFF000000);
+        message.setTextIsSelectable(true);
+
+        hw.addView(message);
+        contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT);
+        setContentView(contentView);
+
+        getActionBar().setTitle(CrashHandler.TITTLE);
+        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()) + " Error");
+    }
+
+    @Override
+    public void onBackPressed() {
+        restartApp();
+    }
+
+    private void restartApp() {
+        final Intent intent = getPackageManager()
+            .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 onCreateOptionsMenu(final Menu menu) {
+        menu.add(0, MENUITEM_COPY, 0, "Copy")
+            .setOnMenuItemClickListener(this)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
+        menu.add(0, MENUITEM_RESTART, 0, "Restart")
+            .setOnMenuItemClickListener(this)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemClick(final MenuItem item) {
+        switch (item.getItemId()) {
+            case MENUITEM_COPY:
+                ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
+                break;
+            case MENUITEM_RESTART:
+                AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
+                restartApp();
+                break;
+            default:
+                break;
+        }
+        return false;
+    }
+}

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

@@ -1,27 +1,13 @@
 package cc.winboll.studio.libappbase;
 
-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.os.Handler;
-import android.os.Looper;
 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 android.widget.Toast;
 
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
 
@@ -220,111 +206,5 @@ public final class CrashHandler {
         }
     }
 
-    // ====================== 内部Activity页面 ======================
-    /**
-     * 基础极简崩溃页面
-     * 保险丝熔断时启动，避免复杂布局二次崩溃
-     */
-    public static final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
-        private static final int MENUITEM_COPY = 0;
-        private static final int MENUITEM_RESTART = 1;
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(final Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
-            mLog = getIntent().getStringExtra(EXTRA_CRASH_LOG);
-            setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
-            initLayout();
-        }
-
-        /**
-         * 动态初始化布局
-         */
-        private void initLayout() {
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView hw = new HorizontalScrollView(this);
-            hw.setBackgroundColor(0xFFF5F5F5);
-
-            TextView message = new TextView(this);
-            final int padding = dp2px(16);
-            message.setPadding(padding, padding, padding, padding);
-            message.setText(mLog);
-            message.setTextColor(0xFF000000);
-            message.setTextIsSelectable(true);
-
-            hw.addView(message);
-            contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
-								ViewGroup.LayoutParams.MATCH_PARENT);
-            setContentView(contentView);
-
-            getActionBar().setTitle(TITTLE);
-            getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()) + " Error");
-        }
-
-        @Override
-        public void onBackPressed() {
-            restartApp();
-        }
-
-        /**
-         * 重启应用
-         */
-        private void restartApp() {
-            final Intent intent = getPackageManager()
-				.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);
-        }
-
-        /**
-         * dp转px
-         */
-        private int dp2px(final float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(final Menu menu) {
-            menu.add(0, MENUITEM_COPY, 0, "Copy")
-				.setOnMenuItemClickListener(this)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-            menu.add(0, MENUITEM_RESTART, 0, "Restart")
-				.setOnMenuItemClickListener(this)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return true;
-        }
-
-        @Override
-        public boolean onMenuItemClick(final MenuItem item) {
-            switch (item.getItemId()) {
-                case MENUITEM_COPY:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
-                    break;
-                case MENUITEM_RESTART:
-                    AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
-                    restartApp();
-                    break;
-                default:
-                    break;
-            }
-            return false;
-        }
-    }
 }
 

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

@@ -152,7 +152,7 @@ public class GlobalApplication extends Application {
                 this,
                 getPackageName(),
                 stackTraceStr,
-                CrashHandler.CrashActivity.class
+                CrashActivity.class
             );
         }
     }

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

@@ -66,7 +66,7 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
             mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
             final Intent intent = new Intent();
             intent.putExtra(CrashHandler.EXTRA_CRASH_LOG, mCrashLog);
-            CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashHandler.CrashActivity.class);
+            CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashActivity.class);
 
             StackTraceElement[] stackElements = Thread.currentThread().getStackTrace();
             StringBuilder sb = new StringBuilder("GlobalCrashActivity onCreate StackTrace");