diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
index 0f1bff7..e633313 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
@@ -72,7 +72,6 @@ libaes
libappbase
libdebugtemp
libgpsrelaysentinel
-libwinboll
local.properties-demo
mymessagemanager
positions
@@ -158,7 +157,7 @@ echo -e "## 对象列表结束
## 合并 APP 项目
MERGE_APP_PROJECT_LIST=(
-DemoAPP
+WinBoLL
)
echo -e "#@@@ 开始合并应用型模块源码 @@@#
## 目标合并对象列表："
@@ -173,7 +172,6 @@ done
## 合并 LIB 项目
MERGE_LIB_PROJECT_LIST=(
-WinBoLL
APPBase
AES
)
@@ -189,4 +187,4 @@ git checkout origin/$item_lower $item_lower lib$item_lower
done
echo '正在推送 Projects_Keeper 项目'
-git push
\ No newline at end of file
+git push
diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
index 6d30f3b..520335a 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
@@ -65,7 +65,6 @@ libaes
libappbase
libdebugtemp
libgpsrelaysentinel
-libwinboll
local.properties-demo
mymessagemanager
positions
@@ -98,7 +97,7 @@ check_diff
echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
# 应用型模块
-MERGE_APP_PROJECT_LIST=(DemoAPP)
+MERGE_APP_PROJECT_LIST=(WinBoLL)
echo -e "---------- 应用型模块 ----------"
for name in "${MERGE_APP_PROJECT_LIST[@]}";do
low_name=$(echo "$name" | tr 'A-Z' 'a-z')
@@ -120,7 +119,7 @@ for name in "${MERGE_APP_PROJECT_LIST[@]}";do
done
# 类库模块
-MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
+MERGE_LIB_PROJECT_LIST=(APPBase AES)
echo -e "---------- 类库模块 ----------"
for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
low_name=$(echo "$name" | tr 'A-Z' 'a-z')
diff --git a/libwinboll/.gitignore b/libwinboll/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/libwinboll/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/libwinboll/build.gradle b/libwinboll/build.gradle
deleted file mode 100644
index 6399081..0000000
--- a/libwinboll/build.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply from: '../.winboll/winboll_lib_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-android {
- // 适配MIUI12
- compileSdkVersion 30
- buildToolsVersion "30.0.3"
-
- defaultConfig {
- minSdkVersion 26
- targetSdkVersion 30
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- // 网络连接类库
- api 'com.squareup.okhttp3:okhttp:4.4.1'
- // Gson
- api 'com.google.code.gson:gson:2.8.9'
- // Html 解析
- api 'org.jsoup:jsoup:1.13.1'
- // 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
- api 'com.jcraft:jsch:0.1.54'
-
- // 米盟
- //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'
- api 'com.google.code.gson:gson:2.8.5'
- api 'com.github.bumptech.glide:glide:4.9.0'
- //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
-
- // WinBoLL库 nexus.winboll.cc 地址
- api 'cc.winboll.studio:libappbase:15.20.34'
- api 'cc.winboll.studio:libaes:15.20.17'
-
- // 备用库 jitpack.io 地址
- //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
- //api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
-
- api fileTree(dir: 'libs', include: ['*.jar'])
-}
diff --git a/libwinboll/build.properties b/libwinboll/build.properties
deleted file mode 100644
index c9c6f2a..0000000
--- a/libwinboll/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Wed Jul 01 01:46:46 CST 2026
-stageCount=9
-libraryProject=libwinboll
-baseVersion=15.20
-publishVersion=15.20.8
-buildCount=4
-baseBetaVersion=15.20.9
diff --git a/libwinboll/proguard-rules.pro b/libwinboll/proguard-rules.pro
deleted file mode 100644
index 536058a..0000000
--- a/libwinboll/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 *;
-#}
diff --git a/libwinboll/src/main/AndroidManifest.xml b/libwinboll/src/main/AndroidManifest.xml
deleted file mode 100644
index 2323080..0000000
--- a/libwinboll/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java b/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java
deleted file mode 100644
index bb86ae9..0000000
--- a/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cc.winboll.studio.libwinboll;
-
-import android.app.Activity;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class WinBoLLLibraryActivity extends Activity
-{
- @Override
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_winbolllibrary);
-
- ToastUtils.show("WinBoLLLibraryActivity onCreate");
- }
-}
diff --git a/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e..0000000
Binary files a/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047d..0000000
Binary files a/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d76..0000000
Binary files a/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 4df1894..0000000
Binary files a/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/libwinboll/src/main/res/layout/activity_winbolllibrary.xml b/libwinboll/src/main/res/layout/activity_winbolllibrary.xml
deleted file mode 100644
index 97dc11a..0000000
--- a/libwinboll/src/main/res/layout/activity_winbolllibrary.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
diff --git a/libwinboll/src/main/res/values-v21/styles.xml b/libwinboll/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 0948fdc..0000000
--- a/libwinboll/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/libwinboll/src/main/res/values/strings.xml b/libwinboll/src/main/res/values/strings.xml
deleted file mode 100644
index b677aa6..0000000
--- a/libwinboll/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- libwinboll
- Hello world!
-
-
diff --git a/libwinboll/src/main/res/values/styles.xml b/libwinboll/src/main/res/values/styles.xml
deleted file mode 100644
index 8d78246..0000000
--- a/libwinboll/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/settings.gradle-demo b/settings.gradle-demo
index 73a9840..0746047 100644
--- a/settings.gradle-demo
+++ b/settings.gradle-demo
@@ -72,7 +72,6 @@
// WinBoLL 项目编译设置
//include ':winboll'
-//include ':libwinboll'
//rootProject.name = "winboll"
// RegExpUtils 项目编译设置
diff --git a/winboll/build.gradle b/winboll/build.gradle
index d536381..b9dc76d 100644
--- a/winboll/build.gradle
+++ b/winboll/build.gradle
@@ -39,7 +39,6 @@ android {
}
dependencies {
- api project(':libwinboll')
api 'com.google.code.gson:gson:2.10.1'
// 下拉控件
@@ -97,8 +96,8 @@ dependencies {
implementation 'androidx.biometric:biometric:1.1.0'
// WinBoLL库 nexus.winboll.cc 地址
- api 'cc.winboll.studio:libappbase:15.20.33'
- api 'cc.winboll.studio:libaes:15.20.16'
+ api 'cc.winboll.studio:libappbase:15.20.34'
+ api 'cc.winboll.studio:libaes:15.20.17'
// 备用库 jitpack.io 地址
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
diff --git a/winboll/build.properties b/winboll/build.properties
index c9c6f2a..f90c062 100644
--- a/winboll/build.properties
+++ b/winboll/build.properties
@@ -1,5 +1,5 @@
#Created by .winboll/winboll_app_build.gradle
-#Wed Jul 01 01:46:46 CST 2026
+#Tue Jun 30 19:03:41 GMT 2026
stageCount=9
libraryProject=libwinboll
baseVersion=15.20