[Android ] Fix camera switch issues.

cloudwebrtc · cloudwebrtc · commit a8be27423fbe · 2019-01-21T00:06:54.000+08:00
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
@@ -271,8 +271,7 @@ public void onMethodCall(MethodCall call, Result result) {
             result.success(null);
         } else if (call.method.equals("mediaStreamTrackSwitchCamera")) {
             String trackId = call.argument("trackId");
-            mediaStreamTrackSwitchCamera(trackId);
-            result.success(null);
+            mediaStreamTrackSwitchCamera(trackId, result);
         } else if (call.method.equals("setVolume")) {
             String trackId = call.argument("trackId");
             double volume = call.argument("volume");
@@ -801,10 +800,13 @@ public void mediaStreamTrackSetEnabled(final String id, final boolean enabled) {
         track.setEnabled(enabled);
     }
 
-    public void mediaStreamTrackSwitchCamera(final String id) {
+    public void mediaStreamTrackSwitchCamera(final String id, Result result) {
         MediaStreamTrack track = localTracks.get(id);
         if (track != null) {
             getUserMediaImpl.switchCamera(id);
+            result.success(null);
+        }else{
+            result.error("mediaStreamTrackSwitchCameraFailed", "mediaStreamTrackSwitchCamera() track is null", null);
         }
     }
 
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java
@@ -516,7 +516,7 @@ public void onStop() {
                     plugin.localStreams.put(streamId, mediaStream);
                     successResult.putString("streamId", streamId);
                     successResult.putArray("audioTracks", audioTracks.toArrayList());
-                    successResult.putArray("videoTracks", audioTracks.toArrayList());
+                    successResult.putArray("videoTracks", videoTracks.toArrayList());
                     result.success(successResult.toMap());
                 }else{
                     result.error(
@@ -602,7 +602,7 @@ private void getUserMedia(
 
         successResult.putString("streamId", streamId);
         successResult.putArray("audioTracks", audioTracks.toArrayList());
-        successResult.putArray("videoTracks", audioTracks.toArrayList());
+        successResult.putArray("videoTracks", videoTracks.toArrayList());
         result.success(successResult.toMap());
     }
 
