Merge pull request #284 from nathanGroovy/dev/WebGL-46-New

Dev/web gl 46 new

Author: icywind

Assets/API-Example/datastream-sample/DataStream.cs

@@ -203,10 +203,8 @@ public VideoSurface makeImageSurface(string goName)
         }
         // set up transform
         go.transform.Rotate(0f, 0.0f, 180.0f);
-        float xPos = Random.Range(Offset - Screen.width / 2f, Screen.width / 2f - Offset);
-        float yPos = Random.Range(Offset, Screen.height / 2f - Offset);
-        Debug.Log("position x " + xPos + " y: " + yPos);
-        go.transform.localPosition = new Vector3(xPos, yPos, 0f);
+        Vector2 pos = AgoraUIUtils.GetRandomPosition(60);
+        go.transform.localPosition = new Vector3(pos.x, pos.y, 0f);
         go.transform.localScale = new Vector3(1.5f, 1f, 1f);
 
         // configure videoSurface

Assets/API-Example/device-manager/AgoraDeviceManager.cs

@@ -35,7 +35,7 @@ public class AgoraDeviceManager : MonoBehaviour
     private const float Offset = 100;
     GameObject LastRemote = null;
     public Slider recordingVolume, playbackVolume;
-    public bool joinedChannel, previewing;
+    public bool joinedChannel, previewing, pubAudio, subAudio, pubVideo, subVideo = true;
     public Button videoDeviceButton, joinChannelButton, leaveChannelButton, startPreviewButton, stopPreviewButton, cacheVideoButton;
     // Start is called before the first frame update
     private void Awake()
@@ -114,6 +114,7 @@ public void cacheVideoDevices()
     {
 #if UNITY_WEBGL && !UNITY_EDITOR
         _rtcEngine.CacheVideoDevices();
+        pubVideo = true;
         Invoke("GetVideoDeviceManager", .2f);
 #endif
     }
@@ -122,6 +123,7 @@ public void cacheRecordingDevices()
     {
 #if UNITY_WEBGL && !UNITY_EDITOR
         _rtcEngine.CacheRecordingDevices();
+        pubAudio = true;
         Invoke("GetAudioRecordingDevice", .2f);
 #endif
     }
@@ -132,6 +134,7 @@ public void cachePlaybackDevices()
     {
 #if UNITY_WEBGL && !UNITY_EDITOR
         _rtcEngine.CachePlaybackDevices();
+        subAudio = true;
         Invoke("GetAudioPlaybackDevice", .2f);
 #endif
     }
@@ -145,21 +148,31 @@ bool CheckAppId()
     public void playbackUpdate()
     {
         _playbackDeviceIndex = playbackDropdown.value;
+        subAudio = true;
         SetAndReleasePlaybackDevice();
     }
 
     public void recordingUpdate()
     {
         _recordingDeviceIndex = recordingDropdown.value;
+        pubAudio = true;
         SetAndReleaseRecordingDevice();
     }
 
     public void videoUpdate()
     {
         _videoDeviceIndex = videoDropdown.value;
+        pubVideo = true;
         SetVideoDevice();
     }
 
+    public void updateAll()
+    {
+        videoUpdate();
+        recordingUpdate();
+        playbackUpdate();
+    }
+
     public void startPreview()
     {
         previewing = true;
@@ -345,7 +358,7 @@ public void JoinChannel()
 
     public void startJoiningChannel()
     {
-        _rtcEngine.JoinChannel(CHANNEL_NAME);
+        _rtcEngine.JoinChannel(appInfo.token, CHANNEL_NAME, "", 0, new ChannelMediaOptions(subAudio, subVideo, pubAudio, pubVideo));
         makeVideoView(CHANNEL_NAME, 0);
     }
 

Assets/API-Example/geo-area-sample/HelloVideoAgora2.cs

@@ -183,10 +183,8 @@ public VideoSurface makeImageSurface(string goName)
         }
         // set up transform
         go.transform.Rotate(0f, 0.0f, 180.0f);
-        float xPos = Random.Range(Offset - Screen.width / 2f, Screen.width / 2f - Offset);
-        float yPos = Random.Range(Offset, Screen.height / 2f - Offset);
-        Debug.Log("position x " + xPos + " y: " + yPos);
-        go.transform.localPosition = new Vector3(xPos, yPos, 0f);
+        Vector2 pos = AgoraUIUtils.GetRandomPosition(60);
+        go.transform.localPosition = new Vector3(pos.x, pos.y, 0f);
         go.transform.localScale = new Vector3(3f, 4f, 1f);
 
         // configure videoSurface

Assets/API-Example/push-video-frame/AgoraScreenShare.cs

@@ -364,10 +364,8 @@ public VideoSurface makeImageSurface(string goName)
         }
         // set up transform
         go.transform.Rotate(0f, 0.0f, 180.0f);
-        float xPos = Random.Range(Offset - Screen.width / 2f, Screen.width / 2f - Offset);
-        float yPos = Random.Range(Offset, Screen.height / 2f - Offset);
-        Debug.Log("position x " + xPos + " y: " + yPos);
-        go.transform.localPosition = new Vector3(xPos, yPos, 0f);
+        Vector2 pos = AgoraUIUtils.GetRandomPosition(60);
+        go.transform.localPosition = new Vector3(pos.x, pos.y, 0f);
         //go.transform.localPosition = new Vector3(10, 10, 0f);
         go.transform.localScale = new Vector3(1 * 1.33333f, 1f, 1f);
 

Assets/API-Example/rtmp-streaming/RtmpStreaming.cs

@@ -298,10 +298,8 @@ public VideoSurface makeImageSurface(string goName)
 
         // set up transform
         go.transform.Rotate(0f, 0.0f, 180.0f);
-        float xPos = Random.Range(Offset - Screen.width / 2f, Screen.width / 2f - Offset);
-        float yPos = Random.Range(Offset, Screen.height / 2f - Offset);
-        Debug.Log("position x " + xPos + " y: " + yPos);
-        go.transform.localPosition = new Vector3(xPos, yPos, 0f);
+        Vector2 pos = AgoraUIUtils.GetRandomPosition(60);
+        go.transform.localPosition = new Vector3(pos.x, pos.y, 0f);
         go.transform.localScale = new Vector3(3f, 4f, 1f);
 
         // configure videoSurface

Assets/API-Example/screen-sharing/AgoraScreenSharingClientManager.cs

@@ -385,9 +385,8 @@ public VideoSurface makeImageSurface(string goName)
 
         // set up transform
         go.transform.Rotate(0f, 0.0f, 180.0f);
-        float xPos = Random.Range(Offset - Screen.width / 4f, Screen.width / 4f - Offset);
-        float yPos = Random.Range(Offset, Screen.height / 4f - Offset);
-        go.transform.localPosition = new Vector3(xPos, yPos, 0f);
+        Vector2 pos = AgoraUIUtils.GetRandomPosition(60);
+        go.transform.localPosition = new Vector3(pos.x, pos.y, 0f);
         go.transform.localScale = new Vector3(1.5f, 1f, 1f);
 
         // configure videoSurface