From 62bfbedaa360a799cb4246a3060f8f18814794cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 16 Sep 2021 20:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A2=E8=B7=AF=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                                               | 2 +-
 .idea/misc.xml                                                 | 2 +-
 app/build.gradle                                               | 2 +-
 {libraries => modules}/tanlulib/.gitignore                     | 0
 {libraries => modules}/tanlulib/build.gradle                   | 0
 {libraries => modules}/tanlulib/consumer-rules.pro             | 0
 {libraries => modules}/tanlulib/gradle.properties              | 0
 {libraries => modules}/tanlulib/proguard-rules.pro             | 0
 {libraries => modules}/tanlulib/src/main/AndroidManifest.xml   | 0
 .../java/com/zhidao/roadcondition/MogoTanluApiProvider.java    | 0
 .../java/com/zhidao/roadcondition/base/BaseIntentService.kt    | 0
 .../main/java/com/zhidao/roadcondition/base/BaseRepository.kt  | 0
 .../src/main/java/com/zhidao/roadcondition/constant/Const.kt   | 0
 .../java/com/zhidao/roadcondition/constant/HttpConstants.kt    | 0
 .../com/zhidao/roadcondition/event/GetImageSuccessEvent.kt     | 0
 .../com/zhidao/roadcondition/event/LatLngStickyEventBus.kt     | 0
 .../java/com/zhidao/roadcondition/exception/ApiException.kt    | 0
 .../main/java/com/zhidao/roadcondition/model/BaseRequest.kt    | 0
 .../main/java/com/zhidao/roadcondition/model/BaseResponse.kt   | 0
 .../main/java/com/zhidao/roadcondition/model/CityStrategy.kt   | 0
 .../main/java/com/zhidao/roadcondition/model/CommonConfig.kt   | 0
 .../java/com/zhidao/roadcondition/model/InformationBody.kt     | 0
 .../java/com/zhidao/roadcondition/model/InformationResource.kt | 0
 .../java/com/zhidao/roadcondition/model/InformationType.kt     | 0
 .../com/zhidao/roadcondition/model/InformationTypeResult.kt    | 0
 .../main/java/com/zhidao/roadcondition/model/Informations.kt   | 0
 .../src/main/java/com/zhidao/roadcondition/model/Items.kt      | 0
 .../main/java/com/zhidao/roadcondition/model/LocationInfo.kt   | 0
 .../src/main/java/com/zhidao/roadcondition/model/Results.kt    | 0
 .../com/zhidao/roadcondition/model/StrategyServiceModel.kt     | 1 -
 .../main/java/com/zhidao/roadcondition/model/UploadResult.kt   | 0
 .../zhidao/roadcondition/model/proxy/ActiveInfoTypeProxy.kt    | 0
 .../zhidao/roadcondition/model/proxy/InformationsTypeProxy.kt  | 0
 .../main/java/com/zhidao/roadcondition/net/CoroutineChain.kt   | 0
 .../src/main/java/com/zhidao/roadcondition/net/CoroutineDSL.kt | 0
 .../src/main/java/com/zhidao/roadcondition/net/HttpApi.kt      | 3 ---
 .../src/main/java/com/zhidao/roadcondition/net/HttpClient.kt   | 1 -
 .../com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt     | 1 -
 .../com/zhidao/roadcondition/service/CarCorderController.kt    | 1 -
 .../zhidao/roadcondition/service/CosCallbackMapController.kt   | 0
 .../com/zhidao/roadcondition/service/CosStatusController.kt    | 0
 .../com/zhidao/roadcondition/service/CustomStatusHandler.kt    | 0
 .../main/java/com/zhidao/roadcondition/service/DelayService.kt | 0
 .../roadcondition/service/InformationUploadController.kt       | 0
 .../main/java/com/zhidao/roadcondition/service/MainService.kt  | 0
 .../com/zhidao/roadcondition/service/MainServiceController.kt  | 0
 .../main/java/com/zhidao/roadcondition/service/ServiceConst.kt | 0
 .../com/zhidao/roadcondition/service/TakePhotoInterceptor.kt   | 0
 .../main/java/com/zhidao/roadcondition/service/UploadParams.kt | 0
 .../main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt   | 0
 .../src/main/java/com/zhidao/roadcondition/util/FileUtil.kt    | 0
 .../main/java/com/zhidao/roadcondition/util/LocationUtil.kt    | 0
 .../src/main/java/com/zhidao/roadcondition/util/PdUtil.kt      | 1 -
 .../java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt | 0
 .../com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt    | 0
 .../main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt  | 0
 settings.gradle                                                | 2 +-
 57 files changed, 4 insertions(+), 12 deletions(-)
 rename {libraries => modules}/tanlulib/.gitignore (100%)
 rename {libraries => modules}/tanlulib/build.gradle (100%)
 rename {libraries => modules}/tanlulib/consumer-rules.pro (100%)
 rename {libraries => modules}/tanlulib/gradle.properties (100%)
 rename {libraries => modules}/tanlulib/proguard-rules.pro (100%)
 rename {libraries => modules}/tanlulib/src/main/AndroidManifest.xml (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseIntentService.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseRepository.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/event/GetImageSuccessEvent.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/event/LatLngStickyEventBus.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/exception/ApiException.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseRequest.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseResponse.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/CommonConfig.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationResource.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationType.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationTypeResult.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/Informations.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/Items.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt (97%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/UploadResult.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/ActiveInfoTypeProxy.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/InformationsTypeProxy.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineChain.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineDSL.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt (86%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt (99%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt (93%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt (99%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/ServiceConst.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/TakePhotoInterceptor.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt (98%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt (100%)
 rename {libraries => modules}/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt (100%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e5a1ccc208..67345575b0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -31,7 +31,6 @@
             <option value="$PROJECT_DIR$/libraries/map-custom" />
             <option value="$PROJECT_DIR$/libraries/mogo-map" />
             <option value="$PROJECT_DIR$/libraries/mogo-map-api" />
-            <option value="$PROJECT_DIR$/libraries/tanlulib" />
             <option value="$PROJECT_DIR$/main-extensions" />
             <option value="$PROJECT_DIR$/main-extensions/mogo-module-main-launcher" />
             <option value="$PROJECT_DIR$/modules" />
@@ -59,6 +58,7 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-smp" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
             <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
+            <option value="$PROJECT_DIR$/modules/tanlulib" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />
             <option value="$PROJECT_DIR$/services/mogo-service-api" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6d402a6181..0c2e948c39 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -31,7 +31,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0be83a3c2c..09736fd4b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -183,7 +183,7 @@ dependencies {
         implementation project(':modules:mogo-module-service')
         implementation project(':modules:mogo-module-v2x')
         implementation project(':modules:mogo-module-share')
-        implementation project(':libraries:tanlulib')
+        implementation project(':modules:tanlulib')
         implementation project(':modules:mogo-module-monitor')
         implementation project(':modules:mogo-module-extensions')
         implementation project(':modules:mogo-module-map')
diff --git a/libraries/tanlulib/.gitignore b/modules/tanlulib/.gitignore
similarity index 100%
rename from libraries/tanlulib/.gitignore
rename to modules/tanlulib/.gitignore
diff --git a/libraries/tanlulib/build.gradle b/modules/tanlulib/build.gradle
similarity index 100%
rename from libraries/tanlulib/build.gradle
rename to modules/tanlulib/build.gradle
diff --git a/libraries/tanlulib/consumer-rules.pro b/modules/tanlulib/consumer-rules.pro
similarity index 100%
rename from libraries/tanlulib/consumer-rules.pro
rename to modules/tanlulib/consumer-rules.pro
diff --git a/libraries/tanlulib/gradle.properties b/modules/tanlulib/gradle.properties
similarity index 100%
rename from libraries/tanlulib/gradle.properties
rename to modules/tanlulib/gradle.properties
diff --git a/libraries/tanlulib/proguard-rules.pro b/modules/tanlulib/proguard-rules.pro
similarity index 100%
rename from libraries/tanlulib/proguard-rules.pro
rename to modules/tanlulib/proguard-rules.pro
diff --git a/libraries/tanlulib/src/main/AndroidManifest.xml b/modules/tanlulib/src/main/AndroidManifest.xml
similarity index 100%
rename from libraries/tanlulib/src/main/AndroidManifest.xml
rename to modules/tanlulib/src/main/AndroidManifest.xml
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseIntentService.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseIntentService.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseIntentService.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseIntentService.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseRepository.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseRepository.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseRepository.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/base/BaseRepository.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/event/GetImageSuccessEvent.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/event/GetImageSuccessEvent.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/event/GetImageSuccessEvent.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/event/GetImageSuccessEvent.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/event/LatLngStickyEventBus.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/event/LatLngStickyEventBus.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/event/LatLngStickyEventBus.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/event/LatLngStickyEventBus.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/exception/ApiException.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/exception/ApiException.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/exception/ApiException.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/exception/ApiException.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseRequest.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseRequest.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseRequest.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseRequest.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseResponse.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseResponse.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseResponse.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/BaseResponse.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CommonConfig.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/CommonConfig.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CommonConfig.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/CommonConfig.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationResource.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationResource.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationResource.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationResource.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationType.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationType.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationType.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationType.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationTypeResult.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationTypeResult.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationTypeResult.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationTypeResult.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Informations.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/Informations.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Informations.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/Informations.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Items.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/Items.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Items.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/Items.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
similarity index 97%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
index 1ff3f6388c..92e0a59301 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
@@ -3,7 +3,6 @@ package com.zhidao.roadcondition.model
 import android.util.Log
 import com.google.gson.Gson
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.commons.network.Utils
 import com.mogo.module.common.constants.HostConst
 import com.zhidao.roadcondition.base.BaseRepository
 import com.zhidao.roadcondition.net.HttpClient
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/UploadResult.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/UploadResult.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/UploadResult.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/UploadResult.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/ActiveInfoTypeProxy.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/ActiveInfoTypeProxy.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/ActiveInfoTypeProxy.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/ActiveInfoTypeProxy.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/InformationsTypeProxy.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/InformationsTypeProxy.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/InformationsTypeProxy.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/proxy/InformationsTypeProxy.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineChain.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineChain.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineChain.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineChain.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineDSL.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineDSL.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineDSL.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/CoroutineDSL.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt
similarity index 86%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt
index 750a66afd6..1cdd1a7f1f 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpApi.kt
@@ -1,11 +1,8 @@
 package com.zhidao.roadcondition.net
 
 import com.zhidao.roadcondition.model.BaseResponse
-import com.zhidao.roadcondition.model.CommonConfig
 import com.zhidao.roadcondition.model.Results
 import com.zhidao.roadcondition.model.UploadResult
-import okhttp3.MultipartBody
-import okhttp3.ResponseBody
 import retrofit2.http.*
 
 /**
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
similarity index 99%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
index 376c6dd254..fb98c27ee9 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
@@ -1,6 +1,5 @@
 package com.zhidao.roadcondition.net
 
-import android.util.Log
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.utils.network.NetConfig
 import com.zhidao.roadcondition.constant.HttpConstants
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
similarity index 93%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
index eae6d678f7..263f349f8c 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import com.zhidao.roadcondition.service.MainService
 
 class ShareRoadReceiver : BroadcastReceiver() {
 
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
similarity index 99%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index d56e854675..7c30cbfcc9 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -11,7 +11,6 @@ import com.mogo.cloud.tanlu.bean.UploadInfo
 import com.mogo.cloud.tanlu.bean.UploadResult
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
-import com.mogo.commons.network.Utils
 import com.mogo.utils.NetworkUtils
 import com.zhidao.auto.carcorder.callback.TakePhotoCallback
 import com.zhidao.auto.carcorder.callback.TakeVideoCallback
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/ServiceConst.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/ServiceConst.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/ServiceConst.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/ServiceConst.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/TakePhotoInterceptor.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/TakePhotoInterceptor.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/TakePhotoInterceptor.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/TakePhotoInterceptor.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
similarity index 98%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
index 31b0cf0719..1f32b6d9e6 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
@@ -5,7 +5,6 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.commons.network.Utils
 import com.zhidao.roadcondition.model.InformationBody
 import com.zhidao.roadcondition.model.LocationInfo
 import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt
similarity index 100%
rename from libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt
rename to modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt
diff --git a/settings.gradle b/settings.gradle
index 0a9415f2e1..29994c4e51 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,7 +18,7 @@ include ':libraries:map-custom'
 include ':libraries:mogo-map-api'
 include ':libraries:map-autonavi'
 include ':libraries:mogo-map'
-include ':libraries:tanlulib'
+include ':modules:tanlulib'
 
 // 核心模块
 include ':core:mogo-core-data'