From 063f00c203e1e6d3885eba4e179ce25927155a85 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 17 Nov 2021 18:48:46 +0800
Subject: [PATCH] fix bug of location upload data

---
 .../locationinfo/MogoLocationSource.java       |  2 +-
 gradle.properties                              | 16 ++++++++--------
 .../com/mogo/module/service/MogoServices.java  | 18 +-----------------
 .../module/service/StatusChangedAdapter.java   |  1 -
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationSource.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationSource.java
index 76e4e977f6..d726507fe5 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationSource.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationSource.java
@@ -1,7 +1,7 @@
 package com.mogo.aicloud.services.locationinfo;
 
 import com.elegant.spi.annotations.Service;
-import com.zhidao.locupload.location.LocationServiceProvider;
+import com.mogo.cloud.location.third.core.LocationServiceProvider;
 
 @Service(value = LocationServiceProvider.class)
 public class MogoLocationSource extends LocationServiceProvider {
diff --git a/gradle.properties b/gradle.properties
index c039c20de7..35d8e958f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -62,21 +62,21 @@ SERVICE_CHAIN_VERSION=1.0.22
 LOGLIB_VERSION=1.0.4
 ######## MogoAiCloudSDK Version ########
 # 网络请求
-MOGO_NETWORK_VERSION=1.3.1
+MOGO_NETWORK_VERSION=1.3.2
 # 鉴权
-MOGO_PASSPORT_VERSION=1.3.1
+MOGO_PASSPORT_VERSION=1.3.2
 # 常链接
-MOGO_SOCKET_VERSION=1.3.1
+MOGO_SOCKET_VERSION=1.3.2
 # 数据采集
-MOGO_REALTIME_VERSION=1.3.1
+MOGO_REALTIME_VERSION=1.3.2
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.3.1
+MOGO_TANLU_VERSION=1.3.2
 # 直播推流
-MOGO_LIVE_VERSION=1.3.1
+MOGO_LIVE_VERSION=1.3.2
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.3.1
+MOGO_TRAFFICLIVE_VERSION=1.3.2
 # 定位服务
-MOGO_LOCATION_VERSION=1.3.1
+MOGO_LOCATION_VERSION=1.3.2
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=V2.0.0.6
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 156839d55e..f679671435 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -68,6 +68,7 @@ import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.NetworkUtils;
 import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
+import com.zhidao.locupload.service.UploadDataService;
 
 import org.json.JSONObject;
 
@@ -380,10 +381,6 @@ public class MogoServices implements IMogoMapListener,
 
         CarIconDisplayStrategy.getInstance().changeCarIconStatus( mStatusManager.isSeekHelping() );
 
-        if ( DebugConfig.isLaunchLocationService() ) {
-            initLocationServiceProcess( context );
-        }
-
         AutoPilotRemoteController.getInstance().start();
 
         Intent intent = new Intent( "com.freedom.ser.ACTION" );
@@ -396,19 +393,6 @@ public class MogoServices implements IMogoMapListener,
         TimeDelayUploadManager.getInstance().init(context);
     }
 
-    public void initLocationServiceProcess( Context context ) {
-        try {
-            Intent intent = new Intent();
-            intent.setAction( "com.zhidao.locationinfo.service.uploaddataservice" );
-            ComponentName cn = new ComponentName( "com.zhidao.locationinfo", "com.zhidao.locationinfo.service.UploadDataService" );
-            intent.setComponent( cn );
-            context.startService( intent );
-        } catch ( Exception e ) {
-            Logger.e( TAG, e, "start location service error." );
-        }
-    }
-
-
     private void initWorkThread() {
         mThreadHandler = new RefreshWorkThreadHandler( WorkThreadHandler.getInstance().getLooper() ) {
             @Override
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
index 00ee59b2fd..0c110cb3cc 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
@@ -146,7 +146,6 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener {
                 mIsFirstAccOn = false;
                 return;
             }
-            MogoServices.getInstance().initLocationServiceProcess(AbsMogoApplication.getApp());
             MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
             MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp()).start();
             MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).removeMarkers();