yixiong/digitalCoalMiningPlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
lvmeng
2025-09-19 15:27:33 +08:00
parent 6f2a47ad3f
commit f9f800bef3
5 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/login/activity/LoginActivity.kt
+3 -5
View File
@@ -9,11 +9,8 @@ import com.zmkg.coaloperation.base.BaseVMBActivity
import com.zmkg.coaloperation.base.viewmodel.TestViewModel import com.zmkg.coaloperation.base.viewmodel.TestViewModel
import com.zmkg.coaloperation.databinding.ActivityLoginBinding import com.zmkg.coaloperation.databinding.ActivityLoginBinding
import com.zmkg.coaloperation.local.DataStoreManager import com.zmkg.coaloperation.local.DataStoreManager
import com.zmkg.coaloperation.local.DataStoreUtils
import com.zmkg.coaloperation.superfuntion.loginIm import com.zmkg.coaloperation.superfuntion.loginIm
import com.zmkg.coaloperation.utils.UserUtils import com.zmkg.coaloperation.utils.SpTool
import com.zmkg.coaloperation.utils.toJsonString
import com.zmkg.coaloperation.utils.toObject
class LoginActivity : class LoginActivity :
BaseVMBActivity<TestViewModel, ActivityLoginBinding>(R.layout.activity_login) { BaseVMBActivity<TestViewModel, ActivityLoginBinding>(R.layout.activity_login) {
@@ -52,7 +49,8 @@ class LoginActivity :
loginIm(userName) {} loginIm(userName) {}
DataStoreManager.setUserName(userName) DataStoreManager.setUserName(userName)
UserUtils.saveUserData(userName) // TODO: 保存临时生成的用户id
SpTool.put(SpTool.USER_ID, "1758266158000")
toActivity(MainActivity::class.java) toActivity(MainActivity::class.java)
finish() finish()
coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt
+1 -1
View File
@@ -181,7 +181,7 @@ class TunnelingActivity :
@SuppressLint("SuspiciousIndentation") @SuppressLint("SuspiciousIndentation")
private fun getRecordAdapter(position:Int):TunnelWorkingFaceRecordAdapter { private fun getRecordAdapter(position:Int):TunnelWorkingFaceRecordAdapter {
val viewHolder = val viewHolder =
mBinding.rvList.findViewHolderForLayoutPosition(position) as TunnelWorkingFaceAdapter.VH mBinding.rvTunnelingList.findViewHolderForLayoutPosition(position) as TunnelWorkingFaceAdapter.VH
return viewHolder.binding.rvFaceRecord.adapter as TunnelWorkingFaceRecordAdapter return viewHolder.binding.rvFaceRecord.adapter as TunnelWorkingFaceRecordAdapter
} }
coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/user/fragment/UserFragment.kt
+4 -3
View File
@@ -105,10 +105,11 @@ class UserFragment :
} }
private suspend fun getFaceAndRecordList() { private suspend fun getFaceAndRecordList() {
mViewModel.tunnelFaceAndRecordList.collectLatest { mViewModel.tunnelFaceAndRecordList.collectLatest { dataList ->
Log.d(TAG, "getFaceAndRecordList: ${it.toJsonString()}") Log.d(TAG, "getFaceAndRecordList: ${dataList.toJsonString()}")
it?.let { list -> dataList?.let { list ->
//保存工作面数据 //保存工作面数据
list.forEach { it.userId = SpTool.getString(SpTool.USER_ID) }
workingFaceViewModel.insertList(list) {} workingFaceViewModel.insertList(list) {}
list.forEach { faceEntity -> list.forEach { faceEntity ->
faceEntity.records?.let { recordList -> faceEntity.records?.let { recordList ->
coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/SpTool.kt
+1
View File
@@ -6,6 +6,7 @@ import kotlin.to
object SpTool { object SpTool {
const val DICT_JSON = "dictJson" const val DICT_JSON = "dictJson"
const val USER_ID = "userId"
const val USER_JSON = "userJson" const val USER_JSON = "userJson"
const val USER_ACCOUNT = "userAccount" const val USER_ACCOUNT = "userAccount"
coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/UserUtils.kt
+37 -37
View File
@@ -1,37 +1,37 @@
package com.zmkg.coaloperation.utils //package com.zmkg.coaloperation.utils
//
import com.zmkg.coaloperation.local.DataStoreManager //import com.zmkg.coaloperation.local.DataStoreManager
import com.zmkg.coaloperation.local.DataStoreUtils //import com.zmkg.coaloperation.local.DataStoreUtils
//
object UserUtils { //object UserUtils {
//
const val USER_DATA = "userData" // const val USER_DATA = "userData"
//
fun saveUserData(userName: String) { // fun saveUserData(userName: String) {
var userData = DataStoreUtils.getSyncData(USER_DATA, "") // var userData = DataStoreUtils.getSyncData(USER_DATA, "")
var userMap: MutableMap<String, String?> = mutableMapOf() // var userMap: MutableMap<String, String?> = mutableMapOf()
if (userData.isBlank()) { // if (userData.isBlank()) {
userMap.put(userName, System.currentTimeMillis().toString()) // userMap.put(userName, System.currentTimeMillis().toString())
} else { // } else {
userMap = userData.toObject<MutableMap<String, String?>>() // userMap = userData.toObject<MutableMap<String, String?>>()
val userId = userMap[userName] // val userId = userMap[userName]
if (userId.isNullOrBlank()) { // if (userId.isNullOrBlank()) {
// TODO: ----------- // userMap.put(userName, System.currentTimeMillis().toString())
} // }
} // }
userData = userMap.toJsonString() // userData = userMap.toJsonString()
DataStoreUtils.putSyncData(USER_DATA, userData) // DataStoreUtils.putSyncData(USER_DATA, userData)
} // }
//
fun getUserName() = DataStoreManager.getUserName() // fun getUserName() = DataStoreManager.getUserName()
//
fun getUserId(userName: String = getUserName()): String? { // fun getUserId(userName: String = getUserName()): String? {
val userData = DataStoreUtils.getSyncData(USER_DATA, "") // val userData = DataStoreUtils.getSyncData(USER_DATA, "")
if (userData.isBlank()) { // if (userData.isBlank()) {
return null // return null
} // }
val userMap = userData.toObject<MutableMap<String, String?>>() // val userMap = userData.toObject<MutableMap<String, String?>>()
return userMap[userName] // return userMap[userName]
} // }
//
} //}