diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle index f296085..16a6f41 100644 --- a/foudations/mogo-passport/build.gradle +++ b/foudations/mogo-passport/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) // passport-for-sdk 外部SDK版本 - api 'com.zhidao.thirdlogin:third-login:1.0.6' + api 'com.zhidao.thirdlogin:third-login:1.0.8' // passport-for-internal 内部SDK版本 implementation 'com.zhidao.accountservice:account-sdk:1.0.18' diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java index b1e3941..807851e 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java @@ -61,6 +61,21 @@ public class MoGoAiCloudClientConfig { */ private boolean thirdLogin; + /** + * passport url + */ + private String passportUrl; + + /** + * socket base url + */ + private String socketBaseUrl; + + /** + * socket tech url + */ + private String socketTechUrl; + /** * 是否打印日志 */ @@ -226,6 +241,30 @@ public class MoGoAiCloudClientConfig { this.thirdLogin = thirdLogin; } + public String getPassportUrl() { + return passportUrl; + } + + public void setPassportUrl(String passportUrl) { + this.passportUrl = passportUrl; + } + + public String getSocketBaseUrl() { + return socketBaseUrl; + } + + public void setSocketBaseUrl(String socketBaseUrl) { + this.socketBaseUrl = socketBaseUrl; + } + + public String getSocketTechUrl() { + return socketTechUrl; + } + + public void setSocketTechUrl(String socketTechUrl) { + this.socketTechUrl = socketTechUrl; + } + /** * 获取当前网络环境 * @@ -467,16 +506,23 @@ public class MoGoAiCloudClientConfig { ", thirdPartyDeviceId='" + thirdPartyDeviceId + '\'' + ", thirdPartyAppKey='" + thirdPartyAppKey + '\'' + ", authPubKey='" + authPubKey + '\'' + + ", secretKey='" + secretKey + '\'' + ", thirdPartySignSecret='" + thirdPartySignSecret + '\'' + ", thirdLogin=" + thirdLogin + + ", passportUrl='" + passportUrl + '\'' + + ", socketBaseUrl='" + socketBaseUrl + '\'' + + ", socketTechUrl='" + socketTechUrl + '\'' + ", isShowDebugLog=" + isShowDebugLog + + ", isShowNetDebugLog=" + isShowNetDebugLog + + ", isShowToastLog=" + isShowToastLog + + ", isAnchor=" + isAnchor + ", token='" + token + '\'' + ", sn='" + sn + '\'' + ", mLoopCheckDelay=" + mLoopCheckDelay + ", mIsAccuracyDevice=" + mIsAccuracyDevice + ", mServiceAppId='" + mServiceAppId + '\'' + - ", mIHttpDnsCurrentLocation=" + mIHttpDnsCurrentLocation + ", isUseOriginSocket=" + isUseOriginSocket + + ", mIHttpDnsCurrentLocation=" + mIHttpDnsCurrentLocation + '}'; } } diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java index 7f4a187..3062bf8 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java @@ -87,6 +87,7 @@ public class ThirdPassportManager { }); LoginManager.getInstance().login( context, + mAiCloudClientConfig.getPassportUrl(), environment, thirdLoginParam, loginCallback); diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle index 5f0eb24..f2aacee 100644 --- a/foudations/mogo-socket/build.gradle +++ b/foudations/mogo-socket/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'com.zhidao.socketsdk:socketsdk:2.1.4' // socket-for-sdk 长链 http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48956182 外部SDK版本 - api 'com.zhidao.socket:built-in-socket:1.0.28' + api 'com.zhidao.socket:built-in-socket:1.0.30' if (Boolean.valueOf(RELEASE)) { diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java index 0b94dba..840c4e7 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java @@ -61,6 +61,8 @@ public class ThirdSocketManager implements Callback, ErrorCallback { .setSecretKey(cloudClientConfig.getSecretKey()) .setAuthPubKey(cloudClientConfig.getAuthPubKey()) .setDebug(cloudClientConfig.isShowDebugLog()) + .setCustomTechBaseUrl(cloudClientConfig.getSocketTechUrl()) + .setCustomBaseUrl(cloudClientConfig.getSocketBaseUrl()) .setLocation(mLocation); SocketClient.getInstance().registerSocketCallback(this); SocketClient.getInstance().registerErrorCallback(this); diff --git a/gradle.properties b/gradle.properties index 939f247..3ba473c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,26 +36,26 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.4.3.32-beta3 +MOGO_UTILS_VERSION=1.4.4.1 # 网络请求 -MOGO_NETWORK_VERSION=1.4.3.32-beta3 +MOGO_NETWORK_VERSION=1.4.4.1 # 网络DNS -MOGO_HTTPDNS_VERSION=1.4.3.32-beta3 +MOGO_HTTPDNS_VERSION=1.4.4.1 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.3.32-beta3 +MOGO_PASSPORT_VERSION=1.4.4.1 # 常链接 -MOGO_SOCKET_VERSION=1.4.3.32-beta3 +MOGO_SOCKET_VERSION=1.4.4.1 # 数据采集 -MOGO_REALTIME_VERSION=1.4.3.32-beta3 +MOGO_REALTIME_VERSION=1.4.4.1 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.3.32-beta3 +MOGO_TANLU_VERSION=1.4.4.1 # 直播推流 -MOGO_LIVE_VERSION=1.4.3.32-beta3 +MOGO_LIVE_VERSION=1.4.4.1 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.3.32-beta3 +MOGO_TRAFFICLIVE_VERSION=1.4.4.1 # 定位服务 -MOGO_LOCATION_VERSION=1.4.3.32-beta3 +MOGO_LOCATION_VERSION=1.4.4.1 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.3.32-beta2 +MOGO_TELEMATIC_VERSION=1.4.4.1 # v2x -MOGO_V2X_VERSION=1.4.3.32-beta3 +MOGO_V2X_VERSION=1.4.4.1