Merge pull request #29 from infrared5/develop

Develop
red5pro · Apr 26, 2018 · 9b4ce8a · 9b4ce8a
2 parents 55a4c39 + 1263e31
commit 9b4ce8a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/android/src/main/java/com/red5pro/reactnative/view/R5VideoViewLayout.java b/android/src/main/java/com/red5pro/reactnative/view/R5VideoViewLayout.java
@@ -289,6 +289,7 @@ public void publish (String streamName, R5Stream.RecordType streamType) {
             mCamera.getCamera().stopPreview();
         }
 
+        reorient();
         mStream.publish(streamName, streamType);
 
         if (shouldPublishVideo) {
@@ -480,7 +481,7 @@ protected void applyDeviceRotation () {
 
         mCameraOrientation += degrees;
         mCameraOrientation = mCameraOrientation % 360;
-        mOrigCamOrientation = mCameraOrientation;
+        mOrigCamOrientation = 270;
 
     }
 
@@ -498,7 +499,7 @@ protected void applyInverseDeviceRotation(){
 
         mCameraOrientation += degrees;
         mCameraOrientation = mCameraOrientation % 360;
-        mOrigCamOrientation = mCameraOrientation;
+        mOrigCamOrientation = 90;
 
     }
 
@@ -552,7 +553,7 @@ protected Camera openBackFacingCameraGingerbread() {
 
     protected void onConfigured(String key) {
 
-        System.out.println("[R5VideoViewLayout]:: onConfigured()");
+        Log.d("R5VideoViewLayout", "onConfigured()");
         WritableMap map = new WritableNativeMap();
         map.putString("key", key);
         mEventEmitter.receiveEvent(this.getId(), "onConfigured", map);

diff --git a/...Red5ProVideoViewExample.xcodeproj/xcshareddata/xcschemes/Red5ProVideoViewExample.xcscheme b/...Red5ProVideoViewExample.xcodeproj/xcshareddata/xcschemes/Red5ProVideoViewExample.xcscheme
@@ -54,7 +54,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -84,7 +83,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/ios/R5VideoView/R5VideoView/R5VideoView.m b/ios/R5VideoView/R5VideoView/R5VideoView.m
@@ -141,7 +141,7 @@ - (void)unsubscribe {
       [self.stream stop];
     }
     else {
-      self.onUnpublishNotification(@{});
+      self.onUnsubscribeNotification(@{});
       [self tearDown];
     }
   });
@@ -199,6 +199,7 @@ - (void)publish:(NSString *)streamName withMode:(int)publishMode {
         }
 
         [self.stream publish:streamName type:publishMode];
+        [self onDeviceOrientation:NULL];
         [self.stream updateStreamMeta];
 
     });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-red5pro",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "React Native Red5 Pro Publisher/Subscriber",
   "main": "index.js",
   "scripts": {