diff --git a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java
index 8ac65ba..2f27919 100644
--- a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java
+++ b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java
@@ -41,6 +41,8 @@ public abstract class BaseLiveActivity extends AppCompatActivity {
protected SurfaceView surfacePlayView;
// 查看直播按钮
protected ToggleButton liveToggleBtn;
+ // 登录第二个房间的按钮
+ protected ToggleButton tbLoginMultiRoom;
// 要查看的车机SN
protected EditText etLookRoomId;
// WIFI状态
@@ -84,6 +86,13 @@ public abstract class BaseLiveActivity extends AppCompatActivity {
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();
+ toggleLoginMultiRoom(isChecked);
+ });
tvWifiState = findViewById(R.id.tvWifiState);
initCamer();
@@ -183,4 +192,11 @@ public abstract class BaseLiveActivity extends AppCompatActivity {
*/
public abstract void togglePlay(boolean isPlay);
+ /**
+ * 登录或退出第二个房间
+ *
+ * @param isLogin true-登录,false-退出
+ */
+ public abstract void toggleLoginMultiRoom(boolean isLogin);
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
index 74dfcdb..3903799 100644
--- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.util.Log;
import com.mogo.cloud.live.listener.ILiveStatusListener;
-import com.mogo.cloud.live.manager.ILiveStreamManager;
import com.mogo.cloud.live.manager.LiveStreamManagerImpl;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.trafficlive.api.ITrafficLiveCallBack;
@@ -18,12 +17,13 @@ import com.mogo.cloud.wifi.WifiStateManager;
/**
* 推流和拉流页面
*/
-public class LivePlayAndPushActivity extends BaseLiveActivity implements ITrafficLiveCallBack, IWifiStateListener {
+public class LivePlayAndPushActivity extends BaseLiveActivity
+ implements ITrafficLiveCallBack, IWifiStateListener {
public static final String TAG = "LivePlayAndPushActivity";
private String liveSn;
- ILiveStreamManager liveStreamManager;
+ LiveStreamManagerImpl liveStreamManager;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -67,7 +67,7 @@ public class LivePlayAndPushActivity extends BaseLiveActivity implements ITraffi
public void toggleLive(boolean isLive) {
if (isLive) {
liveStreamManager.startLiveStream();
- }else{
+ } else {
liveStreamManager.stopLiveStream();
}
}
@@ -94,6 +94,16 @@ public class LivePlayAndPushActivity extends BaseLiveActivity implements ITraffi
}
}
+ @Override
+ public void toggleLoginMultiRoom(boolean isLogin) {
+ if (isLogin) {
+ liveSn = etLookRoomId.getText().toString().trim();
+ liveStreamManager.getLivePusher().loginMultiRoom(liveSn);
+ } else {
+ liveStreamManager.getLivePusher().logoutMultiRoom();
+ }
+ }
+
@Override
protected void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/java/com/mogo/cloud/LivePushActivity.java b/app/src/main/java/com/mogo/cloud/LivePushActivity.java
index 5d26f04..3776ae4 100644
--- a/app/src/main/java/com/mogo/cloud/LivePushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePushActivity.java
@@ -74,6 +74,11 @@ public class LivePushActivity extends BaseLiveActivity {
}
+ @Override
+ public void toggleLoginMultiRoom(boolean isLogin) {
+
+ }
+
@Override
protected void onDestroy() {
super.onDestroy();
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 e32ed2f..937d62f 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
@@ -101,12 +101,21 @@
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"
app:layout_constraintStart_toStartOf="@+id/surfacePlayView" />
+
+
+ app:layout_constraintLeft_toRightOf="@+id/tbLoginMultiRoom" />