Merge branch 'master' into fix_log_print

# Conflicts:
#	foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
#	gradle.properties

.idea/misc.xml

@@ -16,6 +16,7 @@
         <entry key="app/src/main/res/layout/activity_location.xml" value="0.36502448356535333" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3640625" />
         <entry key="app/src/main/res/layout/activity_real_time.xml" value="0.1609347442680776" />
+        <entry key="app/src/main/res/xml/network_security_config.xml" value="0.23854166666666668" />
       </map>
     </option>
   </component>

app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"

app/src/main/java/com/mogo/cloud/MoGoApplication.java

@@ -59,7 +59,7 @@ public class MoGoApplication extends MultiDexApplication {
         // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
         // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备）
         // TODO 这里使用的是测试的sn
-        clientConfig.setThirdPartyDeviceId("P95ACB94DF240C89");
+        clientConfig.setThirdPartyDeviceId("123456789987654321");
         // 设置应用服务AppId  长链、鉴权   //todo 需要卸载智慧驾驶、行车记录仪
         clientConfig.setServiceAppId("com.mogo.launcher");
         // 设置循环检测间隔时间

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>

foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java

@@ -1,7 +1,6 @@
 package com.mogo.cloud.socket.third.core;
 
 import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_ORIGIN_PUB_KEY;
-import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_PUB_KEY;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -139,11 +138,7 @@ public class SocketConfig {
 
     public String getAuthPubKey() {
         if (TextUtils.isEmpty(authPubKey)) {
-            if (MoGoAiCloudClientConfig.getInstance().isUseOriginSocket()) {
-                authPubKey = DEFAULT_AUTH_ORIGIN_PUB_KEY;
-            } else {
-                authPubKey = DEFAULT_AUTH_PUB_KEY;
-            }
+            authPubKey = DEFAULT_AUTH_ORIGIN_PUB_KEY;
         }
         return authPubKey;
     }

foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java

@@ -17,8 +17,6 @@ public interface SocketConstants {
     /*unit is ms*/
     long ONE_MINUTE = 60 * ONE_SECOND;
 
-    String DEFAULT_AUTH_PUB_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1En+aK8zhDRI2495gwmFYuIAHJxFV8MQuBWSY+xRJMtNq6UITx72NgfMWxmxzoxrvv6T1mb3HMVpIto1H3mliPg9LbZ48GAuDRWXHxLxNR69W45okhGAkDxU1GmlRPzEplwwfbar5Bdv3Bd24ABpGQhzozfEK5T5Ej9KrT/a7YwIDAQAB";
-
     String DEFAULT_AUTH_ORIGIN_PUB_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLe57ORPgOnBrcWmGac3esB4PtIyI0rAHiyk5QoCRTnTyanwWLfstu7mz2MSHD3YuveNWDiIY8vtRvFNE4M/yA7eb4Mct01VKhKFI/JqwyXgNaSh5YCfmv0vg9687c7IUjTEAg+ReC/bSLDqEB3a0vuP95Txtj9smMlx1e37XFYQIDAQAB";
 
 }

gradle.properties

@@ -37,22 +37,22 @@ RELEASE=false
 MOGO_CORE_UTILS_VERSION=0.0.25
 # AI CLOUD 云平台
 # 工具类
-MOGO_UTILS_VERSION=1.3.4
+MOGO_UTILS_VERSION=1.3.5
 # 网络请求
-MOGO_NETWORK_VERSION=1.3.4
+MOGO_NETWORK_VERSION=1.3.5
 # 网络DNS
-MOGO_HTTPDNS_VERSION=1.3.4
+MOGO_HTTPDNS_VERSION=1.3.5
 # 鉴权
-MOGO_PASSPORT_VERSION=1.3.4
+MOGO_PASSPORT_VERSION=1.3.5
 # 常链接
-MOGO_SOCKET_VERSION=1.3.4
+MOGO_SOCKET_VERSION=1.3.5
 # 数据采集
-MOGO_REALTIME_VERSION=1.3.4
+MOGO_REALTIME_VERSION=1.3.5
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.3.4
+MOGO_TANLU_VERSION=1.3.5
 # 直播推流
-MOGO_LIVE_VERSION=1.3.4
+MOGO_LIVE_VERSION=1.3.5
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.3.4
+MOGO_TRAFFICLIVE_VERSION=1.3.5
 # 定位服务
-MOGO_LOCATION_VERSION=1.3.4
+MOGO_LOCATION_VERSION=1.3.5