@@ -1014,7 +1014,7 @@ export class CameraPlus extends CameraPlusBase {
1014
1014
*/
1015
1015
private _initCamera ( id ?) : void {
1016
1016
try {
1017
- CLog ( `*** _initCamera ***\nthis.cameraId = ${ this . cameraId } ` ) ;
1017
+ CLog ( `*** _initCamera ***\nthis.cameraId = ${ this . cameraId } --- ${ DEVICE_INFO_STRING } ` ) ;
1018
1018
if ( this . camera === null ) {
1019
1019
this . cameraId = CAMERA_FACING_BACK ;
1020
1020
}
@@ -1044,24 +1044,7 @@ export class CameraPlus extends CameraPlusBase {
1044
1044
}
1045
1045
1046
1046
// 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 ( ) ;
1065
1048
1066
1049
this . _setCameraDisplayOrientation ( app . android . foregroundActivity , this . cameraId , this . camera ) ;
1067
1050
this . camera . setPreviewTexture ( this . _surface ) ;
0 commit comments