fix: 合并代码

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

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

@@ -6,6 +6,7 @@ import android.util.Log
 import androidx.activity.viewModels
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.findNavController
 import com.navinfo.collect.library.map.NIMapController
@@ -52,7 +53,7 @@ class MainActivity : BaseActivity() {
         //给xml传递viewModel对象
         binding.viewModel = viewModel
 //        lifecycle.addObserver(viewModel)
-
+        lifecycleScope
     }
 
     override fun onStart() {
@@ -92,4 +93,8 @@ class MainActivity : BaseActivity() {
         val naviController = findNavController(R.id.main_activity_right_fragment)
         naviController.navigate(R.id.EvaluationResultFragment)
     }
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+    }
 }