diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index 25a471a..448421b 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.bin and b/.gradle/5.6.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock
index 51682bf..40fe4c1 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.lock and b/.gradle/5.6.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin
index 7a9321c..4c12fbc 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.bin and b/.gradle/5.6.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock
index 71edaf5..6915ff0 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.lock and b/.gradle/5.6.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin
index de44819..4a5b2d7 100644
Binary files a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin and b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.6.4/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin
index ccfe88d..3d5b8eb 100644
Binary files a/.gradle/5.6.4/javaCompile/classAnalysis.bin and b/.gradle/5.6.4/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin
index c621d6a..b0ad632 100644
Binary files a/.gradle/5.6.4/javaCompile/jarAnalysis.bin and b/.gradle/5.6.4/javaCompile/jarAnalysis.bin differ
diff --git a/.gradle/5.6.4/javaCompile/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock
index e86502e..f25fc13 100644
Binary files a/.gradle/5.6.4/javaCompile/javaCompile.lock and b/.gradle/5.6.4/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.6.4/javaCompile/taskHistory.bin b/.gradle/5.6.4/javaCompile/taskHistory.bin
index c936868..ac697b9 100644
Binary files a/.gradle/5.6.4/javaCompile/taskHistory.bin and b/.gradle/5.6.4/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 26dec09..29bf16b 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 6de6b25..310ed54 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ac0779d..20e8aa6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -15,6 +15,7 @@
             <option value="$PROJECT_DIR$/kurotool" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/libraries/Gradle__D__A_TaxiApp_taxi26_26Original_taxiapp_ktl_app_libs_xixun_card_settings_1_2_4_jar.xml b/.idea/libraries/Gradle____app_libs_xixun_card_settings_1_2_4_jar.xml
similarity index 60%
rename from .idea/libraries/Gradle__D__A_TaxiApp_taxi26_26Original_taxiapp_ktl_app_libs_xixun_card_settings_1_2_4_jar.xml
rename to .idea/libraries/Gradle____app_libs_xixun_card_settings_1_2_4_jar.xml
index d607440..d99c23e 100644
--- a/.idea/libraries/Gradle__D__A_TaxiApp_taxi26_26Original_taxiapp_ktl_app_libs_xixun_card_settings_1_2_4_jar.xml
+++ b/.idea/libraries/Gradle____app_libs_xixun_card_settings_1_2_4_jar.xml
@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Gradle: D./A_TaxiApp/taxi26/26Original/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar">
+  <library name="Gradle: ./app/libs/xixun_card_settings_1.2.4.jar">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/libs/xixun_card_settings_1.2.4.jar!/" />
     </CLASSES>
diff --git a/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml b/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml
index 44ee6c2..62ae5d2 100644
--- a/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml
+++ b/.idea/libraries/Gradle__com_facebook_stetho_stetho_1_5_1_aar.xml
@@ -10,6 +10,7 @@
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d20b09848ce936fd0a38f787548625fb/jetified-stetho-1.5.1/AndroidManifest.xml" />
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/jars/classes.jar!/" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/AndroidManifest.xml" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fce90db6a21dd6386ea645855f8dd306/jetified-stetho-1.5.1/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.stetho/stetho/1.5.1/b71856fcb682e807ccec3a276e47c94944b6c6ea/stetho-1.5.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml b/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml
index 196039b..d2f957a 100644
--- a/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml
+++ b/.idea/libraries/Gradle__com_github_yuweiguocn_GreenDaoUpgradeHelper_v2_2_1_aar.xml
@@ -6,6 +6,7 @@
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/101f185b157935dfade56b3a699a0795/jetified-GreenDaoUpgradeHelper-v2.2.1/AndroidManifest.xml" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/63f8cddfb70b6a7b209bd5d6c1e063f4/jetified-GreenDaoUpgradeHelper-v2.2.1/AndroidManifest.xml" />
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/63f8cddfb70b6a7b209bd5d6c1e063f4/jetified-GreenDaoUpgradeHelper-v2.2.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/63f8cddfb70b6a7b209bd5d6c1e063f4/jetified-GreenDaoUpgradeHelper-v2.2.1/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.yuweiguocn/GreenDaoUpgradeHelper/v2.2.1/7aef2e7b4c18afb240f0e17af5d045f176d2b8ef/GreenDaoUpgradeHelper-v2.2.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml b/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml
index 0f5222e..8ade13e 100644
--- a/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_orhanobut_logger_2_2_0_aar.xml
@@ -6,6 +6,7 @@
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4a728ea0a76fc8be4450545c3cb00b59/jetified-logger-2.2.0/AndroidManifest.xml" />
       <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6446fd50a6f5e7cd6a4876d9772e064e/jetified-logger-2.2.0/AndroidManifest.xml" />
       <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6446fd50a6f5e7cd6a4876d9772e064e/jetified-logger-2.2.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6446fd50a6f5e7cd6a4876d9772e064e/jetified-logger-2.2.0/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.orhanobut/logger/2.2.0/98e69754ab23f7179137d8d2a0e3eea79200d746/logger-2.2.0-javadoc.jar!/" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fd39319..bc01c18 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 28da36a..5b76b3e 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,17 +4,8 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/taxiapp-ktl.iml" filepath="$PROJECT_DIR$/.idea/modules/taxiapp-ktl.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.unitTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/app/taxiapp-ktl.app.androidTest.iml b/.idea/modules/app/taxiapp-ktl.app.androidTest.iml
deleted file mode 100644
index d2a6618..0000000
--- a/.idea/modules/app/taxiapp-ktl.app.androidTest.iml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app:androidTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd6ee3eb3fc50696fc57eaf7fa81506a/jetified-xixun_card_settings_1.2.4.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bff8f75db4bfb23ea8ad0045cda2a5f3/jetified-junit-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0259eda880fbc008bd939b513f4fae7/espresso-core-3.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc2331c16e0efac6eaa7bfabaa59c4ef/runner-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7572de4f97202338cea7115a363451e7/jetified-hamcrest-integration-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbacc0420eb54d22b11c3ebe49cbfb9d/jetified-hamcrest-library-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2aff52a3446202851bad44fbb8fd9c7/jetified-core-1.2.0-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f04b6481913b1f5d71d584021e858f13/jetified-stetho-1.5.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/010edc493b1efc47cf355a3d68aa505b/jetified-logger-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3dbd4cd9d84196433da10e47c8b9d3c/jetified-GreenDaoUpgradeHelper-v2.2.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec781f3119334c7509522ff1bb966868/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92fe512df5d2ebc82ff9bd9832b874f2/monitor-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/120238fa6ed7c650c37bd723e55cb919/jetified-glide-4.10.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c605afe14240d86ffdda7e97a0948ae1/jetified-gifdecoder-4.10.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f608662a75fc89303d1701f5ec50e0/jetified-lifecycle-reactivestreams-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4ca13cf63f4054293515af97111c4863/lifecycle-reactivestreams-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/798edd96275281c937a1982cd81c07a3/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cefff415e1fe00ea21396c57c7341a42/jetified-lifecycle-livedata-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7739b7d4512687dbb5587f5b8a75519/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09aa48e4d1bb4690ed61b17b12e36887/lifecycle-livedata-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8b13fed7b1eac935e93ecb88a8d7eba2/jetified-kxml2-2.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e50a3d78a9f997aab4708f4813c3fab/espresso-idling-resource-3.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebb7400b0bde94d40cbe29396025409/jetified-javawriter-2.1.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7b199dd647d3bc718d4c7a2a53806a3/jetified-javax.inject-1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47aa66be67ebced1e389bced7a130b8c/jetified-jsr305-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2e05a7c119c523ef3da3eca735692616/jetified-kotlin-reflect-1.3.61.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4328063df2e6d63759b65a77f467cfa5/jetified-kotlinx-coroutines-android-1.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ff1574ed7393fe1b60add9cdd6db67e/jetified-kotlinx-coroutines-core-1.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771ed26861001e83547f29ca57ea5600/jetified-commons-cli-1.2.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/07fb80bba96aa33515b769741cf9f530/jetified-debug-db-1.0.6-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac5d0c2b21600f7e7564db308a676a66/jetified-debug-db-base-1.0.6-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5e0d53d793dac656ea782f084dc65c7f/jetified-fastjson-1.2.46.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da8beefcea58e938669984ec77975c37/jetified-disklrucache-4.10.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77f7b691d7df0d3e300f1f0f4f7b62fa/jetified-annotations-4.10.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3c55ae322327a81558aad151cba07105/jetified-ARxLib-0.1.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34a29451ab55ddc2e04b4e6c3c44dffd/jetified-greendao-3.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db4cc42c0975ae365c0a0cfe3f95c132/jetified-greendao-api-3.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9822764d1b6050859a78a0b3ec51c6dc/jetified-permissionx-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/020b480d2bde92043942aeb85ef94e0f/jetified-YJTools-v1.0.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debugAndroidTest" />
-            <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="moduleName" arg="app_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths">
-              <args>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/app_classes/debug/classes.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions">
-              <args>
-                <arg>plugin:org.jetbrains.kotlin.android:experimental=false</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:enabled=true</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap</arg>
-              </args>
-            </arrayArg>
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debugAndroidTest" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/src/androidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" />
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="taxiapp-ktl.kurotool.main" scope="TEST" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debugAndroidTest" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: D./A_TaxiApp/taxi26/26Original/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.61" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.alibaba:fastjson:1.2.46" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:disklrucache:4.10.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:annotations:4.10.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.greenrobot:greendao:3.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.greenrobot:greendao-api:3.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.facebook.stetho:stetho:1.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.orhanobut:logger:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.2.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.amitshekhar.android:debug-db:1.0.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.amitshekhar.android:debug-db-base:1.0.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.xy02:ARxLib:0.1.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.permissionx.guolindev:permissionx:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.joeyupdo:YJTools:v1.0.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: net.zetetic:android-database-sqlcipher:3.5.7@aar" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl.app.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/app/taxiapp-ktl.app.iml b/.idea/modules/app/taxiapp-ktl.app.iml
index 1b8e90e..c11c95a 100644
--- a/.idea/modules/app/taxiapp-ktl.app.iml
+++ b/.idea/modules/app/taxiapp-ktl.app.iml
@@ -24,16 +24,181 @@
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="4" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xallow-no-source-files" />
+        </compilerSettings>
+        <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug" />
+          <option name="classpath" value="$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/cd6ee3eb3fc50696fc57eaf7fa81506a/jetified-xixun_card_settings_1.2.4.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/2e05a7c119c523ef3da3eca735692616/jetified-kotlin-reflect-1.3.61.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/cefff415e1fe00ea21396c57c7341a42/jetified-lifecycle-livedata-ktx-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/f7739b7d4512687dbb5587f5b8a75519/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/52f608662a75fc89303d1701f5ec50e0/jetified-lifecycle-reactivestreams-ktx-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/ec781f3119334c7509522ff1bb966868/jetified-lifecycle-runtime-ktx-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/798edd96275281c937a1982cd81c07a3/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar;D:/A_TaxiApp/taxi26/26Original/2/taxiapp-ktl/kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar;D:/A_TaxiApp/taxi26/26Original/2/taxiapp-ktl/kurotool/build/intermediates/compile_library_classes/debug/classes.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4328063df2e6d63759b65a77f467cfa5/jetified-kotlinx-coroutines-android-1.3.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7ff1574ed7393fe1b60add9cdd6db67e/jetified-kotlinx-coroutines-core-1.3.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/f04b6481913b1f5d71d584021e858f13/jetified-stetho-1.5.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/010edc493b1efc47cf355a3d68aa505b/jetified-logger-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/f3dbd4cd9d84196433da10e47c8b9d3c/jetified-GreenDaoUpgradeHelper-v2.2.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/120238fa6ed7c650c37bd723e55cb919/jetified-glide-4.10.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/c605afe14240d86ffdda7e97a0948ae1/jetified-gifdecoder-4.10.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4ca13cf63f4054293515af97111c4863/lifecycle-reactivestreams-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/09aa48e4d1bb4690ed61b17b12e36887/lifecycle-livedata-2.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/771ed26861001e83547f29ca57ea5600/jetified-commons-cli-1.2.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/47aa66be67ebced1e389bced7a130b8c/jetified-jsr305-2.0.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/07fb80bba96aa33515b769741cf9f530/jetified-debug-db-1.0.6-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/ac5d0c2b21600f7e7564db308a676a66/jetified-debug-db-base-1.0.6-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/5e0d53d793dac656ea782f084dc65c7f/jetified-fastjson-1.2.46.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/da8beefcea58e938669984ec77975c37/jetified-disklrucache-4.10.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/77f7b691d7df0d3e300f1f0f4f7b62fa/jetified-annotations-4.10.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/3c55ae322327a81558aad151cba07105/jetified-ARxLib-0.1.5-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/34a29451ab55ddc2e04b4e6c3c44dffd/jetified-greendao-3.3.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/db4cc42c0975ae365c0a0cfe3f95c132/jetified-greendao-api-3.3.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9822764d1b6050859a78a0b3ec51c6dc/jetified-permissionx-1.1.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/020b480d2bde92043942aeb85ef94e0f/jetified-YJTools-v1.0.5-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar;D:/Android/sdk/platforms/android-29/android.jar;D:/Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar" />
+          <option name="noStdlib" value="true" />
+          <option name="noReflect" value="true" />
+          <option name="moduleName" value="app_debug" />
+          <option name="languageVersion" value="1.3" />
+          <option name="apiVersion" value="1.3" />
+          <option name="pluginOptions">
+            <array>
+              <option value="plugin:org.jetbrains.kotlin.android:experimental=false" />
+              <option value="plugin:org.jetbrains.kotlin.android:enabled=true" />
+              <option value="plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap" />
+            </array>
+          </option>
+          <option name="pluginClasspaths">
+            <array>
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
+            </array>
+          </option>
+          <option name="errors">
+            <ArgumentParseErrors />
+          </option>
+        </compilerArguments>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
     <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="module-library">
+      <library name="Gradle: kaptGeneratedClasses">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debugAndroidTest" />
+          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debugUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debug" />
+          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/release" />
+          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/releaseUnitTest" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/xixun_card_settings_1.2.4.jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.61" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
+    <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.46" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.10.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.10.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.greenrobot:greendao:3.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.greenrobot:greendao-api:3.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime-ktx:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.stetho:stetho:1.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.orhanobut:logger:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amitshekhar.android:debug-db:1.0.6@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amitshekhar.android:debug-db-base:1.0.6@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.xy02:ARxLib:0.1.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.permissionx.guolindev:permissionx:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.joeyupdo:YJTools:v1.0.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: net.zetetic:android-database-sqlcipher:3.5.7@aar" level="project" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurotool" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/taxiapp-ktl.app.main.iml b/.idea/modules/app/taxiapp-ktl.app.main.iml
deleted file mode 100644
index 6f7f8e4..0000000
--- a/.idea/modules/app/taxiapp-ktl.app.main.iml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app:main" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd6ee3eb3fc50696fc57eaf7fa81506a/jetified-xixun_card_settings_1.2.4.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2e05a7c119c523ef3da3eca735692616/jetified-kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cefff415e1fe00ea21396c57c7341a42/jetified-lifecycle-livedata-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7739b7d4512687dbb5587f5b8a75519/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f608662a75fc89303d1701f5ec50e0/jetified-lifecycle-reactivestreams-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec781f3119334c7509522ff1bb966868/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/798edd96275281c937a1982cd81c07a3/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4328063df2e6d63759b65a77f467cfa5/jetified-kotlinx-coroutines-android-1.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ff1574ed7393fe1b60add9cdd6db67e/jetified-kotlinx-coroutines-core-1.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f04b6481913b1f5d71d584021e858f13/jetified-stetho-1.5.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/010edc493b1efc47cf355a3d68aa505b/jetified-logger-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3dbd4cd9d84196433da10e47c8b9d3c/jetified-GreenDaoUpgradeHelper-v2.2.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/120238fa6ed7c650c37bd723e55cb919/jetified-glide-4.10.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c605afe14240d86ffdda7e97a0948ae1/jetified-gifdecoder-4.10.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4ca13cf63f4054293515af97111c4863/lifecycle-reactivestreams-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09aa48e4d1bb4690ed61b17b12e36887/lifecycle-livedata-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771ed26861001e83547f29ca57ea5600/jetified-commons-cli-1.2.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47aa66be67ebced1e389bced7a130b8c/jetified-jsr305-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/07fb80bba96aa33515b769741cf9f530/jetified-debug-db-1.0.6-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac5d0c2b21600f7e7564db308a676a66/jetified-debug-db-base-1.0.6-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5e0d53d793dac656ea782f084dc65c7f/jetified-fastjson-1.2.46.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da8beefcea58e938669984ec77975c37/jetified-disklrucache-4.10.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77f7b691d7df0d3e300f1f0f4f7b62fa/jetified-annotations-4.10.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3c55ae322327a81558aad151cba07105/jetified-ARxLib-0.1.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34a29451ab55ddc2e04b4e6c3c44dffd/jetified-greendao-3.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db4cc42c0975ae365c0a0cfe3f95c132/jetified-greendao-api-3.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9822764d1b6050859a78a0b3ec51c6dc/jetified-permissionx-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/020b480d2bde92043942aeb85ef94e0f/jetified-YJTools-v1.0.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug" />
-            <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="moduleName" arg="app_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths" />
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions">
-              <args>
-                <arg>plugin:org.jetbrains.kotlin.android:experimental=false</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:enabled=true</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap</arg>
-              </args>
-            </arrayArg>
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/src/debug" />
-    <content url="file://$MODULE_DIR$/../../../app/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary.main" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debug" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="taxiapp-ktl.kurotool.main" />
-    <orderEntry type="library" name="Gradle: D./A_TaxiApp/taxi26/26Original/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.61" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
-    <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.46" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.greenrobot:greendao:3.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.greenrobot:greendao-api:3.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.stetho:stetho:1.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.orhanobut:logger:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.2.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.amitshekhar.android:debug-db:1.0.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.amitshekhar.android:debug-db-base:1.0.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.xy02:ARxLib:0.1.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.permissionx.guolindev:permissionx:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.joeyupdo:YJTools:v1.0.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: net.zetetic:android-database-sqlcipher:3.5.7@aar" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/app/taxiapp-ktl.app.unitTest.iml b/.idea/modules/app/taxiapp-ktl.app.unitTest.iml
deleted file mode 100644
index a8e96f5..0000000
--- a/.idea/modules/app/taxiapp-ktl.app.unitTest.iml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app:unitTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd6ee3eb3fc50696fc57eaf7fa81506a/jetified-xixun_card_settings_1.2.4.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2e05a7c119c523ef3da3eca735692616/jetified-kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cefff415e1fe00ea21396c57c7341a42/jetified-lifecycle-livedata-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7739b7d4512687dbb5587f5b8a75519/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f608662a75fc89303d1701f5ec50e0/jetified-lifecycle-reactivestreams-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec781f3119334c7509522ff1bb966868/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/798edd96275281c937a1982cd81c07a3/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4328063df2e6d63759b65a77f467cfa5/jetified-kotlinx-coroutines-android-1.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ff1574ed7393fe1b60add9cdd6db67e/jetified-kotlinx-coroutines-core-1.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f04b6481913b1f5d71d584021e858f13/jetified-stetho-1.5.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/010edc493b1efc47cf355a3d68aa505b/jetified-logger-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3dbd4cd9d84196433da10e47c8b9d3c/jetified-GreenDaoUpgradeHelper-v2.2.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/120238fa6ed7c650c37bd723e55cb919/jetified-glide-4.10.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c605afe14240d86ffdda7e97a0948ae1/jetified-gifdecoder-4.10.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4ca13cf63f4054293515af97111c4863/lifecycle-reactivestreams-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09aa48e4d1bb4690ed61b17b12e36887/lifecycle-livedata-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771ed26861001e83547f29ca57ea5600/jetified-commons-cli-1.2.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47aa66be67ebced1e389bced7a130b8c/jetified-jsr305-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/07fb80bba96aa33515b769741cf9f530/jetified-debug-db-1.0.6-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac5d0c2b21600f7e7564db308a676a66/jetified-debug-db-base-1.0.6-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5e0d53d793dac656ea782f084dc65c7f/jetified-fastjson-1.2.46.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da8beefcea58e938669984ec77975c37/jetified-disklrucache-4.10.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77f7b691d7df0d3e300f1f0f4f7b62fa/jetified-annotations-4.10.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3c55ae322327a81558aad151cba07105/jetified-ARxLib-0.1.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34a29451ab55ddc2e04b4e6c3c44dffd/jetified-greendao-3.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db4cc42c0975ae365c0a0cfe3f95c132/jetified-greendao-api-3.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9822764d1b6050859a78a0b3ec51c6dc/jetified-permissionx-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/020b480d2bde92043942aeb85ef94e0f/jetified-YJTools-v1.0.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debugUnitTest" />
-            <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="moduleName" arg="app_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths">
-              <args>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debug</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions">
-              <args>
-                <arg>plugin:org.jetbrains.kotlin.android:experimental=false</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:enabled=true</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap</arg>
-              </args>
-            </arrayArg>
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugUnitTest/out" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debugUnitTest" />
-    <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app/src/testDebug" />
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary.main" scope="TEST" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debugUnitTest" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="taxiapp-ktl.kurotool.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: D./A_TaxiApp/taxi26/26Original/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.61" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.alibaba:fastjson:1.2.46" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:disklrucache:4.10.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:annotations:4.10.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.greenrobot:greendao:3.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.greenrobot:greendao-api:3.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.facebook.stetho:stetho:1.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.orhanobut:logger:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.2.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-reactivestreams:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.amitshekhar.android:debug-db:1.0.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.amitshekhar.android:debug-db-base:1.0.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.xy02:ARxLib:0.1.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.permissionx.guolindev:permissionx:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.github.joeyupdo:YJTools:v1.0.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: net.zetetic:android-database-sqlcipher:3.5.7@aar" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl.app.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml
deleted file mode 100644
index 51781e7..0000000
--- a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurolibrary:androidTest" external.linked.project.path="$MODULE_DIR$/../../../kurolibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurolibrary/src/main/res;file://$MODULE_DIR$/../../../kurolibrary/src/debug/res;file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest/res;file://$MODULE_DIR$/../../../kurolibrary/src/androidTestDebug/res;file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/04c2f15fd6406a6a4c04ca88c762801f/jetified-junit-1.1.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/74ddc0334705a7b2ee545fc24609d522/espresso-core-3.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ef7afd86d095279f8c0dd4391e5af5b/jetified-okhttp-4.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e93e3fa3b80ee04b5b90cd9901cba5d/jetified-okio-jvm-2.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/279e8b321fb00fe273cb945f3ab3adb4/runner-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7572de4f97202338cea7115a363451e7/jetified-hamcrest-integration-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbacc0420eb54d22b11c3ebe49cbfb9d/jetified-hamcrest-library-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/740bd8479136dd587653ff28b9f87d72/jetified-core-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e9898d831ef0e589591813acbb976c5f/jetified-storage-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c47a323fbeb0ebb5e3c6c91898fc2389/monitor-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f17425093e890f8ce6262ebf674a34e7/room-runtime-2.2.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.room/room-common/2.2.5/f5e3b73a0c2ab5e276e26868e4ce3542baede207/room-common-2.2.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3be1a38a61333e6328ca9b7bac3b98d2/sqlite-framework-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fc326b801d1ff977fa0c8fe21cd621b/sqlite-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47aa66be67ebced1e389bced7a130b8c/jetified-jsr305-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bc40fa23d51307a1b0ef1b0bba8f71f9/espresso-idling-resource-3.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebb7400b0bde94d40cbe29396025409/jetified-javawriter-2.1.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7b199dd647d3bc718d4c7a2a53806a3/jetified-javax.inject-1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ebbb51aff728784c20eede62a79cb68a/jetified-kotlin-stdlib-1.3.41.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae41db9d384a8894f0560bd49880d3ea/jetified-kotlin-stdlib-common-1.3.41.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debugAndroidTest" />
-            <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="moduleName" arg="kurolibrary_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths">
-              <args>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions" />
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/ap_generated_sources/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/androidTest/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/buildConfig/androidTest/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debugAndroidTest" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest/java" isTestSource="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/src/androidTestDebug" />
-    <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugAndroidTest" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:4.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.room:room-common:2.2.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.41" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.41" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.services:storage:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.room:room-runtime:2.2.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.sqlite:sqlite-framework:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.sqlite:sqlite:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurolibrary.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml
index 54c1fbf..1ec60f2 100644
--- a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml
+++ b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml
@@ -25,16 +25,140 @@
         <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="4" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xallow-no-source-files" />
+        </compilerSettings>
+        <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug" />
+          <option name="classpath" value="$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1ef7afd86d095279f8c0dd4391e5af5b/jetified-okhttp-4.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4e93e3fa3b80ee04b5b90cd9901cba5d/jetified-okio-jvm-2.3.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/ebbb51aff728784c20eede62a79cb68a/jetified-kotlin-stdlib-1.3.41.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/ae41db9d384a8894f0560bd49880d3ea/jetified-kotlin-stdlib-common-1.3.41.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/f17425093e890f8ce6262ebf674a34e7/room-runtime-2.2.5-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.room/room-common/2.2.5/f5e3b73a0c2ab5e276e26868e4ce3542baede207/room-common-2.2.5.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/3be1a38a61333e6328ca9b7bac3b98d2/sqlite-framework-2.0.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7fc326b801d1ff977fa0c8fe21cd621b/sqlite-2.0.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar;D:/Android/sdk/platforms/android-32/android.jar;D:/Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
+          <option name="noStdlib" value="true" />
+          <option name="noReflect" value="true" />
+          <option name="moduleName" value="kurolibrary_debug" />
+          <option name="languageVersion" value="1.3" />
+          <option name="apiVersion" value="1.3" />
+          <option name="pluginOptions">
+            <array />
+          </option>
+          <option name="pluginClasspaths">
+            <array>
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
+            </array>
+          </option>
+          <option name="errors">
+            <ArgumentParseErrors />
+          </option>
+        </compilerArguments>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debug/classes" />
     <output-test url="file://$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../kurolibrary">
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/main/res" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../../kurolibrary/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../kurolibrary/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.13.2" level="project" />
+    <orderEntry type="module-library">
+      <library name="Gradle: kaptGeneratedClasses">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/release" />
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/releaseUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debug" />
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugAndroidTest" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.3@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.services:storage:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.41" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.41" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.room:room-common:2.2.5" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.2.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite-framework:2.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite:2.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml
deleted file mode 100644
index 787c95d..0000000
--- a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurolibrary:main" external.linked.project.path="$MODULE_DIR$/../../../kurolibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurolibrary/src/main/res;file://$MODULE_DIR$/../../../kurolibrary/src/debug/res;file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest/res;file://$MODULE_DIR$/../../../kurolibrary/src/androidTestDebug/res;file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ef7afd86d095279f8c0dd4391e5af5b/jetified-okhttp-4.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e93e3fa3b80ee04b5b90cd9901cba5d/jetified-okio-jvm-2.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ebbb51aff728784c20eede62a79cb68a/jetified-kotlin-stdlib-1.3.41.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae41db9d384a8894f0560bd49880d3ea/jetified-kotlin-stdlib-common-1.3.41.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f17425093e890f8ce6262ebf674a34e7/room-runtime-2.2.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.room/room-common/2.2.5/f5e3b73a0c2ab5e276e26868e4ce3542baede207/room-common-2.2.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3be1a38a61333e6328ca9b7bac3b98d2/sqlite-framework-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fc326b801d1ff977fa0c8fe21cd621b/sqlite-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug" />
-            <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="moduleName" arg="kurolibrary_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths" />
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions" />
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/aidl_source_output_dir/debug/out" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/ap_generated_sources/debug/out">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/renderscript_source_output_dir/debug/out" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/buildConfig/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/src/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/main/res" type="java-resource" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debug" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.41" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.41" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.room:room-common:2.2.5" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.2.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite-framework:2.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite:2.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml
deleted file mode 100644
index 7f8121b..0000000
--- a/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurolibrary:unitTest" external.linked.project.path="$MODULE_DIR$/../../../kurolibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurolibrary/src/main/res;file://$MODULE_DIR$/../../../kurolibrary/src/debug/res;file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest/res;file://$MODULE_DIR$/../../../kurolibrary/src/androidTestDebug/res;file://$MODULE_DIR$/../../../kurolibrary/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ef7afd86d095279f8c0dd4391e5af5b/jetified-okhttp-4.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e93e3fa3b80ee04b5b90cd9901cba5d/jetified-okio-jvm-2.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ebbb51aff728784c20eede62a79cb68a/jetified-kotlin-stdlib-1.3.41.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae41db9d384a8894f0560bd49880d3ea/jetified-kotlin-stdlib-common-1.3.41.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31917e4a4b4c7ae99d19b34a8d9c594f/fragment-1.3.4-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d557a868048661df2b7966ab02f6804c/jetified-activity-1.2.3-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ab1c90ecec2656fadad8d68fd0cfff7/jetified-appcompat-resources-1.3.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/808282e6ac34da0ae19078f2cf2ac8ed/dynamicanimation-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882d9f4e2d6d060e3187aa0a5c20e298/legacy-support-core-utils-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bec44afd385b2893c2d6d803f9d0ceb/core-1.5.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f902841a8ba7d4a4f0020bf5be9ff329/jetified-lifecycle-viewmodel-savedstate-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e11afed615cceed014f644ab037489e/jetified-savedstate-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/093710b7c906e9a05ba1b8bfcbb1d5ca/lifecycle-runtime-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f17425093e890f8ce6262ebf674a34e7/room-runtime-2.2.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.room/room-common/2.2.5/f5e3b73a0c2ab5e276e26868e4ce3542baede207/room-common-2.2.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3be1a38a61333e6328ca9b7bac3b98d2/sqlite-framework-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fc326b801d1ff977fa0c8fe21cd621b/sqlite-2.0.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a00f37f27f3e8ad61572f1295513f4b4/core-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/078938ecc3ce2946a9de88a15ea5b456/versionedparcelable-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82a56e435eb6ce9c3c849e72585ec84/lifecycle-viewmodel-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a715ee52a8386c204a73cfe6d8d8716/lifecycle-livedata-core-2.3.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811ecf2702677263b189335dd11f9dcc/documentfile-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/651d9a17b4ee50dc0a479d7a5f57c387/localbroadcastmanager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3736860ed9cc9eb3dcccea1b82aa3d63/print-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6caef15cbfc6f35ac8669787bd9cfcab/jetified-junit-4.13.2.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debugUnitTest" />
-            <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="moduleName" arg="kurolibrary_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths">
-              <args>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debug</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions" />
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/ap_generated_sources/debugUnitTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debugUnitTest" />
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/test/java" isTestSource="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurolibrary/src/testDebug" />
-    <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debugUnitTest" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:4.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.41" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.41" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.room:room-common:2.2.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.room:room-runtime:2.2.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.sqlite:sqlite-framework:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.sqlite:sqlite:2.0.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurolibrary.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml
deleted file mode 100644
index a51354b..0000000
--- a/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurotool:androidTest" external.linked.project.path="$MODULE_DIR$/../../../kurotool" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurotool/src/main/res;file://$MODULE_DIR$/../../../kurotool/src/debug/res;file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurotool/src/androidTest/res;file://$MODULE_DIR$/../../../kurotool/src/androidTestDebug/res;file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bff8f75db4bfb23ea8ad0045cda2a5f3/jetified-junit-1.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0259eda880fbc008bd939b513f4fae7/espresso-core-3.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35392eb56c1d0580ad3dffc16f562cfd/material-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc2331c16e0efac6eaa7bfabaa59c4ef/runner-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7572de4f97202338cea7115a363451e7/jetified-hamcrest-integration-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbacc0420eb54d22b11c3ebe49cbfb9d/jetified-hamcrest-library-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2aff52a3446202851bad44fbb8fd9c7/jetified-core-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91e3e57adeee3b780afead2d7a7d5bb7/appcompat-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92fe512df5d2ebc82ff9bd9832b874f2/monitor-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61eb2ecfc026b926fafa0f81127bec9a/fragment-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49a0f3458b53a067438423ae7c0dfb8c/jetified-appcompat-resources-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fba7b33d13e73231562cd340a2c71ea0/jetified-activity-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e7b34f7ccbee70ccde03223f1fb10de/core-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4faf711e1dd216139604f777ce0f7113/lifecycle-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99224bf02b30d8acccc5c114b4886228/versionedparcelable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fbe5d137b400302d60fd6a471d562b9/jetified-savedstate-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6226f2a8a8ae923e009e5b6d2ba06c10/lifecycle-livedata-core-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec7d0e65890bec7fddb26258f54bd840/lifecycle-viewmodel-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d56fd68c56fa1414f1d9cacfc2c3236/core-runtime-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8b13fed7b1eac935e93ecb88a8d7eba2/jetified-kxml2-2.3.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e50a3d78a9f997aab4708f4813c3fab/espresso-idling-resource-3.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebb7400b0bde94d40cbe29396025409/jetified-javawriter-2.1.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7b199dd647d3bc718d4c7a2a53806a3/jetified-javax.inject-1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47aa66be67ebced1e389bced7a130b8c/jetified-jsr305-2.0.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e23299ce283ec40921fac6b0c088acd/jetified-kotlin-android-extensions-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e0ed715837c2bdb1b753746850552ad/jetified-kotlin-stdlib-jdk7-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debugAndroidTest" />
-            <stringArg name="jvmTarget" arg="1.6" />
-            <stringArg name="moduleName" arg="kurotool_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths">
-              <args>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions">
-              <args>
-                <arg>plugin:org.jetbrains.kotlin.android:experimental=false</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:enabled=true</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap</arg>
-              </args>
-            </arrayArg>
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/ap_generated_sources/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/androidTest/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/buildConfig/androidTest/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debugAndroidTest" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugAndroidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/src/androidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/androidTest/java" isTestSource="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/src/androidTestDebug" />
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugAndroidTest" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.61" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurotool.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml
index 879241c..5aca6dd 100644
--- a/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml
+++ b/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml
@@ -25,16 +25,140 @@
         <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="4" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xallow-no-source-files" />
+        </compilerSettings>
+        <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug" />
+          <option name="classpath" value="$MODULE_DIR$/../../../kurotool/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/35392eb56c1d0580ad3dffc16f562cfd/material-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/3e23299ce283ec40921fac6b0c088acd/jetified-kotlin-android-extensions-runtime-1.3.61.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7e0ed715837c2bdb1b753746850552ad/jetified-kotlin-stdlib-jdk7-1.3.61.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/91e3e57adeee3b780afead2d7a7d5bb7/appcompat-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/61eb2ecfc026b926fafa0f81127bec9a/fragment-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/49a0f3458b53a067438423ae7c0dfb8c/jetified-appcompat-resources-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/fba7b33d13e73231562cd340a2c71ea0/jetified-activity-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1e7b34f7ccbee70ccde03223f1fb10de/core-1.3.2-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/4faf711e1dd216139604f777ce0f7113/lifecycle-runtime-2.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/99224bf02b30d8acccc5c114b4886228/versionedparcelable-1.1.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/ec7d0e65890bec7fddb26258f54bd840/lifecycle-viewmodel-2.1.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/7fbe5d137b400302d60fd6a471d562b9/jetified-savedstate-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/6226f2a8a8ae923e009e5b6d2ba06c10/lifecycle-livedata-core-2.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/9d56fd68c56fa1414f1d9cacfc2c3236/core-runtime-2.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/刘金华/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar;C:/Users/刘金华/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;D:/Android/sdk/platforms/android-29/android.jar;D:/Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar" />
+          <option name="noStdlib" value="true" />
+          <option name="noReflect" value="true" />
+          <option name="moduleName" value="kurotool_debug" />
+          <option name="jvmTarget" value="1.6" />
+          <option name="languageVersion" value="1.3" />
+          <option name="apiVersion" value="1.3" />
+          <option name="pluginOptions">
+            <array>
+              <option value="plugin:org.jetbrains.kotlin.android:experimental=false" />
+              <option value="plugin:org.jetbrains.kotlin.android:enabled=true" />
+              <option value="plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap" />
+            </array>
+          </option>
+          <option name="pluginClasspaths">
+            <array>
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
+            </array>
+          </option>
+          <option name="errors">
+            <ArgumentParseErrors />
+          </option>
+        </compilerArguments>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debug/classes" />
     <output-test url="file://$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../kurotool">
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../../kurotool/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../kurotool/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="module-library">
+      <library name="Gradle: kaptGeneratedClasses">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugAndroidTest" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/releaseUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debug" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugUnitTest" />
+          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/release" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.3.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml
deleted file mode 100644
index dbf6c01..0000000
--- a/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurotool:main" external.linked.project.path="$MODULE_DIR$/../../../kurotool" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurotool/src/main/res;file://$MODULE_DIR$/../../../kurotool/src/debug/res;file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurotool/src/androidTest/res;file://$MODULE_DIR$/../../../kurotool/src/androidTestDebug/res;file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35392eb56c1d0580ad3dffc16f562cfd/material-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e23299ce283ec40921fac6b0c088acd/jetified-kotlin-android-extensions-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e0ed715837c2bdb1b753746850552ad/jetified-kotlin-stdlib-jdk7-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91e3e57adeee3b780afead2d7a7d5bb7/appcompat-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61eb2ecfc026b926fafa0f81127bec9a/fragment-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49a0f3458b53a067438423ae7c0dfb8c/jetified-appcompat-resources-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fba7b33d13e73231562cd340a2c71ea0/jetified-activity-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e7b34f7ccbee70ccde03223f1fb10de/core-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4faf711e1dd216139604f777ce0f7113/lifecycle-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99224bf02b30d8acccc5c114b4886228/versionedparcelable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec7d0e65890bec7fddb26258f54bd840/lifecycle-viewmodel-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fbe5d137b400302d60fd6a471d562b9/jetified-savedstate-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6226f2a8a8ae923e009e5b6d2ba06c10/lifecycle-livedata-core-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d56fd68c56fa1414f1d9cacfc2c3236/core-runtime-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug" />
-            <stringArg name="jvmTarget" arg="1.6" />
-            <stringArg name="moduleName" arg="kurotool_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths" />
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions">
-              <args>
-                <arg>plugin:org.jetbrains.kotlin.android:experimental=false</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:enabled=true</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap</arg>
-              </args>
-            </arrayArg>
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/aidl_source_output_dir/debug/out" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/ap_generated_sources/debug/out">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/renderscript_source_output_dir/debug/out" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/buildConfig/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/src/debug" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debug" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.61" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.3.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml
deleted file mode 100644
index f10d680..0000000
--- a/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurotool:unitTest" external.linked.project.path="$MODULE_DIR$/../../../kurotool" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurotool/src/main/res;file://$MODULE_DIR$/../../../kurotool/src/debug/res;file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../kurotool/src/androidTest/res;file://$MODULE_DIR$/../../../kurotool/src/androidTestDebug/res;file://$MODULE_DIR$/../../../kurotool/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="classpath">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8c586e0ef51ed962cedce30250c8e00/jetified-logging-interceptor-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91ff60686c23d239d8bbc93a1dde6471/jetified-okhttp-4.3.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/736a4b5601cf6870163e216dd4531f5b/jetified-okio-jvm-2.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eebbc1ca544777fc56e6e9ad0926d94e/jetified-rxandroid-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01cd38edbffee093e59531fad741bed8/jetified-rxjava-2.2.17.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35392eb56c1d0580ad3dffc16f562cfd/material-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ecb5eedc81564913e3183d7a159d11f/jetified-library-1.7.5-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e23299ce283ec40921fac6b0c088acd/jetified-kotlin-android-extensions-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e0ed715837c2bdb1b753746850552ad/jetified-kotlin-stdlib-jdk7-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f267915a84ab14cfb46da4e2f5f17db/jetified-core-ktx-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d29ee6216737436a08ee788c0e48cd2/jetified-kotlin-stdlib-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc688a8a552fac18d0cea0e8fe8591e/jetified-kotlin-stdlib-common-1.3.71.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91e3e57adeee3b780afead2d7a7d5bb7/appcompat-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7b0db8e2269dccc2170be0523f5a43c/cardview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd074f987ad0d9b15cd7d98e891e5c4/coordinatorlayout-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62cfd10075143437c93737d4877bbfc2/jetified-viewpager2-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61eb2ecfc026b926fafa0f81127bec9a/fragment-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0267a9c4885d5bcded9db9017252a87c/recyclerview-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7522e76212700777f052119c7c2a0f80/transition-1.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49a0f3458b53a067438423ae7c0dfb8c/jetified-appcompat-resources-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7f0605ba2098665b84314071f98e068/vectordrawable-animated-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7f225ba7920a89a713efa5550243d545/vectordrawable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cb6d84be61f3f332438b589c4429e53/drawerlayout-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/60c7cfc205102d00a295ef5398fc233c/viewpager-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9322ce26c854b79e2e2a2f545caa9d8/customview-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9c0326c2b12aa7752e325493141c526/loader-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fba7b33d13e73231562cd340a2c71ea0/jetified-activity-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e7b34f7ccbee70ccde03223f1fb10de/core-1.3.2-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4faf711e1dd216139604f777ce0f7113/lifecycle-runtime-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ae97c24264c49b544e889e56cd06143/cursoradapter-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99224bf02b30d8acccc5c114b4886228/versionedparcelable-1.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec7d0e65890bec7fddb26258f54bd840/lifecycle-viewmodel-2.1.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fbe5d137b400302d60fd6a471d562b9/jetified-savedstate-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e41b1b2e1fe25407aa731a53b5a7bb92/lifecycle-livedata-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6226f2a8a8ae923e009e5b6d2ba06c10/lifecycle-livedata-core-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d56fd68c56fa1414f1d9cacfc2c3236/core-runtime-2.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
-              </args>
-            </stringArg>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debugUnitTest" />
-            <stringArg name="jvmTarget" arg="1.6" />
-            <stringArg name="moduleName" arg="kurotool_debug" />
-            <stringArg name="apiVersion" arg="1.3" />
-            <stringArg name="languageVersion" arg="1.3" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="friendPaths">
-              <args>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debug</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.intellij.deps/trove4j/1.0.20181211/216c2e14b070f334479d800987affe4054cd563f/trove4j-1.0.20181211.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.61/54ca7c214a5cd73cd887a42002266e25440097f2/kotlin-android-extensions-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.3.61/c35c0833d5a1e3d229359758482c480306724618/kotlin-compiler-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.3.61/4de83e41a92c8395d89ab2e81d26b788ba163824/kotlin-daemon-embeddable-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.3.61/2e07c9a84c9e118efb70eede7e579fd663932122/kotlin-reflect-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.61/e5feb39c8de63dcbdc1154b34ca4413874231605/kotlin-script-runtime-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.61/65abb71d5afb850b68be03987b08e2c864ca3110/kotlin-stdlib-common-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.61/4702105e97f7396ae41b113fdbdc180ec1eb1e36/kotlin-stdlib-1.3.61.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions">
-              <args>
-                <arg>plugin:org.jetbrains.kotlin.android:experimental=false</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:enabled=true</arg>
-                <arg>plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap</arg>
-              </args>
-            </arrayArg>
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/ap_generated_sources/debugUnitTest/out" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debugUnitTest" />
-    <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugUnitTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/test/java" isTestSource="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../kurotool/src/testDebug" />
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.7.1" level="project" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debugUnitTest" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-gson:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.7.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:4.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.4.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxjava:2.2.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.61" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.liulishuo.filedownloader:library:1.7.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurotool.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/taxiapp-ktl.iml b/.idea/modules/taxiapp-ktl.iml
index 11543a1..51f844c 100644
--- a/.idea/modules/taxiapp-ktl.iml
+++ b/.idea/modules/taxiapp-ktl.iml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="taxiapp-ktl" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 450b265..294c507 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "net.sysolution.taxiapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 176
-        versionName "3.3.3-beta26.3-release"
+        versionCode 178
+        versionName "3.3.3-beta26.3.6-debug"
 
         //alphaxx - 预览版本,不会对外发布，由测试人员测试，会有很多bug
         //Betaxx - 公开测试版本，会发给其他工作人员，会有较多版本
@@ -39,12 +39,15 @@ android {
 
         //333-20 转凭证conn没被改到问题
         //333-21 下载素材时去掉isdownloading的判断
+        //333-24 修复有视频不下载的情况
 
         /*
         333-26  添加计次播放和多时段播放功能
             26.3 解决定点投放广告播放不了问题，播放日志和gps定点日志开关默认改为关闭，心跳由30s改为两分钟发一次，重连时间10s改为30s
                  凭证信息可备份至conn,防止跑账号
-        * */
+            26.3.2 解决卸载重装后设备不在原来的分组问题
+            26.3.3 解决直接升级后设备不播放广告或者等很久才播放问题
+        **/
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -96,7 +99,7 @@ android {
 
 //每升级一次数据库加一
 greendao {
-    schemaVersion 42
+    schemaVersion 44
     daoPackage 'cn.trans88.taxiappkotlin.logic.dao'
     targetGenDir 'src/main/java'
 }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java b/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java
index 13086a2..e5d1425 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java
@@ -21,6 +21,7 @@ public class Configurations {
 
     //将老的cn.trans88.taxiappkotlin.logic.Settings
     public void init(){
+
         boolean init = context.getSharedPreferences("config", Context.MODE_PRIVATE).getBoolean("init", false);
         if(init) return;
 
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt b/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt
index 25ec295..4bf2440 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt
@@ -2,6 +2,7 @@ package cn.trans88.taxiappkotlin
 
 import android.app.Application
 import android.content.Intent
+import android.media.MediaCodecList
 import android.os.Build
 import android.util.Log
 import cn.trans88.kurotool.util.LogLevel
@@ -17,6 +18,7 @@ import cn.trans88.taxiappkotlin.logic.model.Schedule
 import cn.trans88.taxiappkotlin.logic.network.JoeyDownloadManager
 import cn.trans88.taxiappkotlin.net.BizInterceptor
 import cn.trans88.taxiappkotlin.net.RetrofitCallFactory
+import cn.trans88.taxiappkotlin.ui.custom.JVideoView
 import cn.trans88.taxiappkotlin.ui.play.PlayActivity
 import cn.trans88.taxiappkotlin.ui.play.PlayServer
 import cn.trans88.taxiappkotlin.util.YoungUtil
@@ -34,6 +36,8 @@ class TaxiApp:Application() {
 
     private lateinit var daoSession: DaoSession
 
+    var nextVideoView:JVideoView? = null
+
     val timer = Timer()
     //定时任务是否执行
     var isTimed:Boolean = false
@@ -81,6 +85,23 @@ class TaxiApp:Application() {
 
         setLogUtil()
 
+        //获取设备上支持的所有解码器列表
+        val allCodecs = MediaCodecList(MediaCodecList.ALL_CODECS)
+        val codes = allCodecs.codecInfos;
+        for (codec in codes) {
+            if (codec.isEncoder()) {
+                continue
+            }
+            val types: Array<String> = codec.getSupportedTypes()
+            for (j in types.indices) {
+//                if (types[j].equals("video/avc", ignoreCase = true)) {
+//                if (types[j].contains("decoder", ignoreCase = true)) {
+//                    Log.e("yzd_t", "Found AVC decoder: " + codec.getName())
+                    Log.e("yzd_t", "Found decoder: " + codec.getName())
+//                }
+            }
+        }
+
         //初始化下载
         JoeyDownloadManager.init(this, 30 * 1000, 30 * 1000)
 
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/Repository.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/Repository.kt
index 510bd5a..c968b9b 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/Repository.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/Repository.kt
@@ -118,6 +118,49 @@ object Repository {
         return list
     }
 
+    fun getAdvertiseNext(): Advertise? {
+//        return getPlayAdvertise(circularListMap[getPlayLevels()])
+        val isTimedAdvertise = Configurations.config(taxiApp.activity).isTimedAdvertise
+//        val advertise = getNextPlayAdvertise(myListMap[getTestPlayLevels()])
+        val advertise = if (isTimedAdvertise){
+            getNextPlayAdvertise(taxiApp.timedAds)
+        } else {
+            getNextPlayAdvertise(myListMap[getTestPlayLevels()])
+        }
+        "getAdvertiseNext() -> advertise:${advertise}".loge()
+        return advertise
+    }
+
+    /**
+     * 拿到将要播放的广告
+     */
+    private fun getNextPlayAdvertise(list: MutableList<Advertise>?): Advertise? {
+        YoungUtil.YoungLog("getNextPlayAdvertise")
+        var nextIndex = currentListOrder + 1
+        list?.let {
+            if (it.isEmpty()) {
+                return null
+            }
+            for (index in 0..list.size) {
+
+                //防止下标越界
+                if (nextIndex >= list.size) {
+                    nextIndex = 0
+                }
+
+                //YoungUtil.YoungLog("当前播放的广告list位数 ： $currentListOrder")
+                val advertise = list[nextIndex]
+
+                if (advertise.isAllowPlay()) {
+                    //YoungUtil.YoungLog("拿到广告花费时间 ：${System.currentTimeMillis() - currentTimeMillis}")
+                    YoungUtil.YoungLog("拿到下一个广告:" + advertise.ad_id)
+                    return advertise
+                }
+            }
+        }
+        return null
+    }
+
     /**
      * 拿到将要播放的广告
      */
@@ -376,23 +419,9 @@ object Repository {
     }
 
 
-    /**
-     * 如果是按次数播放，则每次播放次数减一
-     * @param advertise Advertise?
-     */
-//    @Synchronized
-//    fun playByCount(advertise: Advertise?){
-//        advertise?.let {
-//            if (it.isCount){
-//                advertise.play_numbers --
-//                var count = advertise.play_numbers
-//                "广告[${advertise.ad_id}]剩余播放次数【${count}】".loge()
-//                DaoUtil.updatePlayNumbers(advertise)
-//            }
-//        }
-//    }
-
     private fun oldAdvertiseToNewAdvertise(oldAdvertise: Advertise): Advertise {
+        "oldAdvertise:$oldAdvertise，isCount:${oldAdvertise.isCount}".loge()
+
         val advertise = Advertise()
         advertise.apply {
             belongTo = oldAdvertise.belongTo
@@ -420,7 +449,7 @@ object Repository {
             is_exclusive = oldAdvertise.is_exclusive
 
             time_section = oldAdvertise.time_section
-//            if (sanleAdvertise.createAt ==null){
+//            if (sanleAdvertise.createAt == null){
 //                send("服务器日志 三乐广告 createAt :${sanleAdvertise.createAt}")
 //            }
         }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/AdvertiseDao.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/AdvertiseDao.java
index 82c09b8..9831843 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/AdvertiseDao.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/AdvertiseDao.java
@@ -39,10 +39,10 @@ public class AdvertiseDao extends AbstractDao<Advertise, Long> {
         public final static Property IsDownloaded = new Property(12, boolean.class, "isDownloaded", false, "IS_DOWNLOADED");
         public final static Property IsDownloading = new Property(13, boolean.class, "isDownloading", false, "IS_DOWNLOADING");
         public final static Property Play_numbers = new Property(14, int.class, "play_numbers", false, "PLAY_NUMBERS");
-        public final static Property IsCount = new Property(15, Boolean.class, "isCount", false, "IS_COUNT");
+        public final static Property IsCount = new Property(15, boolean.class, "isCount", false, "IS_COUNT");
         public final static Property Mxkl_url = new Property(16, String.class, "mxkl_url", false, "MXKL_URL");
-        public final static Property IsTimedAd = new Property(17, Boolean.class, "isTimedAd", false, "IS_TIMED_AD");
-        public final static Property Is_exclusive = new Property(18, Boolean.class, "is_exclusive", false, "IS_EXCLUSIVE");
+        public final static Property IsTimedAd = new Property(17, boolean.class, "isTimedAd", false, "IS_TIMED_AD");
+        public final static Property Is_exclusive = new Property(18, boolean.class, "is_exclusive", false, "IS_EXCLUSIVE");
     }
 
 
@@ -73,10 +73,10 @@ public class AdvertiseDao extends AbstractDao<Advertise, Long> {
                 "\"IS_DOWNLOADED\" INTEGER NOT NULL ," + // 12: isDownloaded
                 "\"IS_DOWNLOADING\" INTEGER NOT NULL ," + // 13: isDownloading
                 "\"PLAY_NUMBERS\" INTEGER NOT NULL ," + // 14: play_numbers
-                "\"IS_COUNT\" INTEGER," + // 15: isCount
+                "\"IS_COUNT\" INTEGER NOT NULL ," + // 15: isCount
                 "\"MXKL_URL\" TEXT," + // 16: mxkl_url
-                "\"IS_TIMED_AD\" INTEGER," + // 17: isTimedAd
-                "\"IS_EXCLUSIVE\" INTEGER);"); // 18: is_exclusive
+                "\"IS_TIMED_AD\" INTEGER NOT NULL ," + // 17: isTimedAd
+                "\"IS_EXCLUSIVE\" INTEGER NOT NULL );"); // 18: is_exclusive
     }
 
     /** Drops the underlying database table. */
@@ -143,26 +143,14 @@ public class AdvertiseDao extends AbstractDao<Advertise, Long> {
         stmt.bindLong(13, entity.getIsDownloaded() ? 1L: 0L);
         stmt.bindLong(14, entity.getIsDownloading() ? 1L: 0L);
         stmt.bindLong(15, entity.getPlay_numbers());
- 
-        Boolean isCount = entity.getIsCount();
-        if (isCount != null) {
-            stmt.bindLong(16, isCount ? 1L: 0L);
-        }
+        stmt.bindLong(16, entity.getIsCount() ? 1L: 0L);
  
         String mxkl_url = entity.getMxkl_url();
         if (mxkl_url != null) {
             stmt.bindString(17, mxkl_url);
         }
- 
-        Boolean isTimedAd = entity.getIsTimedAd();
-        if (isTimedAd != null) {
-            stmt.bindLong(18, isTimedAd ? 1L: 0L);
-        }
- 
-        Boolean is_exclusive = entity.getIs_exclusive();
-        if (is_exclusive != null) {
-            stmt.bindLong(19, is_exclusive ? 1L: 0L);
-        }
+        stmt.bindLong(18, entity.getIsTimedAd() ? 1L: 0L);
+        stmt.bindLong(19, entity.getIs_exclusive() ? 1L: 0L);
     }
 
     @Override
@@ -223,26 +211,14 @@ public class AdvertiseDao extends AbstractDao<Advertise, Long> {
         stmt.bindLong(13, entity.getIsDownloaded() ? 1L: 0L);
         stmt.bindLong(14, entity.getIsDownloading() ? 1L: 0L);
         stmt.bindLong(15, entity.getPlay_numbers());
- 
-        Boolean isCount = entity.getIsCount();
-        if (isCount != null) {
-            stmt.bindLong(16, isCount ? 1L: 0L);
-        }
+        stmt.bindLong(16, entity.getIsCount() ? 1L: 0L);
  
         String mxkl_url = entity.getMxkl_url();
         if (mxkl_url != null) {
             stmt.bindString(17, mxkl_url);
         }
- 
-        Boolean isTimedAd = entity.getIsTimedAd();
-        if (isTimedAd != null) {
-            stmt.bindLong(18, isTimedAd ? 1L: 0L);
-        }
- 
-        Boolean is_exclusive = entity.getIs_exclusive();
-        if (is_exclusive != null) {
-            stmt.bindLong(19, is_exclusive ? 1L: 0L);
-        }
+        stmt.bindLong(18, entity.getIsTimedAd() ? 1L: 0L);
+        stmt.bindLong(19, entity.getIs_exclusive() ? 1L: 0L);
     }
 
     @Override
@@ -268,10 +244,10 @@ public class AdvertiseDao extends AbstractDao<Advertise, Long> {
             cursor.getShort(offset + 12) != 0, // isDownloaded
             cursor.getShort(offset + 13) != 0, // isDownloading
             cursor.getInt(offset + 14), // play_numbers
-            cursor.isNull(offset + 15) ? null : cursor.getShort(offset + 15) != 0, // isCount
+            cursor.getShort(offset + 15) != 0, // isCount
             cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // mxkl_url
-            cursor.isNull(offset + 17) ? null : cursor.getShort(offset + 17) != 0, // isTimedAd
-            cursor.isNull(offset + 18) ? null : cursor.getShort(offset + 18) != 0 // is_exclusive
+            cursor.getShort(offset + 17) != 0, // isTimedAd
+            cursor.getShort(offset + 18) != 0 // is_exclusive
         );
         return entity;
     }
@@ -293,10 +269,10 @@ public class AdvertiseDao extends AbstractDao<Advertise, Long> {
         entity.setIsDownloaded(cursor.getShort(offset + 12) != 0);
         entity.setIsDownloading(cursor.getShort(offset + 13) != 0);
         entity.setPlay_numbers(cursor.getInt(offset + 14));
-        entity.setIsCount(cursor.isNull(offset + 15) ? null : cursor.getShort(offset + 15) != 0);
+        entity.setIsCount(cursor.getShort(offset + 15) != 0);
         entity.setMxkl_url(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16));
-        entity.setIsTimedAd(cursor.isNull(offset + 17) ? null : cursor.getShort(offset + 17) != 0);
-        entity.setIs_exclusive(cursor.isNull(offset + 18) ? null : cursor.getShort(offset + 18) != 0);
+        entity.setIsTimedAd(cursor.getShort(offset + 17) != 0);
+        entity.setIs_exclusive(cursor.getShort(offset + 18) != 0);
      }
     
     @Override
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/DaoMaster.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/DaoMaster.java
index 5ac1672..21a48cc 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/DaoMaster.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/DaoMaster.java
@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 42): knows all DAOs.
+ * Master of DAO (schema version 44): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 42;
+    public static final int SCHEMA_VERSION = 44;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/SanleAdvertiseDao.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/SanleAdvertiseDao.java
index 11fc4be..68ab2d3 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/SanleAdvertiseDao.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/dao/SanleAdvertiseDao.java
@@ -34,10 +34,10 @@ public class SanleAdvertiseDao extends AbstractDao<SanleAdvertise, Long> {
         public final static Property Duration = new Property(7, String.class, "duration", false, "DURATION");
         public final static Property CreateAt = new Property(8, Long.class, "createAt", false, "CREATE_AT");
         public final static Property Play_numbers = new Property(9, int.class, "play_numbers", false, "PLAY_NUMBERS");
-        public final static Property IsCount = new Property(10, Boolean.class, "isCount", false, "IS_COUNT");
+        public final static Property IsCount = new Property(10, boolean.class, "isCount", false, "IS_COUNT");
         public final static Property Mxkl_url = new Property(11, String.class, "mxkl_url", false, "MXKL_URL");
-        public final static Property IsTimedAd = new Property(12, Boolean.class, "isTimedAd", false, "IS_TIMED_AD");
-        public final static Property Is_exclusive = new Property(13, Boolean.class, "is_exclusive", false, "IS_EXCLUSIVE");
+        public final static Property IsTimedAd = new Property(12, boolean.class, "isTimedAd", false, "IS_TIMED_AD");
+        public final static Property Is_exclusive = new Property(13, boolean.class, "is_exclusive", false, "IS_EXCLUSIVE");
     }
 
 
@@ -63,10 +63,10 @@ public class SanleAdvertiseDao extends AbstractDao<SanleAdvertise, Long> {
                 "\"DURATION\" TEXT," + // 7: duration
                 "\"CREATE_AT\" INTEGER," + // 8: createAt
                 "\"PLAY_NUMBERS\" INTEGER NOT NULL ," + // 9: play_numbers
-                "\"IS_COUNT\" INTEGER," + // 10: isCount
+                "\"IS_COUNT\" INTEGER NOT NULL ," + // 10: isCount
                 "\"MXKL_URL\" TEXT," + // 11: mxkl_url
-                "\"IS_TIMED_AD\" INTEGER," + // 12: isTimedAd
-                "\"IS_EXCLUSIVE\" INTEGER);"); // 13: is_exclusive
+                "\"IS_TIMED_AD\" INTEGER NOT NULL ," + // 12: isTimedAd
+                "\"IS_EXCLUSIVE\" INTEGER NOT NULL );"); // 13: is_exclusive
     }
 
     /** Drops the underlying database table. */
@@ -116,26 +116,14 @@ public class SanleAdvertiseDao extends AbstractDao<SanleAdvertise, Long> {
             stmt.bindLong(9, createAt);
         }
         stmt.bindLong(10, entity.getPlay_numbers());
- 
-        Boolean isCount = entity.getIsCount();
-        if (isCount != null) {
-            stmt.bindLong(11, isCount ? 1L: 0L);
-        }
+        stmt.bindLong(11, entity.getIsCount() ? 1L: 0L);
  
         String mxkl_url = entity.getMxkl_url();
         if (mxkl_url != null) {
             stmt.bindString(12, mxkl_url);
         }
- 
-        Boolean isTimedAd = entity.getIsTimedAd();
-        if (isTimedAd != null) {
-            stmt.bindLong(13, isTimedAd ? 1L: 0L);
-        }
- 
-        Boolean is_exclusive = entity.getIs_exclusive();
-        if (is_exclusive != null) {
-            stmt.bindLong(14, is_exclusive ? 1L: 0L);
-        }
+        stmt.bindLong(13, entity.getIsTimedAd() ? 1L: 0L);
+        stmt.bindLong(14, entity.getIs_exclusive() ? 1L: 0L);
     }
 
     @Override
@@ -179,26 +167,14 @@ public class SanleAdvertiseDao extends AbstractDao<SanleAdvertise, Long> {
             stmt.bindLong(9, createAt);
         }
         stmt.bindLong(10, entity.getPlay_numbers());
- 
-        Boolean isCount = entity.getIsCount();
-        if (isCount != null) {
-            stmt.bindLong(11, isCount ? 1L: 0L);
-        }
+        stmt.bindLong(11, entity.getIsCount() ? 1L: 0L);
  
         String mxkl_url = entity.getMxkl_url();
         if (mxkl_url != null) {
             stmt.bindString(12, mxkl_url);
         }
- 
-        Boolean isTimedAd = entity.getIsTimedAd();
-        if (isTimedAd != null) {
-            stmt.bindLong(13, isTimedAd ? 1L: 0L);
-        }
- 
-        Boolean is_exclusive = entity.getIs_exclusive();
-        if (is_exclusive != null) {
-            stmt.bindLong(14, is_exclusive ? 1L: 0L);
-        }
+        stmt.bindLong(13, entity.getIsTimedAd() ? 1L: 0L);
+        stmt.bindLong(14, entity.getIs_exclusive() ? 1L: 0L);
     }
 
     @Override
@@ -219,10 +195,10 @@ public class SanleAdvertiseDao extends AbstractDao<SanleAdvertise, Long> {
             cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // duration
             cursor.isNull(offset + 8) ? null : cursor.getLong(offset + 8), // createAt
             cursor.getInt(offset + 9), // play_numbers
-            cursor.isNull(offset + 10) ? null : cursor.getShort(offset + 10) != 0, // isCount
+            cursor.getShort(offset + 10) != 0, // isCount
             cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // mxkl_url
-            cursor.isNull(offset + 12) ? null : cursor.getShort(offset + 12) != 0, // isTimedAd
-            cursor.isNull(offset + 13) ? null : cursor.getShort(offset + 13) != 0 // is_exclusive
+            cursor.getShort(offset + 12) != 0, // isTimedAd
+            cursor.getShort(offset + 13) != 0 // is_exclusive
         );
         return entity;
     }
@@ -239,10 +215,10 @@ public class SanleAdvertiseDao extends AbstractDao<SanleAdvertise, Long> {
         entity.setDuration(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
         entity.setCreateAt(cursor.isNull(offset + 8) ? null : cursor.getLong(offset + 8));
         entity.setPlay_numbers(cursor.getInt(offset + 9));
-        entity.setIsCount(cursor.isNull(offset + 10) ? null : cursor.getShort(offset + 10) != 0);
+        entity.setIsCount(cursor.getShort(offset + 10) != 0);
         entity.setMxkl_url(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11));
-        entity.setIsTimedAd(cursor.isNull(offset + 12) ? null : cursor.getShort(offset + 12) != 0);
-        entity.setIs_exclusive(cursor.isNull(offset + 13) ? null : cursor.getShort(offset + 13) != 0);
+        entity.setIsTimedAd(cursor.getShort(offset + 12) != 0);
+        entity.setIs_exclusive(cursor.getShort(offset + 13) != 0);
      }
     
     @Override
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/Advertise.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/Advertise.java
index a7e9473..cbe8c53 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/Advertise.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/Advertise.java
@@ -34,23 +34,19 @@ public class Advertise implements Serializable {
     //新加字段，代表播放次数
     private int play_numbers;
     //是否计次
-    private Boolean isCount = false;
+    private boolean isCount = false;
     //新的下载地址
     private String mxkl_url;
 
     //是否是分时段广告
-    private Boolean isTimedAd = false;
+    private boolean isTimedAd = false;
     //如果false，代表轮播，如果true，就是独享
-    private Boolean is_exclusive = false;
+    private boolean is_exclusive = false;
 
-    public Boolean getIs_exclusive() {
+    public boolean getIs_exclusive() {
         return is_exclusive;
     }
 
-    public void setIs_exclusive(Boolean is_exclusive) {
-        this.is_exclusive = is_exclusive;
-    }
-
     //分时段播放的json
     @Transient
     private List<Schedule> time_section;
@@ -88,13 +84,13 @@ public class Advertise implements Serializable {
     @Transient
     private boolean isLast=false;
 
-    @Generated(hash = 2002231375)
+    @Generated(hash = 1692343993)
     public Advertise(Long autoId, String id, int belongTo, int media_type,
             String media_url, String ad_id, String region_id, String pathName,
             String duration, Long createAt, Double longitude, Double latitude,
             boolean isDownloaded, boolean isDownloading, int play_numbers,
-            Boolean isCount, String mxkl_url, Boolean isTimedAd,
-            Boolean is_exclusive) {
+            boolean isCount, String mxkl_url, boolean isTimedAd,
+            boolean is_exclusive) {
         this.autoId = autoId;
         this.id = id;
         this.belongTo = belongTo;
@@ -120,6 +116,7 @@ public class Advertise implements Serializable {
     public Advertise() {
     }
 
+
     public List<TimeSpan> getTime_Span() {
         return time_span;
     }
@@ -216,8 +213,6 @@ public class Advertise implements Serializable {
         this.region_id = region_id;
     }
 
-    
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -293,18 +288,23 @@ public class Advertise implements Serializable {
     }
 
     public boolean getIsCount() {
-        return this.isCount;
+        boolean isCount = this.isCount;
+        return isCount;
     }
 
-    public void setIsCount(Boolean isCount) {
+    public void setIsCount(boolean isCount) {
         this.isCount = isCount;
     }
 
-    public Boolean getIsTimedAd() {
+    public boolean getIsTimedAd() {
         return this.isTimedAd;
     }
 
-    public void setIsTimedAd(Boolean isTimedAd) {
+    public void setIsTimedAd(boolean isTimedAd) {
         this.isTimedAd = isTimedAd;
     }
+
+    public void setIs_exclusive(boolean is_exclusive) {
+        this.is_exclusive = is_exclusive;
+    }
 }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/SanleAdvertise.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/SanleAdvertise.java
index bb34223..18d83b4 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/SanleAdvertise.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/SanleAdvertise.java
@@ -23,21 +23,21 @@ public class SanleAdvertise {
     //新加字段，代表播放次数
     private int play_numbers;
     //是否计次
-    private Boolean isCount = false;
+    private boolean isCount = false;
 
     //新的下载地址
     private String mxkl_url;
 
     //是否是分时段广告
-    private Boolean isTimedAd = false;
+    private boolean isTimedAd = false;
     //如果false，代表轮播，如果true，就是独享
-    private Boolean is_exclusive = false;
+    private boolean is_exclusive = false;
 
-    public Boolean getIs_exclusive() {
+    public boolean getIs_exclusive() {
         return is_exclusive;
     }
 
-    public void setIs_exclusive(Boolean is_exclusive) {
+    public void setIs_exclusive(boolean is_exclusive) {
         this.is_exclusive = is_exclusive;
     }
 
@@ -45,11 +45,11 @@ public class SanleAdvertise {
     @Transient
     private List<Schedule> time_section;
 
-    public Boolean getTimedAd() {
+    public boolean getTimedAd() {
         return isTimedAd;
     }
 
-    public void setTimedAd(Boolean timedAd) {
+    public void setTimedAd(boolean timedAd) {
         isTimedAd = timedAd;
     }
 
@@ -80,11 +80,11 @@ public class SanleAdvertise {
     @Transient
     private List<TimeSpan> time_span;
 
-    @Generated(hash = 376068790)
+    @Generated(hash = 1382148836)
     public SanleAdvertise(Long AutoId, String id, String task_id, int belongTo,
             int media_type, String media_url, String pathName, String duration,
-            Long createAt, int play_numbers, Boolean isCount, String mxkl_url,
-            Boolean isTimedAd, Boolean is_exclusive) {
+            Long createAt, int play_numbers, boolean isCount, String mxkl_url,
+            boolean isTimedAd, boolean is_exclusive) {
         this.AutoId = AutoId;
         this.id = id;
         this.task_id = task_id;
@@ -105,8 +105,6 @@ public class SanleAdvertise {
     public SanleAdvertise() {
     }
 
-
-
     public List<TimeSpan> getTime_span() {
         return time_span;
     }
@@ -212,15 +210,15 @@ public class SanleAdvertise {
         return this.isCount;
     }
 
-    public void setIsCount(Boolean isCount) {
+    public void setIsCount(boolean isCount) {
         this.isCount = isCount;
     }
 
-    public Boolean getIsTimedAd() {
+    public boolean getIsTimedAd() {
         return this.isTimedAd;
     }
 
-    public void setIsTimedAd(Boolean isTimedAd) {
+    public void setIsTimedAd(boolean isTimedAd) {
         this.isTimedAd = isTimedAd;
     }
 }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt
index 830f36e..d3103c4 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ConnManger.kt
@@ -76,9 +76,10 @@ object ConnManger {
             }
 
             //不是绑定或者转移账号，就对比一下conn的信息
+            var result = false
             if (!isBindOrTransfer){
                 "is not BindOrTransfer count".loge()
-                val result = contrastConnMessage()
+                result = contrastConnMessage()
                 "对比结果,result:$result".loge()
             }
 
@@ -115,6 +116,13 @@ object ConnManger {
             val body = RequestBody.create(parse, requestJson)
             val client = RxRestClient.builder().baseUrl("${baseUrl}v1/cms/taxi/").useInterceptor(true).build()
 
+            var isFirstRegist = Configurations.config(TaxiApp.instance()).isFirstRegister().toString()
+            //如果conn有数据，就不是第一次注册
+            if (result){
+                isFirstRegist = "false"
+            }
+            "isFirstRegist：$isFirstRegist".loge()
+
             client.setURL("register")
 //                .setBaseUrl("${Settings.taxiBaseUrl}v1/cms/taxi/")
 //                .setBaseUrl("${baseUrl}v1/cms/taxi/")
@@ -123,7 +131,7 @@ object ConnManger {
                 .setHeader("Authorization", "Bearer ${Configurations.config(TaxiApp.instance()).registerToken()}")
 //                .setHeader("Authorization", "Bearer $testToken")
 //                .setHeader("IsFirstRegister",TaxiApp.isFirstRegister.toString())
-                .setHeader("IsFirstRegister", Configurations.config(TaxiApp.instance()).isFirstRegister().toString())
+                .setHeader("IsFirstRegister", isFirstRegist)
                 //todo 如果解析的对象的属性有为空的赋值比如之前的upload_debug_file_url暂时还没有数据，会抛出解析错误异常
                 .post(object : BaseObserver<RegisterResponse>() {
                     override fun onGot(registerResponse: RegisterResponse) {
@@ -861,7 +869,7 @@ object ConnManger {
         WsManager.stopConnect(code,msg)
         isRegisterSuccess = false
         //Settings.isFirstRegister = true
-         Configurations.config(TaxiApp.instance()).isFirstRegisterSave(true)
+        Configurations.config(TaxiApp.instance()).isFirstRegisterSave(true)
         registerApp()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
index 3dbba04..cc6358e 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
@@ -1,6 +1,7 @@
 package cn.trans88.taxiappkotlin.logic.network;
 
 import android.app.Application;
+import android.util.Log;
 
 import androidx.lifecycle.ViewModelStore;
 
@@ -135,6 +136,7 @@ public class JoeyDownloadManager {
 
     public synchronized void downloadSingle(String url, String pathName, String adId) {
         YoungUtil.YoungLog("downloadSingle url: " + url + ", pathName: " + pathName);
+//        Log.e("yzd_t",Configurations.config(app).downloadUrl() + url);
         BaseDownloadTask downloader = FileDownloader.getImpl()
 //            .create(SaveSimpleData.getDownloadUrl()+url)
                 .create( Configurations.config(app).downloadUrl() + url)
@@ -259,13 +261,15 @@ public class JoeyDownloadManager {
                                         .setTag(task.getTag())
                                         .setAutoRetryTimes(task.getAutoRetryTimes());//防止由于传的mxkl_url是无效链接，只给6次机会
                             } else {
+                                Log.e("yzd_t","剩余下载次数,download count：" + task.getRetryingTimes());
                                 downloader = FileDownloader.getImpl()
                                         .create(task.getUrl())
                                         .setPath(task.getPath(), false)
                                         .setCallbackProgressTimes(400)
                                         .setMinIntervalUpdateSpeed(300)
                                         .setTag(task.getTag())
-                                        .setAutoRetryTimes(RETRY_TIMES);
+                                        .setAutoRetryTimes(task.getRetryingTimes());
+//                                        .setAutoRetryTimes(RETRY_TIMES);
                             }
 
                             if (null != getDownloadListener()) {
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
index 34182e7..5b398a9 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
@@ -104,7 +104,7 @@ object ProcessingCommands {
             ConnManger.sendLocation()
         }
 
-        baseResponse.type =type
+        baseResponse.type = type
         val response = gson.toJson(baseResponse)
         send(response)
     }
@@ -177,7 +177,7 @@ object ProcessingCommands {
 //        reconnect(1004,"长时间未收到心跳断开连接")
 
         if(beatTimer!=null){
-            YoungUtil.YoungLog("收到新的心跳应答，取消之前定时")
+            YoungUtil.YoungLog("received heart response,收到新的心跳应答，取消之前定时")
             beatTimer!!.cancel()
             beatTimer!!.purge()
             beatTimer =null
@@ -192,7 +192,7 @@ object ProcessingCommands {
                 reconnect(1004, "长时间未收到心跳断开连接")
             }
 
-        },4*60*1000)
+        },3*60*1000)
     }
 
     /**
@@ -649,6 +649,7 @@ object ProcessingCommands {
         }
 
         if (insert) {
+            "insert advertise:$advertise".loge()
             DaoUtil.getAdvertise().insert(advertise)
             advertise.time_Span.forEach {
                 it.advertiseId = advertise.ad_id
@@ -699,7 +700,8 @@ object ProcessingCommands {
             belongTo = AdvertiseType.GROUP.ordinal
             pathName = dest.path
             //#edit by ljh 2023/2/6
-//            isCount = false
+            isCount = false
+            isTimedAd = false
             if(play_numbers > 0){
                 isCount = true
                 "${task_id}计次播放,该广告播放次数为${sanleAdvertise.play_numbers}".logd()
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
index d234da3..22ac919 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
@@ -54,10 +54,11 @@ object WsManager {
         YoungUtil.YoungLog("长连接进行连接的token:${Configurations.config(TaxiApp.instance()).appToken()}")
         mRequest = Request.Builder()
             .url("${Configurations.config(TaxiApp.instance()).taxiServiceUrl()}?auth_token=${Configurations.config(TaxiApp.instance()).appToken()}")
-//            .url("http://rudbcblk.beesnat.com/?auth_token=${Configurations.config(TaxiApp.instance()).appToken()}")
-//            .url("http://192.168.1.127:2347/?auth_token=${Configurations.config(TaxiApp.instance()).appToken()}")
+//            .url("http://192.168.1.132:2347/?auth_token=${Configurations.config(TaxiApp.instance()).appToken()}")
+//            .url("http://1vf5fnic.beesnat.com/?auth_token=${Configurations.config(TaxiApp.instance()).appToken()}")
+//            .url("http://192.168.1.132:2347/?auth_token=${Configurations.config(TaxiApp.instance()).appToken()}")
 //            .url("http://192.168.1.127:2347/?auth_token=${testToken}")
-//            .url("http://192.168.1.110:2347/?auth_token=${testToken}")
+//            .url("http://192.168.1.132:2347/?auth_token=${testToken}")
 //            .url("http://taxihub.cn:2347/?auth_token=${testToken}")
             .build()
 
@@ -99,7 +100,7 @@ object WsManager {
                     YoungUtil.YoungLog("onFailure  response message :" + response.message)
                 }
 
-//                wsMainHandler.removeCallbacks(heartbeat)
+//              wsMainHandler.removeCallbacks(heartbeat)
                 tryReconnect()
             }
 
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayActivity.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayActivity.kt
index c140cc2..1eae75b 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayActivity.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayActivity.kt
@@ -21,6 +21,7 @@ import cn.trans88.taxiappkotlin.R.string
 import cn.trans88.taxiappkotlin.TaxiApp
 import cn.trans88.taxiappkotlin.TaxiApp.Companion.HAOSHENG
 import cn.trans88.taxiappkotlin.TaxiApp.Companion.MAIDIER
+import cn.trans88.taxiappkotlin.ext.logd
 import cn.trans88.taxiappkotlin.ext.loge
 import cn.trans88.taxiappkotlin.jetpack.PlayViewModelFactory
 import cn.trans88.taxiappkotlin.logic.Repository
@@ -99,6 +100,11 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
 //        }
         taxiApp.activity = this
 
+        //默认关闭日志
+        "default close log...".logd()
+        Configurations.config(this).gpsSwitchSave(false)
+        Configurations.config(this).loggerSwitchSave(false)
+
         JoeyDownloadManager.getInstance().setCallBack(this)
 
         registerBoardReceiver()
@@ -164,6 +170,7 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
                 YoungUtil.YoungLog("bindService onServiceConnected")
                 connService = ConnService.Stub.asInterface(service)
                 ConnManger.setConnService(connService)
+                ConnManger.registerApp()
                 //对照conn之前的绑定信息
 //                val result = ConnManger.contrastConnMessage()
 //                "对比结果,result:$result".loge()
@@ -344,7 +351,8 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
         YoungUtil.YoungLog("startTask")
         initAdvertise()
 //        GpsUtils.getInstance().setGpsInformationListener(playViewModel)
-        ConnManger.registerApp()
+
+//        ConnManger.registerApp()
 
         //edit by yzd @20220908 下面这行代码移到外面去，晚一点执行，
         //否则广告列表还没准备好就刷新播放，导致播放的还是logo
@@ -396,7 +404,6 @@ class PlayActivity : AppCompatActivity(), NetworkCallback, BusCallback, OnScreen
         })
 
         getCardWidthHeight()
-
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayView.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayView.kt
index 27e7240..643592f 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayView.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayView.kt
@@ -48,7 +48,7 @@ fun View.createView(context: Context, advertise: Advertise, seek: Int): View? {
         MaterialType.IMAGE.ordinal -> {
             YoungUtil.YoungLog("素材是图片:${Configurations.config(TaxiApp.instance()).downloadUrl()}${advertise.media_url} 是否在主线程：${isMainThread()}")
             val image = ImageView(context)
-//                val bitmap = BitmapFactory.decodeFile(advertise.pathName)
+        //  val bitmap = BitmapFactory.decodeFile(advertise.pathName)
             val bitmap = thumbnail(advertise.pathName, Configurations.config(TaxiApp.instance()).screenSizeX(), Configurations.config(TaxiApp.instance()).screenSizeY())
             image.setImageBitmap(bitmap)
             image.scaleType = ImageView.ScaleType.FIT_XY
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt
index ac7f3fa..e3153ec 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayViewModel.kt
@@ -18,6 +18,7 @@ import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.FrameLayout
 import android.widget.ImageView
+import androidx.core.view.children
 import androidx.core.view.get
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
@@ -31,6 +32,7 @@ import cn.trans88.taxiappkotlin.TaxiApp.Companion.HAOSHENG
 import cn.trans88.taxiappkotlin.TaxiApp.Companion.MAIDIER
 import cn.trans88.taxiappkotlin.TaxiApp.Companion.SANLE
 import cn.trans88.taxiappkotlin.TaxiApp.Companion.XIXUN
+import cn.trans88.taxiappkotlin.ext.logd
 import cn.trans88.taxiappkotlin.ext.loge
 import cn.trans88.taxiappkotlin.ext.logi
 import cn.trans88.taxiappkotlin.logic.Repository
@@ -52,6 +54,7 @@ import cn.trans88.taxiappkotlin.play.RefreshPlayer
 import cn.trans88.taxiappkotlin.ui.advertise.AdvertiseType
 import cn.trans88.taxiappkotlin.ui.advertise.AdvertiseType.AREA
 import cn.trans88.taxiappkotlin.ui.advertise.MaterialType
+import cn.trans88.taxiappkotlin.ui.custom.JVideoView
 import cn.trans88.taxiappkotlin.util.DateUtil
 import cn.trans88.taxiappkotlin.util.YoungUtil
 import java.io.ByteArrayOutputStream
@@ -451,8 +454,16 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
                     "日志durarion:${curLogger!!.duration}".loge()
                 }
 
+
                 val createView = fl_play.createView(fl_play.context, advertise, 0)
 
+//                fl_play.children.iterator().forEach {
+//                    if (it is JVideoView) {
+//                        "是JVideoView".loge()
+//                        it.stopPlayback()
+//                    }
+//                }
+
                 fl_play.apply {
 //                    clearAnimation()
                     val currentTimeMillis = System.currentTimeMillis()
@@ -512,6 +523,14 @@ class PlayViewModel(val lifecycle: Lifecycle, private val fl_play: FrameLayout,
 
             } else {
                 YoungUtil.YoungLog("收到的广告为空停止播放")
+//                val advertises = getAdvertise().queryBuilder().orderDesc(Properties.CreateAt).limit(5).list()
+//                if (advertises.isNullOrEmpty()){
+//                    stopPlay()
+//                } else {
+//                    "当前播放列表不为空，playList is not null".logd()
+//                    handler.removeCallbacksAndMessages(null)
+//                    RefreshPlayer.refresh()
+//                }
                 stopPlay()
             }
         }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
index 9094939..fb36804 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
@@ -28,14 +28,6 @@ fun Advertise.isReady(): Boolean {
                 ready = false
             }
 
-            //edit by ljh @2023/2/9
-//            if (this.play_numbers == -1){
-//                val file = File(this.pathName)
-//                if(file.length() > 0){
-//                    return false
-//                }
-//            }
-
             if(media_type !=MaterialType.Text.ordinal){
                 /* 这里exist判断不准，文件存在被判定为不存在 略作改动
                 if (!File(this.pathName).exists()) {
diff --git a/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml b/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
deleted file mode 100644
index 2b099a4..0000000
--- a/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" ?>
-<sdk_metadata>
-  <library  groupId="com.urbanairship.android" artifactId="urbanairship-sdk" recommended-version="9.3.1" >
-    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-sdk:9.1.0" />
-    <versions from="9.0.0" to="9.0.4" status="deprecated" description="Version is known issues with in-app automation. Please update to version &lt;current&gt; as soon as possible." />
-    <versions from="8.9.1" to="8.9.2" status="deprecated" description="Version is known to have stability issues. Please update to version &lt;current&gt; as soon as possible. See &lt;url&gt; for more details." url="https://github.com/urbanairship/android-library/blob/master/CHANGELOG.md#version-893---october-17-2017" />
-    <versions from="6.1.4" to="8.7.0" status="deprecated" description="Version is known to have Android O compatibility issues. Please update to version &lt;current&gt; as soon as possible." />
-    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-sdk:9.3.0" />
-    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-sdk:9.3.1" />
-  </library>
-  <library  groupId="com.urbanairship.android" artifactId="urbanairship-core" recommended-version="9.3.1" >
-    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-core:9.1.0" />
-    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-core:9.3.0" />
-    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-core:9.3.1" />
-  </library>
-  <library  groupId="com.urbanairship.android" artifactId="urbanairship-fcm" recommended-version="9.3.1" >
-    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-fcm:9.1.0" />
-    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-fcm:9.3.0" />
-    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-fcm:9.3.1" />
-  </library>
-  <library  groupId="com.urbanairship.android" artifactId="urbanairship-gcm" recommended-version="9.3.1" >
-    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-gcm:9.1.0" />
-    <versions from="9.3.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-gcm:9.3.0" />
-    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-gcm:9.3.1" />
-  </library>
-  <library  groupId="com.urbanairship.android" artifactId="urbanairship-adm" recommended-version="9.3.1" >
-    <versions from="9.1.0" status="deprecated" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-adm:9.1.0" />
-    <versions from="9.3.0" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-adm:9.3.0" />
-    <versions from="9.3.1" status="recommended" version-literal="!SDK-VERSION-STRING!:com.urbanairship.android:urbanairship-adm:9.3.1" />
-  </library>
-  <library  groupId="com.tune" artifactId="tune-marketing-console-sdk" recommended-version="5.3.0" >
-    <versions from="5.3.0" version-literal="com.tune.BuildConfig.5.3.0" description="Bug affecting SDK data quality" />
-    <versions from="5.2.1" version-literal="com.tune.BuildConfig.5.2.1" />
-    <versions from="5.2.0" version-literal="com.tune.BuildConfig.5.2.0" />
-    <versions from="5.1.1" status="deprecated" version-literal="com.tune.BuildConfig.5.1.1" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="5.0.0" to="5.0.2" status="deprecated" version-literal="com.tune.BuildConfig.5.0.0" description="Bug affecting SDK data quality" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.15.2" to="4.16.0" status="deprecated" version-literal="com.tune.BuildConfig.4.15.2" description="Bug affecting SDK data quality" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.15.1" version-literal="com.tune.BuildConfig.4.15.1" description="Bug affecting SDK performance" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.15.0" version-literal="com.tune.BuildConfig.4.15.0" description="Bug affecting SDK performance" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.14.0" version-literal="com.tune.BuildConfig.4.14.0" description="Bug affecting SDK performance" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.13.0" status="deprecated" version-literal="com.tune.BuildConfig.4.13.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.12.1" status="deprecated" version-literal="com.tune.BuildConfig.4.12.1" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.12.0" status="deprecated" version-literal="com.tune.BuildConfig.4.12.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.11.1" status="deprecated" version-literal="com.tune.BuildConfig.4.11.1" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.11.0" status="deprecated" version-literal="com.tune.BuildConfig.4.11.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.10.2" version-literal="com.tune.BuildConfig.4.10.2" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.10.1" version-literal="com.tune.BuildConfig.4.10.1" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.10.0" version-literal="com.tune.BuildConfig.4.10.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.9.0" version-literal="com.tune.BuildConfig.4.9.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.8.0" to="4.8.1" version-literal="com.tune.BuildConfig.4.8.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="4.0.0" to="4.7.1" status="deprecated" version-literal="com.tune.BuildConfig.4.0.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="3.0.0" to="3.11.4" status="deprecated" version-literal="com.tune.BuildConfig.3.0.0" description="Bug affecting app stability" url="https://developers.tune.com/sdk/migrating-to-android-4-8-0-and-above/" />
-    <versions from="0.0.0" to="3.0.0" status="deprecated" description="Bug affecting app stability" />
-  </library>
-  <library  groupId="com.android.volley" artifactId="volley" recommended-version="1.1.0" >
-    <versions from="1.1.0" />
-    <versions from="1.1.0-rc2" status="deprecated" description="Bug affecting app stability" url="https://github.com/google/volley/releases" />
-    <versions from="1.1.0-rc1" status="deprecated" description="Bug affecting app stability" url="https://github.com/google/volley/releases" />
-    <versions from="1.0.0" status="deprecated" description="Bug affecting app stability" url="https://github.com/google/volley/releases" />
-  </library>
-  <library groupId="com.crashlytics.sdk.android" artifactId="answers" recommended-version="17.4.0">
-    <versions from="1.0.0" to="1.4.7" status="deprecated" description="Fabric Answers is deprecated. To continue getting real-time analytics, switch over to using Google Analytics.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/switch-to-analytics." url="https://firebase.google.com/docs/crashlytics/switch-to-analytics?platform=android" />
-  </library>
-  <library groupId="com.crashlytics.sdk.android" artifactId="crashlytics" recommended-version="17.2.2">
-    <versions from="2.0.0" to="2.10.1" status="deprecated" description="The Fabric Crashlytics SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/upgrade-sdk" url="https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android" />
-  </library>
-  <library groupId="com.crashlytics.sdk.android" artifactId="crashlytics-core" recommended-version="17.2.2">
-    <versions from="2.0.0" to="2.7.0" status="deprecated" description="The Fabric Crashlytics SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/upgrade-sdk" url="https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android" />
-  </library>
-  <library groupId="com.crashlytics.sdk.android" artifactId="crashlytics-ndk" recommended-version="17.2.2">
-    <versions from="0.5.0" to="2.1.1" status="deprecated" description="The Fabric Crashlytics SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/upgrade-sdk" url="https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android" />
-  </library>
-  <library  groupId="com.google.guava" artifactId="guava" recommended-version="24.1-jre" >
-    <versions from="24.1-jre" />
-  </library>
-  <library  groupId="com.google.guava" artifactId="guava" recommended-version="25.0-android" >
-    <versions from="25.0-android" />
-    <versions from="24.1.1-android" status="insecure" description="Moderate security vulnerability" url="https://github.com/google/guava/wiki/CVE-2018-10237" />
-    <versions from="24.1-android" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/guava/releases" />
-    <versions from="24.0-android" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/guava/releases" />
-  </library>
-  <library  groupId="com.google.firebase" artifactId="firebase-analytics" recommended-version="15.0.0" >
-    <versions from="15.0.0" />
-    <versions from="12.0.1" />
-    <versions from="12.0.0" />
-    <versions from="11.8.0" />
-    <versions from="11.6.2" />
-    <versions from="11.6.0" />
-    <versions from="11.4.2" />
-    <versions from="11.4.0" />
-    <versions from="11.2.2" />
-    <versions from="11.2.0" />
-    <versions from="11.0.4" />
-    <versions from="11.0.2" />
-    <versions from="11.0.1" />
-    <versions from="11.0.0" />
-    <versions from="10.2.6" />
-    <versions from="10.2.4" />
-    <versions from="10.2.1" />
-    <versions from="10.2.0" />
-    <versions from="10.0.1" />
-    <versions from="10.0.0" />
-    <versions from="9.8.0" />
-    <versions from="9.6.1" />
-    <versions from="9.6.0" />
-    <versions from="9.4.0" />
-    <versions from="9.2.1" />
-    <versions from="9.2.0" />
-    <versions from="9.0.2" />
-    <versions from="9.0.1" />
-    <versions from="9.0.0" />
-  </library>
-  <library  groupId="com.google.firebase" artifactId="firebase-appcheck-safetynet">
-    <versions from="16.0.0-beta01" to="16.0.0-beta01" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-    <versions from="16.0.0-beta02" to="16.0.0-beta02" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-    <versions from="16.0.0-beta03" to="16.0.0-beta03" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-    <versions from="16.0.0-beta04" to="16.0.0-beta04" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-    <versions from="16.0.0-beta05" to="16.0.0-beta05" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-    <versions from="16.0.0-beta06" to="16.0.0-beta06" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-    <versions from="16.0.0" status="deprecated" description="The SafetyNet Attestation API is deprecated and has been replaced by the Play Integrity API. Before June 2023, migrate to the Firebase App Check SDK for Play Integrity by following https://firebase.google.com/docs/app-check/android/play-integrity-provider." url="https://developer.android.com/training/safetynet/deprecation-timeline"/>
-  </library>
-  <library groupId="com.google.firebase" artifactId="firebase-config">
-    <versions from="21.1.0" to="21.1.0" status="deprecated" description="Bug affecting some locales causing HTTP errors" url="https://firebase.google.com/docs/remote-config/get-started?platform=android" />
-  </library>
-  <library groupId="com.google.firebase" artifactId="firebase-crashlytics" recommended-version="18.3.1">
-    <versions from="17.0.0-beta01" to="17.0.0-beta01" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="17.0.0-beta02" to="17.0.0-beta02" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="17.0.0-beta03" to="17.0.0-beta03" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="17.0.0-beta04" to="17.0.0-beta04" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="18.3.0" to="18.3.0" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.1+." url="https://github.com/firebase/firebase-android-sdk/issues/4223" />
-  </library>
-  <library groupId="com.google.firebase" artifactId="firebase-crashlytics-ndk" recommended-version="18.3.2">
-    <versions from="17.0.0-beta01" to="17.0.0-beta01" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="17.0.0-beta02" to="17.0.0-beta02" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="17.0.0-beta03" to="17.0.0-beta03" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="17.0.0-beta04" to="17.0.0-beta04" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
-    <versions from="18.3.0" to="18.3.0" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.1+." url="https://github.com/firebase/firebase-android-sdk/issues/4223" />
-    <versions from="18.3.1" to="18.3.1" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.2+." url="https://github.com/firebase/firebase-android-sdk/issues/4313" />
-  </library>
-  <library  groupId="com.google.firebase" artifactId="firebase-messaging" recommended-version="20.1.2" >
-    <versions from="20.1.1" status="deprecated" description="Bug affecting app stability" url="https://firebase.google.com/support/release-notes/android#messaging_v20-1-1" />
-  </library>
-  <library  groupId="com.google.firebase" artifactId="firebase-ml-vision">
-    <versions from="15.0.0" to="24.1.0" status="deprecated" description="For more information, refer to documentation for specific features.&#13;&#10;Text recognition: https://firebase.google.com/docs/ml/android/recognize-text&#13;&#10;Image labeling: https://firebase.google.com/docs/ml/android/label-images&#13;&#10;Landmark recognition: https://firebase.google.com/docs/ml/android/recognize-landmarks " />
-  </library>
-  <library  groupId="com.google.firebase" artifactId="firebase-ml-model-interpreter">
-    <versions from="15.0.0" to="22.0.4" status="deprecated" description="The Firebase ML Model Interpreter library is deprecated in favor of the Firebase ML Model Downloader library. For more information, visit https://firebase.google.com/docs/ml/android/use-custom-models" />
-  </library>
-
-  <library  groupId="com.google.firebase" artifactId="firebase-perf">
-    <versions to="16.2.1" status="deprecated" description="This version will soon be deprecated. Update to version 19.0.10 or higher to get real time performance data. For more information, visit https://firebase.google.com/docs/perf-mon/troubleshooting" url="https://firebase.google.com/docs/perf-mon/troubleshooting?platform=android#faq-real-time-data"/>
-  </library>
-
-  <library  groupId="com.google.dagger" artifactId="dagger-android" recommended-version="2.35.1" >
-    <versions from="2.15" />
-    <versions from="2.14.1" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.14" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.13" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.12" status="deprecated" description="Bug affecting app performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.11" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.11-rc2" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.11-rc1" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
-    <versions from="2.10" status="deprecated" url="https://github.com/google/dagger/releases/tag/2.15" />
-  </library>
-  <library  groupId="AppsFlyer" artifactId="af-android-sdk" recommended-version="4.8.10" >
-    <versions from="4.8.9" version-literal="!SDK-VERSION-STRING!:com.appsflyer:af-android-sdk:4.8.9" />
-    <versions from="4.8.10" version-literal="!SDK-VERSION-STRING!:com.appsflyer:af-android-sdk:4.8.10" />
-  </library>
-  <library  groupId="com.kochava" artifactId="tracker" recommended-version="3.4.0" >
-    <versions from="3.4.0" />
-    <versions from="3.3.1" version-literal="&quot;AndroidTracker 3.3.1&quot;, &quot;control.kochava.com&quot;" />
-    <versions from="3.3.0" version-literal="&quot;AndroidTracker 3.3.0&quot;, &quot;control.kochava.com&quot;" />
-    <versions from="3.2.0" version-literal="&quot;AndroidTracker 3.2.0&quot;, &quot;control.kochava.com&quot;" />
-    <versions from="3.1.1" version-literal="&quot;AndroidTracker 3.1.1&quot;, &quot;control.kochava.com&quot;" />
-    <versions from="3.1.0" status="deprecated" version-literal="&quot;AndroidTracker 3.1.0&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="3.0.0" status="deprecated" version-literal="&quot;AndroidTracker 3.0.0&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20170303" status="deprecated" version-literal="&quot;Android20170303&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20170216" status="deprecated" version-literal="&quot;Android20170216&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20170127" status="deprecated" version-literal="&quot;Android20170127&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20170106" status="deprecated" version-literal="&quot;Android20170106&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20161122" status="deprecated" version-literal="&quot;Android20161122&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20160914" status="deprecated" version-literal="&quot;Android20160914&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20160902" status="deprecated" version-literal="&quot;Android20160902&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20160811" status="deprecated" version-literal="&quot;Android20160811&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20160615" status="deprecated" version-literal="&quot;Android20160615&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20160427" status="deprecated" version-literal="&quot;Android20160427&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20160222" status="deprecated" version-literal="&quot;Android20160222&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20151109" status="deprecated" version-literal="&quot;Android20151109&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20150511" status="deprecated" version-literal="&quot;Android20150511&quot;, &quot;control.kochava.com&quot;" description="Bug affecting SDK performance" />
-    <versions from="20150312" status="insecure" version-literal="&quot;Android20150312&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
-    <versions from="20150128" status="insecure" version-literal="&quot;Android20150128&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
-    <versions from="20141023" status="insecure" version-literal="&quot;Android20141023&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
-    <versions from="20140825" status="insecure" version-literal="&quot;Android20140825&quot;, &quot;control.kochava.com&quot;" description="Moderate security vulnerability" />
-  </library>
-</sdk_metadata>
diff --git a/debug/TaxiApp_v3.3.3-beta26.3.6-debug{175}.apk b/debug/TaxiApp_v3.3.3-beta26.3.6-debug{175}.apk
deleted file mode 100644
index fdd8b72..0000000
Binary files a/debug/TaxiApp_v3.3.3-beta26.3.6-debug{175}.apk and /dev/null differ
diff --git a/debug/output.json b/debug/output.json
deleted file mode 100644
index 8f0406b..0000000
--- a/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":175,"versionName":"3.3.3-beta26.3.6-debug","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.6-debug{175}.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.6-debug{175}.apk","properties":{}}]
\ No newline at end of file
diff --git a/release/TaxiApp_v3.3.3-beta26.3-release{176}.apk b/his-version-apk/TaxiApp_v3.3.3-beta26.3.3-release{178}.zip
similarity index 56%
rename from release/TaxiApp_v3.3.3-beta26.3-release{176}.apk
rename to his-version-apk/TaxiApp_v3.3.3-beta26.3.3-release{178}.zip
index 7a04d56..ae6e520 100644
Binary files a/release/TaxiApp_v3.3.3-beta26.3-release{176}.apk and b/his-version-apk/TaxiApp_v3.3.3-beta26.3.3-release{178}.zip differ
diff --git a/kurotool/src/main/java/cn/trans88/kurotool/net/webSocket/WsManager.java b/kurotool/src/main/java/cn/trans88/kurotool/net/webSocket/WsManager.java
index 24283f2..5b7dcaa 100644
--- a/kurotool/src/main/java/cn/trans88/kurotool/net/webSocket/WsManager.java
+++ b/kurotool/src/main/java/cn/trans88/kurotool/net/webSocket/WsManager.java
@@ -216,8 +216,8 @@ public class WsManager {
 
         if (mWebSocket!=null){
             isCloseConnect = mWebSocket.close(code, "closeContext");
-            Log.i(TAG, "stopConnect: "+isCloseConnect );
-            mWebSocket =null;
+            Log.i(TAG, "stopConnect: " + isCloseConnect );
+            mWebSocket = null;
         }
 
         return isCloseConnect;
diff --git a/local.properties b/local.properties
index d3c4d32..86fffdf 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Oct 21 16:04:48 GMT+08:00 2022
+#Tue Apr 18 13:34:15 GMT+08:00 2023
 sdk.dir=D\:\\Android\\sdk
diff --git a/release/output.json b/release/output.json
index a8ecf7b..6fde2a8 100644
--- a/release/output.json
+++ b/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":176,"versionName":"3.3.3-beta26.3-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3-release{176}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3-release{176}.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":178,"versionName":"3.3.3-beta26.3.5-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.3.5-release{178}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.3.5-release{178}.apk","properties":{}}]
\ No newline at end of file