合并 AES 项目

合并 APPBase 项目
合并 WinBoLL 项目
2026-07-02 04:35:45 +08:00 · 2026-05-17 22:00:01 +08:00 · 2026-05-17 22:00:01 +08:00 · 2026-05-17 22:00:01 +08:00 · 2026-05-17 12:40:46 +08:00 · 2026-05-17 12:18:02 +08:00
11 changed files with 30 additions and 25 deletions
--- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh
+++ b/.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 分支！"
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:28 HKT 2026
-stageCount=4
+#Sun May 17 20:53:49 HKT 2026
+stageCount=5
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.4
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.5
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 16 03:50:01 CST 2026
-stageCount=10
+#Sun May 17 16:16:51 HKT 2026
+stageCount=16
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
-buildCount=6
-baseBetaVersion=15.20.10
+publishVersion=15.20.15
+buildCount=0
+baseBetaVersion=15.20.16
--- a/libaes/build.gradle
+++ b/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"
    }
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:09 HKT 2026
-stageCount=4
+#Sun May 17 20:53:39 HKT 2026
+stageCount=5
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.4
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.5
--- a/libaes/src/main/res/layout/view_adscontrol.xml
+++ b/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"
--- a/libaes/src/main/res/values-night/colors.xml
+++ b/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>
--- a/libaes/src/main/res/values/colors.xml
+++ b/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>
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 16 03:50:01 CST 2026
-stageCount=10
+#Sun May 17 16:16:36 HKT 2026
+stageCount=16
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
-buildCount=6
-baseBetaVersion=15.20.10
+publishVersion=15.20.15
+buildCount=0
+baseBetaVersion=15.20.16
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
+++ b/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();

--- a/libwinboll/build.gradle
+++ b/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'])
 }
Author	SHA1	Message	Date
qinglong	5de9ecc371	合并 AES 项目	2026-05-17 22:00:01 +08:00
qinglong	cac012b50c	合并 APPBase 项目	2026-05-17 22:00:01 +08:00
qinglong	414e0c5568	合并 WinBoLL 项目	2026-05-17 22:00:01 +08:00
ZhanGSKen	aba7019e0f	合并 APPBase 项目	2026-05-17 12:40:46 +08:00
ZhanGSKen	68a9d65280	Merge branch 'projects-keeper' of https://gitea.winboll.cc/Studio/WinBoLL.git into projects-keeper	2026-05-17 12:18:02 +08:00
ZhanGSKen	f918b91636	更换分支名称	2026-05-17 12:17:13 +08:00
qinglong	771f591a3a	合并 APPBase 项目	2026-05-16 17:30:01 +08:00