Studio/WinBoLL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更正应用验证时使用的应用包名称配置

Browse Source
This commit is contained in:
ZhangShaojian
2026-04-10 05:36:14 +08:00
parent 5a1342156f
commit d673ba46a1
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appbase/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #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 stageCount=18
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.15 baseVersion=15.15
publishVersion=15.15.17 publishVersion=15.15.17
buildCount=0 buildCount=5
baseBetaVersion=15.15.18 baseBetaVersion=15.15.18

2
appbase/src/main/java/cc/winboll/studio/appbase/AboutActivity.java
View File

@@ -43,7 +43,7 @@ public class AboutActivity extends Activity {
LogUtils.d(TAG, "genDefaultAppInfo() 调用"); LogUtils.d(TAG, "genDefaultAppInfo() 调用");
String branchName = "appbase"; String branchName = "appbase";
APPInfo appInfo = new APPInfo(); APPInfo appInfo = new APPInfo();
appInfo.setAppName(getString(R.string.app_name)); appInfo.setAppName("APPBase");
appInfo.setAppIcon(R.drawable.ic_winboll); appInfo.setAppIcon(R.drawable.ic_winboll);
appInfo.setAppDescription(getString(R.string.app_description)); appInfo.setAppDescription(getString(R.string.app_description));
appInfo.setAppGitName("WinBoLL"); appInfo.setAppGitName("WinBoLL");

4
libappbase/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #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 stageCount=18
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.15 baseVersion=15.15
publishVersion=15.15.17 publishVersion=15.15.17
buildCount=0 buildCount=5
baseBetaVersion=15.15.18 baseBetaVersion=15.15.18

10
libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/APPValidationDialog.java
View File

@@ -31,18 +31,18 @@ public class APPValidationDialog extends Dialog {
private TextView tvAuthResult; private TextView tvAuthResult;
// ===================================== 业务入参属性 ===================================== // ===================================== 业务入参属性 =====================================
private String projectName; private String appName;
private String versionName; private String versionName;
private String clientSign; private String clientSign;
private String clientHash; private String clientHash;
// ===================================== 构造方法 ===================================== // ===================================== 构造方法 =====================================
public APPValidationDialog(Context context, String projectName, String versionName) { public APPValidationDialog(Context context, String appName, String versionName) {
super(context, R.style.DialogStyle); super(context, R.style.DialogStyle);
this.mContext = context; this.mContext = context;
this.projectName = projectName; this.appName = appName;
this.versionName = versionName; 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( new APPUtils().checkAPKValidation(
mContext, mContext,
projectName, appName,
versionName, versionName,
clientSign, clientSign,
clientHash, clientHash,

8
libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APPUtils.java
View File

@@ -49,10 +49,10 @@ public class APPUtils {
* @param clientHash 外部计算的APK SHA256哈希字符串（小写16进制） * @param clientHash 外部计算的APK SHA256哈希字符串（小写16进制）
* @param callback 校验结果回调（主线程调用，返回是否合法+提示信息） * @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) { 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); + ", versionName=" + versionName + ", clientSign=" + clientSign + ", clientHash=" + clientHash);
// 1. 核心入参空值校验（快速失败） // 1. 核心入参空值校验（快速失败）
@@ -61,7 +61,7 @@ public class APPUtils {
callCallbackOnMainThread(callback, false, "上下文对象不能为空"); callCallbackOnMainThread(callback, false, "上下文对象不能为空");
return; return;
} }
if (isStringEmpty(projectName)) { if (isStringEmpty(appName)) {
LogUtils.w(TAG, "checkAPKValidation: 入参projectName为空/空白，直接返回校验失败"); LogUtils.w(TAG, "checkAPKValidation: 入参projectName为空/空白，直接返回校验失败");
callCallbackOnMainThread(callback, false, "项目名称不能为空"); callCallbackOnMainThread(callback, false, "项目名称不能为空");
return; return;
@@ -85,7 +85,7 @@ public class APPUtils {
// 2. 动态参数URL编码（避免特殊字符导致请求解析异常） // 2. 动态参数URL编码（避免特殊字符导致请求解析异常）
LogUtils.d(TAG, "checkAPKValidation: 开始对动态参数进行UTF-8 URL编码"); LogUtils.d(TAG, "checkAPKValidation: 开始对动态参数进行UTF-8 URL编码");
String encodeProjectName = urlEncode(projectName); String encodeProjectName = urlEncode(appName);
String encodeVersionName = urlEncode(versionName); String encodeVersionName = urlEncode(versionName);
String encodeClientSign = urlEncode(clientSign); String encodeClientSign = urlEncode(clientSign);
String encodeClientHash = urlEncode(clientHash); String encodeClientHash = urlEncode(clientHash);

32
libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
View File

@@ -93,14 +93,14 @@ public class AboutView extends LinearLayout {
initViewFromXml(); initViewFromXml();
} }
public AboutView(Context context, APPInfo appInfo) { // public AboutView(Context context, APPInfo appInfo) {
super(context); // super(context);
LogUtils.d(TAG, "AboutView(Context,APPInfo)：传入应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName())); // LogUtils.d(TAG, "AboutView(Context,APPInfo)：传入应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName()));
this.mContext = context; // this.mContext = context;
this.mAPPInfo = appInfo; // this.mAPPInfo = appInfo;
initViewFromXml(); // initViewFromXml();
initAll(); // initAll();
} // }
public AboutView(Context context, AttributeSet attrs) { public AboutView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
@@ -142,13 +142,13 @@ public class AboutView extends LinearLayout {
* 重置应用信息并重新初始化页面，支持动态更新关于页内容 * 重置应用信息并重新初始化页面，支持动态更新关于页内容
* @param appInfo 新的应用信息实体 * @param appInfo 新的应用信息实体
*/ */
public void setAPPInfoAndInit(APPInfo appInfo) { // public void setAPPInfoAndInit(APPInfo appInfo) {
LogUtils.d(TAG, "setAPPInfoAndInit()：重置应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName())); // LogUtils.d(TAG, "setAPPInfoAndInit()：重置应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName()));
this.mAPPInfo = appInfo; // this.mAPPInfo = appInfo;
if (llFunctionContainer != null) llFunctionContainer.removeAllViews(); // if (llFunctionContainer != null) llFunctionContainer.removeAllViews();
initAll(); // initAll();
LogUtils.d(TAG, "setAPPInfoAndInit()：应用信息重置+页面重构完成"); // LogUtils.d(TAG, "setAPPInfoAndInit()：应用信息重置+页面重构完成");
} // }
/** /**
* 设置应用信息，兼容旧调用逻辑，设置后自动重构页面 * 设置应用信息，兼容旧调用逻辑，设置后自动重构页面
@@ -333,7 +333,7 @@ public class AboutView extends LinearLayout {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
LogUtils.d(TAG, "ibSigngetDialog onClick：唤起应用正版校验弹窗"); LogUtils.d(TAG, "ibSigngetDialog onClick：唤起应用正版校验弹窗");
new APPValidationDialog(mContext, mszAppGitName, mszAppVersionName).show(); new APPValidationDialog(mContext, mszAppName, mszAppVersionName).show();
} }
}); });
// 调试地址配置弹窗 // 调试地址配置弹窗