From 7298936665eb140832b6c7287768f22719e2ca0d Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Thu, 17 Oct 2024 11:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0shsx=5Ftest=E5=8F=98=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 10 +++++----
 .../com/project/survey/ui/SplashActivity.kt   |  1 -
 .../java/com/project/survey/util/MockUtil.kt  | 21 ++++++++++++-------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a138c10..26b8548 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,9 @@ android {
         minSdkVersion AndroidSdk.minSdkVersion
         targetSdkVersion AndroidSdk.targetSdkVersion
 
+        def versionUtils = new SurveyorVersionUtils(project)
+        versionCode versionUtils.versionCode + 0
+        versionName versionUtils.versionName
 
         ndk {}
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -45,9 +48,8 @@ android {
 
     productFlavors {
         shsx {
-            def versionUtils = new SurveyorVersionUtils(project)
-            versionCode versionUtils.versionCode + 0
-            versionName versionUtils.versionName
+        }
+        shsx_test {
         }
     }
 
@@ -109,7 +111,7 @@ android {
         def versionNameString = variant.productFlavors.get(0).versionName
         def branch = "_" + ('git rev-parse --short HEAD'.execute().text.trim())
         variant.outputs.all { output ->
-            def versionName = (versionNameString + branch).replace(".", "_")
+            def versionName = (versionName + branch).replace(".", "_")
             def apkName = output.outputFileName.replace(".apk", "_" + versionName + ".apk")
             output.outputFileName = apkName
 
diff --git a/app/src/main/java/com/project/survey/ui/SplashActivity.kt b/app/src/main/java/com/project/survey/ui/SplashActivity.kt
index 9dea6cf..cd4d94f 100644
--- a/app/src/main/java/com/project/survey/ui/SplashActivity.kt
+++ b/app/src/main/java/com/project/survey/ui/SplashActivity.kt
@@ -5,7 +5,6 @@ import androidx.fragment.app.viewModels
 import com.project.survey.constants.SPConstants
 import com.project.survey.databinding.ActivitySplashBinding
 import com.project.survey.logic.viewmodel.MainViewModel
-import com.project.survey.model.LoginBean
 import com.project.survey.model.ProjectBean
 import com.project.survey.ui.base.BaseBindingActivity
 import com.project.survey.ui.login.LoginActivity
diff --git a/app/src/main/java/com/project/survey/util/MockUtil.kt b/app/src/main/java/com/project/survey/util/MockUtil.kt
index fbb3e6c..851106d 100644
--- a/app/src/main/java/com/project/survey/util/MockUtil.kt
+++ b/app/src/main/java/com/project/survey/util/MockUtil.kt
@@ -11,14 +11,15 @@ import com.bingce.data.surveyor.designdata.kv.KeyValueRecord
 import com.bingce.data.surveyor.designdata.project.ProjectRecord
 import com.bingce.utils.ThreadPoolUtil
 import com.project.survey.App
+import com.project.survey.BuildConfig
 import com.project.survey.constants.SPConstants
 import java.util.Date
 
 object MockUtil {
 
-    val isTest = false
+    val isTest = "shsx_test" == BuildConfig.FLAVOR
 
-    fun login(){
+    fun login() {
         SPUtils.put(SPConstants.ACCOUNT, "zhangsan")
         SPUtils.put(SPConstants.TOKEN, "1234567890")
         val personId = "123456"
@@ -31,7 +32,8 @@ object MockUtil {
 
         // 存储配置--当前项目
         ThreadPoolUtil.execute {
-            var userConfig = AppDataBase.getInstance().userConfigDao().findByLeanCloudUserId(personId)
+            var userConfig =
+                AppDataBase.getInstance().userConfigDao().findByLeanCloudUserId(personId)
             if (userConfig == null) { //创建第一个用户配置--使用默认数据目录
                 userConfig = UserConfig.newItem(
                     personId,
@@ -42,8 +44,12 @@ object MockUtil {
 
             //存储新的项目
             ProjectDb.getInstance().save(
-                ProjectRecord(projectId, "哈哈工程",
-                    CoordinateSystem.newCoordinateSystem(App.instance.applicationContext), Date().time).apply {
+                ProjectRecord(
+                    projectId,
+                    "哈哈工程",
+                    CoordinateSystem.newCoordinateSystem(App.instance.applicationContext),
+                    Date().time
+                ).apply {
                     author = "张哈哈"
                 }
             )
@@ -52,14 +58,15 @@ object MockUtil {
             if (currentProjectConfig != null) {
                 currentProjectConfig.value = projectId
             } else {
-                currentProjectConfig = KeyValueRecord(KeyValueConstants.KEY_CURRENT_PROJECT_ID, projectId)
+                currentProjectConfig =
+                    KeyValueRecord(KeyValueConstants.KEY_CURRENT_PROJECT_ID, projectId)
             }
             KeyValueDb.getInstance().save(currentProjectConfig)
         }
 
     }
 
-    fun logout(){
+    fun logout() {
 
     }
 }
\ No newline at end of file