yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
donghongyu
2021-11-19 21:29:02 +08:00
parent 380c248ff4 9e7ca17d17
commit 493da4d118
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,11 @@
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;
import com.mogo.cloud.TelephoneUtil;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
public class SocketConfig {
@@ -139,11 +137,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;
}

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

@@ -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";
}

20
gradle.properties
View File

@@ -36,22 +36,22 @@ PASSWORD=xintai2018
RELEASE=false
# 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