[2.13.0-arch-opt] merge

app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt

@@ -39,8 +39,6 @@ import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.ProcessUtils
 import com.mogo.eagle.core.utilcode.util.ThreadPoolService
 import com.mogo.eagle.core.utilcode.util.TimeUtils
-import com.mogo.map.location.GDLocationClient
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.rousetime.android_startup.AndroidStartup
 import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
 import com.zhjt.service.chain.ChainLog
@@ -78,14 +76,14 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         this.context = context
         // TODO 需要与，陈扶风，确认为啥要限制仅在主进程
 //        if (ProcessUtils.isMainProcess(context)) {
-            initGDLoc()
-            initHttpDns()
+        initGDLoc()
+        initHttpDns()
 //        }
         return true
     }
 
     private fun initGDLoc() {
-        GDLocationClient.getInstance(context).start()
+        CallerMapUIServiceManager.getGDLocationServer(context!!)?.start()
     }
 
     /**
@@ -155,12 +153,11 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
                 }
                 val httpDnsSimpleLocation =
                     if (mogoLocation != null && mogoLocation.latitude != 0.0 && mogoLocation.longitude != 0.0) {
-                        if (mogoLocation.cityCode.isNullOrEmpty() && !GDLocationClient.getInstance(
-                                context
-                            ).lastCityCode.isNullOrEmpty()
+                        if (mogoLocation.cityCode.isNullOrEmpty()
+                            && !CallerMapUIServiceManager.getGDLocationServer(context!!)?.lastCityCode.isNullOrEmpty()
                         ) {
                             HttpDnsSimpleLocation(
-                                GDLocationClient.getInstance(context).lastCityCode,
+                                CallerMapUIServiceManager.getGDLocationServer(context!!)?.lastCityCode ?: "010",
                                 mogoLocation.latitude,
                                 mogoLocation.longitude
                             )