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

Conflicts: app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
2023-05-06 14:31:05 +08:00
parent 8501f64b2c 7a09721dc8
commit fbff312f41
10 changed files with 222 additions and 91 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
@@ -56,6 +56,10 @@ class QsRecordListFragment : BaseFragment(){
                findNavController().popBackStack()
            }
        })
+
+        binding.recordBack.setOnClickListener{
+            findNavController().navigateUp()
+        }
    }

    override fun onResume() {