添加shsx_test变种

main
chenglifeng 7 months ago
parent 5e3abc157a
commit 7298936665
  1. 10
      app/build.gradle
  2. 1
      app/src/main/java/com/project/survey/ui/SplashActivity.kt
  3. 21
      app/src/main/java/com/project/survey/util/MockUtil.kt

@ -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

@ -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

@ -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() {
}
}
Loading…
Cancel
Save