resolve player remain issues

Author: xianing

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MediaPlayer.java

@@ -38,6 +38,7 @@
 import static io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_IDLE;
 import static io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_OPEN_COMPLETED;
 import static io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_PLAYBACK_COMPLETED;
+import static io.agora.mediaplayer.Constants.MediaPlayerState.PLAYER_STATE_STOPPED;
 import static io.agora.rtc2.video.VideoCanvas.RENDER_MODE_HIDDEN;
 import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
 import static io.agora.rtc2.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
@@ -517,8 +518,11 @@ public void onPlayerStateChanged(io.agora.mediaplayer.Constants.MediaPlayerState
         Log.e(TAG, "onPlayerStateChanged mediaPlayerError " + mediaPlayerError);
         if (mediaPlayerState.equals(PLAYER_STATE_OPEN_COMPLETED)) {
             setMediaPlayerViewEnable(true);
-        } else if (mediaPlayerState.equals(PLAYER_STATE_IDLE) || mediaPlayerState.equals(PLAYER_STATE_PLAYBACK_COMPLETED) ) {
+        } else if (mediaPlayerState.equals(PLAYER_STATE_IDLE) || mediaPlayerState.equals(PLAYER_STATE_STOPPED) || mediaPlayerState.equals(PLAYER_STATE_PLAYBACK_COMPLETED) ) {
             setMediaPlayerViewEnable(false);
+            options.publishMediaPlayerVideoTrack = false;
+            options.publishMediaPlayerAudioTrack = false;
+            engine.updateChannelMediaOptions(options);
         }
     }
 

iOS/APIExample/Examples/Advanced/MediaPlayer/Base.lproj/MediaPlayer.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -114,19 +114,26 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uBn-Om-6Vs">
-                                        <rect key="frame" x="165" y="0.0" width="32" height="30"/>
+                                        <rect key="frame" x="103" y="0.0" width="32" height="30"/>
                                         <state key="normal" title="Stop"/>
                                         <connections>
                                             <action selector="doStopWithSender:" destination="jxp-ZN-2yG" eventType="touchUpInside" id="zJg-By-NUx"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gpl-j7-fNe">
-                                        <rect key="frame" x="332" y="0.0" width="42" height="30"/>
+                                        <rect key="frame" x="208" y="0.0" width="42" height="30"/>
                                         <state key="normal" title="Pause"/>
                                         <connections>
                                             <action selector="doPauseWithSender:" destination="jxp-ZN-2yG" eventType="touchUpInside" id="r75-hp-PgR"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vfb-Ay-x4e">
+                                        <rect key="frame" x="323" y="0.0" width="51" height="30"/>
+                                        <state key="normal" title="Publish"/>
+                                        <connections>
+                                            <action selector="doPublishWithSender:" destination="jxp-ZN-2yG" eventType="touchUpInside" id="cuV-Ma-rDj"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                             </stackView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Playout Volume" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nDn-o2-Vmd">

iOS/APIExample/Examples/Advanced/MediaPlayer/MediaPlayer.swift

@@ -178,6 +178,17 @@ class MediaPlayerMain: BaseViewController, UITextFieldDelegate {
 
     @IBAction func doPlay(sender: UIButton) {
         mediaPlayerKit.play()// get channel name from configs
+    }
+    
+    @IBAction func doStop(sender: UIButton) {
+        mediaPlayerKit.stop()
+    }
+    
+    @IBAction func doPause(sender: UIButton) {
+        mediaPlayerKit.pause()
+    }
+    
+    @IBAction func doPublish(sender: UIButton) {
         guard let channelName = configs["channelName"] as? String else { return }
         let option = AgoraRtcChannelMediaOptions()
         option.publishMediaPlayerVideoTrack = .of(true)
@@ -188,14 +199,7 @@ class MediaPlayerMain: BaseViewController, UITextFieldDelegate {
         connection.channelId = channelName
         connection.localUid = PLAYER_UID
         agoraKit.updateChannelEx(with: option, connection: connection)
-    }
-    
-    @IBAction func doStop(sender: UIButton) {
-        mediaPlayerKit.stop()
-    }
-    
-    @IBAction func doPause(sender: UIButton) {
-        mediaPlayerKit.pause()
+
     }
 
     @IBAction func doAdjustPlayoutVolume(sender: UISlider) {
@@ -292,20 +296,28 @@ extension MediaPlayerMain: AgoraRtcMediaPlayerDelegate {
         LogUtils.log(message: "player rtc channel publish helper state changed to: \(state.rawValue), error: \(error.rawValue)", level: .info)
         DispatchQueue.main.async {[weak self] in
             guard let weakself = self else { return }
-            switch state {
-            case .failed:
+            switch state.rawValue {
+            case 100: // failed
                 weakself.showAlert(message: "media player error: \(error.rawValue)")
                 break
-            case .openCompleted:
+            case 2: // openCompleted
                 let duration = weakself.mediaPlayerKit.getDuration()
                 weakself.playerControlStack.isHidden = false
                 weakself.playerDurationLabel.text = "\(String(format: "%02d", duration / 60000)) : \(String(format: "%02d", duration % 60000 / 1000))"
                 weakself.playerProgressSlider.setValue(0, animated: true)
                 break
-            case .stopped:
+            case 7: // stopped
                 weakself.playerControlStack.isHidden = true
                 weakself.playerProgressSlider.setValue(0, animated: true)
                 weakself.playerDurationLabel.text = "00 : 00"
+                guard let channelName = weakself.configs["channelName"] as? String else { return }
+                let option = AgoraRtcChannelMediaOptions()
+                option.publishMediaPlayerVideoTrack = .of(false)
+                option.publishMediaPlayerAudioTrack = .of(false)
+                let connection = AgoraRtcConnection()
+                connection.channelId = channelName
+                connection.localUid = PLAYER_UID
+                weakself.agoraKit.updateChannelEx(with: option, connection: connection)
                 break
             default: break
             }

iOS/APIExample/Examples/Advanced/MediaPlayer/zh-Hans.lproj/MediaPlayer.strings

@@ -37,3 +37,7 @@
 
 /* Class = "UIButton"; normalTitle = "Play"; ObjectID = "vdv-zd-3aD"; */
 "vdv-zd-3aD.normalTitle" = "播放";
+
+
+/* Class = "UIButton"; normalTitle = "Publish"; ObjectID = "vfb-Ay-x4e"; */
+"vfb-Ay-x4e.normalTitle" = "发流";