From b93434887d74fea52552bfd18794af207384ff46 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 13 Nov 2025 07:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=A1=80=E7=B1=BB?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=87=8F=E5=B0=91=E7=B1=BB=E5=BA=93=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E5=BC=95=E7=94=A8=E3=80=82=E4=BF=AE=E6=94=B9=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=80=82=E9=85=8D=E5=BA=94=E7=94=A8=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 12 ++++--- aes/build.properties | 12 +++---- .../cc/winboll/studio/aes/MainActivity.java | 4 +-- libaes/build.gradle | 18 ++++++---- libaes/build.properties | 12 +++---- .../studio/libaes/utils/PrefUtils.java | 33 +++++++++++++++++ .../studio/libaes/views/AboutView.java | 17 +++++---- .../main/res/menu/toolbar_studio_debug.xml | 35 +++++++++++++++++++ libaes/src/main/res/values/strings.xml | 7 +++- .../main/res/xml/network_security_config.xml | 7 ++++ 10 files changed, 122 insertions(+), 35 deletions(-) create mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/utils/PrefUtils.java create mode 100644 libaes/src/main/res/menu/toolbar_studio_debug.xml create mode 100644 libaes/src/main/res/xml/network_security_config.xml diff --git a/aes/build.gradle b/aes/build.gradle index c9c1271c..2a780ce6 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -18,18 +18,22 @@ def genVersionName(def versionName){ } android { - compileSdkVersion 32 - buildToolsVersion "32.0.0" + + // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30） + compileSdkVersion 30 + + // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion） + buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版 defaultConfig { applicationId "cc.winboll.studio.aes" - minSdkVersion 24 + minSdkVersion 23 targetSdkVersion 30 versionCode 1 // versionName 更新后需要手动设置 // 项目模块目录的 build.gradle 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.10" + versionName "15.11" if(true) { versionName = genVersionName("${versionName}") } diff --git a/aes/build.properties b/aes/build.properties index 14e2b616..b5adf177 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Sep 29 13:04:18 HKT 2025 -stageCount=3 +#Wed Nov 12 23:19:13 GMT 2025 +stageCount=0 libraryProject=libaes -baseVersion=15.10 -publishVersion=15.10.2 -buildCount=0 -baseBetaVersion=15.10.3 +baseVersion=15.11 +publishVersion=15.11.0 +buildCount=1 +baseBetaVersion=15.11.1 diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index 40a70dbf..53968fd8 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -91,8 +91,8 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.toolbar_library, menu); - if(App.isDebuging()) { - getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu); + if(App.isDebugging()) { + getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu); } return super.onCreateOptionsMenu(menu); } diff --git a/libaes/build.gradle b/libaes/build.gradle index 88f73bdd..fcd08d0b 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -4,11 +4,15 @@ apply from: '../.winboll/winboll_lib_build.gradle' apply from: '../.winboll/winboll_lint_build.gradle' android { - compileSdkVersion 32 - buildToolsVersion "32.0.0" + + // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30） + compileSdkVersion 30 + + // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion） + buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版 defaultConfig { - minSdkVersion 24 + minSdkVersion 23 targetSdkVersion 30 } buildTypes { @@ -20,10 +24,6 @@ android { } dependencies { - api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libapputils:15.10.2' - api 'cc.winboll.studio:libappbase:15.10.9' - // 吐司类库 api 'com.github.getActivity:ToastUtils:10.5' @@ -52,4 +52,8 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable:1.1.0' //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' + + api 'cc.winboll.studio:libappbase:15.11.0' + + api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index 256a9063..b5adf177 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Sep 29 13:04:07 HKT 2025 -stageCount=3 +#Wed Nov 12 23:19:13 GMT 2025 +stageCount=0 libraryProject=libaes -baseVersion=15.10 -publishVersion=15.10.2 -buildCount=0 -baseBetaVersion=15.10.3 +baseVersion=15.11 +publishVersion=15.11.0 +buildCount=1 +baseBetaVersion=15.11.1 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/PrefUtils.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/PrefUtils.java new file mode 100644 index 00000000..751a9e56 --- /dev/null +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/PrefUtils.java @@ -0,0 +1,33 @@ +package cc.winboll.studio.libaes.utils; + +import android.content.Context; +import android.content.SharedPreferences; + +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/11/13 06:50 + * @Describe 应用变量保存工具 + */ + +public class PrefUtils { + + public static final String TAG = "PrefUtils"; + + // + // 保存字符串到SharedPreferences的函数 + // + public static void saveString(Context context, String key, String value) { + SharedPreferences sharedPreferences = context.getSharedPreferences("myPrefs", Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString(key, value); + editor.apply(); + } + + // + // 从SharedPreferences读取字符串的函数 + // + public static String getString(Context context, String key, String defaultValue) { + SharedPreferences sharedPreferences = context.getSharedPreferences("myPrefs", Context.MODE_PRIVATE); + return sharedPreferences.getString(key, defaultValue); + } +} diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java index 41ddb8d0..e45024d7 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AboutView.java @@ -12,7 +12,6 @@ import android.content.res.TypedArray; import android.net.Uri; import android.os.Message; import android.util.AttributeSet; -import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; @@ -20,10 +19,10 @@ import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog; import cc.winboll.studio.libaes.models.APPInfo; import cc.winboll.studio.libaes.utils.AppVersionUtils; +import cc.winboll.studio.libaes.utils.PrefUtils; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libapputils.utils.PrefUtils; import com.hjq.toast.ToastUtils; import java.io.IOException; import mehdi.sakout.aboutpage.AboutPage; @@ -108,7 +107,7 @@ public class AboutView extends LinearLayout { mszAppDescription = mAPPInfo.getAppDescription(); mnAppIcon = mAPPInfo.getAppIcon(); - mszWinBoLLServerHost = GlobalApplication.isDebuging() ? "https://yun-preivew.winboll.cc": "https://yun.winboll.cc"; + mszWinBoLLServerHost = GlobalApplication.isDebugging() ? "https://yun-preivew.winboll.cc": "https://yun.winboll.cc"; try { mszAppVersionName = _mContext.getPackageManager().getPackageInfo(_mContext.getPackageName(), 0).versionName; @@ -229,7 +228,7 @@ public class AboutView extends LinearLayout { // 定义应用调试按钮 // Element elementAppMode; - if (GlobalApplication.isDebuging()) { + if (GlobalApplication.isDebugging()) { elementAppMode = new Element(_mContext.getString(R.string.app_normal), R.drawable.ic_winboll); elementAppMode.setOnClickListener(mAppNormalOnClickListener); } else { @@ -263,8 +262,8 @@ public class AboutView extends LinearLayout { if (intent != null) { //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - GlobalApplication.setIsDebuging(true); - GlobalApplication.saveDebugStatus(_mContext); + GlobalApplication.setIsDebugging(true); + GlobalApplication.saveDebugStatus((GlobalApplication)_mContext.getApplicationContext()); WinBoLLActivityManager.getInstance().finishAll(); context.startActivity(intent); @@ -275,8 +274,8 @@ public class AboutView extends LinearLayout { Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()); if (intent != null) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - GlobalApplication.setIsDebuging(false); - GlobalApplication.saveDebugStatus(_mContext); + GlobalApplication.setIsDebugging(false); + GlobalApplication.saveDebugStatus((GlobalApplication)_mContext.getApplicationContext()); WinBoLLActivityManager.getInstance().finishAll(); context.startActivity(intent); @@ -301,7 +300,7 @@ public class AboutView extends LinearLayout { String szUrl = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName; // 构建包含认证信息的请求 String credential = ""; - if (GlobalApplication.isDebuging()) { + if (GlobalApplication.isDebugging()) { credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString()); PrefUtils.saveString(_mContext, "metDevUserName", metDevUserName.getText().toString()); PrefUtils.saveString(_mContext, "metDevUserPassword", metDevUserPassword.getText().toString()); diff --git a/libaes/src/main/res/menu/toolbar_studio_debug.xml b/libaes/src/main/res/menu/toolbar_studio_debug.xml new file mode 100644 index 00000000..4471301c --- /dev/null +++ b/libaes/src/main/res/menu/toolbar_studio_debug.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + diff --git a/libaes/src/main/res/values/strings.xml b/libaes/src/main/res/values/strings.xml index 5f94d4c4..f9f1d392 100644 --- a/libaes/src/main/res/values/strings.xml +++ b/libaes/src/main/res/values/strings.xml @@ -12,5 +12,10 @@ GoldenTheme MemorTheme TaoTheme - + + Click here is switch to Normal APP + Click here is switch to APP DEBUG + GITEA HOME + APP UPDATE + diff --git a/libaes/src/main/res/xml/network_security_config.xml b/libaes/src/main/res/xml/network_security_config.xml new file mode 100644 index 00000000..bd145cbb --- /dev/null +++ b/libaes/src/main/res/xml/network_security_config.xml @@ -0,0 +1,7 @@ + + + + + winboll.cc + +