From 6ff9dd977a7356b0c40ca3d047375f8293f2582d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 4 Nov 2021 17:25:32 +0800 Subject: [PATCH] =?UTF-8?q?//=20=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E7=9B=B4=E6=92=AD=E6=8E=A8=E6=B5=81=E7=9A=84=E4=B8=BB?= =?UTF-8?q?=E6=92=AD=EF=BC=8Ctrue=20=E6=98=AF=E8=A7=82=E4=BC=97=EF=BC=8Cfa?= =?UTF-8?q?lse-=E6=98=AF=E4=B8=BB=E6=92=AD=20clientConfig.setAnchor(false)?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 鹰眼为观看端，设置为 true 行车记录仪或推流服务，为主播设置为false --- .idea/deploymentTargetDropDown.xml | 4 ++-- .../java/com/mogo/cloud/MoGoApplication.java | 2 +- .../layout/activity_live_play_and_push.xml | 2 +- .../cloud/live/manager/MoGoLiveManager.java | 4 ++-- gradle.properties | 20 +++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0aef461..528ee8d 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ 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 979a2ce..18b5124 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("B95ACB94DF240C88"); + clientConfig.setThirdPartyDeviceId("B95ACB94DF240C89"); // 设置应用服务AppId 长链、鉴权 //todo 需要卸载智慧驾驶、行车记录仪 clientConfig.setServiceAppId("com.mogo.launcher"); // 设置循环检测间隔时间 diff --git a/app/src/main/res/layout/activity_live_play_and_push.xml b/app/src/main/res/layout/activity_live_play_and_push.xml index 17d186f..a01bac8 100644 --- a/app/src/main/res/layout/activity_live_play_and_push.xml +++ b/app/src/main/res/layout/activity_live_play_and_push.xml @@ -104,7 +104,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:hint="请输入要查看的车机SN" - android:text="X2020210706B95ACB94DF240C88" + android:text="F803EB2046PZD00188" android:textColor="#FFFF" app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn" 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 b922f8b..674ba85 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 @@ -526,8 +526,8 @@ public class MoGoLiveManager { if (!mLiveStatusModel.isLoginCurrentRoom()) { loginRoom(); } - mLiveStatusModel.setMultiRoomId(ROOM_ID_PREFIX +"Audience_"+ otherRoomId); - mLiveStatusModel.setMultiStreamId(STREAM_ID_PREFIX +"Audience_"+ otherRoomId); + mLiveStatusModel.setMultiRoomId(ROOM_ID_PREFIX + otherRoomId); + mLiveStatusModel.setMultiStreamId(STREAM_ID_PREFIX + otherRoomId); Logger.i(TAG, "尝试进入多房间 loginMultiRoom multiRoomId : " + mLiveStatusModel.getMultiRoomId() + " currentStreamId : " + mLiveStatusModel.getMultiStreamId()); diff --git a/gradle.properties b/gradle.properties index b7406b2..0880dae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,22 +30,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.48-live +MOGO_UTILS_VERSION=1.1.49-live # 网络请求 -MOGO_NETWORK_VERSION=1.1.48-live +MOGO_NETWORK_VERSION=1.1.49-live # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.48-live +MOGO_HTTPDNS_VERSION=1.1.49-live # 鉴权 -MOGO_PASSPORT_VERSION=1.1.48-live +MOGO_PASSPORT_VERSION=1.1.49-live # 常链接 -MOGO_SOCKET_VERSION=1.1.48-live +MOGO_SOCKET_VERSION=1.1.49-live # 数据采集 -MOGO_REALTIME_VERSION=1.1.48-live +MOGO_REALTIME_VERSION=1.1.49-live # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.1.48-live +MOGO_TANLU_VERSION=1.1.49-live # 直播推流 -MOGO_LIVE_VERSION=1.1.48-live +MOGO_LIVE_VERSION=1.1.49-live # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.48-live +MOGO_TRAFFICLIVE_VERSION=1.1.49-live # 定位服务 -MOGO_LOCATION_VERSION=1.1.48-live +MOGO_LOCATION_VERSION=1.1.49-live