From d673ba46a1064b96ea4d2049f49d635dbcd42217 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 10 Apr 2026 05:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E5=BA=94=E7=94=A8=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=97=B6=E4=BD=BF=E7=94=A8=E7=9A=84=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E7=A7=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +-- .../winboll/studio/appbase/AboutActivity.java | 2 +- libappbase/build.properties | 4 +-- .../dialogs/APPValidationDialog.java | 10 +++--- .../studio/libappbase/utils/APPUtils.java | 8 ++--- .../studio/libappbase/views/AboutView.java | 32 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 63e1068..45a3394 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Apr 06 20:39:30 HKT 2026 +#Thu Apr 09 18:07:20 GMT 2026 stageCount=18 libraryProject=libappbase baseVersion=15.15 publishVersion=15.15.17 -buildCount=0 +buildCount=5 baseBetaVersion=15.15.18 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/AboutActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/AboutActivity.java index 26eb926..fea29ce 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/AboutActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/AboutActivity.java @@ -43,7 +43,7 @@ public class AboutActivity extends Activity { LogUtils.d(TAG, "genDefaultAppInfo() 调用"); String branchName = "appbase"; APPInfo appInfo = new APPInfo(); - appInfo.setAppName(getString(R.string.app_name)); + appInfo.setAppName("APPBase"); appInfo.setAppIcon(R.drawable.ic_winboll); appInfo.setAppDescription(getString(R.string.app_description)); appInfo.setAppGitName("WinBoLL"); diff --git a/libappbase/build.properties b/libappbase/build.properties index 63e1068..45a3394 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Apr 06 20:39:30 HKT 2026 +#Thu Apr 09 18:07:20 GMT 2026 stageCount=18 libraryProject=libappbase baseVersion=15.15 publishVersion=15.15.17 -buildCount=0 +buildCount=5 baseBetaVersion=15.15.18 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/APPValidationDialog.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/APPValidationDialog.java index 97e9fcb..2e70ea8 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/APPValidationDialog.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/APPValidationDialog.java @@ -31,18 +31,18 @@ public class APPValidationDialog extends Dialog { private TextView tvAuthResult; // ===================================== 业务入参属性 ===================================== - private String projectName; + private String appName; private String versionName; private String clientSign; private String clientHash; // ===================================== 构造方法 ===================================== - public APPValidationDialog(Context context, String projectName, String versionName) { + public APPValidationDialog(Context context, String appName, String versionName) { super(context, R.style.DialogStyle); this.mContext = context; - this.projectName = projectName; + this.appName = appName; this.versionName = versionName; - LogUtils.d(TAG, "AppValidationDialog: 构造方法初始化，入参-> projectName=" + projectName + ", versionName=" + versionName); + LogUtils.d(TAG, "AppValidationDialog: 构造方法初始化，入参-> projectName=" + appName + ", versionName=" + versionName); } // ===================================== 生命周期方法 ===================================== @@ -104,7 +104,7 @@ public class APPValidationDialog extends Dialog { // 调用网络校验接口 new APPUtils().checkAPKValidation( mContext, - projectName, + appName, versionName, clientSign, clientHash, diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APPUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APPUtils.java index 3e13aac..b815497 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APPUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APPUtils.java @@ -49,10 +49,10 @@ public class APPUtils { * @param clientHash 外部计算的APK SHA256哈希字符串（小写16进制） * @param callback 校验结果回调（主线程调用，返回是否合法+提示信息） */ - public void checkAPKValidation(Context context, String projectName, String versionName, + public void checkAPKValidation(Context context, String appName, String versionName, String clientSign, String clientHash, final CheckResultCallback callback) { // 方法调用+全量入参调试日志 - LogUtils.d(TAG, "checkAPKValidation: 方法调用，入参-> projectName=" + projectName + LogUtils.d(TAG, "checkAPKValidation: 方法调用，入参-> appName=" + appName + ", versionName=" + versionName + ", clientSign=" + clientSign + ", clientHash=" + clientHash); // 1. 核心入参空值校验（快速失败） @@ -61,7 +61,7 @@ public class APPUtils { callCallbackOnMainThread(callback, false, "上下文对象不能为空"); return; } - if (isStringEmpty(projectName)) { + if (isStringEmpty(appName)) { LogUtils.w(TAG, "checkAPKValidation: 入参projectName为空/空白，直接返回校验失败"); callCallbackOnMainThread(callback, false, "项目名称不能为空"); return; @@ -85,7 +85,7 @@ public class APPUtils { // 2. 动态参数URL编码（避免特殊字符导致请求解析异常） LogUtils.d(TAG, "checkAPKValidation: 开始对动态参数进行UTF-8 URL编码"); - String encodeProjectName = urlEncode(projectName); + String encodeProjectName = urlEncode(appName); String encodeVersionName = urlEncode(versionName); String encodeClientSign = urlEncode(clientSign); String encodeClientHash = urlEncode(clientHash); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java index 97494ea..338f004 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java @@ -93,14 +93,14 @@ public class AboutView extends LinearLayout { initViewFromXml(); } - public AboutView(Context context, APPInfo appInfo) { - super(context); - LogUtils.d(TAG, "AboutView(Context,APPInfo)：传入应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName())); - this.mContext = context; - this.mAPPInfo = appInfo; - initViewFromXml(); - initAll(); - } +// public AboutView(Context context, APPInfo appInfo) { +// super(context); +// LogUtils.d(TAG, "AboutView(Context,APPInfo)：传入应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName())); +// this.mContext = context; +// this.mAPPInfo = appInfo; +// initViewFromXml(); +// initAll(); +// } public AboutView(Context context, AttributeSet attrs) { super(context, attrs); @@ -142,13 +142,13 @@ public class AboutView extends LinearLayout { * 重置应用信息并重新初始化页面，支持动态更新关于页内容 * @param appInfo 新的应用信息实体 */ - public void setAPPInfoAndInit(APPInfo appInfo) { - LogUtils.d(TAG, "setAPPInfoAndInit()：重置应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName())); - this.mAPPInfo = appInfo; - if (llFunctionContainer != null) llFunctionContainer.removeAllViews(); - initAll(); - LogUtils.d(TAG, "setAPPInfoAndInit()：应用信息重置+页面重构完成"); - } +// public void setAPPInfoAndInit(APPInfo appInfo) { +// LogUtils.d(TAG, "setAPPInfoAndInit()：重置应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName())); +// this.mAPPInfo = appInfo; +// if (llFunctionContainer != null) llFunctionContainer.removeAllViews(); +// initAll(); +// LogUtils.d(TAG, "setAPPInfoAndInit()：应用信息重置+页面重构完成"); +// } /** * 设置应用信息，兼容旧调用逻辑，设置后自动重构页面 @@ -333,7 +333,7 @@ public class AboutView extends LinearLayout { @Override public void onClick(View v) { LogUtils.d(TAG, "ibSigngetDialog onClick：唤起应用正版校验弹窗"); - new APPValidationDialog(mContext, mszAppGitName, mszAppVersionName).show(); + new APPValidationDialog(mContext, mszAppName, mszAppVersionName).show(); } }); // 调试地址配置弹窗