From 0212be33965ad5aec85cdd9ebcf85f0724afa504 Mon Sep 17 00:00:00 2001
From: liuguijing <1440265357@qq.com>
Date: Wed, 11 Jun 2025 16:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/mplive/MainActivity.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/xypower/mplive/MainActivity.java b/app/src/main/java/com/xypower/mplive/MainActivity.java
index 0f30e26..7ee33b2 100644
--- a/app/src/main/java/com/xypower/mplive/MainActivity.java
+++ b/app/src/main/java/com/xypower/mplive/MainActivity.java
@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.hardware.Camera;
 import android.os.Build;
 import android.os.Bundle;
@@ -211,7 +210,6 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
                     }
                     efu.setText(rtmpUrl);
                     mPublisher.startPublish(rtmpUrl);
-//                    mPublisher.startCamera();
                     mPublisher.switchCameraFace(cameraId, rotation);
 
                     if (btnSwitchEncoder.getText().toString().contentEquals("soft encoder")) {
@@ -294,7 +292,7 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
                 @Override
                 public void run() {
 //                    rtmpUrl = "rtsp://127.0.0.1:8554/live/7";
-                    efu.setText(rtmpUrl + "rotation= " + rotation + " cameraid=" + cameraId + " auto=" + autoStart);
+                    efu.setText(rtmpUrl + " rotation= " + rotation + " cameraid=" + cameraId + " auto=" + autoStart);
                     if (netCamera == 0) {
                         mPublisher.startPublish(rtmpUrl);
                         if (btnSwitchEncoder.getText().toString().contentEquals("soft encoder")) {
@@ -441,24 +439,26 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        sendStopPushBroadcast();
+        if (netCamera == 1) {
+            sendStopPushBroadcast();
+        }
         stopRTMPServer();
         mPublisher.stopPublish();
         mPublisher.stopRecord();
     }
 
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        mPublisher.stopEncode();
-        mPublisher.stopRecord();
-        btnRecord.setText("record");
-        mPublisher.setScreenOrientation(newConfig.orientation);
-        if (btnPublish.getText().toString().contentEquals("stop")) {
-            mPublisher.startEncode();
-        }
-        mPublisher.startCamera();
-    }
+//    @Override
+//    public void onConfigurationChanged(Configuration newConfig) {
+//        super.onConfigurationChanged(newConfig);
+//        mPublisher.stopEncode();
+//        mPublisher.stopRecord();
+//        btnRecord.setText("record");
+//        mPublisher.setScreenOrientation(newConfig.orientation);
+//        if (btnPublish.getText().toString().contentEquals("stop")) {
+//            mPublisher.startEncode();
+//        }
+//        mPublisher.startCamera();
+//    }
 
     private void startRTMPServer() {
         File streamingDir = null;