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

更新SDK,去除了冲突的ContentProvider

Browse Source
This commit is contained in:
董宏宇
2021-01-22 19:43:37 +08:00
parent a6967ba1ab
commit 2739cd88d4
4 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsConfig.kt
View File

@@ -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

3
foudations/mogo-passport/build.gradle
View File

@@ -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'

33
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
View File

@@ -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 鉴权失败 ");

10
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
View File

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