From f49fecd9a94302f274d604e8c5530923f707f60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 3 Nov 2021 15:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E9=99=86=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E4=B8=8D=E7=BB=9F=E4=B8=80=E5=AF=BC=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=8B=89=E6=B5=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .idea/compiler.xml | 2 +- .idea/deploymentTargetDropDown.xml | 17 +++++++++++++++++ .idea/misc.xml | 14 +++++++++++++- app/build.gradle | 2 +- .../java/com/mogo/cloud/LivePlayActivity.java | 2 +- .../com/mogo/cloud/LivePlayAndPushActivity.java | 2 +- .../java/com/mogo/cloud/LivePushActivity.java | 2 +- .../java/com/mogo/cloud/MoGoApplication.java | 2 +- app/src/main/res/layout/activity_live_play.xml | 2 +- .../res/layout/activity_live_play_and_push.xml | 2 +- .../cloud/live/manager/MoGoLiveManager.java | 4 ++-- gradle.properties | 2 +- 13 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.gitignore b/.gitignore index 603b140..c453264 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /local.properties /.idea/caches /.idea/libraries +/.idea/modules /.idea/modules.xml /.idea/workspace.xml /.idea/navEditor.xml @@ -12,3 +13,4 @@ /captures .externalNativeBuild .cxx +/.idea/modules/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..4116d78 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 10608e0..7605932 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,21 @@ + + + + + + + - + diff --git a/app/build.gradle b/app/build.gradle index c0fb5d6..454c856 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid // 从车机获取视频流 - implementation 'com.zhidao.carmanager:common:1.0.23@aar' + implementation 'com.zhidao.carmanager:common:1.0.25@aar' if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}" diff --git a/app/src/main/java/com/mogo/cloud/LivePlayActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayActivity.java index 018e2f7..498adff 100644 --- a/app/src/main/java/com/mogo/cloud/LivePlayActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePlayActivity.java @@ -37,7 +37,7 @@ public class LivePlayActivity extends AppCompatActivity implements ITrafficCarLi tvWifiState = findViewById(R.id.tvWifiState); LiveStreamManagerImpl.getInstance(this.getApplication(), - MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId()); + MoGoAiCloudClientConfig.getInstance().getSn()); liveToggleBtn.setOnCheckedChangeListener((buttonView, isChecked) -> { Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); if (isChecked) { diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java index 521f2fa..06b4c28 100644 --- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java @@ -31,7 +31,7 @@ public class LivePlayAndPushActivity extends BaseLiveActivity // 初始化直播流管理 liveStreamManager = LiveStreamManagerImpl.getInstance(this.getApplication(), - MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId()); + MoGoAiCloudClientConfig.getInstance().getSn()); // 设置状态回调 liveStreamManager.setLiveStatusChangeCallback(new ILiveStatusListener() { diff --git a/app/src/main/java/com/mogo/cloud/LivePushActivity.java b/app/src/main/java/com/mogo/cloud/LivePushActivity.java index 8b1b6a0..6eba2b3 100644 --- a/app/src/main/java/com/mogo/cloud/LivePushActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePushActivity.java @@ -22,7 +22,7 @@ public class LivePushActivity extends BaseLiveActivity { super.onCreate(savedInstanceState); // 初始化直播流管理 liveStreamManager = LiveStreamManagerImpl.getInstance(this.getApplication(), - MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId()); + MoGoAiCloudClientConfig.getInstance().getSn()); // 设置状态回调 liveStreamManager.setLiveStatusChangeCallback(new ILiveStatusListener() { diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index c1814fa..979a2ce 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("123123test123123"); + clientConfig.setThirdPartyDeviceId("B95ACB94DF240C88"); // 设置应用服务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 efd8e5d..532de62 100644 --- a/app/src/main/res/layout/activity_live_play.xml +++ b/app/src/main/res/layout/activity_live_play.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="请输入要查看的车机SN" - android:text="F803EB2046PZD00149" + android:text="X2020210706B95ACB94DF240C88" android:textColor="#FFFF" app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn" app:layout_constraintEnd_toEndOf="parent" 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 5bd49d6..17d186f 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="F803BB2037EZD00007" + android:text="X2020210706B95ACB94DF240C88" 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 674ba85..b922f8b 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 + otherRoomId); - mLiveStatusModel.setMultiStreamId(STREAM_ID_PREFIX + otherRoomId); + mLiveStatusModel.setMultiRoomId(ROOM_ID_PREFIX +"Audience_"+ otherRoomId); + mLiveStatusModel.setMultiStreamId(STREAM_ID_PREFIX +"Audience_"+ otherRoomId); Logger.i(TAG, "尝试进入多房间 loginMultiRoom multiRoomId : " + mLiveStatusModel.getMultiRoomId() + " currentStreamId : " + mLiveStatusModel.getMultiStreamId()); diff --git a/gradle.properties b/gradle.properties index 2b3a411..ec7b70c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # AI CLOUD 云平台 # 工具类 MOGO_UTILS_VERSION=1.1.42