From 2739cd88d433e65393a53f2382d8b393bbb22c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 22 Jan 2021 19:43:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0SDK,=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=86=B2=E7=AA=81=E7=9A=84ContentProvider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/cloud/httpdns/MogoHttpDnsConfig.kt | 9 ++--- foudations/mogo-passport/build.gradle | 3 +- .../cloud/passport/MoGoAiCloudClient.java | 33 ++++++++++++++----- .../passport/MoGoAiCloudClientConfig.java | 10 +++--- 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsConfig.kt b/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsConfig.kt index 1cc19c7..d9e78cf 100644 --- a/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsConfig.kt +++ b/foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsConfig.kt @@ -16,15 +16,16 @@ class MogoHttpDnsConfig { */ const val HTTP_DNS_ENV_QA = 2 + /** + * 线上环境 + */ + const val HTTP_DNS_ENV_RELEASE = 3 + /** * 演示环境 */ const val HTTP_DNS_ENV_DEMO = 4 - /** - * 线上环境 - */ - const val HTTP_DNS_ENV_RELEASE = 3 } private var mSn: String? = null private var mCurrentLocation: IHttpDnsCurrentLocation? = null diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle index 333563c..86a3073 100644 --- a/foudations/mogo-passport/build.gradle +++ b/foudations/mogo-passport/build.gradle @@ -31,7 +31,8 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat api rootProject.ext.dependencies.mogoutils // passport - implementation 'com.zhidao.tcloginsdk:tclogin:1.1.5.1' + implementation 'com.zhidao.thirdlogin:third-login:1.0.1' + implementation 'com.zhidao.account:accountsdk:1.0.16.1' api project(path: ':foudations:mogo-httpdns') // api 'com.mogo.cloud:httpdns:1.0.0' diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java index af1bb1c..fbea8b4 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java @@ -7,10 +7,11 @@ import androidx.annotation.Keep; import com.mogo.cloud.httpdns.MogoHttpDnsClient; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; -import com.zhidao.tcloginsdk.LoginManager; -import com.zhidao.tcloginsdk.model.ThirdLoginParam; -import com.zhidao.tcloginsdk.model.TokenData; -import com.zhidao.tcloginsdk.network.LoginCallback; +import com.zhidao.thirdlogin.Environment; +import com.zhidao.thirdlogin.LoginManager; +import com.zhidao.thirdlogin.model.ThirdLoginParam; +import com.zhidao.thirdlogin.model.TokenData; +import com.zhidao.thirdlogin.network.LoginCallback; /** * 蘑菇AI云平台SDK入口 @@ -52,8 +53,6 @@ public class MoGoAiCloudClient { ) { mContext = context; mAiCloudClientConfig = aiCloudClientConfig; - // 设置鉴权的网络环境 - LoginManager.getInstance(context).setNetEnviron(aiCloudClientConfig.getNetMode()); // 刷新令牌 refreshToken(null); return sInstance; @@ -119,9 +118,25 @@ public class MoGoAiCloudClient { Log.w(TAG, "loginCallback：" + loginCallback); - LoginManager.getInstance(mContext).login( - mAiCloudClientConfig.isThirdLogin(), - thirdLoginParam, loginCallback); + Environment environment; + switch (mAiCloudClientConfig.getNetMode()) { + case MogoHttpDnsConfig.HTTP_DNS_ENV_DEV: + environment = Environment.dev; + break; + case MogoHttpDnsConfig.HTTP_DNS_ENV_QA: + case MogoHttpDnsConfig.HTTP_DNS_ENV_DEMO: + environment = Environment.qa; + break; + default: + environment = Environment.release; + break; + } + + LoginManager.getInstance().login( + mContext, + environment, + thirdLoginParam, + loginCallback); } else { Log.e(TAG, "═════════════════════════════════════"); Log.e(TAG, "║ MoGo 鉴权失败 "); 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 df820e0..498252f 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 @@ -149,8 +149,8 @@ public class MoGoAiCloudClientConfig { * @return 当前的网络环境是那个 * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEV 研发环境 * @see MogoHttpDnsConfig#HTTP_DNS_ENV_QA 测试环境 - * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEMO 演示环境 * @see MogoHttpDnsConfig#HTTP_DNS_ENV_RELEASE 线上环境 + * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEMO 演示环境 */ public int getNetMode() { return sNetMode; @@ -160,10 +160,10 @@ public class MoGoAiCloudClientConfig { * 设置当前网络环境 * * @param sNetMode 当前的网络环境 - * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEV - * @see MogoHttpDnsConfig#HTTP_DNS_ENV_QA - * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEMO - * @see MogoHttpDnsConfig#HTTP_DNS_ENV_RELEASE + * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEV 研发环境 + * @see MogoHttpDnsConfig#HTTP_DNS_ENV_QA 测试环境 + * @see MogoHttpDnsConfig#HTTP_DNS_ENV_RELEASE 线上环境 + * @see MogoHttpDnsConfig#HTTP_DNS_ENV_DEMO 演示环境 */ public void setNetMode(int sNetMode) { this.sNetMode = sNetMode;