From e4808667d5fc0b19512fa7a93dd152f40ee19b91 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 28 Dec 2021 14:12:52 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=20=E5=A4=84=E7=90=86=201003070=20=09?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=8E=A8=E6=B5=81=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=A4=B1=E8=B4=A5=E3=80=82=20=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=8E=9F=E5=9B=A0=EF=BC=9A=E5=A4=9A=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E8=B0=83=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E6=B5=81=E5=87=BD=E6=95=B0=E6=9C=89=E8=AF=AF=E3=80=82?= =?UTF-8?q?=20=E5=A4=84=E7=90=86=E5=BB=BA=E8=AE=AE=EF=BC=9A=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=B8=A6=E6=9C=89=E5=8F=82=E6=95=B0=20[ZegoPublisherC?= =?UTF-8?q?onfig]=20=E7=9A=84=E6=8E=A8=E6=B5=81=E5=87=BD=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 26 ------------------- .../java/com/mogo/cloud/MoGoApplication.java | 2 +- .../main/res/layout/activity_live_play.xml | 2 +- .../cloud/live/manager/MoGoLiveManager.java | 5 +++- gradle.properties | 20 +++++++------- 5 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 9c7b1e2..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index 1a4060a..c56e082 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -58,7 +58,7 @@ public class MoGoApplication extends MultiDexApplication { // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请 // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） // TODO 这里使用的是测试的sn - clientConfig.setThirdPartyDeviceId("1234567899876543214"); + clientConfig.setThirdPartyDeviceId("123456789987654321"); // 设置应用服务AppId 长链、鉴权 //todo 需要卸载智慧驾驶、行车记录仪 clientConfig.setServiceAppId("com.mogo.launcher"); // 设置循环检测间隔时间 diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml index dbb3a24..3fbfdde 100644 --- a/app/src/main/res/layout/activity_live_play.xml +++ b/app/src/main/res/layout/activity_live_play.xml @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="请输入要查看的车机SN" - android:text="F803EB2046PZD00274" + android:text="F803EB2046PZD00212" android:textColor="#000" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 6198f98..e4fb5e6 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -52,6 +52,7 @@ import im.zego.zegoexpress.entity.ZegoCustomVideoCaptureConfig; import im.zego.zegoexpress.entity.ZegoEngineConfig; import im.zego.zegoexpress.entity.ZegoEngineProfile; import im.zego.zegoexpress.entity.ZegoPlayerConfig; +import im.zego.zegoexpress.entity.ZegoPublisherConfig; import im.zego.zegoexpress.entity.ZegoRoomConfig; import im.zego.zegoexpress.entity.ZegoUser; import im.zego.zegoexpress.entity.ZegoVideoConfig; @@ -666,7 +667,9 @@ public class MoGoLiveManager { */ public void startPublish() { Log.i(TAG, "开始推流到ZeGo startPublish currentStreamId : " + mLiveStatusModel.getCurrentStreamId()); - mExpressEngine.startPublishingStream(mLiveStatusModel.getCurrentStreamId()); + ZegoPublisherConfig config = new ZegoPublisherConfig(); + config.roomID = mLiveStatusModel.getCurrentRoomId(); + mExpressEngine.startPublishingStream(mLiveStatusModel.getCurrentStreamId(), config, ZegoPublishChannel.MAIN); } /** diff --git a/gradle.properties b/gradle.properties index 7bc76e5..d6884f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,22 +30,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.63 +MOGO_UTILS_VERSION=1.1.64 # 网络请求 -MOGO_NETWORK_VERSION=1.1.63 +MOGO_NETWORK_VERSION=1.1.64 # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.63 +MOGO_HTTPDNS_VERSION=1.1.64 # 鉴权 -MOGO_PASSPORT_VERSION=1.1.63 +MOGO_PASSPORT_VERSION=1.1.64 # 常链接 -MOGO_SOCKET_VERSION=1.1.63 +MOGO_SOCKET_VERSION=1.1.64 # 数据采集 -MOGO_REALTIME_VERSION=1.1.63 +MOGO_REALTIME_VERSION=1.1.64 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.63 +MOGO_TANLU_VERSION=1.1.64 # 直播推流 -MOGO_LIVE_VERSION=1.1.63 +MOGO_LIVE_VERSION=1.1.64 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.63 +MOGO_TRAFFICLIVE_VERSION=1.1.64 # 定位服务 -MOGO_LOCATION_VERSION=1.1.63 +MOGO_LOCATION_VERSION=1.1.64