Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS

 Conflicts:

	app/build.gradle

	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt

	app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

	app/src/main/res/layout/fragment_offline_map_state_list.xml

	app/src/main/res/layout/map_view.xml

	collect-library/build.gradle

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt

@@ -58,11 +58,11 @@ class LoginActivity : PermissionsActivity() {
                 loginDialog = null
             }
             LoginStatus.LOGIN_STATUS_SUCCESS -> {
-                val intent = Intent(this@LoginActivity, MainActivity::class.java)
-                startActivity(intent)
-//                    finish()
                 loginDialog?.dismiss()
                 loginDialog = null
+                val intent = Intent(this@LoginActivity, MainActivity::class.java)
+                startActivity(intent)
+                finish()
             }
             LoginStatus.LOGIN_STATUS_CANCEL -> {
                 loginDialog?.dismiss()

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

@@ -8,10 +8,10 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.omqs.bean.LoginUserBean
+import com.navinfo.omqs.db.RoomAppDatabase
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
 import com.navinfo.omqs.tools.FileManager
-import com.navinfo.omqs.tools.RealmCoroutineScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.*
 import okio.IOException
@@ -57,7 +57,7 @@ enum class LoginStatus {
 @HiltViewModel
 class LoginViewModel @Inject constructor(
     private val networkService: NetworkService,
-    private val realmManager: RealmCoroutineScope
+    private val roomAppDatabase: RoomAppDatabase
 ) : ViewModel() {
     //用户信息
     val loginUser: MutableLiveData<LoginUserBean> = MutableLiveData()
@@ -126,9 +126,7 @@ class LoginViewModel @Inject constructor(
                     for (cityBean in result.data) {
                         FileManager.checkOfflineMapFileInfo(cityBean)
                     }
-                    realmManager.launch {
-                        realmManager.insertOrUpdate(result.data)
-                    }
+                    roomAppDatabase.getOfflineMapDao().insertOrUpdate(result.data)
                 }
             }
             is NetResult.Error -> {
@@ -143,7 +141,8 @@ class LoginViewModel @Inject constructor(
                         .show()
                 }
             }
-            NetResult.Loading -> {}
+            is NetResult.Loading -> {}
+            else -> {}
         }
         loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
     }

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -5,6 +5,9 @@ import androidx.activity.viewModels
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
 import com.blankj.utilcode.util.ToastUtils
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.findNavController
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
@@ -26,6 +29,7 @@ class MainActivity : BaseActivity() {
     //注入地图控制器
     @Inject
     lateinit var mapController: NIMapController
+
     @Inject
     lateinit var offlineMapDownloadManager: OfflineMapDownloadManager
 
@@ -37,9 +41,9 @@ class MainActivity : BaseActivity() {
         //初始化地图
         mapController.init(
             this,
-            binding.mapView.mainActivityMap,
+            binding.mainActivityMap,
             null,
-            Constant.ROOT_PATH + "/map/"
+            Constant.MAP_PATH
         )
         //关联生命周期
         binding.lifecycleOwner = this
@@ -48,7 +52,7 @@ class MainActivity : BaseActivity() {
         //给xml传递viewModel对象
         binding.viewModel = viewModel
 //        lifecycle.addObserver(viewModel)
-
+        lifecycleScope
     }
 
     override fun onStart() {
@@ -88,4 +92,15 @@ class MainActivity : BaseActivity() {
         binding!!.viewModel!!.onClickCameraButton(this)
     }
 
+    /**
+     * 点击录音按钮
+     */
+    fun voiceOnclick() {
+        val naviController = findNavController(R.id.main_activity_right_fragment)
+        naviController.navigate(R.id.EvaluationResultFragment)
+    }
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+    }
 }