Merge pull request #45 from ksvc/v2.3.2-7573

update to v2.3.2-7573

KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java

@@ -127,7 +127,6 @@ public class CameraActivity extends Activity implements
     private boolean mRecording = false;
     private boolean mIsFileRecording = false;
     private boolean mIsFlashOpened = false;
-    private boolean mSwitchOrQuit = false;
     private String mUrl;
     private String mDebugInfo = "";
     private String mBgmPath = "/sdcard/test.mp3";
@@ -525,12 +524,6 @@ public void onPause() {
             mOrientationEventListener.disable();
         }
         mStreamer.onPause();
-        if (!mSwitchOrQuit) {
-            // setOffscreenPreview to enable camera capture in background
-            mStreamer.setOffscreenPreview(mStreamer.getPreviewWidth(),
-                    mStreamer.getPreviewHeight());
-        }
-        mSwitchOrQuit = false;
 
         // disable audio low delay in background
         if (mAudioLDCheckBox.isChecked()) {
@@ -889,7 +882,6 @@ private void onAddClick() {
         Intent intent = new Intent(getApplicationContext(), FloatViewActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         KSYGlobalStreamer.setInstance(mStreamer);
-        mSwitchOrQuit = true;
         startActivity(intent);
     }
 
@@ -907,7 +899,6 @@ public void onClick(DialogInterface arg0, int arg1) {
                     @Override
                     public void onClick(DialogInterface arg0, int arg1) {
                         mChronometer.stop();
-                        mSwitchOrQuit = true;
                         CameraActivity.this.finish();
                     }
                 }).show();

KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/FloatViewActivity.java

@@ -64,9 +64,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.goods_activity);
         mObserverButton = new ButtonObserver();
-        initSurfaceWindow();
-        addSurfaceWindow();
         mLastRotation = getDisplayRotation();
+        mFloatBack = (ImageView) findViewById(R.id.float_back);
+        mFloatBack.setOnClickListener(mObserverButton);
 
         mOrientationEventListener = new OrientationEventListener(this,
                 SensorManager.SENSOR_DELAY_NORMAL) {
@@ -83,28 +83,20 @@ public void onOrientationChanged(int orientation) {
         if (mOrientationEventListener.canDetectOrientation()) {
             mOrientationEventListener.enable();
         }
+
+        addFloatViewWithPermCheck();
     }
 
     @Override
     protected void onResume() {
         Log.d(TAG, "onResume");
         super.onResume();
-        //KSYGlobalStreamer.getInstance().onResume();
-        //6.0 需要检查overlay权限
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (!Settings.canDrawOverlays(this)) {
-                Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                        Uri.parse("package:" + getPackageName()));
-                startActivityForResult(intent, OVERLAY_PERMISSION_RESULT_CODE);
-            }
-        }
     }
 
     @Override
     protected void onPause() {
         Log.d(TAG, "onPause");
         super.onPause();
-        //KSYGlobalStreamer.getInstance().onPause();
     }
 
     @Override
@@ -132,6 +124,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
     private void onBackoffClick() {
         KSYGlobalStreamer.getInstance().onPause();
+        KSYGlobalStreamer.getInstance().setDisplayPreview((GLSurfaceView) null);
         FloatViewActivity.this.finish();
     }
 
@@ -202,9 +195,6 @@ public void onClick(View v) {
                 }
             });
 
-            mFloatBack = (ImageView) findViewById(R.id.float_back);
-            mFloatBack.setOnClickListener(mObserverButton);
-
             mCameraView = new GLSurfaceView(this);
             KSYGlobalStreamer.getInstance().setDisplayPreview(mCameraView);
             RelativeLayout.LayoutParams previewLayoutParams =
@@ -277,6 +267,18 @@ private int getDisplayRotation() {
         return 0;
     }
 
+    private void addFloatViewWithPermCheck() {
+        // 6.0 需要检查overlay权限
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(this)) {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                    Uri.parse("package:" + getPackageName()));
+            startActivityForResult(intent, OVERLAY_PERMISSION_RESULT_CODE);
+        } else {
+            initSurfaceWindow();
+            addSurfaceWindow();
+        }
+    }
+
     /**
      * 申请overlay权限窗口返回
      *
@@ -292,6 +294,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     // SYSTEM_ALERT_WINDOW permission not granted...
                     Toast.makeText(FloatViewActivity.this, "SYSTEM_ALERT_WINDOW not granted",
                             Toast.LENGTH_SHORT).show();
+                } else {
+                    initSurfaceWindow();
+                    addSurfaceWindow();
                 }
             }
         }

KSYLiveDemo/app/src/main/res/layout/camera_activity.xml

@@ -3,7 +3,7 @@
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
+    android:background="#ff000000" >
 
     <android.opengl.GLSurfaceView
         android:id="@+id/camera_preview"