refactor(activity): 清理 InitActivity 中的注释代码,保留有效初始化逻辑
This commit is contained in:
@@ -2,7 +2,6 @@ package com.shuwei.dish.match.ui
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.os.Bundle
|
||||
import android.provider.Settings
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import com.shuwei.dish.match.base.BaseActivity
|
||||
@@ -11,15 +10,11 @@ import com.shuwei.dish.match.base.DeviceRole
|
||||
import com.shuwei.dish.match.base.GlobalData
|
||||
import com.shuwei.dish.match.databinding.ActivityInitBinding
|
||||
import com.shuwei.dish.match.db.AppRepository
|
||||
import com.shuwei.dish.match.http.UrlConfig
|
||||
import com.shuwei.dish.match.utils.AppUtil
|
||||
import com.shuwei.dish.match.utils.QRCodeUtil
|
||||
import com.shuwei.dish.match.utils.SpTool
|
||||
import com.shuwei.dish.match.utils.WeightUtil
|
||||
import com.shuwei.dish.match.utils.Weigher2
|
||||
import com.shuwei.dish.match.utils.ext.dp
|
||||
import com.shuwei.dish.match.utils.WeightUtil
|
||||
import com.shuwei.dish.match.utils.ext.startActivity
|
||||
import com.shuwei.dish.match.utils.ext.toObject
|
||||
import com.shuwei.dish.match.viewmodel.AppViewModel
|
||||
import com.shuwei.dish.match.viewmodel.factory.AppFactory
|
||||
import kotlinx.coroutines.delay
|
||||
@@ -48,44 +43,12 @@ class InitActivity : BaseActivity() {
|
||||
setHeaderBgVisible(false)
|
||||
BaseApp.appVersion = AppUtil.getAppVersionCode(this).toString()
|
||||
|
||||
// 获取 ANDROID_ID
|
||||
// var androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
|
||||
// androidId = "39a7abdd06b3c7ab"
|
||||
// BaseApp.deviceId = androidId
|
||||
// SpTool.put(SpTool.DEVICE_ID, androidId)
|
||||
// BaseApp.configUrl = UrlConfig.BASE_URL
|
||||
BaseApp.canteenId = "0"
|
||||
// // TODO: 以上保存deviceId用于临时使用,后续改为下面注释方式
|
||||
|
||||
// var deviceId = AppUtil.getUDID(this)
|
||||
// Log.d(TAG, "onCreate: deviceId=$deviceId")
|
||||
//// deviceId = "39a7abdd06b3c7ab"
|
||||
// deviceId = "3ea47dc0-3cf0-3c2f-909c-265a9a65572e"
|
||||
//// deviceId = "6ce7cd59-b875-38b2-b73d-88a570be3212"
|
||||
//
|
||||
// BaseApp.deviceId = deviceId
|
||||
//
|
||||
// SpTool.put(SpTool.DEVICE_ID, deviceId)
|
||||
// val deviceConfigCache = SpTool.getString(SpTool.DEVICE_CONFIG_CACHE)
|
||||
// val checkResult = checkConfigData(deviceConfigCache)
|
||||
// if (checkResult.not()) {
|
||||
// binding.ivQrCode.visible()
|
||||
// binding.btnInit.visible()
|
||||
// //进行初始化操作
|
||||
// initConfig()
|
||||
// return
|
||||
// }
|
||||
|
||||
// binding.ivQrCode.invisible()
|
||||
// binding.btnInit.invisible()
|
||||
|
||||
initViewModel()
|
||||
// 若有保存的串口配置则先应用(子设备串口可能与主设备不同)
|
||||
// val savedPort = SpTool.getString(SpTool.SCALE_DEVICE_PORT, "")
|
||||
// if (savedPort.isNotEmpty()) {
|
||||
// Weigher2.setDevicePort(savedPort)
|
||||
// }
|
||||
// TODO: 测试不同的串口配置---------------------2、5、3
|
||||
|
||||
// 主设备上/dev/ttyS7,子设备是/dev/ttyS4
|
||||
Weigher2.setDevicePort(
|
||||
if (GlobalData.deviceId == "8fc2ab34-2137-3112-acca-f884ea8736d4") {
|
||||
"/dev/ttyS7"
|
||||
@@ -133,21 +96,18 @@ class InitActivity : BaseActivity() {
|
||||
if (it.isEmpty()) {
|
||||
//无调料信息打开采样历史列表页面,点击设置配置调料信息
|
||||
startActivity<SamplingListActivity>()
|
||||
// finish()
|
||||
return@loadSeasoning
|
||||
}
|
||||
appViewModel.countCookFood(cookMode = 1) { count ->
|
||||
if (count > 0) {
|
||||
//有烹饪中数据打开采样历史列表页面
|
||||
startActivity<SamplingListActivity>()
|
||||
// finish()
|
||||
return@countCookFood
|
||||
}
|
||||
//无烹饪数据打开新增采样页面
|
||||
startActivity<DishSamplingActivity> {
|
||||
putExtra(DishSamplingActivity.PAGE_FROM, DishSamplingActivity.HOME)
|
||||
}
|
||||
// finish()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -170,71 +130,6 @@ class InitActivity : BaseActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
// private fun initConfig() {
|
||||
// binding.ivQrCode.setImageBitmap(
|
||||
// QRCodeUtil.generateQRCode(
|
||||
// content = BaseApp.deviceId ?: "",
|
||||
// size = 200.dp
|
||||
// )
|
||||
// )
|
||||
// binding.btnInit.setOnClickListener {
|
||||
//// HttpUtil.loopGetToken = false
|
||||
//// getDeviceConfig()
|
||||
// }
|
||||
// }
|
||||
|
||||
// private fun getDeviceConfig() {
|
||||
// val tokenUrl =
|
||||
// "${UrlConfig.DEVICE_TOKEN}?qrcodeId=${BaseApp.deviceId}&appVersion=${BaseApp.appVersion}"
|
||||
// HttpUtil.get(url = tokenUrl, doSuccess = { token ->
|
||||
// Log.d(TAG, "initConfig: $token")
|
||||
// getConfig(token.toString())
|
||||
// }, doFailure = { code, msg ->
|
||||
// Log.d(TAG, "initConfig: $code,$msg")
|
||||
// })
|
||||
// }
|
||||
|
||||
// private fun getConfig(token: String) {
|
||||
// val deviceConfigUrl =
|
||||
// "${UrlConfig.DEVICE_CONFIG}?equipmentCode=${BaseApp.deviceId}&&appVersion=${BaseApp.appVersion}"
|
||||
// HttpUtil.get(
|
||||
// url = deviceConfigUrl, header = mutableMapOf(
|
||||
// "X-Access-Token" to token
|
||||
// ), doSuccess = {
|
||||
// Log.d(TAG, "getDeviceConfig: $it")
|
||||
// val data = it.toJsonString()
|
||||
// val checkResult = checkConfigData(data)
|
||||
// if (checkResult.not()) {
|
||||
// toast("初始化设备失败,请稍后重试")
|
||||
// return@get
|
||||
// }
|
||||
// HttpUtil.loopGetToken = true
|
||||
// SpTool.put(SpTool.DEVICE_CONFIG_CACHE, data)
|
||||
// startActivity<HomeActivity>()
|
||||
//// finish()
|
||||
// }, doFailure = { code, msg ->
|
||||
// Log.d(TAG, "getDeviceConfig: $code,$msg")
|
||||
// toast("初始化设备失败,请稍后重试,code=${code},msg=${msg}")
|
||||
// })
|
||||
// }
|
||||
|
||||
data class DeviceConfigBean(
|
||||
var appPackageUrl: String? = null,
|
||||
var canteenId: String? = null
|
||||
)
|
||||
|
||||
// private fun checkConfigData(data: String): Boolean {
|
||||
// if (data.isBlank()) {
|
||||
// return false
|
||||
// }
|
||||
// val config = data.toObject<DeviceConfigBean?>()
|
||||
// if (config == null) {
|
||||
// return false
|
||||
// }
|
||||
// BaseApp.configUrl = config.appPackageUrl ?: ""
|
||||
// BaseApp.canteenId = config.canteenId ?: ""
|
||||
// return true
|
||||
// }
|
||||
|
||||
override fun onDestroy() {
|
||||
WeightUtil.stopContinuousRead()
|
||||
|
||||
Reference in New Issue
Block a user