From 6384a2d906064940140011b905311994ca9cf2a8 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Sat, 20 Nov 2021 21:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 20 +++++++++----------
 .../network/TrafficLightNetWorkModel.kt       | 10 +++++-----
 .../v2x/vip/network/VipNetWorkModel.kt        |  7 ++++---
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 07fa84c995..c5e2ae103d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,17 +5,17 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'android-aspectjx'
 apply plugin: 'bugly'
 //apply ByteX宿主
-apply plugin: 'bytex'
-ByteX {
-    enable true
-    enableInDebug true
-    logLevel "DEBUG"
-}
+//apply plugin: 'bytex'
+//ByteX {
+//    enable true
+//    enableInDebug true
+//    logLevel "DEBUG"
+//}
 
-apply plugin: 'chain.log.hook'
-hooklog{
-    enableLoggerToServer true
-}
+//apply plugin: 'chain.log.hook'
+//hooklog{
+//    enableLoggerToServer true
+//}
 bugly {
     appId = 'ac71228f85' // 注册时分配的App ID
     appKey = '3c736249-d6be-4066-b577-b7a6dc975cf7' // 注册时分配的App Key
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
index 647fc54dee..8aad353347 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
@@ -1,11 +1,10 @@
 package com.mogo.eagle.core.function.v2x.trafficlight.network
 
 import com.google.gson.Gson
-import com.mogo.cloud.network.RetrofitFactory
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.trafficlight.*
+import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.constants.HostConst.CITY_HOST
 import com.mogo.utils.network.apiCall
 import com.mogo.utils.network.cancel
@@ -14,8 +13,9 @@ import com.mogo.utils.network.request
 class TrafficLightNetWorkModel {
 
     private fun getNetWorkApi(baseUrl: String = CITY_HOST): TrafficLightApiService {
-        return RetrofitFactory.getInstanceNoCallAdapter(baseUrl)!!
-            .create(TrafficLightApiService::class.java)
+        return MogoApisHandler.getInstance().apis.networkApi.createNoCallAdapter(
+            TrafficLightApiService::class.java, baseUrl
+        )
     }
 
     fun requestRoadID(
@@ -72,7 +72,7 @@ class TrafficLightNetWorkModel {
         request<BaseResponse<TrafficLightResult>>("requestTrafficLight") {
             val map = hashMapOf<String, String>()
             start {
-                if(roadId == null){
+                if (roadId == null) {
                     return@start
                 }
                 val trafficLightRequestData = TrafficLightRequestData(lat, lon, bearing, roadId)
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/network/VipNetWorkModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/network/VipNetWorkModel.kt
index 4ca63f023f..110c9dac74 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/network/VipNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/network/VipNetWorkModel.kt
@@ -1,8 +1,8 @@
 package com.mogo.eagle.core.function.v2x.vip.network
 
-import com.mogo.cloud.network.RetrofitFactory
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.BaseResponse
+import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.constants.HostConst.DATA_SERVICE_HOST
 import com.mogo.utils.network.apiCall
 import com.mogo.utils.network.request
@@ -10,8 +10,9 @@ import com.mogo.utils.network.request
 class VipNetWorkModel {
 
     private fun getNetWorkApi(baseUrl: String = DATA_SERVICE_HOST): VipApiService {
-        return RetrofitFactory.getInstanceNoCallAdapter(baseUrl)!!
-            .create(VipApiService::class.java)
+        return MogoApisHandler.getInstance().apis.networkApi.createNoCallAdapter(
+            VipApiService::class.java, baseUrl
+        )
     }
 
     fun requestVip(onSuccess: ((Boolean) -> Unit), onError: ((String) -> Unit)) {