From bb24f10086d9202c9880fef37993973437f51c4d Mon Sep 17 00:00:00 2001 From: wenfei Date: Tue, 29 Jul 2025 10:31:00 +0800 Subject: [PATCH] =?UTF-8?q?app=E5=85=A5=E5=8F=A3=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90?= =?UTF-8?q?=20https://mobile.zhp.geg.com.cn:7081?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/rehome/zhdcoa/Contans.java | 4 +++- .../java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt | 8 ++++++-- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index feb4eac..40a4518 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -44,7 +44,9 @@ public class Contans { //巡检，点检，仓库 内网服务器 （设备设施巡检） //public static String IP_INTRANET = "http://10.19.0.72:8081/"; - public static String IP_INTRANET = "https://eoffice.zhp.geg.com.cn:7081/"; + //public static String IP_INTRANET = "https://eoffice.zhp.geg.com.cn:7081/"; + //启用新域名，统一内网app入口 + public static String IP_INTRANET = "https://mobile.zhp.geg.com.cn:7081/"; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 7150734..b16c0d8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -174,8 +174,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@996") + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") //公司内网215管理员 // binding.etUsername.setText("ZHPS_Admin") @@ -217,6 +217,10 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("310063") // binding.etPassword.setText("ZHPs@040909") + ////郑佩障 +// binding.etUsername.setText("310569") +// binding.etPassword.setText("sUnnY@0926") + //谭添欢 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b3d79f6..b0516f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.9.1" +agp = "8.10.0" androidxAppcompat = "1.7.0" androidxRecyclerview = "1.4.0" appupdate = "4.2.6" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5e3e76a..a274bfe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip