From 20b9609cf394f55f4852d4edf6a4aabc03f9a7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 3 Mar 2021 17:04:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E5=A4=9A=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E7=9B=B4=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/cloud/BaseLiveActivity.java | 10 +++++----- .../main/res/layout/activity_live_play_and_push.xml | 2 +- .../com/mogo/cloud/live/manager/MoGoLiveManager.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java index 4ff38dc..b5f3bf5 100644 --- a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java +++ b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java @@ -58,13 +58,13 @@ public abstract class BaseLiveActivity extends AppCompatActivity { surfacePreviewView = findViewById(R.id.surfacePreviewView); btnLive = findViewById(R.id.btnLive); btnLive.setOnCheckedChangeListener((buttonView, isChecked) -> { - Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); +// Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); toggleLive(isChecked); }); btnSaveFile = findViewById(R.id.btnSaveFile); btnSaveFile.setOnCheckedChangeListener((btnSaveFile, isChecked) -> { - Toast.makeText(getApplicationContext(), btnSaveFile.getText(), Toast.LENGTH_SHORT).show(); +// Toast.makeText(getApplicationContext(), btnSaveFile.getText(), Toast.LENGTH_SHORT).show(); YuvToolUtils.isSaveFile = isChecked; if (isChecked) { YuvToolUtils.connectYUVFile(yuvSavePath); @@ -73,7 +73,7 @@ public abstract class BaseLiveActivity extends AppCompatActivity { btnChangeCameraState = findViewById(R.id.btnChangeCameraState); btnChangeCameraState.setOnCheckedChangeListener((btnSaveFile, isChecked) -> { - Toast.makeText(getApplicationContext(), btnSaveFile.getText(), Toast.LENGTH_SHORT).show(); +// Toast.makeText(getApplicationContext(), btnSaveFile.getText(), Toast.LENGTH_SHORT).show(); toggleCameraState(isChecked); }); @@ -83,14 +83,14 @@ public abstract class BaseLiveActivity extends AppCompatActivity { etLookRoomId = findViewById(R.id.etLookRoomId); liveToggleBtn = findViewById(R.id.liveToggleBtn); liveToggleBtn.setOnCheckedChangeListener((buttonView, isChecked) -> { - Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); +// Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); togglePlay(isChecked); }); tbLoginMultiRoom = findViewById(R.id.tbLoginMultiRoom); tbLoginMultiRoom.setOnCheckedChangeListener((buttonView, isChecked) -> { - Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); +// Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show(); toggleLoginMultiRoom(isChecked); }); tvWifiState = findViewById(R.id.tvWifiState); 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 99cc68f..5a691d9 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="F803EB2046PZD00149" + android:text="F803BB2037EZD00048" 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 bc5e47c..694481c 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 @@ -461,7 +461,7 @@ public class MoGoLiveManager { return; } if (!TextUtils.isEmpty(multiRoomId)) { - mExpressEngine.loginMultiRoom(multiRoomId, zeGoMultiRoomConfig); + mExpressEngine.logoutRoom(multiRoomId); } }