diff --git a/.idea/misc.xml b/.idea/misc.xml index 610ea89..537f4cb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -16,6 +16,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d35262..3b9d61f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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"> + + + \ No newline at end of file diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java index 8f0e941..980052e 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java +++ b/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; } diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java index 131e814..1cbb1a8 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java +++ b/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"; } diff --git a/gradle.properties b/gradle.properties index f0d443d..da4d302 100644 --- a/gradle.properties +++ b/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