From 9b41205800e75235b0fe3a747df06ffcbed89642 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 1 Sep 2021 16:21:42 +0800
Subject: [PATCH] logic perform upgrade

---
 .idea/gradle.xml                              |  4 ---
 .../java/com/mogo/och/bus/OchBusProvider.java |  4 ---
 .../och/bus/presenter/OchBusOrderModel.java   |  3 +-
 .../com/mogo/och/taxi/MogoOCHTaxiModel.java   |  4 +--
 app/build.gradle                              |  1 -
 app/functions/aicloudservices.gradle          | 24 +++++++-------
 .../com/mogo/launcher/MogoApplication.java    |  6 ----
 config.gradle                                 | 13 --------
 .../mogo-aicloud-services-sdk/build.gradle    | 12 +++++--
 .../services/httpdns/HttpDnsConst.java        |  5 ++-
 .../services/httpdns/IHttpDnsCallback.java    |  2 +-
 .../services/httpdns/IMogoHttpDns.java        |  2 +-
 .../aicloud/services/httpdns/MogoHttpDns.java |  5 +--
 .../services/httpdns/MogoHttpDnsHandler.java  |  2 +-
 .../MogoLocationInfoServices.java             |  3 +-
 .../services/passport/PassportManager.java    |  4 +--
 .../socket/MogoAiCloudSocketManager.java      |  8 ++---
 .../mogo-base-websocket-sdk/build.gradle      |  2 --
 foudations/mogo-commons/build.gradle          |  5 ++-
 .../com/mogo/commons/AbsMogoApplication.java  | 32 +++++++------------
 gradle.properties                             |  8 -----
 libraries/mogo-map-api/build.gradle           |  2 --
 modules.txt                                   |  5 +--
 .../module/adas/AdasAutoPilotManager.java     |  2 +-
 .../SnapshotLocationDataCenter.java           |  2 +-
 .../extensions/entrance/EntranceFragment.java |  5 +--
 .../live/ExtensionServiceManager.java         |  4 +--
 .../module/monitor/log/MogoLogMonitor.java    |  3 +-
 .../module/service/MarkerServiceHandler.java  |  2 +-
 .../autopilot/AutoPilotRemoteController.java  |  4 +--
 .../dispatch/DispatchAutoPilotManager.java    |  2 +-
 .../launchercard/LauncherCardRefresher.java   |  3 +-
 .../service/location/MogoRTKLocation.java     |  2 +-
 .../service/marker/MapMarkerManager.java      |  4 +--
 .../timedelay/TimeDelayUploadManager.java     |  2 +-
 .../service/utils/LocationParseUtil.java      |  2 +-
 .../utils/SimpleLocationCorrectStrategy.java  |  2 +-
 .../mogo/module/v2x/V2XServiceManager.java    |  2 +-
 .../listener/V2XMessageListener_401003.java   |  2 +-
 .../listener/V2XMessageListener_401005.java   |  2 +-
 .../listener/V2XMessageListener_401006.java   |  2 +-
 .../listener/V2XMessageListener_401007.java   |  2 +-
 .../listener/V2XMessageListener_401009.java   |  2 +-
 .../listener/V2XMessageListener_401010.java   |  2 +-
 .../listener/V2XMessageListener_401011.java   |  6 +---
 .../listener/V2XMessageListener_401012.java   |  2 +-
 .../listener/V2XMessageListener_401018.java   |  4 +--
 .../listener/V2XMessageListener_402000.java   |  2 +-
 services/mogo-service-api/build.gradle        |  2 --
 .../com/mogo/service/IMogoServiceApis.java    |  8 ++---
 .../adas/entity/CarModelListResponse.java     |  8 +++--
 .../cloud/location/CloudLocationInfo.java     |  2 +-
 .../location/IMogoLocationInfoService.java    |  2 +-
 .../cloud/passport/IMogoPassportManager.java  |  2 +-
 .../cloud/passport/IMogoTicketCallback.java   |  2 +-
 services/mogo-service/consumer-rules.pro      |  8 ++---
 .../mogo/service/impl/MogoServiceApis.java    |  8 ++---
 .../location/MogoLocationInfoService.java     |  2 +-
 .../cloud/passport/MogoPassportManager.java   |  2 +-
 .../impl/cloud/socket/MogoSocketManager.java  |  2 +-
 .../cloud/socket/MogoWebSocketManager.java    |  2 +-
 settings.gradle                               |  4 ---
 62 files changed, 109 insertions(+), 168 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5ab50e02d6..5a0a6eb121 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -18,10 +18,6 @@
             <option value="$PROJECT_DIR$/OCH/mogo-och-taxi" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/foudations" />
-            <option value="$PROJECT_DIR$/foudations/httpdns-base" />
-            <option value="$PROJECT_DIR$/foudations/httpdns-mogo" />
-            <option value="$PROJECT_DIR$/foudations/httpdns-noop" />
-            <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-apk" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-sdk" />
             <option value="$PROJECT_DIR$/foudations/mogo-commons" />
             <option value="$PROJECT_DIR$/foudations/mogo-utils" />
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
index 794743c9b9..7d7785d9cb 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
@@ -8,16 +8,12 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.IMogoOCH;
 import com.mogo.och.OCHConstants;
-import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.fragment.OchBusFragment;
-import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 
-import java.util.List;
-
 /**
  * 网约车小巴业务实现入口
  *
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
index 8b11406e96..0676b09427 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
@@ -5,11 +5,10 @@ import android.os.Looper;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.och.bus.bean.OchBusArriveAtStationMsg;
 import com.mogo.och.bus.bean.OchBusOrder;
 import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.bean.OchBusStationsChangedMsg;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index cbfa0d459f..5020733d92 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -17,8 +17,8 @@ import com.mogo.och.taxi.ui.OCHTaxiUiController;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.service.adas.RemoteControlAutoPilotParameters;
 import com.mogo.service.adas.entity.AdasOCHData;
-import com.mogo.service.connection.IMogoLifecycleListener;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoLifecycleListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.utils.NetworkUtils;
 import com.mogo.utils.TipToast;
diff --git a/app/build.gradle b/app/build.gradle
index 0aca16d4d7..fb2b4e138e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,6 @@ dependencies {
         implementation project(':modules:mogo-module-obu-mogo')
         implementation project(':modules:mogo-module-hmi')
         implementation project(':modules:mogo-module-adas')
-        implementation project(':foudations:httpdns-mogo')
     }
 
     apply from: "./functions/aicloudservices.gradle"
diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index 719b88065c..489d2fb4a1 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -1,22 +1,24 @@
-// 基础服务：仅比亚迪渠道用sdk方式实现，其他都基于apk基础服务
+// 基础服务
 project.dependencies {
     if (Boolean.valueOf(RELEASE)) {
-        f8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
-        f80xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
-        f8AmapImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
-        fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
-        fochbusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
+
+        f8xxImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
+        f80xImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
+        f8AmapImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
+        fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
+        fochbusImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
 
         fPadLenovoImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
         fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
         fPadLenovoOchBusImplementation  rootProject.ext.dependencies.mogoaicloudservicesdk
     } else {
-        f8xxImplementation project(':foudations:mogo-aicloud-services-apk')
-        f80xImplementation project(':foudations:mogo-aicloud-services-apk')
-        f8AmapImplementation project(':foudations:mogo-aicloud-services-apk')
 
-        fochtaxiImplementation project(':foudations:mogo-aicloud-services-apk')
-        fochbusImplementation project(':foudations:mogo-aicloud-services-apk')
+        f8xxImplementation project(':foudations:mogo-aicloud-services-sdk')
+        f80xImplementation project(':foudations:mogo-aicloud-services-sdk')
+        f8AmapImplementation project(':foudations:mogo-aicloud-services-sdk')
+
+        fochtaxiImplementation project(':foudations:mogo-aicloud-services-sdk')
+        fochbusImplementation project(':foudations:mogo-aicloud-services-sdk')
 
         fPadLenovoImplementation project(':foudations:mogo-aicloud-services-sdk')
         fPadLenovoOchTaxiImplementation project(':foudations:mogo-aicloud-services-sdk')
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 15155bc64d..4c0b164b0a 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -181,12 +181,6 @@ public class MogoApplication extends AbsMogoApplication {
         // 设置循环检测间隔时间
         clientConfig.setLoopCheckDelay(5 * 1000);
 
-        // 设置DNS经纬度位置
-        //        clientConfig.setIHttpDnsCurrentLocation(() -> {
-        //            SocketTestBroadCastReceiver.SocketTestData socketTestData = SocketTestBroadCastReceiver.SocketTestData.getInstance();
-        //            Log.d("TEST-SOCKET","socketTestData cityCode: " + socketTestData.getCityCode());
-        //            return new HttpDnsSimpleLocation(socketTestData.getCityCode(),socketTestData.getLat(),socketTestData.getLon());  //todo 对象唯一实例优化
-        //        });
         clientConfig.setIHttpDnsCurrentLocation(() -> {
             MogoLocation mogoLocation =
                     MogoApisHandler.getInstance()
diff --git a/config.gradle b/config.gradle
index d1934ad6e9..dceecd7fd9 100644
--- a/config.gradle
+++ b/config.gradle
@@ -128,18 +128,12 @@ ext {
             mogomoduleback             : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}",
             mogomoduleauth             : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}",
             mogomoduleguide            : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}",
-            // 长链
-            socketsdk                  : 'com.zhidao.socketsdk:socketsdk:2.1.4',
-            socketsdkconnsvrprotoco    : 'com.zhidao.ptech:connsvr-protoco:0.1.23',
-            socketsdkprotobufjava      : 'com.google.protobuf:protobuf-java:3.5.1',
             // OBU
             moduleobu                  : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}",
 
             //
             jetbrainsannotationsjava5  : "org.jetbrains:annotations-java5:15.0",
 
-            // 统一登录
-            accountsdk                 : "com.zhidao.accountservice:account-sdk:1.0.18",
             // crash
             crashSdk                   : "com.zhidaoauto.crash.log:library:1.0.5",
             kotlinstdlibjdk7           : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",
@@ -230,18 +224,11 @@ ext {
 
 //            mogomodulemachinevision    : "com.mogo.module:module-machine-vision:${MOGO_MODULES_MVISION_VERSION}",
 
-
-            httpdnsbase                : "com.mogo.httpdns:httpdns-base:${HTTPDNS_BASE_VERSION}",
-            httpdnsnoop                : "com.mogo.httpdns:httpdns-noop:${HTTPDNS_NOOP_VERSION}",
-            httpdnstencent             : "com.mogo.httpdns:httpdns-tencent:${HTTPDNS_TENCENT_VERSION}",
-            httpdnsmogo                : "com.mogo.httpdns:httpdns-mogo:${HTTPDNS_MOGO_VERSION}",
-
             mogooch                    : "com.mogo.och:och:${MOGO_OCH_VERSION}",
             mogoochbus                 : "com.mogo.och:och-bus:${MOGO_OCH_BUS_VERSION}",
             mogoochtaxi                : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}",
             mogoochnoop                : "com.mogo.och:och-noop:${MOGO_OCH_NOOP_VERSION}",
 
-            mogoaicloudserviceapk      : "com.mogo.aicloud.services:services-apk:${MOGO_AICLOUD_SERVICES_APK_VERSION}",
             mogoaicloudservicesdk      : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}",
 
             mogoaicloudsocket          : "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}",
diff --git a/foudations/mogo-aicloud-services-sdk/build.gradle b/foudations/mogo-aicloud-services-sdk/build.gradle
index 54ed22ca87..a19bd69b2c 100644
--- a/foudations/mogo-aicloud-services-sdk/build.gradle
+++ b/foudations/mogo-aicloud-services-sdk/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'com.alibaba.arouter'
 }
 
 android {
@@ -12,6 +13,12 @@ android {
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
         consumerProguardFiles "consumer-rules.pro"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
     }
 
     buildTypes {
@@ -27,16 +34,17 @@ android {
 }
 
 dependencies {
+
+    implementation rootProject.ext.dependencies.arouter
+    annotationProcessor rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.mogoaicloudsocket
     implementation rootProject.ext.dependencies.mogoaicloudlocation
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
-        implementation rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.mogoserviceapi
     } else {
         implementation project(":foudations:mogo-utils")
-        implementation project(":foudations:mogo-commons")
         implementation project(":services:mogo-service-api")
     }
 
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java
index e68ad990ed..a98969c3cf 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java
@@ -1,4 +1,4 @@
-package com.mogo.service.cloud.httpdns;
+package com.mogo.aicloud.services.httpdns;
 
 import androidx.annotation.Keep;
 
@@ -11,6 +11,9 @@ import androidx.annotation.Keep;
 @Keep
 public class HttpDnsConst {
 
+    @Keep
+    public static final String PATH = "/httpdns/api";
+
     public static final int HTTP_DNS_ADDRESS_TYPE_HTTP = 0;
     public static final int HTTP_DNS_ADDRESS_TYPE_WS = 1;
     public static final int HTTP_DNS_ADDRESS_TYPE_IM = 2;
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IHttpDnsCallback.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IHttpDnsCallback.java
index e53225d8f1..f0380d376a 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IHttpDnsCallback.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IHttpDnsCallback.java
@@ -1,4 +1,4 @@
-package com.mogo.service.cloud.httpdns;
+package com.mogo.aicloud.services.httpdns;
 
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IMogoHttpDns.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IMogoHttpDns.java
index 71b1befcd1..e81c9bd61c 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IMogoHttpDns.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/IMogoHttpDns.java
@@ -1,4 +1,4 @@
-package com.mogo.service.cloud.httpdns;
+package com.mogo.aicloud.services.httpdns;
 
 import androidx.annotation.Keep;
 
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java
index 9d849daaba..8288ffcb9f 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDns.java
@@ -1,4 +1,4 @@
-package com.mogo.httpdns.mogo;
+package com.mogo.aicloud.services.httpdns;
 
 import android.content.Context;
 
@@ -7,9 +7,6 @@ import androidx.annotation.Keep;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.cloud.httpdns.MogoHttpDnsClient;
 import com.mogo.cloud.httpdns.listener.OnAddressChangedListener;
-import com.mogo.httpdns.HttpDnsConst;
-import com.mogo.httpdns.IHttpDnsCallback;
-import com.mogo.httpdns.IMogoHttpDns;
 import com.mogo.utils.logger.Logger;
 
 @Keep
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDnsHandler.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDnsHandler.java
index a9a7e10fb4..fe3ea302f0 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDnsHandler.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/MogoHttpDnsHandler.java
@@ -1,4 +1,4 @@
-package com.mogo.httpdns;
+package com.mogo.aicloud.services.httpdns;
 
 import androidx.annotation.Keep;
 
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java
index a202024872..5c2e7682c4 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java
@@ -6,10 +6,11 @@ import androidx.annotation.Keep;
 
 import com.mogo.cloud.location.LocationManager;
 import com.mogo.map.location.MogoLocation;
-import com.mogo.service.locationinfo.IMogoLocationInfoService;
+import com.mogo.service.cloud.location.IMogoLocationInfoService;
 import com.mogo.utils.logger.Logger;
 
 @Keep
+
 public class MogoLocationInfoServices implements IMogoLocationInfoService {
 
     private static final String TAG = "MogoLocationInfoServices-sdk";
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/passport/PassportManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/passport/PassportManager.java
index f4a6991534..ce90e2cfaa 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/passport/PassportManager.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/passport/PassportManager.java
@@ -6,8 +6,8 @@ import androidx.annotation.Keep;
 
 import com.mogo.cloud.passport.IMoGoTokenCallback;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.service.passport.IMogoPassportManager;
-import com.mogo.service.passport.IMogoTicketCallback;
+import com.mogo.service.cloud.passport.IMogoPassportManager;
+import com.mogo.service.cloud.passport.IMogoTicketCallback;
 
 public
 /*
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
index 15b6fdedc1..2313dd529f 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
@@ -8,10 +8,10 @@ import com.mogo.cloud.socket.IMogoCloudSocketMsgAckListener;
 import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener;
 import com.mogo.cloud.socket.SocketManager;
 import com.mogo.cloud.socket.entity.MsgBody;
-import com.mogo.service.connection.IMogoLifecycleListener;
-import com.mogo.service.connection.IMogoMsgAckListener;
-import com.mogo.service.connection.IMogoOnMessageListener;
-import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoLifecycleListener;
+import com.mogo.service.cloud.socket.IMogoMsgAckListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.socket.ConnectionLifecycleListener;
diff --git a/foudations/mogo-base-websocket-sdk/build.gradle b/foudations/mogo-base-websocket-sdk/build.gradle
index eac69af030..e326773656 100644
--- a/foudations/mogo-base-websocket-sdk/build.gradle
+++ b/foudations/mogo-base-websocket-sdk/build.gradle
@@ -41,8 +41,6 @@ dependencies {
         implementation project(":services:mogo-service-api")
         implementation project(':modules:mogo-module-common')
     }
-    implementation project(':foudations:httpdns-base')
-
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
\ No newline at end of file
diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index ec4465a808..cea1177c3e 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -41,20 +41,19 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.rxjava
-    implementation rootProject.ext.dependencies.accountsdk
     api rootProject.ext.dependencies.mogoaicloudrealtime
     implementation rootProject.ext.dependencies.amapnavi3dmap
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
+        api rootProject.ext.dependencies.mogoaicloudservicesdk
         api rootProject.ext.dependencies.ttsbase
         implementation rootProject.ext.dependencies.skinsupport
-        implementation rootProject.ext.dependencies.httpdnsbase
     } else {
         implementation project(":foudations:mogo-utils")
+        api project(":foudations:mogo-aicloud-services-sdk")
         api project(":tts:tts-base")
         implementation project(":skin:mogo-skin-support")
-        implementation project(":foudations:httpdns-base")
     }
     api 'org.greenrobot:eventbus:3.1.1'
 }
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index 26704ae41e..6c7a193435 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -1,7 +1,7 @@
 package com.mogo.commons;
 
+import static com.mogo.aicloud.services.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP;
 import static com.mogo.commons.debug.DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE;
-import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP;
 
 import android.app.Application;
 import android.content.Context;
@@ -14,6 +14,8 @@ import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.amap.api.navi.AMapNaviView;
+import com.mogo.aicloud.services.httpdns.IMogoHttpDns;
+import com.mogo.aicloud.services.httpdns.MogoHttpDnsHandler;
 import com.mogo.commons.analytics.AnalyticsUtils;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.device.Devices;
@@ -22,8 +24,6 @@ import com.mogo.commons.network.Constants;
 import com.mogo.commons.network.ParamsUtil;
 import com.mogo.commons.network.X509TrustManagerImpl;
 import com.mogo.commons.storage.SpStorage;
-import com.mogo.httpdns.IMogoHttpDns;
-import com.mogo.httpdns.MogoHttpDnsHandler;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.TipDrawable;
 import com.mogo.utils.TipToast;
@@ -59,6 +59,8 @@ public abstract class AbsMogoApplication extends Application {
         return aMapNaviView;
     }
 
+    private static IMogoHttpDns sApis;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -66,9 +68,7 @@ public abstract class AbsMogoApplication extends Application {
         aMapNaviView.onCreate(null);
         sApp = this;
         initARouter();
-        if (shouldInit()) {
-            init();
-        }
+        init();
     }
 
     private void initARouter() {
@@ -80,12 +80,10 @@ public abstract class AbsMogoApplication extends Application {
         }
     }
 
-    protected boolean shouldInit() {
-        return true;
-    }
-
     protected void init() {
-
+        if (sApis == null) {
+            sApis = MogoHttpDnsHandler.getHttpDnsApi();
+        }
     }
 
     protected void initTipToast() {
@@ -161,11 +159,6 @@ public abstract class AbsMogoApplication extends Application {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-        IMogoHttpDns dns = MogoHttpDnsHandler.getHttpDnsApi();
-        if (dns == null) {
-            Logger.d(TAG, "dns is null");
-        }
         NetConfig.instance().setSignaturePrefix(Constants.SIGN_PREFIX)
                 .setPublicParams(ParamsUtil.getStaticParams())
                 .setHostnameVerifier(new AllAllowedHostnameVerifier())
@@ -181,7 +174,7 @@ public abstract class AbsMogoApplication extends Application {
                 .addInterceptor(chain -> {
                     Request request = chain.request();
                     String path = request.url().encodedPath();
-                    String host = "http://" + dns.syncGetHttpDns(request.url().host().replace("http://", "").replace("https://", ""), HTTP_DNS_ADDRESS_TYPE_HTTP, true);
+                    String host = "http://" + sApis.syncGetHttpDns(request.url().host().replace("http://", "").replace("https://", ""), HTTP_DNS_ADDRESS_TYPE_HTTP, true);
                     String url = host + path;
                     Logger.d("DomainExchange", "oriHost: " + request.url().host() + "  newHost: " + host + " \r\n newUrl: " + url);
                     return chain.proceed(request.newBuilder().url(url).build());
@@ -193,10 +186,9 @@ public abstract class AbsMogoApplication extends Application {
     private String cacheIp = null;
 
     protected void registerSocketHttpDnsTTL(String host) {
-        IMogoHttpDns mogoHttpDns = MogoHttpDnsHandler.getHttpDnsApi();
-        mogoHttpDns.addressChangedListener(map -> {
+        sApis.addressChangedListener(map -> {
             Logger.d("TEST-SOCKET", "ttl callBack ,ready to getCache Dns IP");
-            String dnsCacheIp = mogoHttpDns.getCachedHttpDnsIps(host, HTTP_DNS_ADDRESS_TYPE_HTTP);
+            String dnsCacheIp = sApis.getCachedHttpDnsIps(host, HTTP_DNS_ADDRESS_TYPE_HTTP);
             if (dnsCacheIp == null) {
                 return;
             }
diff --git a/gradle.properties b/gradle.properties
index 226ed7e26c..615df1e20a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -134,11 +134,6 @@ MAP_CUSTOM_VERSION=2.0.16
 #MOGO_MODULES_MVISION_VERSION=2.0.16
 MOGO_MODULES_SMALL_MAP=1.0.0
 MOGO_MODULES_ADAS=1.0.0
-# httpdns
-HTTPDNS_TENCENT_VERSION = 2.0.16
-HTTPDNS_MOGO_VERSION=2.0.16
-HTTPDNS_BASE_VERSION = 2.0.16
-HTTPDNS_NOOP_VERSION = 2.0.16
 
 # OCH
 MOGO_OCH_VERSION=1.0.0
@@ -174,9 +169,6 @@ MOGO_TRAFFICLIVE_VERSION=1.1.36
 # 定位服务
 MOGO_LOCATION_VERSION=1.1.36
 
-######## Foundation MogoAiCloud Module
-# mogoAiCloud apk services
-MOGO_AICLOUD_SERVICES_APK_VERSION=1.0.0-SNAPSHOT
 # mogoAiCloud sdk services
 MOGO_AICLOUD_SERVICES_SDK_VERSION=1.0.0-SNAPSHOT
 # 自研地图
diff --git a/libraries/mogo-map-api/build.gradle b/libraries/mogo-map-api/build.gradle
index a705aa2206..983487d047 100644
--- a/libraries/mogo-map-api/build.gradle
+++ b/libraries/mogo-map-api/build.gradle
@@ -34,10 +34,8 @@ dependencies {
     api rootProject.ext.dependencies.arouter
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
-        implementation rootProject.ext.dependencies.mogocommons
     } else {
         implementation project(':foudations:mogo-utils')
-        implementation project(':foudations:mogo-commons')
     }
 }
 
diff --git a/modules.txt b/modules.txt
index 0abf7fea3b..d588485c0a 100644
--- a/modules.txt
+++ b/modules.txt
@@ -2,9 +2,8 @@
 :skin:mogo-skin-support
 :tts:tts-base
 :tts:tts-zhi
-:foudations:httpdns-base
-:foudations:httpdns-noop
 :foudations:mogo-commons
+:foudations:mogo-aicloud-services-sdk
 :tts:tts-di
 :tts:tts-noop
 :libraries:mogo-map-api
@@ -19,7 +18,6 @@
 :libraries:map-custom
 :libraries:mogo-map
 :modules:mogo-module-common
-:foudations:httpdns-tencent
 :skin:mogo-skin-support-impl
 :skin:mogo-skin-support-noop
 :test:crashreport
@@ -44,7 +42,6 @@
 :main-extensions:mogo-module-main-launcher
 :modules:mogo-module-left-panel
 :modules:mogo-module-left-panel-noop
-:foudations:mogo-base-services-apk
 :modules:mogo-module-push-base
 :modules:mogo-module-push-noop
 :modules:mogo-module-push
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
index 91a88a04f9..78bdb659fd 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
@@ -25,7 +25,7 @@ import com.mogo.module.adas.model.IDispatch;
 import com.mogo.module.adas.overlay.LineOverlayManager;
 import com.mogo.module.adas.view.DispatchRemindDialog;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 import com.zhidao.support.adas.high.bean.AutopilotRoute;
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
index 379ac4aeb0..61229fbcb1 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
@@ -3,7 +3,7 @@ package com.mogo.module.common.datacenter;
 import com.mogo.commons.FunctionBuildConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.locationinfo.CloudLocationInfo;
+import com.mogo.service.cloud.location.CloudLocationInfo;
 
 import org.json.JSONObject;
 
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 6ff27ef9d5..dbc577319b 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -1,14 +1,12 @@
 package com.mogo.module.extensions.entrance;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -67,11 +65,10 @@ import com.mogo.module.extensions.utils.EntranceViewHolder;
 import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
 import com.mogo.module.extensions.utils.TopViewAnimHelper;
 import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
-import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.module.share.manager.ServiceApisManager;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.service.entrance.ButtonIndex;
 import com.mogo.service.fragmentmanager.IFragmentProvider;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/ExtensionServiceManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/ExtensionServiceManager.java
index 97e7d160ec..9e9de0424e 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/ExtensionServiceManager.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/ExtensionServiceManager.java
@@ -2,7 +2,6 @@ package com.mogo.module.extensions.live;
 
 import android.content.Context;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.navi.IMogoNavi;
@@ -11,9 +10,8 @@ import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.MogoServicePaths;
 import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;
 import com.mogo.service.imageloader.IMogoImageloader;
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java
index e664f30b77..a8c675d6e5 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java
@@ -11,14 +11,13 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.context.ContextHolderUtil;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.service.monitor.IMogoMonitorLog;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.NetConfig;
 import com.mogo.utils.network.utils.GsonUtil;
 import com.zhidao.mogo.module.monitor.MogoMonitorConst;
-import com.zhidao.mogo.module.monitor.MogoMonitorProvider;
 import com.zhidao.mogo.module.monitor.bean.RemoteLogPushContent;
 import com.zhidao.mogo.module.monitor.dialog.ILogDialogListener;
 import com.zhidao.mogo.module.monitor.dialog.LogDebugDialog;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
index ba6ba35958..75c9e0041d 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
@@ -17,7 +17,7 @@ import com.mogo.module.service.marker.MapMarkerManager;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.datamanager.IMogoDataManager;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.imageloader.IMogoImageloader;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
index c07f329b04..acd8e143a5 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
@@ -3,8 +3,8 @@ package com.mogo.module.service.autopilot;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.adas.RemoteControlAutoPilotParameters;
-import com.mogo.service.connection.IMogoOnMessageListener;
-import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
index 115218b40e..3c6284abb4 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -19,7 +19,7 @@ import com.mogo.module.service.dispatch.model.IDispatch;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.service.adas.RemoteControlAutoPilotParameters;
 import com.mogo.service.adas.entity.AdasOCHData;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 
 //负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index 7349f7bd13..41d99b19f8 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -11,7 +11,6 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
@@ -23,7 +22,7 @@ import com.mogo.module.service.network.ZhidaoRefreshModel;
 import com.mogo.module.service.network.bean.LauncherCardAdvertisementData;
 import com.mogo.module.service.network.bean.TtsConfigBody;
 import com.mogo.module.service.network.bean.TtsConfigData;
-import com.mogo.service.passport.IMogoTicketCallback;
+import com.mogo.service.cloud.passport.IMogoTicketCallback;
 import com.mogo.utils.AppUtils;
 import com.mogo.utils.NetworkUtils;
 import com.mogo.utils.logger.Logger;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
index 9ba837f2c8..2d4907f7fa 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
@@ -11,7 +11,7 @@ import android.os.Bundle;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.datacenter.SnapshotLocationDataCenter;
-import com.mogo.service.locationinfo.CloudLocationInfo;
+import com.mogo.service.cloud.location.CloudLocationInfo;
 import com.mogo.utils.logger.Logger;
 
 public class MogoRTKLocation {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index dd8df10799..baae843f07 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -20,7 +20,6 @@ import com.mogo.module.common.drawer.AdasRecognizedResultDrawer;
 import com.mogo.module.common.drawer.MarkerDrawer;
 import com.mogo.module.common.drawer.OnlineCarDrawer;
 import com.mogo.module.common.drawer.RoadConditionDrawer;
-import com.mogo.module.common.drawer.SnapshotSetDataDrawer;
 import com.mogo.module.common.drawer.marker.IMarkerView;
 import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
 import com.mogo.module.common.drawer.marker.OnlineCarMarkerView;
@@ -38,8 +37,7 @@ import com.mogo.module.service.network.RefreshModel;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.mogo.service.connection.IMogoLifecycleListener;
-import com.mogo.service.adas.entity.ADASRecognizedResult;
+import com.mogo.service.cloud.socket.IMogoLifecycleListener;
 import com.mogo.service.module.IMogoBizActionDoneListener;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.ThreadPoolService;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index 9d828d0d40..0475da2b94 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -21,7 +21,7 @@ import com.mogo.module.service.network.bean.MockSocketSendData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.adas.IMogoADASController;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
index 3c62c94319..82a0071e9f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
@@ -3,7 +3,7 @@ package com.mogo.module.service.utils;
 import android.location.Location;
 
 import com.mogo.map.MogoLatLng;
-import com.mogo.service.locationinfo.CloudLocationInfo;
+import com.mogo.service.cloud.location.CloudLocationInfo;
 
 /**
  * 定位数据类型转换工具
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
index 0f0bed02b1..69469b9964 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
@@ -4,7 +4,7 @@ import android.os.SystemClock;
 
 import com.mogo.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.locationinfo.CloudLocationInfo;
+import com.mogo.service.cloud.location.CloudLocationInfo;
 import com.mogo.utils.logger.Logger;
 
 import java.util.ArrayList;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
index 57bb851ec9..0637f57d49 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
@@ -21,7 +21,7 @@ import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;
 import com.mogo.service.imageloader.IMogoImageloader;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
index fcceadaf2e..39d51de21f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
@@ -7,7 +7,7 @@ import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.MarkerUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
index aaf099bf30..4ca682c262 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
@@ -9,7 +9,7 @@ import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
 import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.utils.MarkerUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401006.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401006.java
index def6c3032b..bf4fa65fc1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401006.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401006.java
@@ -1,7 +1,7 @@
 package com.mogo.module.v2x.listener;
 
 import com.mogo.module.v2x.entity.net.V2XAlarmEventRes;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401007.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401007.java
index fe6d581741..dc1d180c9d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401007.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401007.java
@@ -5,7 +5,7 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XAlarmEventRes;
 import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.v2x.utils.ADASUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 
 import java.util.HashMap;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java
index 8b49a3a3a9..f262976fe3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java
@@ -4,7 +4,7 @@ import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XGiveLike;
 import com.mogo.module.v2x.utils.ADASUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401010.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401010.java
index 16883842ff..20c6961334 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401010.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401010.java
@@ -1,7 +1,7 @@
 package com.mogo.module.v2x.listener;
 
 import com.mogo.module.v2x.entity.net.V2XAlarmEventRes;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java
index 86f934462a..27f43b6aab 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java
@@ -4,11 +4,7 @@ import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 
 /**
  * author : donghongyu
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
index aeb1c8d287..227b1352f2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -19,7 +19,7 @@ import com.mogo.module.v2x.utils.TimeConstants;
 import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java
index b510fef6f5..8e1485733a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java
@@ -8,10 +8,8 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 
 /**
  * desc: 车路云预警-弱势交通参与者
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
index b8965b84f3..fc5b1d3d63 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
@@ -8,7 +8,7 @@ import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle
index e1219bc0d9..a4ba62cf02 100644
--- a/services/mogo-service-api/build.gradle
+++ b/services/mogo-service-api/build.gradle
@@ -55,11 +55,9 @@ dependencies {
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.mogomapapi
         api rootProject.ext.dependencies.skinsupport
-        api rootProject.ext.dependencies.mogocommons
     } else {
         api project(":libraries:mogo-map-api")
         api project(":skin:mogo-skin-support")
-        api project(":foudations:mogo-commons")
     }
 }
 
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
index 4352ef9149..8797497b66 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
@@ -7,8 +7,8 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-import com.mogo.service.connection.IMogoSocketManager;
-import com.mogo.service.connection.IMogoWebSocketManager;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoWebSocketManager;
 import com.mogo.service.datamanager.IMogoDataManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;
@@ -16,7 +16,7 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.imageloader.IMogoImageloader;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.launcher.IMogoLauncher;
-import com.mogo.service.locationinfo.IMogoLocationInfoService;
+import com.mogo.service.cloud.location.IMogoLocationInfoService;
 import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.obu.IMoGoObuProvider;
@@ -30,7 +30,7 @@ import com.mogo.service.module.IMogoSettingManager;
 import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.service.obu.IMogoCrashWarnProvider;
-import com.mogo.service.passport.IMogoPassportManager;
+import com.mogo.service.cloud.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.share.IMogoTrafficUploadProvider;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java
index f912e13050..9c026b44b4 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java
@@ -1,13 +1,17 @@
 package com.mogo.service.adas.entity;
 
-import com.mogo.commons.data.BaseData;
+
+import java.io.Serializable;
 
 /**
  * 请求根据热心指数获取自车图标列表的响应类
  *
  * @author tongchenfei
  */
-public class CarModelListResponse extends BaseData {
+public class CarModelListResponse implements Serializable, Cloneable {
+
+    public int code = -1;
+    public String msg;
     private CarModelListInfo result;
 
     public CarModelListInfo getResult() {
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/CloudLocationInfo.java b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/CloudLocationInfo.java
index ee316d8043..8c0abcb760 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/CloudLocationInfo.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/CloudLocationInfo.java
@@ -1,4 +1,4 @@
-package com.mogo.service.locationinfo;
+package com.mogo.service.cloud.location;
 
 import android.os.Build;
 import android.os.Parcel;
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java
index cd9548372c..a70a9ba3a5 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java
@@ -1,4 +1,4 @@
-package com.mogo.service.locationinfo;
+package com.mogo.service.cloud.location;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.map.location.MogoLocation;
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoPassportManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoPassportManager.java
index fb6f7d6b85..3b110707d0 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoPassportManager.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoPassportManager.java
@@ -1,4 +1,4 @@
-package com.mogo.service.passport;
+package com.mogo.service.cloud.passport;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
 
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoTicketCallback.java b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoTicketCallback.java
index ace2fc6b05..de6281de26 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoTicketCallback.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/passport/IMogoTicketCallback.java
@@ -1,4 +1,4 @@
-package com.mogo.service.passport;
+package com.mogo.service.cloud.passport;
 
 public
 /**
diff --git a/services/mogo-service/consumer-rules.pro b/services/mogo-service/consumer-rules.pro
index 7837810556..f6c38c06bb 100644
--- a/services/mogo-service/consumer-rules.pro
+++ b/services/mogo-service/consumer-rules.pro
@@ -1,5 +1,5 @@
 -keep class com.mogo.service.impl.adas.*{*;}
--keep class com.mogo.service.impl.connection.MogoSocketManager{*;}
--keep class com.mogo.service.impl.connection.MogoWebSocketManager{*;}
--keep class com.mogo.service.impl.locationinfo.MogoLocationInfoService{*;}
--keep class com.mogo.service.impl.passport.MogoPassportManager{*;}
+-keep class com.mogo.service.impl.cloud.socket.MogoSocketManager{*;}
+-keep class com.mogo.service.impl.cloud.socket.MogoWebSocketManager{*;}
+-keep class com.mogo.service.impl.cloud.location.MogoLocationInfoService{*;}
+-keep class com.mogo.service.impl.cloud.passport.MogoPassportManager{*;}
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
index 1f50864dba..9466c74325 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
@@ -11,8 +11,8 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-import com.mogo.service.connection.IMogoSocketManager;
-import com.mogo.service.connection.IMogoWebSocketManager;
+import com.mogo.service.cloud.socket.IMogoSocketManager;
+import com.mogo.service.cloud.socket.IMogoWebSocketManager;
 import com.mogo.service.datamanager.IMogoDataManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;
@@ -24,7 +24,7 @@ import com.mogo.service.impl.intent.IntentManager;
 import com.mogo.service.impl.singleton.SingletonsHolder;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.launcher.IMogoLauncher;
-import com.mogo.service.locationinfo.IMogoLocationInfoService;
+import com.mogo.service.cloud.location.IMogoLocationInfoService;
 import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.obu.IMoGoObuProvider;
@@ -38,7 +38,7 @@ import com.mogo.service.module.IMogoSettingManager;
 import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.service.obu.IMogoCrashWarnProvider;
-import com.mogo.service.passport.IMogoPassportManager;
+import com.mogo.service.cloud.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.share.IMogoTrafficUploadProvider;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java
index e2a2f20030..62a8804e86 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java
@@ -1,4 +1,4 @@
-package com.mogo.service.impl.cloud;
+package com.mogo.service.impl.cloud.location;
 
 import android.content.Context;
 
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java
index 4ec53c56dc..a41144f2b4 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java
@@ -1,4 +1,4 @@
-package com.mogo.service.impl.cloud;
+package com.mogo.service.impl.cloud.passport;
 
 import android.content.Context;
 
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java
index 14ee89c87d..08681a0174 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java
@@ -1,4 +1,4 @@
-package com.mogo.service.impl.cloud;
+package com.mogo.service.impl.cloud.socket;
 
 import android.content.Context;
 
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java
index 892fb97f7c..e2e8e181bf 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java
@@ -1,4 +1,4 @@
-package com.mogo.service.impl.cloud;
+package com.mogo.service.impl.cloud.socket;
 
 import android.content.Context;
 
diff --git a/settings.gradle b/settings.gradle
index 7965680275..e5e117cf97 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,6 @@
 include ':modules:mogo-module-adas'
 include ':foudations:mogo-aicloud-services-sdk'
-include ':foudations:mogo-aicloud-services-apk'
-include ':foudations:httpdns-mogo'
 include ':modules:mogo-module-smp'
-include ':foudations:httpdns-base'
-include ':foudations:httpdns-noop'
 include ':tts:tts-base'
 include ':tts:tts-di'
 include ':tts:tts-zhi'