From 87ece2840b337949785e848b0e4422bb74e1fdb4 Mon Sep 17 00:00:00 2001 From: qinliwen Date: Sat, 1 Apr 2023 16:46:28 +0800 Subject: [PATCH] Signed-off-by: qinliwen --- .../src/main/ets/pages/Camera/CameraPhotoFormat.ets | 2 ++ .../src/main/ets/pages/Camera/CameraPreviewFormat.ets | 3 +++ .../src/main/ets/pages/Camera/CameraSerialPhoto.ets | 1 + .../acts_validator/src/main/ets/pages/Camera/CameraVideo.ets | 3 +++ 4 files changed, 9 insertions(+) diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets index 16c7e6897..60bb60a03 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraPhotoFormat.ets @@ -174,6 +174,7 @@ struct cameraOrientation { CameraService.initCamera(this.surfaceId, this.cameraDeviceIndex, obj) Logger.info(this.tag, `onSelect Rotation index: ${index}, value: ${value}, obj: ${obj}`) }) + .backgroundColor(Color.Black) Select(this.cameraList) .selected(this.cameraDeviceIndex) .value(this.cameraDeviceIndex ? 'Camera 1' : 'Camera 0') @@ -189,6 +190,7 @@ struct cameraOrientation { this.cameraListFn() }) }) + .backgroundColor(Color.Black) }.justifyContent(FlexAlign.SpaceEvenly) Text(`提示:不同拍照分辨率下进行拍摄,图片拍摄成功且与预览画面一致则选择pass,否则选择fail`) diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets index 915e7d5c9..ec4358f7a 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraPreviewFormat.ets @@ -173,6 +173,7 @@ struct cameraFormat { CameraService.initCamera(this.surfaceId, this.cameraDeviceIndex, obj) Logger.info(this.tag, `onSelect Rotation index: ${index}, value: ${value}, obj: ${obj}`) }) + .backgroundColor(Color.Black) Select(this.cameraList) .selected(this.cameraDeviceIndex) .value(this.cameraDeviceIndex ? 'Camera 1' : 'Camera 0') @@ -186,6 +187,7 @@ struct cameraFormat { this.cameraDeviceIndex = index this.cameraInit() }) + .backgroundColor(Color.Black) }.size({ width: '100%', height: '50%' }).justifyContent(FlexAlign.SpaceEvenly) Row() { @@ -201,6 +203,7 @@ struct cameraFormat { .onSelect((index: number, value) => { Logger.info(this.tag, `onSelect format index: ${index}, value: ${value}`) }) + .backgroundColor(Color.Black) Button('下一个') .borderRadius(8) .backgroundColor(0x317aff) diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets index 2d7336da2..3b7c2d566 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraSerialPhoto.ets @@ -158,6 +158,7 @@ struct cameraOrientation { this.cameraListFn() }) }) + .backgroundColor(Color.Black) Text(`提示:`).fontSize('16fp').fontColor(Color.White) Text(`期望拍摄${this.cameraListLength*10}张照片,实际拍摄${this.clickSerialPhotoVal}张,如果一致请选择pass,否则选择fail`) .fontSize('16fp').fontColor(Color.White) diff --git a/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets b/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets index fdb4073da..de603cb92 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/CameraVideo.ets @@ -202,6 +202,7 @@ struct cameraOrientation { CameraService.initCamera(this.surfaceId, this.cameraDeviceIndex, obj) Logger.info(this.tag, `onSelect Rotation index: ${index}, value: ${value}, obj: ${obj}`) }) + .backgroundColor(Color.Black) Select(this.cameraList) .selected(this.cameraDeviceIndex) .value(this.cameraDeviceIndex ? 'Camera 1' : 'Camera 0') @@ -216,6 +217,7 @@ struct cameraOrientation { this.cameraDeviceIndex = index this.cameraInit() }) + .backgroundColor(Color.Black) Select([{ value: 'YUV' }]) .selected(0) .value('YUV') @@ -229,6 +231,7 @@ struct cameraOrientation { .onSelect((index: number, value) => { Logger.info(this.tag, `onSelect format index: ${index}, value: ${value}`) }) + .backgroundColor(Color.Black) }.size({ width: '100%', height: '50%' }) Row() { -- GitLab