Merge pull request #48 from AgoraIO-Community/dev/refactor1

Dev/refactor1

Author: icywind

Agora_Unity_WebGL.csproj

@@ -268,6 +268,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Assets\AgoraEngine\Demo\AudioVideoStateControl.cs" />
     <Compile Include="Assets\AgoraEngine\Demo\ButtonHandler.cs" />
     <Compile Include="Assets\AgoraEngine\Demo\TestHelloUnityVideo.cs" />
     <Compile Include="Assets\AgoraEngine\Demo\TestHome.cs" />
@@ -296,9 +297,9 @@
     <Compile Include="Assets\AgoraEngine\Utils\TokenClient.cs" />
     <Compile Include="Assets\AgoraEngine\Utils\TokenRequestHelper.cs" />
     <Compile Include="Assets\API-Example\app-screenshare-sample\AgoraScreenShare.cs" />
+    <Compile Include="Assets\API-Example\datastream-sample\TestDataStream.cs" />
     <Compile Include="Assets\API-Example\desktop-screenshare-sample\WebScreenShare.cs" />
     <Compile Include="Assets\API-Example\geo-area-sample\HelloVideoAgora2.cs" />
-    <Compile Include="Assets\API-Example\multi-channel-sample\AgoraMultiChannel.cs" />
     <Compile Include="Assets\API-Example\multi-channel-sample\Scripts\AgoraChannelPanel.cs" />
     <Compile Include="Assets\API-Example\multi-channel-sample\Scripts\MultiChannelSceneCtrl.cs" />
     <Compile Include="Assets\API-Example\rtmp-streaming-sample\RtmpStreaming.cs" />
@@ -307,6 +308,8 @@
     <Compile Include="Assets\API-Example\tools\ToggleStateButton.cs" />
     <Compile Include="Assets\API-Example\tools\UIElementDragger.cs" />
     <Compile Include="Assets\API-Example\video-encoder-configuration\video_encoder_configuration.cs" />
+    <Compile Include="Assets\FunctionalTest\JoinMultipleChannel\AgoraMultiChannel.cs" />
+    <Compile Include="Assets\FunctionalTest\Respawn\TestVideoRespawn.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\AgoraEngine\Plugins\Android\AgoraRtcEngineKit.plugin\AndroidManifest.xml" />

Assets/API-Example/app-screenshare-sample/AgoraScreenShare.cs

@@ -4,7 +4,7 @@
 using UnityEngine.UI;
 using agora_utilities;
 
-public class AgoraScreenShare : MonoBehaviour 
+public class AgoraScreenShare : MonoBehaviour
 {
 
     [SerializeField]
@@ -19,27 +19,27 @@ public class AgoraScreenShare : MonoBehaviour
     [SerializeField]
     Toggle ScreenToggle;
 
-   	public Text logText;
+    public Text logText;
     private Logger logger;
-	public IRtcEngine mRtcEngine = null;
-	private const float Offset = 100;
-	private Texture2D mTexture;
-    private Rect mRect;	
+    public IRtcEngine mRtcEngine = null;
+    private const float Offset = 100;
+    private Texture2D mTexture;
+    private Rect mRect;
     public RawImage rawImage;
     public RawImage textureImage;
-	public Vector2 cameraSize = new Vector2(640, 480);
-	public int cameraFPS = 15;
+    public Vector2 cameraSize = new Vector2(640, 480);
+    public int cameraFPS = 15;
     bool running = false;
     int timestamp = 0;
     bool _sharingImage = false;
 
     // Use this for initialization
-    void Start () 
-	{
+    void Start()
+    {
         bool appReady = CheckAppId();
         if (!appReady) return;
 
-		InitEngine();
+        InitEngine();
         InitTexture();
 
 #if !UNITY_WEBGL || UNITY_EDITOR
@@ -86,7 +86,7 @@ public void WebShareScreen()
         mRtcEngine.StartScreenCaptureForWeb();
     }
 
-        
+
     // On Native only, after stopping screenshare, you need to choose the
     // external source mode again before joining the channel.
     // On Web, it is preferred to enable external source while in the channel
@@ -128,8 +128,8 @@ void HandleToggleValueChange(bool isScreenOn)
             minBitrate = 1,
             orientationMode = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE,
             degradationPreference = DEGRADATION_PREFERENCE.MAINTAIN_FRAMERATE,
-            mirrorMode = VIDEO_MIRROR_MODE_TYPE.VIDEO_MIRROR_MODE_DISABLED 
-                // note: mirrorMode is not effective for WebGL
+            mirrorMode = VIDEO_MIRROR_MODE_TYPE.VIDEO_MIRROR_MODE_DISABLED
+            // note: mirrorMode is not effective for WebGL
         };
         mRtcEngine.SetVideoEncoderConfiguration(config);
 
@@ -199,18 +199,18 @@ void StopSharing()
     }
 
     void InitEngine()
-	{
+    {
         mRtcEngine = IRtcEngine.GetEngine(APP_ID);
-		mRtcEngine.SetLogFile("log.txt");
-		mRtcEngine.SetChannelProfile(CHANNEL_PROFILE.CHANNEL_PROFILE_LIVE_BROADCASTING);
-		mRtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER);
-		mRtcEngine.EnableAudio();
-		mRtcEngine.EnableVideo();
-		mRtcEngine.EnableVideoObserver();
+        mRtcEngine.SetLogFile("log.txt");
+        mRtcEngine.SetChannelProfile(CHANNEL_PROFILE.CHANNEL_PROFILE_LIVE_BROADCASTING);
+        mRtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER);
+        mRtcEngine.EnableAudio();
+        mRtcEngine.EnableVideo();
+        mRtcEngine.EnableVideoObserver();
 
         // Web: calling this before joining creates publish error
         // as we publish new created canvas source
-		//mRtcEngine.SetExternalVideoSource(true, false);
+        //mRtcEngine.SetExternalVideoSource(true, false);
 
         mRtcEngine.OnJoinChannelSuccess += OnJoinChannelSuccessHandler;
         mRtcEngine.OnLeaveChannel += OnLeaveChannelHandler;
@@ -219,16 +219,16 @@ void InitEngine()
         mRtcEngine.OnConnectionLost += OnConnectionLostHandler;
         mRtcEngine.OnUserJoined += OnUserJoinedHandler;
         mRtcEngine.OnUserOffline += OnUserOfflineHandler;
-	}
+    }
 
-	void JoinChannel()
-	{
+    void JoinChannel()
+    {
         int ret = mRtcEngine.JoinChannelByKey(TOKEN, CHANNEL_NAME, "", 0);
         // int ret = mRtcEngine.JoinChannel(CHANNEL_NAME, "", 0);
         Debug.Log(string.Format("JoinChannel ret: ${0}", ret));
-	}
+    }
 
-	bool CheckAppId()
+    bool CheckAppId()
     {
         logger = new Logger(logText);
         return logger.DebugAssert(APP_ID.Length > 10, "<color=red>[STOP] Please fill in your appId in Canvas!!!!</color>");
@@ -268,12 +268,12 @@ void OnSDKWarningHandler(int warn, string msg)
     {
         logger.UpdateLog(string.Format("OnSDKWarning warn: {0}, msg: {1}", warn, msg));
     }
-    
+
     void OnSDKErrorHandler(int error, string msg)
     {
         logger.UpdateLog(string.Format("OnSDKError error: {0}, msg: {1}", error, msg));
     }
-    
+
     void OnConnectionLostHandler()
     {
         logger.UpdateLog(string.Format("OnConnectionLost "));
@@ -283,8 +283,8 @@ void OnApplicationQuit()
     {
         if (mRtcEngine != null)
         {
-			mRtcEngine.LeaveChannel();
-			mRtcEngine.DisableVideoObserver();
+            mRtcEngine.LeaveChannel();
+            mRtcEngine.DisableVideoObserver();
             IRtcEngine.Destroy();
             mRtcEngine = null;
         }
@@ -309,7 +309,7 @@ private void makeVideoView(uint uid)
         {
             return; // reuse
         }
-        
+
         // create a GameObject and assign to this new user
         VideoSurface videoSurface = makeImageSurface(uid.ToString());
         if (!ReferenceEquals(videoSurface, null))
@@ -339,7 +339,7 @@ public VideoSurface makeImageSurface(string goName)
         GameObject canvas = GameObject.Find("Canvas");
         if (canvas != null)
         {
-            go.transform.parent = canvas.transform;
+            go.transform.SetParent(canvas.transform);
             Debug.Log("add video view");
         }
         else
@@ -353,7 +353,7 @@ public VideoSurface makeImageSurface(string goName)
         Debug.Log("position x " + xPos + " y: " + yPos);
         go.transform.localPosition = new Vector3(xPos, yPos, 0f);
         //go.transform.localPosition = new Vector3(10, 10, 0f);
-        go.transform.localScale = new Vector3(3 * 1.6666f, 3f, 1f);
+        go.transform.localScale = new Vector3(1 * 1.33333f, 1f, 1f);
 
         // configure videoSurface
         VideoSurface videoSurface = go.AddComponent<VideoSurface>();