Compare commits

...

17 Commits

Author SHA1 Message Date
Studio
60afeabed0 <appbase>APK 15.20.23 release Publish. 2026-06-03 06:03:05 +08:00
cbfebb921a <libappbase>GlobalApplication初始化异常安全增强
在GlobalApplication.onCreate()中增加try-catch异常捕获,
初始化失败时通过CrashHandleNotifyUtils发送崩溃通知。
2026-06-03 05:49:51 +08:00
208ced7af5 <libappbase>Library Release 15.20.22 2026-05-27 14:51:42 +08:00
bf9a89dc7a <appbase>APK 15.20.22 release Publish. 2026-05-27 14:51:29 +08:00
b28054cf57 编译参数修复 2026-05-27 14:50:46 +08:00
102aae8e66 设置点击调试密钥提示框外部时不关闭对话框。 2026-05-27 14:40:49 +08:00
9e52dc29a7 恢复修复前的前一版本。 2026-05-27 13:28:05 +08:00
dc622003bd fix(AboutView): 调试解锁对话框改为普通Dialog,禁止点击外部关闭
- AlertDialog → Dialog + 自定义布局,绕过AlertController触摸干扰
- 添加 setCancelable(false) + setCanceledOnTouchOutside(false) 双重防护
- 移除DialogInterface.OnShowListener,改用按钮直接绑定OnClickListener
2026-05-27 12:13:46 +08:00
91841962f1 合并projects_keeper_tag 2026-05-24 10:24:03 +08:00
qinglong
ab4cef21f0 合并模块APPBase 同步最新时间标签appbase-v15.20.21 2026-05-24 10:00:01 +08:00
9071d3abd0 <libappbase>Library Release 15.20.21 2026-05-24 09:53:18 +08:00
d34fd0368f <appbase>APK 15.20.21 release Publish. 2026-05-24 09:53:06 +08:00
aBuild
5185ecee3c fix: 调试解锁成功后补全调试状态持久化保存
- 在 GlobalApplication.setIsDebugging(true) 后补充
  saveDebugStatus() 调用,确保调试模式状态持久化到本地文件
2026-05-23 22:18:37 +08:00
aBuild
7efd1b5f5c feat(libappbase): 新增调试解锁弹窗功能,重命名 ib_signgetdialog 相关变量
- 将 ImageButton id 从 ib_signgetdialog 重命名为 ib_debug_unlock
- 添加 contentDescription="应用调试解锁"
- 重命名 Java 变量 ibSigngetDialog → ibDebugUnlock
- 新增 showDebugUnlockDialog() 无模式对话框
  - 输入 Token 与 DebugSwitchInfoImageView 存储值比对
  - 匹配成功:启用调试模式,Toast 提示"重启应用后生效"
  - 匹配失败:Toast 提示"调试Token不匹配"并关闭对话框
2026-05-23 21:53:25 +08:00
aBuild
61933ae75b feat(libappbase): 实现调试 Token 弹窗功能,支持复制与重置
- 将连续点击触发次数从 10 次改为 7 次
- 用 AlertDialog 替换原有 Toast+调试模式切换逻辑
- 弹窗显示调试 Token,点击外部自动关闭
- 新增"复制到剪贴板"按钮,复制后弹窗不关闭
- 新增"重置"按钮,重新生成 UUID Token 并持久化到 SP,刷新弹窗内容
- 新增静态方法 resetDebugToken() 供外部调用
2026-05-23 21:31:55 +08:00
aBuild
463585988d refactor(libappbase): 将 DebugSwitchImageView 重命名为 DebugSwitchInfoImageView 并添加调试 token 功能
- 类名 DebugSwitchImageView → DebugSwitchInfoImageView
- 更新 TAG 常量及所有构造方法名称
- 更新 AboutView.java 字段类型引用
- 更新 layout_about_view.xml 及 layout-night 布局文件中的自定义视图标签
- 新增静态变量 mDebugToken 及 getDebugToken() 方法
  - 首次调用时从 SharedPreferences 读取
  - 无存储值时自动生成 UUID 唯一 token 并持久化到 SP
2026-05-23 21:06:02 +08:00
2754a2ad7c 合并模块AES 同步最新时间标签aes-v15.20.8 2026-05-20 21:00:01 +08:00
9 changed files with 319 additions and 86 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Wed May 20 16:12:26 HKT 2026
stageCount=21
#Wed Jun 03 06:03:05 HKT 2026
stageCount=24
libraryProject=libappbase
baseVersion=15.20
publishVersion=15.20.20
publishVersion=15.20.23
buildCount=0
baseBetaVersion=15.20.21
baseBetaVersion=15.20.24

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Wed May 20 16:12:13 HKT 2026
stageCount=21
#Wed Jun 03 06:03:05 HKT 2026
stageCount=24
libraryProject=libappbase
baseVersion=15.20
publishVersion=15.20.20
publishVersion=15.20.23
buildCount=0
baseBetaVersion=15.20.21
baseBetaVersion=15.20.24

View File

@@ -7,6 +7,11 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import java.io.PrintWriter;
import java.io.StringWriter;
import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
/**
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
* @Date 2025/11/11 19:56
@@ -125,17 +130,31 @@ public class GlobalApplication extends Application {
*/
@Override
public void onCreate() {
super.onCreate();
// 初始化单例实例(确保在所有初始化操作前完成)
sInstance = this;
try {
super.onCreate();
// 初始化单例实例(确保在所有初始化操作前完成)
sInstance = this;
restoreDebugStatus();
// 初始化基础组件日志、崩溃处理、Toast
initCoreComponents();
// 初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
initWinbollHost();
restoreDebugStatus();
// 初始化基础组件日志、崩溃处理、Toast
initCoreComponents();
// 初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
initWinbollHost();
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
} catch (Throwable e) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
pw.close();
String stackTraceStr = sw.toString();
CrashHandleNotifyUtils.handleUncaughtException(
this,
getPackageName(),
stackTraceStr,
GlobalCrashActivity.class
);
}
}
/**

View File

@@ -1,6 +1,8 @@
package cc.winboll.studio.libappbase.views;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
@@ -12,6 +14,7 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.R;
@@ -74,12 +77,12 @@ public class AboutView extends LinearLayout {
private EditText metDevUserPassword;
// ===================================== 页面视图控件 =====================================
private DebugSwitchImageView ivAppIcon;
private DebugSwitchInfoImageView ivAppIcon;
private TextView tvAppNameVersion;
private TextView tvAppDesc;
private LinearLayout llFunctionContainer;
private ImageButton ibSebugStepOver;
private ImageButton ibSigngetDialog;
private ImageButton ibDebugUnlock;
private ImageButton ibWinBoLLHostDialog;
// ===================================== 构造方法(按参数从少到多排序) =====================================
@@ -193,12 +196,12 @@ public class AboutView extends LinearLayout {
llFunctionContainer = findViewById(R.id.ll_function_container);
// 功能按钮绑定
ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
ibDebugUnlock = findViewById(R.id.ib_debug_unlock);
ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
// 调试按钮统一只在调试模式显示
ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
//ibDebugUnlock.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
// 绑定按钮点击事件
@@ -310,6 +313,47 @@ public class AboutView extends LinearLayout {
LogUtils.d(TAG, "initAboutPageView():视图组装完成,功能项加载完毕");
}
// ===================================== 调试解锁弹窗 =====================================
private void showDebugUnlockDialog() {
final AlertDialog dialog = new AlertDialog.Builder(mContext).create();
dialog.setTitle("应用调试解锁");
dialog.setCanceledOnTouchOutside(true);
final EditText etToken = new EditText(mContext);
etToken.setHint("请输入调试Token");
dialog.setView(etToken);
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "调试解锁", (DialogInterface.OnClickListener) null);
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface d) {
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String inputToken = etToken.getText().toString().trim();
String savedToken = DebugSwitchInfoImageView.getDebugToken();
if (savedToken != null && savedToken.equals(inputToken)) {
GlobalApplication.setIsDebugging(true);
GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
Toast.makeText(mContext, "调试解锁成功,重启应用后生效", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(mContext, "调试Token不匹配", Toast.LENGTH_SHORT).show();
dialog.dismiss();
}
}
});
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
}
});
dialog.show();
}
// ===================================== 内部工具/事件方法 =====================================
/**
* 绑定功能按钮点击事件,处理正版校验、调试地址配置弹窗唤起
@@ -335,6 +379,15 @@ public class AboutView extends LinearLayout {
new DebugHostDialog(mContext).show();
}
});
// 应用调试解锁按钮
ibDebugUnlock.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
LogUtils.d(TAG, "ibDebugUnlock onClick弹出调试解锁对话框");
showDebugUnlockDialog();
}
});
LogUtils.d(TAG, "setBtnClickListener():功能按钮点击事件绑定完成");
}

View File

@@ -1,61 +0,0 @@
package cc.winboll.studio.libappbase.views;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;
import cc.winboll.studio.libappbase.GlobalApplication;
/**
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
* @Date 2026/04/06 19:32
* @Describe 具有调试模式切换功能的应用Logo控件连续点击10次弹出提示
*/
public class DebugSwitchImageView extends ImageView {
public static final String TAG = "DebugSwitchImageView";
// 连续点击计数
private int mClickCount = 0;
// 目标点击次数
private static final int TARGET_CLICK_COUNT = 10;
public DebugSwitchImageView(Context context) {
super(context);
init();
}
public DebugSwitchImageView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public DebugSwitchImageView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public DebugSwitchImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mClickCount++;
if (mClickCount == TARGET_CLICK_COUNT) {
// 达到10次弹出Toast
Toast.makeText(getContext(), "连续点击已达到10次现在开启应用调试功能。", Toast.LENGTH_SHORT).show();
GlobalApplication.setIsDebugging(true);
GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
// 重置计数,可再次触发
mClickCount = 0;
}
}
});
}
}

View File

@@ -0,0 +1,127 @@
package cc.winboll.studio.libappbase.views;
import android.app.AlertDialog;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import java.util.UUID;
import cc.winboll.studio.libappbase.GlobalApplication;
/**
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
* @Date 2026/04/06 19:32
* @Describe 应用Logo控件连续点击6次弹出调试Token对话框支持复制与重置
*/
public class DebugSwitchInfoImageView extends ImageView {
public static final String TAG = "DebugSwitchInfoImageView";
// 连续点击计数
private int mClickCount = 0;
// 目标点击次数
private static final int TARGET_CLICK_COUNT = 7;
private static String mDebugToken = null;
private static final String SP_DEBUG_TOKEN = "debug_token_prefs";
private static final String KEY_DEBUG_TOKEN = "debug_token";
public static String getDebugToken() {
if (mDebugToken != null) {
return mDebugToken;
}
Context context = GlobalApplication.getInstance();
if (context != null) {
SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
mDebugToken = sp.getString(KEY_DEBUG_TOKEN, null);
if (mDebugToken == null) {
mDebugToken = UUID.randomUUID().toString();
sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
}
}
return mDebugToken;
}
public static void resetDebugToken() {
Context context = GlobalApplication.getInstance();
if (context != null) {
mDebugToken = UUID.randomUUID().toString();
SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
}
}
private void showDebugTokenDialog() {
final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
dialog.setTitle("调试Token");
dialog.setMessage(getDebugToken());
dialog.setCanceledOnTouchOutside(false);
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "复制到剪贴板", (DialogInterface.OnClickListener) null);
dialog.setButton(DialogInterface.BUTTON_NEUTRAL, "重置", (DialogInterface.OnClickListener) null);
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface d) {
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
cm.setPrimaryClip(ClipData.newPlainText("DebugToken", getDebugToken()));
}
});
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
resetDebugToken();
dialog.setMessage(getDebugToken());
}
});
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
}
});
dialog.show();
}
public DebugSwitchInfoImageView(Context context) {
super(context);
init();
}
public DebugSwitchInfoImageView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mClickCount++;
if (mClickCount >= TARGET_CLICK_COUNT) {
mClickCount = 0;
showDebugTokenDialog();
}
}
});
}
}

View File

@@ -15,7 +15,7 @@
android:paddingRight="16dp"
android:paddingBottom="16dp">
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
android:id="@+id/iv_app_icon"
android:layout_width="48dp"
android:layout_height="48dp"
@@ -81,7 +81,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_key"
android:id="@+id/ib_signgetdialog"
android:id="@+id/ib_debug_unlock"
android:contentDescription="应用调试解锁"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:background="@null"/>

View File

@@ -15,7 +15,7 @@
android:paddingRight="16dp"
android:paddingBottom="16dp">
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
android:id="@+id/iv_app_icon"
android:layout_width="48dp"
android:layout_height="48dp"
@@ -81,7 +81,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_key"
android:id="@+id/ib_signgetdialog"
android:id="@+id/ib_debug_unlock"
android:contentDescription="应用调试解锁"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:background="@null"/>

View File

@@ -1,5 +1,98 @@
// AutoInstaller 项目编译设置
//include ':autoinstaller'
//rootProject.name = "autoinstaller"
// MJ 项目编译设置
//include ':mj'
//rootProject.name = "mj"
// PowerBell 项目编译设置
//include ':powerbell'
//rootProject.name = "powerbell"
// APPBase 项目编译设置
include ':appbase'
include ':libappbase'
rootProject.name = "appbase"
// APPUtils 项目编译设置
//include ':apputils'
//include ':libapputils'
//rootProject.name = "apputils"
// JC 项目编译设置
//include ':jc'
//include ':libjc'
//rootProject.name = "jc"
// AES 项目编译设置
//include ':aes'
//include ':libaes'
//rootProject.name = "aes"
// Contacts 项目编译设置
//include ':contacts'
//rootProject.name = "contacts"
// MyMessageManager 项目编译设置
//include ':mymessagemanager'
//rootProject.name = "mymessagemanager"
// TimeStamp 项目编译设置
//include ':timestamp'
//rootProject.name = "timestamp"
// AndroidDemo 项目编译设置
//include ':androiddemo'
//rootProject.name = "androiddemo"
// AndroidXDemo 项目编译设置
//include ':androidxdemo'
//rootProject.name = "androidxdemo"
// Ollama 项目编译设置
//include ':ollama'
//rootProject.name = "ollama"
// NumTable 项目编译设置
//include ':numtable'
//rootProject.name = "numtable"
// MidiPlayer 项目编译设置
//include ':midiplayer'
//rootProject.name = "midiplayer"
// WebPageSources 项目编译设置
//include ':webpagesources'
//rootProject.name = "webpagesources"
// Positions 项目编译设置
//include ':positions'
//rootProject.name = "positions"
// WinBoLL 项目编译设置
//include ':winboll'
//include ':libwinboll'
//rootProject.name = "winboll"
// RegExpUtils 项目编译设置
//include ':regexputils'
//rootProject.name = "regexputils"
// GPSRelaySentinel 项目编译设置
//include ':gpsrelaysentinel'
//include ':libgpsrelaysentinel'
//rootProject.name = "gpsrelaysentinel"
// Gallery 项目编译设置
//include ':gallery'
//rootProject.name = "gallery"
// DebugTemp 项目编译设置
//include ':debugtemp'
//include ':libdebugtemp'
//rootProject.name = "debugtemp"
// AutoNFC 项目编译设置
//include ':autonfc'
//rootProject.name = "autonfc"