优化

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/login/activity/LoginActivity.kt

@@ -9,11 +9,8 @@ import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.base.viewmodel.TestViewModel
 import com.zmkg.coaloperation.databinding.ActivityLoginBinding
 import com.zmkg.coaloperation.local.DataStoreManager
-import com.zmkg.coaloperation.local.DataStoreUtils
 import com.zmkg.coaloperation.superfuntion.loginIm
-import com.zmkg.coaloperation.utils.UserUtils
-import com.zmkg.coaloperation.utils.toJsonString
-import com.zmkg.coaloperation.utils.toObject
+import com.zmkg.coaloperation.utils.SpTool
 
 class LoginActivity :
     BaseVMBActivity<TestViewModel, ActivityLoginBinding>(R.layout.activity_login) {
@@ -52,7 +49,8 @@ class LoginActivity :
                 loginIm(userName) {}
                 DataStoreManager.setUserName(userName)
 
-                UserUtils.saveUserData(userName)
+                // TODO: 保存临时生成的用户id
+                SpTool.put(SpTool.USER_ID, "1758266158000")
 
                 toActivity(MainActivity::class.java)
                 finish()

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt

@@ -181,7 +181,7 @@ class TunnelingActivity :
     @SuppressLint("SuspiciousIndentation")
     private fun getRecordAdapter(position:Int):TunnelWorkingFaceRecordAdapter {
         val viewHolder =
-            mBinding.rvList.findViewHolderForLayoutPosition(position) as TunnelWorkingFaceAdapter.VH
+            mBinding.rvTunnelingList.findViewHolderForLayoutPosition(position) as TunnelWorkingFaceAdapter.VH
             return viewHolder.binding.rvFaceRecord.adapter as TunnelWorkingFaceRecordAdapter
     }
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/user/fragment/UserFragment.kt

@@ -105,10 +105,11 @@ class UserFragment :
     }
 
     private suspend fun getFaceAndRecordList() {
-        mViewModel.tunnelFaceAndRecordList.collectLatest {
-            Log.d(TAG, "getFaceAndRecordList: ${it.toJsonString()}")
-            it?.let { list ->
+        mViewModel.tunnelFaceAndRecordList.collectLatest { dataList ->
+            Log.d(TAG, "getFaceAndRecordList: ${dataList.toJsonString()}")
+            dataList?.let { list ->
                 //保存工作面数据
+                list.forEach { it.userId = SpTool.getString(SpTool.USER_ID) }
                 workingFaceViewModel.insertList(list) {}
                 list.forEach { faceEntity ->
                     faceEntity.records?.let { recordList ->

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/SpTool.kt

@@ -6,6 +6,7 @@ import kotlin.to
 object SpTool {
 
     const val DICT_JSON = "dictJson"
+    const val USER_ID = "userId"
     const val USER_JSON = "userJson"
     const val USER_ACCOUNT = "userAccount"
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/utils/UserUtils.kt

@@ -1,37 +1,37 @@
-package com.zmkg.coaloperation.utils
-
-import com.zmkg.coaloperation.local.DataStoreManager
-import com.zmkg.coaloperation.local.DataStoreUtils
-
-object UserUtils {
-
-    const val USER_DATA = "userData"
-
-    fun saveUserData(userName: String) {
-        var userData = DataStoreUtils.getSyncData(USER_DATA, "")
-        var userMap: MutableMap<String, String?> = mutableMapOf()
-        if (userData.isBlank()) {
-            userMap.put(userName, System.currentTimeMillis().toString())
-        } else {
-            userMap = userData.toObject<MutableMap<String, String?>>()
-            val userId = userMap[userName]
-            if (userId.isNullOrBlank()) {
-                // TODO: ----------- 
-            }
-        }
-        userData = userMap.toJsonString()
-        DataStoreUtils.putSyncData(USER_DATA, userData)
-    }
-
-    fun getUserName() = DataStoreManager.getUserName()
-
-    fun getUserId(userName: String = getUserName()): String? {
-        val userData = DataStoreUtils.getSyncData(USER_DATA, "")
-        if (userData.isBlank()) {
-            return null
-        }
-        val userMap = userData.toObject<MutableMap<String, String?>>()
-        return userMap[userName]
-    }
-
-}
+//package com.zmkg.coaloperation.utils
+//
+//import com.zmkg.coaloperation.local.DataStoreManager
+//import com.zmkg.coaloperation.local.DataStoreUtils
+//
+//object UserUtils {
+//
+//    const val USER_DATA = "userData"
+//
+//    fun saveUserData(userName: String) {
+//        var userData = DataStoreUtils.getSyncData(USER_DATA, "")
+//        var userMap: MutableMap<String, String?> = mutableMapOf()
+//        if (userData.isBlank()) {
+//            userMap.put(userName, System.currentTimeMillis().toString())
+//        } else {
+//            userMap = userData.toObject<MutableMap<String, String?>>()
+//            val userId = userMap[userName]
+//            if (userId.isNullOrBlank()) {
+//                userMap.put(userName, System.currentTimeMillis().toString())
+//            }
+//        }
+//        userData = userMap.toJsonString()
+//        DataStoreUtils.putSyncData(USER_DATA, userData)
+//    }
+//
+//    fun getUserName() = DataStoreManager.getUserName()
+//
+//    fun getUserId(userName: String = getUserName()): String? {
+//        val userData = DataStoreUtils.getSyncData(USER_DATA, "")
+//        if (userData.isBlank()) {
+//            return null
+//        }
+//        val userMap = userData.toObject<MutableMap<String, String?>>()
+//        return userMap[userName]
+//    }
+//
+//}