合并 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 分支！"

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:28 HKT 2026
-stageCount=4
+#Tue May 19 01:52:52 HKT 2026
+stageCount=7
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.6
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.7

appbase/build.gradle

@@ -26,7 +26,10 @@ android {
         applicationId "cc.winboll.studio.appbase"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 1
+		//1. Android 官方规则
+		//-  versionCode  类型：int 整型
+		//- Java int 最大值：2147483647
+        versionCode 1520000
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 16 09:15:15 GMT 2026
-stageCount=10
+#Tue May 19 18:54:47 HKT 2026
+stageCount=17
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
-buildCount=7
-baseBetaVersion=15.20.10
+publishVersion=15.20.16
+buildCount=0
+baseBetaVersion=15.20.17

libaes/build.gradle

@@ -21,6 +21,11 @@ android {
     }
 	
     // 米盟 SDK
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
+
     packagingOptions {
          doNotStrip "*/*/libmimo_1011.so"
     }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:09 HKT 2026
-stageCount=4
+#Tue May 19 01:52:47 HKT 2026
+stageCount=7
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.6
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.7

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

@@ -50,7 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 -- android:background="@drawable/bg_container_border">
+        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 - android:background="@drawable/bg_container_border" -->
 
         <ImageView
             android:id="@+id/iv_winboll_store"

libaes/src/main/res/values-night/colors.xml

@@ -28,6 +28,6 @@
     <color name="toolbarTextColor">#FFFFFFFF</color>
     <color name="mainWindowBackgroundColor">#FF2C2C2C</color>
     <color name="mainWindowTextColor">#FFFFFFFF</color>
-    <color name="debugTextColor">#FFFF0000</color>
+    <color name="debugTextColor">#FFAAAAAA</color>
 
 </resources>

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

@@ -28,6 +28,6 @@
     <color name="toolbarTextColor">#FFFFFFFF</color>
     <color name="mainWindowBackgroundColor">#FFFFFFFF</color>
     <color name="mainWindowTextColor">#FF000000</color>
-    <color name="debugTextColor">#FFFF0000</color>
+    <color name="debugTextColor">#FF808080</color>
 
 </resources>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 16 09:15:15 GMT 2026
-stageCount=10
+#Tue May 19 18:54:18 HKT 2026
+stageCount=17
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
-buildCount=7
-baseBetaVersion=15.20.10
+publishVersion=15.20.16
+buildCount=0
+baseBetaVersion=15.20.17

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

@@ -135,7 +135,7 @@ public class LogUtils {
             return;
         }
 
-		final long KEEP_FILE_SIZE = 512000L; // 500K
+		final long KEEP_FILE_SIZE = 25000L; // ~25KB 确保剪贴板可完整复制
         final long MAX_FILE_SIZE = 2*KEEP_FILE_SIZE;
         final long fileSize = _mfLogCatchFile.length();
 

libwinboll/build.gradle

@@ -36,7 +36,7 @@ dependencies {
 	
 	// WinBoLL库 nexus.winboll.cc 地址
 	api 'cc.winboll.studio:libaes:15.20.3'
-    api 'cc.winboll.studio:libappbase:15.20.9'
+    api 'cc.winboll.studio:libappbase:15.20.15'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }