fenix/Simple-Flashlight
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Flashlight.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix the flashlight on Android 7

Browse Source
This commit is contained in:
Tibor Kaputa 2016-11-24 15:08:50 +01:00
parent 5a61ad7957
commit 0e89b6e3c6
3 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
View File

@ -50,13 +50,15 @@ public class MyCameraImpl {
if (!mIsStroboscopeRunning) if (!mIsStroboscopeRunning)
disableFlashlight(); disableFlashlight();
if (mCamera == null) { if (!Utils.isNougat()) {
initCamera(); if (mCamera == null) {
} initCamera();
}
if (mCamera == null) { if (mCamera == null) {
Utils.showToast(mContext, R.string.camera_error); Utils.showToast(mContext, R.string.camera_error);
return false; return false;
}
} }
if (mIsStroboscopeRunning) { if (mIsStroboscopeRunning) {
@ -181,6 +183,7 @@ public class MyCameraImpl {
mBus.unregister(this); mBus.unregister(this);
} }
mIsFlashlightOn = false; mIsFlashlightOn = false;
mShouldStroboscopeStop = true;
} }
private boolean isMarshmallow() { private boolean isMarshmallow() {
@ -197,38 +200,53 @@ public class MyCameraImpl {
mShouldStroboscopeStop = false; mShouldStroboscopeStop = false;
mIsStroboscopeRunning = true; mIsStroboscopeRunning = true;
if (mCamera == null) { if (Utils.isNougat()) {
initCamera(); while (!mShouldStroboscopeStop) {
} try {
mMarshmallowCamera.toggleMarshmallowFlashlight(mBus, true);
Camera.Parameters torchOn = mCamera.getParameters(); Thread.sleep(mStroboFrequency);
Camera.Parameters torchOff = mCamera.getParameters(); mMarshmallowCamera.toggleMarshmallowFlashlight(mBus, false);
torchOn.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH); Thread.sleep(mStroboFrequency);
torchOff.setFlashMode(Camera.Parameters.FLASH_MODE_OFF); } catch (InterruptedException ignored) {
mShouldStroboscopeStop = true;
while (!mShouldStroboscopeStop) { } catch (RuntimeException ignored) {
try { mShouldStroboscopeStop = true;
mCamera.setParameters(torchOn);
Thread.sleep(mStroboFrequency);
mCamera.setParameters(torchOff);
Thread.sleep(mStroboFrequency);
} catch (InterruptedException ignored) {
mShouldStroboscopeStop = true;
} catch (RuntimeException ignored) {
mShouldStroboscopeStop = true;
}
}
try {
if (mCamera != null) {
mCamera.setParameters(torchOff);
if (!mShouldEnableFlashlight || mIsMarshmallow) {
mCamera.release();
mCamera = null;
} }
} }
} catch (RuntimeException ignored) { } else {
if (mCamera == null) {
initCamera();
}
Camera.Parameters torchOn = mCamera.getParameters();
Camera.Parameters torchOff = mCamera.getParameters();
torchOn.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
torchOff.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
while (!mShouldStroboscopeStop) {
try {
mCamera.setParameters(torchOn);
Thread.sleep(mStroboFrequency);
mCamera.setParameters(torchOff);
Thread.sleep(mStroboFrequency);
} catch (InterruptedException ignored) {
mShouldStroboscopeStop = true;
} catch (RuntimeException ignored) {
mShouldStroboscopeStop = true;
}
}
try {
if (mCamera != null) {
mCamera.setParameters(torchOff);
if (!mShouldEnableFlashlight || mIsMarshmallow) {
mCamera.release();
mCamera = null;
}
}
} catch (RuntimeException ignored) {
}
} }
mIsStroboscopeRunning = false; mIsStroboscopeRunning = false;

5
app/src/main/java/com/simplemobiletools/flashlight/Utils.java
View File

@ -4,6 +4,7 @@ import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.widget.Toast; import android.widget.Toast;
public class Utils { public class Utils {
@ -20,4 +21,8 @@ public class Utils {
public static void showToast(Context context, int resId) { public static void showToast(Context context, int resId) {
Toast.makeText(context, context.getResources().getString(resId), Toast.LENGTH_SHORT).show(); Toast.makeText(context, context.getResources().getString(resId), Toast.LENGTH_SHORT).show();
} }
public static boolean isNougat() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
}
} }

2
app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
View File

@ -115,7 +115,7 @@ public class MainActivity extends SimpleActivity {
private void toggleStroboscope() { private void toggleStroboscope() {
// use the old Camera API for stroboscope, the new Camera Manager is way too slow // use the old Camera API for stroboscope, the new Camera Manager is way too slow
if (isCameraPermissionGranted()) { if (isCameraPermissionGranted() || Utils.isNougat()) {
if (mCameraImpl.toggleStroboscope()) { if (mCameraImpl.toggleStroboscope()) {
mStroboscopeBar.setVisibility(mStroboscopeBar.getVisibility() == View.VISIBLE ? View.INVISIBLE : View.VISIBLE); mStroboscopeBar.setVisibility(mStroboscopeBar.getVisibility() == View.VISIBLE ? View.INVISIBLE : View.VISIBLE);
changeIconColor(mStroboscopeBar.getVisibility() == View.VISIBLE ? R.color.colorPrimary : R.color.translucent_white, mStroboscopeBtn); changeIconColor(mStroboscopeBar.getVisibility() == View.VISIBLE ? R.color.colorPrimary : R.color.translucent_white, mStroboscopeBtn);