update to v3.3.0.3

Author: chengle

demo/.idea/libraries/support_v4_24_0_0.xml

@@ -56,20 +56,20 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

demo/.idea/misc.xml

@@ -694,6 +694,7 @@ public void onStatus(int what, int arg1, int arg2, String msg) {
                     //编码码率上升状态通知
                     break;
                 case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
+                    Log.e("CameraActivity", "init audio failed");
                     //音频录制初始化失败回调
                     break;
                 case RecorderConstants.KSYVIDEO_INIT_DONE:
@@ -708,6 +709,15 @@ public void onStatus(int what, int arg1, int arg2, String msg) {
                     mHandler.obtainMessage(what, "renderer exception")
                             .sendToTarget();
                     break;
+                case RecorderConstants.KSYVIDEO_AUDIO_PERMISSION_DENIED:
+                    Log.e("CameraActivity", "-------no audio permission");
+                    break;
+                case RecorderConstants.KSYVIDEO_CAMERA_DISABLED:
+                    Log.e("CameraActivity", "-------no camera permission");
+                    break;
+                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
+                    Log.e("CameraActivity", "-------init camera failed");
+                    break;
                 default:
                     if (msg != null) {
                         // 可以在这里处理断网重连的逻辑
@@ -823,6 +833,9 @@ private void onSwitchCamClick() {
     }
 
     private void onFlashClick() {
+        if (mStreamer.isFrontCamera())
+            isFlashOpened = true;
+
         if (isFlashOpened) {
             mStreamer.toggleTorch(false);
             isFlashOpened = false;

demo/.idea/workspace.xml

@@ -192,4 +192,10 @@
 
 2016-06-24 3.3.0.2
 99. 减小so库的体积
-100. 修复关闭摄像头权限或录音权限后应用崩溃的问题，并在无权限时上报相应的错误类型
+100. 修复关闭摄像头权限或录音权限后应用崩溃的问题，并在无权限时上报相应的错误类型
+
+2016-07-07 3.3.0.3
+101. 修复某些机型上(Galaxy S6/S7)上fps设定无效的问题；
+102. 水印logo支持设置assets路径；
+103. 修复部分机型无Camera，Audio权限错误时未通知上层的问题；
+104. 修复闪光灯开关多次点击才生效的问题；