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

增加了zego的正式环境切换

Browse Source
This commit is contained in:
董宏宇
2021-03-04 13:19:54 +08:00
parent a0bae4c52b
commit f56e77c682
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_live_play_and_push.xml
View File

@@ -104,7 +104,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="请输入要查看的车机SN"
android:text="F803EB2046PZD00149"
android:text="F803BB2037EZD00048"
android:textColor="#FFFF"
app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn"
app:layout_constraintEnd_toEndOf="parent"

2
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java
View File

@@ -28,7 +28,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
private final Application mApplication;
// 循环上报摄像头可直播状态间隔时间
private static final int PUSH_CAM_TIME = 60 * 1000;
private static final int PUSH_CAM_TIME = 35 * 1000;
private static volatile int sCam1LiveStatus = 0, sCam2LiveStatus = 0;
private static volatile int sCam1AvailableStatus = 0, sCam2AvailableStatus = 0;
private static final int PUSH_START = 0; // 开始

17
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
View File

@@ -42,6 +42,11 @@ import im.zego.zegoexpress.entity.ZegoUser;
import im.zego.zegoexpress.entity.ZegoVideoConfig;
import im.zego.zegoexpress.entity.ZegoVideoFrameParam;
import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_DEMO;
import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_DEV;
import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_QA;
import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE;
/**
* 即构直播管理
*/
@@ -390,10 +395,20 @@ public class MoGoLiveManager {
// 创建 enging 对象, appID, appSign 为开发者在 ZEGO 管理控制台申请的凭证信息,
// 未上线的开发者 isTestEnvironment 为 true, application 为安卓应用的上下文
boolean isTestEnv = false;
switch (MoGoAiCloudClientConfig.getInstance().getNetMode()) {
case HTTP_DNS_ENV_DEV:
case HTTP_DNS_ENV_QA:
case HTTP_DNS_ENV_DEMO:
isTestEnv = true;
break;
case HTTP_DNS_ENV_RELEASE:
isTestEnv = false;
}
mExpressEngine = ZegoExpressEngine.createEngine(
appId,
appKey,
true,
isTestEnv,
ZegoScenario.GENERAL,
mApplication,
mEventHandler);

18
gradle.properties
View File

@@ -30,20 +30,20 @@ PASSWORD=xintai2018
RELEASE=true
# AI CLOUD 云平台
# 工具类
MOGO_UTILS_VERSION=1.0.48
MOGO_UTILS_VERSION=1.0.49
# 网络请求
MOGO_NETWORK_VERSION=1.0.48
MOGO_NETWORK_VERSION=1.0.49
# 网络DNS
MOGO_HTTPDNS_VERSION=1.0.48
MOGO_HTTPDNS_VERSION=1.0.49
# 鉴权
MOGO_PASSPORT_VERSION=1.0.48
MOGO_PASSPORT_VERSION=1.0.49
# 常链接
MOGO_SOCKET_VERSION=1.0.48
MOGO_SOCKET_VERSION=1.0.49
# 数据采集
MOGO_REALTIME_VERSION=1.0.48
MOGO_REALTIME_VERSION=1.0.49
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.0.48
MOGO_TANLU_VERSION=1.0.49
# 直播推流
MOGO_LIVE_VERSION=1.0.48
MOGO_LIVE_VERSION=1.0.49
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.0.48
MOGO_TRAFFICLIVE_VERSION=1.0.49