Skip to content

Commit a0e4c7a

Browse files
committed
use focusMode method during init
1 parent 0c9797d commit a0e4c7a

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

src/camera-plus.android.ts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ export class CameraPlus extends CameraPlusBase {
10141014
*/
10151015
private _initCamera(id?): void {
10161016
try {
1017-
CLog(`*** _initCamera ***\nthis.cameraId = ${this.cameraId}`);
1017+
CLog(`*** _initCamera ***\nthis.cameraId = ${this.cameraId} --- ${DEVICE_INFO_STRING}`);
10181018
if (this.camera === null) {
10191019
this.cameraId = CAMERA_FACING_BACK;
10201020
}
@@ -1044,24 +1044,7 @@ export class CameraPlus extends CameraPlusBase {
10441044
}
10451045

10461046
// setup autoFocus
1047-
if (this.autoFocus === true && this.camera) {
1048-
const params = this.camera.getParameters();
1049-
const supportedFocusModes = params.getSupportedFocusModes();
1050-
CLog(`supported focus modes = ${supportedFocusModes}`);
1051-
if (supportedFocusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE as any)) {
1052-
CLog(`setting focus mode to FOCUS_MODE_CONTINUOUS_PICTURE`);
1053-
params.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
1054-
this.camera.setParameters(params);
1055-
} else if (supportedFocusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO as any)) {
1056-
CLog(`setting focus mode to FOCUS_MODE_AUTO`);
1057-
params.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO);
1058-
this.camera.setParameters(params);
1059-
} else if (supportedFocusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_FIXED as any)) {
1060-
CLog(`setting focus mode to FOCUS_MODE_FIXED`);
1061-
params.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_FIXED);
1062-
this.camera.setParameters(params);
1063-
}
1064-
}
1047+
this._ensureFocusMode();
10651048

10661049
this._setCameraDisplayOrientation(app.android.foregroundActivity, this.cameraId, this.camera);
10671050
this.camera.setPreviewTexture(this._surface);

0 commit comments

Comments
 (0)