Merge remote-tracking branch 'origin/qa_aiSdk_datalink' into qa_aiSdk_datalink

app/build.gradle

@@ -195,6 +195,12 @@ android {
         }
         // f系列-分体机
         f80x {
+            android{
+                defaultConfig {
+                    minSdkVersion rootProject.ext.android.minSdkVersion
+                    targetSdkVersion rootProject.ext.android.targetSdkVersion
+                }
+            }
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -224,8 +230,15 @@ android {
         }
         // 衡阳-联想Pad
         fPadLenovo {
+            android{
+                defaultConfig {
+                    minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+                    targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
+                }
+            }
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
+
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
@@ -253,6 +266,12 @@ android {
         }
         // f系列-网约车-出租车
         fPadLenovoOchTaxi {
+            android{
+                defaultConfig {
+                    minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+                    targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
+                }
+            }
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -282,6 +301,12 @@ android {
         }
         // f系列-网约车-小巴车
         fPadLenovoOchBus {
+            android{
+                defaultConfig {
+                    minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+                    targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
+                }
+            }
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"

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();
                     }
                 }
         );

config.gradle

@@ -12,8 +12,10 @@ ext {
             commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
             compileSdkVersion              : 28,
             buildToolsVersion              : "29.0.2",
-            minSdkVersion                  : 23,
+            minSdkVersion                  : 19,
-            targetSdkVersion               : 23,
+            targetSdkVersion               : 19,
+            minSdkVersionPadLenovo         : 23,
+            targetSdkVersionPadLenovo      : 23,
     ]
     dependencies = [
             // androidx

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 );
     }
 

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

libraries/map-custom/build.gradle

@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.33'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.35'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 

libraries/map-custom/map-version-update

@@ -59,4 +59,13 @@ mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.5
 解决崩溃问题
 
 8.5.33
-更新顺义衡阳数
+更新顺义衡阳数
+
+8.5.34
+高精数据放到redis
+
+8.5.35
+修改绿化带显示问题
+暂时对sdk去掉混淆，方便crash定位
+解决bugly  #304037 问题
+

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java

@@ -110,11 +110,11 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                                 mV2XScenario = new V2XOptimalRouteVREventScenario();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS:
-                                mV2XScenario = new V2XFrontWarningScenario();
+//                                mV2XScenario = new V2XFrontWarningScenario();
-                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+//                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
-                                } else {
+//                                } else {
-                                    mV2XScenario = null;
+//                                    mV2XScenario = null;
-                                }
+//                                }
                                 break;
                             default:
                                 mV2XScenario = null;

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java

@@ -101,8 +101,6 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener {
         }
         //拉近地图视角为近景
         V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_CLOSE_SIGHT, marker.getPosition());
-        //移动地图中心点至marker位置
-        V2XServiceManager.getMapService().getMapUIController().moveToCenter(marker.getPosition(), true);
         String assInfo = marker.getMarkerAssInfo();
         Log.d(REGISTER_LIFECYCLE_TAG, "onStaticMarkerClicked marker assInfo : " + assInfo);
         if (TextUtils.isEmpty(assInfo) || !assInfo.contains(MAP_STATIC_TRAFFIC)) {