From 4333466d8e1933ed255164a0426616f7d3bfcbee Mon Sep 17 00:00:00 2001 From: hwf453 Date: Wed, 17 Apr 2024 15:54:51 +0800 Subject: [PATCH] =?UTF-8?q?2.2.8=20=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- app/src/main/java/com/rehome/zhdcoa/Contans.java | 2 ++ .../java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt | 5 +++-- .../zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt | 6 ++++++ .../com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt | 6 ++++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e2098f..ccf8ae6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 34 - versionCode 11 - versionName "2.2.7" + versionCode 12 + versionName "2.2.8" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index e868198..3270f81 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -20,6 +20,8 @@ public class Contans { public static String BASE_URL = "http://219.131.195.3:8082/"; //http://192.168.2.215:8082/ // http://219.131.195.3:8082/ public static String IP = "http://219.131.195.3:8081/"; + //学习中心课件文件内网服务器地址 + public static String BASE_URL_STUDY_FILE = "http://10.19.0.72:8089/"; public static String CK_BASE_IP = "http://10.19.0.13:80/"; 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 9348166..81c594b 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 @@ -180,14 +180,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (BuildConfig.LOG_ERROR) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") // binding.etUsername.setText("310386") // binding.etPassword.setText("Zhps$cc0386") // 生产岗位 卢高波 // binding.etUsername.setText("310492") // binding.etPassword.setText("Dudu520520+") + //MeetingBook //陈坚标 // binding.etUsername.setText("310063") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt index be2a523..2ac35ba 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt @@ -60,6 +60,12 @@ class ProduceStudyInfoMoreActivity : override fun initView() { launcherResult = createActivityResultLauncher() URL = Contans.BASE_URL + if(Contans.BASE_URL.equals(Contans.BASE_URL_INTRANET)){ + URL = Contans.BASE_URL_STUDY_FILE + } + showLog("<-----URL----->") + showLog(URL) + //文件下载进度条弹框 //文件下载进度条弹框 dialog = ProgressDialog(this) diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt index f8ae895..40031d0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt @@ -53,6 +53,12 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding") + showLog(URL) + //文件下载进度条弹框 //文件下载进度条弹框 dialog = ProgressDialog(this)