diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java index 9e4f731..ed735d5 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java @@ -301,6 +301,7 @@ public void onClick(View view) { } public void openBackCamera() { + System.out.println(TAG+"open back camera start"); closeCamera(); GetCameraCnt(); @@ -317,15 +318,21 @@ public void openBackCamera() { updateStorageSpace(null); OpenOnlyBackCamera(); + System.out.println(TAG+"open back camera end"); + } public void openFrontCamera() { + System.out.println(TAG+"open front camera start"); + closeCamera(); GetCameraCnt(); updateStorageSpace(null); OpenOnlyFrontCamera(); + System.out.println(TAG+"open front camera end"); + } private void OpenOnlyFrontCamera() { @@ -456,6 +463,16 @@ private void checkPermissions() { } + @Override + protected void onDestroy() { + try { + unregisterReceiver(mCameraInst.getmUsbReceiver()); + }catch (Exception e) { + Log.e(TAG, "fatal during unregister receiver"); + } + super.onDestroy(); + } + @Override protected void onPause() { super.onPause(); diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java index 7b3b68d..00d1abe 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java @@ -300,6 +300,8 @@ public void GetCameraCnt() { } public void Open_TopLeftCam() { + System.out.println(TAG+"open top left camera start"); + String[] Data = new String[5]; ImageButton[] Buttons = new ImageButton[6]; @@ -344,9 +346,13 @@ public void onClick(View v) { ic_camera.setTopLeftCam(new CameraBase(this, mTopLeftCam_textureView, Buttons, mRecordingTimeView, Data, roundedThumbnailView)); + System.out.println(TAG+"open top left camera end"); + } public void Open_TopRightCam() { + System.out.println(TAG+"open top right camera start"); + String[] Data = new String[5]; ImageButton[] Buttons = new ImageButton[6]; mTopRightCam_textureView = findViewById(R.id.textureview1); @@ -390,9 +396,13 @@ public void onClick(View v) { ic_camera.setTopRightCam(new CameraBase(this, mTopRightCam_textureView, Buttons, mRecordingTimeView0, Data, roundedThumbnailView)); + System.out.println(TAG+"open top right camera end"); + } public void Open_BotmLeftCam() { + System.out.println(TAG+"open bot left camera start"); + String[] Data = new String[5]; ImageButton[] Buttons = new ImageButton[6]; mBotmLeftCam_textureView = findViewById(R.id.textureview2); @@ -437,9 +447,13 @@ public void onClick(View v) { ic_camera.setBotLeftCam(new CameraBase(this, mBotmLeftCam_textureView, Buttons, mRecordingTimeView1, Data, roundedThumbnailView)); + System.out.println(TAG+"open top left camera end"); + } public void Open_BotmRightCam() { + System.out.println(TAG+"open bot right camera start"); + String[] Data = new String[5]; ImageButton[] Buttons = new ImageButton[6]; mBotmRightCam_textureView = findViewById(R.id.textureview3); @@ -482,6 +496,8 @@ public void onClick(View v) { ic_camera.setBotRightCam(new CameraBase(this, mBotmRightCam_textureView, Buttons, mRecordingTimeView2, Data, roundedThumbnailView)); + System.out.println(TAG+"open bot right camera end"); + } private void manageTopLeftCam() { @@ -650,6 +666,16 @@ public void closeCamera() { } } + @Override + protected void onDestroy() { + try { + unregisterReceiver(ic_camera.getmUsbReceiver()); + }catch (Exception e) { + Log.e(TAG, "fatal during unregister receiver"); + } + super.onDestroy(); + } + @Override protected void onPause() { System.out.println("onPause"); diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java index a8c09a7..eecec59 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java @@ -346,6 +346,16 @@ private void checkPermissions() { } + @Override + protected void onDestroy() { + try { + unregisterReceiver(mCameraInst.getmUsbReceiver()); + }catch (Exception e) { + Log.e(TAG, "fatal during unregister receiver"); + } + super.onDestroy(); + } + @Override protected void onPause() { super.onPause();