From 47dd4698b8d0e0c5271c7a1cab10b120e24c71d9 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 23 Jan 2026 05:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=E4=BB=8B?= =?UTF-8?q?=E7=BB=8D=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.gradle | 4 ++-- winboll/build.properties | 4 ++-- .../main/java/cc/winboll/studio/winboll/MainActivity.java | 6 ------ .../winboll/studio/winboll/activities/AboutActivity.java | 8 +++++++- .../studio/winboll/activities/BaseWinBoLLActivity.java | 5 +---- .../winboll/studio/winboll/activities/New2Activity.java | 7 +++++++ .../cc/winboll/studio/winboll/activities/NewActivity.java | 7 +++++++ .../studio/winboll/activities/SettingsActivity.java | 7 +++++++ .../studio/winboll/unittest/TermuxEnvTestActivity.java | 8 +++++++- 9 files changed, 40 insertions(+), 16 deletions(-) diff --git a/winboll/build.gradle b/winboll/build.gradle index a06fee2..43ec875 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -108,8 +108,8 @@ dependencies { implementation 'com.termux:termux-shared:0.118.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libaes:15.15.7' - api 'cc.winboll.studio:libappbase:15.15.4' + api 'cc.winboll.studio:libaes:15.15.2' + api 'cc.winboll.studio:libappbase:15.15.7' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.7' diff --git a/winboll/build.properties b/winboll/build.properties index f526490..31e2ebb 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 19 09:54:26 GMT 2026 +#Thu Jan 22 21:44:39 GMT 2026 stageCount=11 libraryProject= baseVersion=15.11 publishVersion=15.11.10 -buildCount=50 +buildCount=55 baseBetaVersion=15.11.11 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index 356a756..67d3bea 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -44,13 +44,7 @@ public class MainActivity extends DrawerFragmentActivity { } showFragment(mBrowserFragment); } - - @Override - public String getTag() { - return TAG; - } - public static void sendMessage(Message msg) { _mMainHandler.sendMessage(msg); } diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java index b1761b4..d7ef2e6 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java @@ -10,6 +10,7 @@ import cc.winboll.studio.libappbase.models.APPInfo; import cc.winboll.studio.libappbase.views.AboutView; import cc.winboll.studio.winboll.MainActivity; import cc.winboll.studio.winboll.R; +import android.app.Activity; /** * @Author 豆包&ZhanGSKen @@ -18,6 +19,12 @@ import cc.winboll.studio.winboll.R; */ public class AboutActivity extends BaseWinBoLLActivity { + @Override + public Activity getActivity() { + return this; + } + + public static final String TAG = "AboutActivity"; private Toolbar mToolbar; @@ -54,7 +61,6 @@ public class AboutActivity extends BaseWinBoLLActivity { public void onClick(View v) { LogUtils.d(TAG, "导航栏 点击返回按钮"); getActivity().finish(); - WinBoLLActivityManager.getInstance().startWinBoLLActivity(getActivity(), MainActivity.class); } }); LogUtils.d(TAG, "initToolbar() 配置完成"); diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java index f9edcd4..9d4f407 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java @@ -51,9 +51,6 @@ public abstract class BaseWinBoLLActivity extends AppCompatActivity implements I @Override public abstract String getTag(); - @Override - public Activity getActivity() { - return this; - } + public abstract Activity getActivity(); } diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java index 7b19999..561cf64 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java @@ -9,9 +9,16 @@ import android.os.Bundle; import android.view.View; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.winboll.R; +import android.app.Activity; public class New2Activity extends BaseWinBoLLActivity { + @Override + public Activity getActivity() { + return this; + } + + public static final String TAG = "New2Activity"; Toolbar mToolbar; diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java index 430a0e9..e3b6530 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java @@ -10,9 +10,16 @@ import android.view.View; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.winboll.R; +import android.app.Activity; public class NewActivity extends BaseWinBoLLActivity { + @Override + public Activity getActivity() { + return this; + } + + public static final String TAG = "NewActivity"; Toolbar mToolbar; diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java index d3bb54e..c7d877d 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java @@ -5,6 +5,7 @@ import android.view.View; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.winboll.R; +import android.app.Activity; /** * @Author ZhanGSKen&豆包大模型 @@ -13,6 +14,12 @@ import cc.winboll.studio.winboll.R; */ public class SettingsActivity extends BaseWinBoLLActivity { + @Override + public Activity getActivity() { + return this; + } + + public static final String TAG = "SettingsActivity"; @Override diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java index 66f353f..16652ed 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java @@ -19,6 +19,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import android.app.Activity; /** * @Author 豆包&ZhanGSKen @@ -29,6 +30,12 @@ import java.nio.charset.StandardCharsets; * 支持Termux目录读取、Gradle命令实时输出执行（唤起窗口），基于sharedUserId实现跨包权限适配 */ public class TermuxEnvTestActivity extends BaseWinBoLLActivity { + + @Override + public Activity getActivity() { + return this; + } + // 常量属性（置顶排列） public static final String TAG = "TermuxEnvTestActivity"; private static final String TERMUX_HOME_PATH = "/sdcard/WinBoLLStudio"; @@ -100,7 +107,6 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity { public void onClick(View v) { LogUtils.d(TAG, "initToolbar() 导航栏返回按钮点击"); getActivity().finish(); - WinBoLLActivityManager.getInstance().startWinBoLLActivity(getActivity(), MainActivity.class); } });