xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
This commit is contained in:
squallzhjch
2023-04-26 15:19:25 +08:00
parent cf640cb1d2 a81e2f5d82
commit d00505c22d
56 changed files with 160 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
View File

@@ -80,22 +80,21 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
}
})
}
// R.id.personal_center_menu_import_data -> { // 导入zip数据
// fileChooser.openChooseFileDialog(object : FileChooserCallback() {
// override fun onCancel(reason: String) {
// }
//
// override fun onResult(uri: Uri) {
// val file = UriUtils.uri2File(uri)
// val importOMDBHelper: ImportOMDBHelper =
// importOMDBHiltFactory.obtainImportOMDBHelper(
// requireContext(),
// file
// )
// viewModel.importOMDBData(importOMDBHelper)
// }
// })
// }
R.id.personal_center_menu_import_data -> { // 导入zip数据
fileChooser.openChooseFileDialog(object : FileChooserCallback() {
override fun onCancel(reason: String) {
}
override fun onResult(uri: Uri) {
val file = UriUtils.uri2File(uri)
val importOMDBHelper: ImportOMDBHelper = importOMDBHiltFactory.obtainImportOMDBHelper(
requireContext(),
file
)
viewModel.importOMDBData(importOMDBHelper)
}
})
}
R.id.personal_center_menu_import_yuan_data -> {
// 用户选中导入数据，打开文件选择器，用户选择导入的数据文件目录
fileChooser.openChooseFileDialog(object : FileChooserCallback() {