合并 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.gradle

@@ -39,6 +39,10 @@ android {
         }
     }
 	
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
 }
 
 dependencies {

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 24 04:25:54 CST 2026
+#Wed Jun 03 20:29:52 HKT 2026
-stageCount=17
+stageCount=16
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.16
+publishVersion=15.20.15
 buildCount=0
-baseBetaVersion=15.20.17
+baseBetaVersion=15.20.16

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

@@ -1,7 +1,11 @@
 package cc.winboll.studio.aes;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import cc.winboll.studio.libaes.views.ADsControlView;
 
 /**
  * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -16,7 +20,7 @@ public class SettingsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-        //ADsControlView adsControlView = (ADsControlView) findViewById(R.id.ads_control_view);
+        ADsControlView adsControlView = (ADsControlView) findViewById(R.id.ads_control_view);
 		
 //		adsControlView.setOnAdsModeSelectedListener(new ADsControlView.OnAdsModeSelectedListener() {
 //				@Override

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

@@ -6,5 +6,12 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
+	<cc.winboll.studio.libaes.views.ADsControlView
+		android:id="@+id/ads_control_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/bg_frame"
+		android:padding="10dp"/>
+
 </LinearLayout>
 

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 24 04:11:18 CST 2026
+#Wed Jun 03 20:17:17 HKT 2026
-stageCount=34
+stageCount=27
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.33
+publishVersion=15.20.26
 buildCount=0
-baseBetaVersion=15.20.34
+baseBetaVersion=15.20.27

libaes/build.gradle

@@ -20,11 +20,15 @@ android {
         }
     }
 	
+    // 米盟 SDK
      compileOptions {
          sourceCompatibility JavaVersion.VERSION_1_7
          targetCompatibility JavaVersion.VERSION_1_7
      }
 
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
 }
 
 dependencies {
@@ -53,7 +57,7 @@ dependencies {
     //api 'androidx.fragment:fragment:1.1.0'
 	
 	// 米盟
-	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
@@ -62,9 +66,9 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.33'
+    api 'cc.winboll.studio:libappbase:15.20.26'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+	//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 24 04:25:54 CST 2026
+#Wed Jun 03 20:29:39 HKT 2026
-stageCount=17
+stageCount=16
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.16
+publishVersion=15.20.15
 buildCount=0
-baseBetaVersion=15.20.17
+baseBetaVersion=15.20.16

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

@@ -15,6 +15,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -22,9 +23,9 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 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.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
@@ -32,9 +33,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.DevelopUtils;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
+import cc.winboll.studio.libaes.views.ADsBannerView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.baoyz.widget.PullRefreshLayout;
+
 import java.util.ArrayList;
 
 public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
@@ -88,10 +91,10 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         WinBoLLActivityManager.getInstance().registeRemove(this);
         super.onDestroy();
         // 修复：释放广告资源，避免内存泄漏
-//        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
-//        if (adsBannerView != null) {
+        if (adsBannerView != null) {
-//            adsBannerView.releaseAdResources();
+            adsBannerView.releaseAdResources();
-//        }
+        }
     }
 
     @Override
@@ -148,10 +151,10 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     protected void onResume() {
         super.onResume();
 
-//        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
-//        if (adsBannerView != null) {
+        if (adsBannerView != null) {
-//            adsBannerView.resumeADs(DrawerFragmentActivity.this);
+            adsBannerView.resumeADs(DrawerFragmentActivity.this);
-//        }
+        }
     }
 
     void initRootView() {

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

@@ -56,5 +56,10 @@
 		
 	</LinearLayout>
 
+	<cc.winboll.studio.libaes.views.ADsBannerView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/adsbanner"/>
+
 </LinearLayout>
 

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 24 04:11:18 CST 2026
+#Wed Jun 03 20:17:02 HKT 2026
-stageCount=34
+stageCount=27
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.33
+publishVersion=15.20.26
 buildCount=0
-baseBetaVersion=15.20.34
+baseBetaVersion=15.20.27

libwinboll/build.gradle

@@ -35,7 +35,7 @@ dependencies {
 	api 'com.jcraft:jsch:0.1.54'
 	
 	// 米盟
-	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
@@ -44,12 +44,12 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.33'
+    api 'cc.winboll.studio:libappbase:15.20.25'
-    api 'cc.winboll.studio:libaes:15.20.16'
+    api 'cc.winboll.studio:libaes:15.20.14'
 	
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.25'
-	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.14'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libwinboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 24 08:11:15 CST 2026
+#Wed Jun 03 07:32:48 HKT 2026
-stageCount=9
+stageCount=8
 libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.8
+publishVersion=15.20.7
 buildCount=0
-baseBetaVersion=15.20.9
+baseBetaVersion=15.20.8

winboll/build.gradle

@@ -36,6 +36,17 @@ android {
             versionName = genVersionName("${versionName}")
         }
     }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
 }
 
 dependencies {
@@ -69,7 +80,7 @@ dependencies {
 	
 	
 	// 米盟
-	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
@@ -97,12 +108,12 @@ dependencies {
 	implementation 'androidx.biometric:biometric:1.1.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.33'
+    api 'cc.winboll.studio:libappbase:15.20.25'
-    api 'cc.winboll.studio:libaes:15.20.16'
+    api 'cc.winboll.studio:libaes:15.20.14'
 	
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.25'
-	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.14'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 24 08:11:15 CST 2026
+#Wed Jun 03 07:32:48 HKT 2026
-stageCount=9
+stageCount=8
 libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.8
+publishVersion=15.20.7
 buildCount=0
-baseBetaVersion=15.20.9
+baseBetaVersion=15.20.8