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

Conflicts: app/src/main/res/layout/adapter_task_list.xml
2023-05-06 15:39:31 +08:00
parent 3733634eb5 be9e582048
commit 8e4d1c7e0e
37 changed files with 245 additions and 75 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -116,7 +116,7 @@ class LoginViewModel @Inject constructor(
        //文件夹初始化
        try {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_INIT)
-            createUserFolder(context, "1")
+            createUserFolder(context, "02911")
        } catch (e: IOException) {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE)
        }