From 47fec5307fb749628df2278f175169b172e6c36f Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 31 May 2021 16:26:48 +0800
Subject: [PATCH] fixbug

---
 app/build.gradle                                 |  1 +
 .../java/com/mogo/launcher/MogoApplication.java  |  6 ++----
 config.gradle                                    |  6 ++++--
 .../java/com/mogo/commons/network/Utils.java     |  3 ---
 gradle.properties                                | 16 ++++++++--------
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0d86235c00..555e184626 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -226,6 +226,7 @@ android {
         fPadLenovo {
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
+
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 618cd96bc8..ab491ba2ee 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -69,6 +69,8 @@ public class MogoApplication extends AbsMogoApplication {
         //设置debug模式，日志不上传
         crashSystem.setDebug(BuildConfig.DEBUG);
         Logger.init(BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF);
+        initMogoHttpDns();
+        initModules();
     }
 
     @Override
@@ -205,17 +207,13 @@ public class MogoApplication extends AbsMogoApplication {
                 new IMoGoTokenCallback() {
                     @Override
                     public void onTokenGot(String token, String sn) {
-                        // 初始化鹰眼HttpDns服务
-                        initMogoHttpDns();
                         // 鉴权成功后开启socket长链服务
                         prepareSocketAndLocationServices();
-                        initModules();
                     }
 
                     @Override
                     public void onError(int code, String msg) {
                         Log.d(TAG,"初始化MogoAiCloudSdk failed ,reason : " + msg + " , 未能开启长链服务和初始化Modules服务");
-                        initModules();
                     }
                 }
         );
diff --git a/config.gradle b/config.gradle
index 06437c2f8e..325b270279 100644
--- a/config.gradle
+++ b/config.gradle
@@ -12,8 +12,10 @@ ext {
             commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
             compileSdkVersion              : 28,
             buildToolsVersion              : "29.0.2",
-            minSdkVersion                  : 23,
-            targetSdkVersion               : 23,
+            minSdkVersion                  : 19,
+            targetSdkVersion               : 19,
+            minSdkVersionPadLenovo         : 23,
+            targetSdkVersionPadLenovo      : 23,
     ]
     dependencies = [
             // androidx
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
index d6f7af9371..42fc7b5c52 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -68,9 +68,6 @@ public class Utils {
         if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
             return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp());
         }
-        if(DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO){
-            return   MoGoAiCloudClientConfig.getInstance().getSn();
-        }
         return getSystemProperties( GSM_SERIAL );
     }
 
diff --git a/gradle.properties b/gradle.properties
index 9803cf7ba0..5b32afb1b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -158,21 +158,21 @@ LOGLIB_VERSION = 1.0.4
 
 ######## MogoAiCloudSDK Version
 # 网络请求
-MOGO_NETWORK_VERSION=1.1.10
+MOGO_NETWORK_VERSION=1.1.15
 # 鉴权
-MOGO_PASSPORT_VERSION=1.1.10
+MOGO_PASSPORT_VERSION=1.1.15
 # 常链接
-MOGO_SOCKET_VERSION=1.1.10
+MOGO_SOCKET_VERSION=1.1.15
 # 数据采集
-MOGO_REALTIME_VERSION=1.1.10
+MOGO_REALTIME_VERSION=1.1.15
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.1.10
+MOGO_TANLU_VERSION=1.1.15
 # 直播推流
-MOGO_LIVE_VERSION=1.1.10
+MOGO_LIVE_VERSION=1.1.15
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.1.10
+MOGO_TRAFFICLIVE_VERSION=1.1.15
 #ADAS HIGHT
-MOGO_ADASHIGH_VERSION = '1.1.3'
+MOGO_ADASHIGH_VERSION=1.1.3
 
 ######## Foundation MogoAiCloud Module
 # mogoAiCloud apk services