From 5f2df28a46ed5fa62457b75ea1d7939de7f4d2a4 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 23 Jul 2020 17:17:31 +0800
Subject: [PATCH] opt

---
 .../com/mogo/launcher/MogoApplication.java    |  5 +++++
 .../mogo-base-services-sdk/build.gradle       |  2 +-
 .../MogoLocationInfoServices.java             | 20 -------------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 10d652ff1f..26ebe45ea4 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -134,6 +134,11 @@ public class MogoApplication extends AbsMogoApplication {
             @Override
             public void onError( int code, String msg ) {
                 Logger.w( TAG, "code = %s, msg = %s", code, msg );
+                if ( !TextUtils.isEmpty( Utils.getSn() ) ) {
+                    if ( after != null ) {
+                        after.run();
+                    }
+                }
             }
         } );
     }
diff --git a/foudations/mogo-base-services-sdk/build.gradle b/foudations/mogo-base-services-sdk/build.gradle
index 9f8fb2da7b..8b6cd89281 100644
--- a/foudations/mogo-base-services-sdk/build.gradle
+++ b/foudations/mogo-base-services-sdk/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.arouter
     // 上报位置
-    implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.1'
+    implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.2'
     // 长链
     implementation 'com.zhidao.socket:built-in-socket:1.0.15'
     // passport
diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
index 5aa0c6937f..8ecd0cb034 100644
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
@@ -4,8 +4,6 @@ import android.content.Context;
 
 import androidx.annotation.Keep;
 
-import com.elegant.spi.annotations.Service;
-import com.mogo.base.services.BaseServicesConstants;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.service.locationinfo.IMogoLocationInfoService;
@@ -13,8 +11,6 @@ import com.mogo.utils.logger.Logger;
 import com.zhidao.locupload.LocEnvironment;
 import com.zhidao.locupload.LocUploadConfig;
 import com.zhidao.locupload.LocUploadManager;
-import com.zhidao.locupload.Platform;
-import com.zhidao.locupload.location.LocationServiceProvider;
 
 public
 /**
@@ -76,25 +72,9 @@ class MogoLocationInfoServices implements IMogoLocationInfoService {
     public void init( Context context ) {
         LocUploadConfig.instance().
                 setAppId( DebugConfig.getSocketAppId() ).
-                setSocketChannelId( BaseServicesConstants.SOCKET_CHANNEL_ID ).
                 setContext( context.getApplicationContext() ).
-                setLocEnvironment( getEnvironment() ).
                 setLoggable( DebugConfig.isDebug() ).
-                setPlatform( Platform.car ).
                 setLocInterval( 2000L );
         Logger.d( TAG, "sdk - init" );
     }
-
-    private LocEnvironment getEnvironment() {
-        switch ( DebugConfig.getNetMode() ) {
-            case 1:
-                return LocEnvironment.dev;
-            case 2:
-            case 4:
-                return LocEnvironment.qa;
-            case 3:
-            default:
-                return LocEnvironment.release;
-        }
-    }
 }