From c4b2804d58318d40206aa9f0848fd7b33c6ae1f4 Mon Sep 17 00:00:00 2001 From: hwf452 Date: Fri, 17 Jan 2025 16:12:10 +0800 Subject: [PATCH] dsfdf --- ZJYXDXJ/app/build.gradle | 6 ++++++ .../main/java/com/bjzc/zjyxdxj/activity/LoginActivity.java | 7 ++++--- .../main/java/com/bjzc/zjyxdxj/activity/MainActivity.java | 3 ++- .../com/bjzc/zjyxdxj/activity/sbxj/XscbglActivity.java | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ZJYXDXJ/app/build.gradle b/ZJYXDXJ/app/build.gradle index 778203c..895e6d2 100755 --- a/ZJYXDXJ/app/build.gradle +++ b/ZJYXDXJ/app/build.gradle @@ -42,6 +42,12 @@ android { minifyEnabled false //开启代码混淆，防止反编译查看源代码 debuggable false // 是否debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + //修改生成的apk名字 + android.applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "zynyyxqj.apk" + } + } signingConfig signingConfigs.release // 打包签名信息 } } diff --git a/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/LoginActivity.java b/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/LoginActivity.java index a12915e..5584d2e 100755 --- a/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/LoginActivity.java +++ b/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/LoginActivity.java @@ -152,8 +152,8 @@ public class LoginActivity extends BaseActivity { // etUse.setText("181145"); // etPwd.setText("13902576510"); - etUse.setText("180701"); - etPwd.setText("13902576186"); +// etUse.setText("180701"); +// etPwd.setText("13902576186"); } @@ -398,6 +398,7 @@ public class LoginActivity extends BaseActivity { ApkUpdateBean appUploadInfo = response.body(); if (appUploadInfo != null) { if (appUploadInfo.getTotal() != null && appUploadInfo.getTotal().equals("1")) { + showLog(GsonUtils.GsonString(appUploadInfo)); String appURL = appUploadInfo.getRows().get(0).getApkurl(); String appversionname = appUploadInfo.getRows().get(0).getVersionname(); String versioncode = appUploadInfo.getRows().get(0).getVersioncode(); @@ -433,7 +434,7 @@ public class LoginActivity extends BaseActivity { .apkUrl(downloadURL) .apkName("中粤能源点巡检.apk") .smallIcon(R.mipmap.logo1) - .showNewerToast(true) + .showNewerToast(false) .apkVersionCode(Integer.parseInt(versionCode)) .apkVersionName(versionName) .apkDescription(description) diff --git a/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/MainActivity.java b/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/MainActivity.java index a634638..3c2b770 100644 --- a/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/MainActivity.java +++ b/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/MainActivity.java @@ -517,6 +517,7 @@ public class MainActivity extends BaseActivity3 { ApkUpdateBean appUploadInfo = response.body(); if (appUploadInfo != null) { if (appUploadInfo.getTotal() != null && appUploadInfo.getTotal().equals("1")) { + showLog(GsonUtils.GsonString(appUploadInfo)); String appURL = appUploadInfo.getRows().get(0).getApkurl(); String appversionname = appUploadInfo.getRows().get(0).getVersionname(); String versioncode = appUploadInfo.getRows().get(0).getVersioncode(); @@ -550,7 +551,7 @@ public class MainActivity extends BaseActivity3 { .apkUrl(downloadURL) .apkName("中粤能源点巡检.apk") .smallIcon(R.mipmap.logo1) - .showNewerToast(true) + .showNewerToast(false) .apkVersionCode(Integer.parseInt(versionCode)) .apkVersionName(versionName) .apkDescription(description) diff --git a/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/sbxj/XscbglActivity.java b/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/sbxj/XscbglActivity.java index 1f67202..fc18544 100755 --- a/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/sbxj/XscbglActivity.java +++ b/ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/sbxj/XscbglActivity.java @@ -348,7 +348,7 @@ public class XscbglActivity extends BaseActivity { info.setAction("BA_XJGL_RWLB_GET"); info.setId(id); String json = GsonUtils.GsonString(info); - //Log.i("app", json); + showLog(json); return json; }