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

# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java

config.gradle

@@ -157,7 +157,7 @@ ext {
             gpssimulatordebug          : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}",
             gpssimulatornoop           : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}",
 
-            adasapi                    : "com.zhidao.autopilot.support:adas:1.0.6.13",
+            adasapi                    : "com.zhidao.autopilot.support:adas:1.0.6.14",
             adasconfigapi              : "com.zhidao.adasconfig:adasconfig:1.1.5.2",
 
             // 个人中心的SDK

gradle.properties

@@ -155,19 +155,19 @@ LOGLIB_VERSION = 1.0.4
 
 ######## MogoAiCloudSDK Version
 # 网络请求
-MOGO_NETWORK_VERSION=1.0.55
+MOGO_NETWORK_VERSION=1.0.57
 # 鉴权
-MOGO_PASSPORT_VERSION=1.0.55
+MOGO_PASSPORT_VERSION=1.0.57
 # 常链接
-MOGO_SOCKET_VERSION=1.0.55
+MOGO_SOCKET_VERSION=1.0.57
 # 数据采集
-MOGO_REALTIME_VERSION=1.0.56
+MOGO_REALTIME_VERSION=1.0.58
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.0.55
+MOGO_TANLU_VERSION=1.0.57
 # 直播推流
-MOGO_LIVE_VERSION=1.0.55
+MOGO_LIVE_VERSION=1.0.57
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.0.55
+MOGO_TRAFFICLIVE_VERSION=1.0.57
 
 ######## Foundation MogoAiCloud Module
 # mogoAiCloud apk services

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java

@@ -1000,18 +1000,21 @@ public class AMapViewWrapper implements IMogoMapView,
         double yawRate = data.optDouble("yawRate", -1);
         double speed = data.optDouble("speed", -1);
         long systemTime = data.optLong("systemTime");
+        long satelliteTime = data.optLong("satelliteTime");
         long receiverDataTime = data.optLong("receiverDataTime");
+        long adasSatelliteTime = data.optLong("adasSatelliteTime");
         if (lon == -1) {
             return;
         }
         RTKAutopilotLocationBean bean = new RTKAutopilotLocationBean();
         bean.setYaw_rate(yawRate);
         bean.setHeading(heading);
-        bean.setSystemTime(systemTime);
-        bean.setReceiverDataTime(receiverDataTime);
-        bean.setHeading(heading);
         bean.setAcceleration(acceleration);
         bean.setAlt(alt);
+        bean.setSystemTime(systemTime);
+        bean.setSatelliteTime( satelliteTime );
+        bean.setReceiverDataTime(receiverDataTime);
+        bean.setAdasSatelliteTime( adasSatelliteTime );
         bean.setLon(lon);
         bean.setGnss_speed(((float) speed));
         bean.setLat(lat);

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -972,17 +972,22 @@ public class MogoServices implements IMogoMapListener,
                 data.putOpt( "acceleration", stateInfo.getValues().getAcceleration() );
                 data.putOpt( "yawRate", stateInfo.getValues().getYaw_rate() );
                 try {
-                    data.putOpt( "systemTime", Long.valueOf( stateInfo.getValues().getSystemTime() ) );
+                    data.putOpt( "systemTime", Long.parseLong( stateInfo.getValues().getSystemTime() ) );
                 } catch ( Exception e ) {
                     e.printStackTrace();
                 }
                 try {
-                    data.putOpt( "satelliteTime", Long.valueOf( stateInfo.getValues().getSatelliteTime() ) );
+                    data.putOpt( "satelliteTime", Long.parseLong( stateInfo.getValues().getSatelliteTime() ) );
                 } catch ( Exception e ) {
                     e.printStackTrace();
                 }
                 try {
-                    data.putOpt( "receiverDataTime", Long.valueOf( stateInfo.getValues().getReceiverDataTime() ) );
+                    data.putOpt( "receiverDataTime", Long.parseLong( stateInfo.getValues().getReceiverDataTime() ) );
+                } catch ( Exception e ) {
+                    e.printStackTrace();
+                }
+                try {
+                    data.putOpt( "adasSatelliteTime", Long.parseLong( stateInfo.getValues().getAdasSatelliteTime() ) );
                 } catch ( Exception e ) {
                     e.printStackTrace();
                 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java

@@ -161,7 +161,6 @@ public class CarZegoLiveVideoView extends RoundLayout {
             Logger.w(TAG, "心跳：关闭直播...");
             // 暂停
             MoGoAiCloudTrafficLive.stopLive(carLiveInfo.getVideoSn());
-            MoGoAiCloudTrafficLive.destroyLive();
         } catch (Exception e) {
             e.printStackTrace();
         }

services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASCarStateInfo.java

@@ -60,6 +60,15 @@ public class ADASCarStateInfo implements Serializable {
         private String receiverDataTime;
         // udp收到数据的时间
         private String startReceiverDataTime;
+        private String adasSatelliteTime;
+
+        public String getAdasSatelliteTime() {
+            return adasSatelliteTime;
+        }
+
+        public void setAdasSatelliteTime( String adasSatelliteTime ) {
+            this.adasSatelliteTime = adasSatelliteTime;
+        }
 
         public String getStartReceiverDataTime() {
             return startReceiverDataTime;