diff --git a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java index 15419f0..7b0d012 100644 --- a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java +++ b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; +import android.view.TextureView; import android.widget.EditText; import android.widget.TextView; import android.widget.ToggleButton; @@ -38,7 +39,7 @@ public abstract class BaseLiveActivity extends AppCompatActivity { protected SurfaceView surfacePreviewView; // 查看指定车机的画面 - protected SurfaceView surfacePlayView; + protected TextureView textureView; // 查看直播按钮 protected ToggleButton liveToggleBtn; // 登录第二个房间的按钮 @@ -79,7 +80,7 @@ public abstract class BaseLiveActivity extends AppCompatActivity { tvLiveStatus = findViewById(R.id.tvLiveStatus); - surfacePlayView = findViewById(R.id.surfacePlayView); + textureView = findViewById(R.id.textureView); etLookRoomId = findViewById(R.id.etLookRoomId); liveToggleBtn = findViewById(R.id.liveToggleBtn); liveToggleBtn.setOnCheckedChangeListener((buttonView, isChecked) -> { diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java index 0baec68..660afe7 100644 --- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java @@ -90,7 +90,7 @@ public class LivePlayAndPushActivity extends BaseLiveActivity public void togglePlay(boolean isPlay) { if (isPlay) { liveSn = etLookRoomId.getText().toString().trim(); - MoGoAiCloudTrafficLive.viewDesignativeVehicleLive(liveSn, surfacePlayView, this); + MoGoAiCloudTrafficLive.viewDesignativeVehicleLive(liveSn, textureView, this); } else { MoGoAiCloudTrafficLive.stopCarLive(liveSn); } @@ -127,7 +127,7 @@ public class LivePlayAndPushActivity extends BaseLiveActivity @Override public void onFirstFrame() { - surfacePlayView.setVisibility(View.VISIBLE); + textureView.setVisibility(View.VISIBLE); Logger.d(TAG, "onFirstFrame"); } 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 1efdf83..450b9c6 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 @@ -11,12 +11,24 @@ android:layout_height="match_parent" android:layout_weight="1" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/surfacePlayView" + app:layout_constraintEnd_toStartOf="@+id/textureView" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + + + + + + + + + + + + @@ -110,7 +122,7 @@ android:textColor="#000" app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@+id/surfacePlayView" /> + app:layout_constraintStart_toStartOf="@+id/textureView" />