调整探路目录关系

Signed-off-by: 董宏宇 <martindhy@gmail.com>

.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" />

.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>

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')

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

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.*
 
 /**

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

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() {
 

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

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

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'