Merge branch 'fix_loginMultiRoom_bug'
# Conflicts: # gradle.properties
This commit is contained in:
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -11,7 +11,7 @@
|
||||
<component name="DesignSurface">
|
||||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
<entry key="app/src/main/res/layout/activity_live_play_and_push.xml" value="0.2703125" />
|
||||
<entry key="app/src/main/res/layout/activity_live_play_and_push.xml" value="0.1" />
|
||||
<entry key="app/src/main/res/layout/activity_live_push.xml" value="0.3640625" />
|
||||
<entry key="app/src/main/res/layout/activity_main.xml" value="0.3640625" />
|
||||
</map>
|
||||
|
||||
@@ -47,7 +47,7 @@ public class MoGoApplication extends MultiDexApplication {
|
||||
// 配置云服务API
|
||||
MoGoAiCloudClientConfig clientConfig = MoGoAiCloudClientConfig.getInstance();
|
||||
// 设置网络环境:HTTP_DNS_ENV_QA、HTTP_DNS_ENV_RELEASE、HTTP_DNS_ENV_DEV
|
||||
clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA);
|
||||
clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE);
|
||||
// 设置是否是第三APP登录,false:自有车机 true:外部三方车机
|
||||
clientConfig.setThirdLogin(true);
|
||||
// 设置是否输出日志
|
||||
|
||||
@@ -36,22 +36,22 @@ PASSWORD=xintai2018
|
||||
RELEASE=true
|
||||
# AI CLOUD 云平台
|
||||
# 工具类
|
||||
MOGO_UTILS_VERSION=1.1.54-live
|
||||
MOGO_UTILS_VERSION=1.1.55-live
|
||||
# 网络请求
|
||||
MOGO_NETWORK_VERSION=1.1.54-live
|
||||
MOGO_NETWORK_VERSION=1.1.55-live
|
||||
# 网络DNS
|
||||
MOGO_HTTPDNS_VERSION=1.1.54-live
|
||||
MOGO_HTTPDNS_VERSION=1.1.55-live
|
||||
# 鉴权
|
||||
MOGO_PASSPORT_VERSION=1.1.54-live
|
||||
MOGO_PASSPORT_VERSION=1.1.55-live
|
||||
# 常链接
|
||||
MOGO_SOCKET_VERSION=1.1.54-live
|
||||
MOGO_SOCKET_VERSION=1.1.55-live
|
||||
# 数据采集
|
||||
MOGO_REALTIME_VERSION=1.1.54-live
|
||||
MOGO_REALTIME_VERSION=1.1.55-live
|
||||
# 探路,道路事件发布,获取
|
||||
MOGO_TANLU_VERSION=1.1.54-live
|
||||
MOGO_TANLU_VERSION=1.1.55-live
|
||||
# 直播推流
|
||||
MOGO_LIVE_VERSION=1.1.54-live
|
||||
MOGO_LIVE_VERSION=1.1.55-live
|
||||
# 直播拉流
|
||||
MOGO_TRAFFICLIVE_VERSION=1.1.54-live
|
||||
MOGO_TRAFFICLIVE_VERSION=1.1.55-live
|
||||
# 定位服务
|
||||
MOGO_LOCATION_VERSION=1.1.54-live
|
||||
MOGO_LOCATION_VERSION=1.1.55-live
|
||||
|
||||
Reference in New Issue
Block a user