Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correction for call getParameters using the object created at flashlight on android 5 and support for newer flashlight api CameraManager tested on android 9 #716

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 44 additions & 25 deletions plyer/platforms/android/flash.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,70 @@
"""

from plyer.facades import Flash
from jnius import autoclass
from plyer.platforms.android import activity
from jnius import autoclass, cast
from plyer.platforms.android import activity, SDK_INT

if SDK_INT < 23: #use the deprecated api
Camera = autoclass("android.hardware.Camera")
CameraParameters = autoclass("android.hardware.Camera$Parameters")
SurfaceTexture = autoclass("android.graphics.SurfaceTexture")
else:
Context = autoclass('android.content.Context')

Camera = autoclass("android.hardware.Camera")
CameraParameters = autoclass("android.hardware.Camera$Parameters")
SurfaceTexture = autoclass("android.graphics.SurfaceTexture")
PackageManager = autoclass('android.content.pm.PackageManager')
pm = activity.getPackageManager()
flash_available = pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)


class AndroidFlash(Flash):
_camera = None

def _on(self):

if self._camera is None:
self._camera_open()
if not self._camera:
return
self._camera.setParameters(self._f_on)
if not self._camera:
return

if SDK_INT < 23:
self._camera.setParameters(self._f_on)
else:
self._camera.setTorchMode(self._cameraid, True)

def _off(self):

if not self._camera:
return
self._camera.setParameters(self._f_off)

if SDK_INT < 23:
self._camera.setParameters(self._f_off)
else:
self._camera.setTorchMode(self._cameraid, False)

def _release(self):
if not self._camera:
return
self._camera.stopPreview()
self._camera.release()
self._camera = None
if SDK_INT < 23:
if not self._camera:
return
self._camera.stopPreview()
self._camera.release()
self._camera = None

def _camera_open(self):
def _camera_open(self):
if not flash_available:
return
self._camera = Camera.open()
self._f_on = Camera.getParameters()
self._f_off = Camera.getParameters()
self._f_on.setFlashMode(CameraParameters.FLASH_MODE_TORCH)
self._f_off.setFlashMode(CameraParameters.FLASH_MODE_OFF)
self._camera.startPreview()
# Need this for Nexus 5
self._camera.setPreviewTexture(SurfaceTexture(0))


if SDK_INT < 23:
self._camera = Camera.open()
self._f_on = self._camera.getParameters()
self._f_off = self._camera.getParameters()
self._f_on.setFlashMode(CameraParameters.FLASH_MODE_TORCH)
self._f_off.setFlashMode(CameraParameters.FLASH_MODE_OFF)
self._camera.startPreview()
# Need this for Nexus 5
self._camera.setPreviewTexture(SurfaceTexture(0))
else:
service = activity.getSystemService(Context.CAMERA_SERVICE)
self._camera = cast('android.hardware.camera2.CameraManager', service)
self._cameraid = self._camera.getCameraIdList()[0]

def instance():
return AndroidFlash()