From 9c11a344fe08e45c944760de150b337a0d9dc43f Mon Sep 17 00:00:00 2001 From: lijinfengde123 Date: Wed, 26 Feb 2025 16:54:45 +0800 Subject: [PATCH] =?UTF-8?q?api14=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lijinfengde123 --- .../default/redux/reducers/CameraReducer.ts | 3 +- .../ets/default/redux/reducers/ZoomReducer.ts | 2 +- .../ets/default/setting/SettingManager.ts | 73 ++++++++++--------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/common/src/main/ets/default/redux/reducers/CameraReducer.ts b/common/src/main/ets/default/redux/reducers/CameraReducer.ts index 7499881..9a85db5 100644 --- a/common/src/main/ets/default/redux/reducers/CameraReducer.ts +++ b/common/src/main/ets/default/redux/reducers/CameraReducer.ts @@ -14,7 +14,8 @@ */ import { CameraId } from '../../setting/settingitem/CameraId'; -import { Action, ActionData } from '../actions/Action'; +import { ActionData } from '../actions/Action'; +import { Action } from '../actions/Action'; export type CameraState = { cameraPosition: CameraId, diff --git a/common/src/main/ets/default/redux/reducers/ZoomReducer.ts b/common/src/main/ets/default/redux/reducers/ZoomReducer.ts index f3d164c..3779565 100644 --- a/common/src/main/ets/default/redux/reducers/ZoomReducer.ts +++ b/common/src/main/ets/default/redux/reducers/ZoomReducer.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Action, ActionData } from '../actions/Action'; +import { Action, ActionData } from '../actions/Action' export type ZoomState = { zoomRatio: number, diff --git a/common/src/main/ets/default/setting/SettingManager.ts b/common/src/main/ets/default/setting/SettingManager.ts index 22cf9f2..8df8e1a 100644 --- a/common/src/main/ets/default/setting/SettingManager.ts +++ b/common/src/main/ets/default/setting/SettingManager.ts @@ -15,6 +15,7 @@ import AspectRatio from '../setting/settingitem/AspectRatio' import AssistiveGrid from '../setting/settingitem/AssistiveGrid' +import { CameraId } from './settingitem/CameraId' import { Log } from '../utils/Log' import { Constants } from '../utils/Constants' import DisplayCalculator from '../setting/DisplayCalculator' @@ -26,12 +27,10 @@ import SettingItemInfo from '../setting/storage/SettingItemInfo' import Timer from '../setting/settingitem/Timer' import VideoCodec from '../setting/settingitem/VideoCodec' import { Voice } from '../setting/settingitem/Voice' -import { EventBusManager } from '../worker/eventbus/EventBusManager' +import { EventBusManager } from '../worker/eventbus/EventBusManager'; export class SettingManager { private static TAG = '[SettingManager]:' - public mScreenWidth: number - public mScreenHeight: number private mRdbStoreManager: RdbStoreManager = RdbStoreManager.getInstance() private mEventBus = EventBusManager.getInstance().getEventBus() private mSettingsList = [ @@ -54,8 +53,6 @@ export class SettingManager { private mCurGeoLocation = undefined private mVideoCodec: string private mCaptureMute: string - private mPlatformCapability - private mCameraId: string public static getInstance(): SettingManager { Log.info(`${this.TAG} getInstance`) @@ -163,12 +160,46 @@ export class SettingManager { Log.info(`${SettingManager.TAG} loadAllSetting X`) } + private setDefault(force: boolean): void { + if (!this.mAspectRatio || force) { + this.mAspectRatio = AspectRatio.DEFAULT_VALUE + } + if (!this.mResolution || force) { + this.mResolution = Resolution.DEFAULT_VALUE + } + if (!this.mAssistiveGrid || force) { + this.mAssistiveGrid = AssistiveGrid.DEFAULT_VALUE + } + if (!this.mTimer || force) { + this.mTimer = Timer.DEFAULT_VALUE + } + if (!this.mSaveGeoLocation || force) { + this.mSaveGeoLocation = '1' + } + if (!this.mCaptureMute || force) { + this.mCaptureMute = Voice.MUTE + } + } + public restoreValues(mode: string): void { for (let i = 0; i < this.mSettingsList.length; i++) { this.setSettingValue(this.mSettingsList[i].ALIAS, this.mSettingsList[i].DEFAULT_VALUE, mode) } } + private async commit(settingAlias, itemValue) { + Log.info(`${SettingManager.TAG} getInstance settingAlias: ${settingAlias} itemValue ${itemValue}`) + const settingItemInfo: SettingItemInfo = new SettingItemInfo() + settingItemInfo.itemName = settingAlias + settingItemInfo.itemValue = itemValue + await this.mRdbStoreManager.updateValue(settingItemInfo) + } + + public mScreenWidth: number + public mScreenHeight: number + private mPlatformCapability + private mCameraId: string + public setCameraPlatformCapability(platformCapability): void { this.mPlatformCapability = platformCapability } @@ -203,8 +234,7 @@ export class SettingManager { public getPreviewDisplaySize(mode: string) { const preViewSize = this.getPreviewSize(mode) - return DisplayCalculator.calcSurfaceDisplaySize(this.mScreenWidth, this.mScreenHeight, preViewSize.width, - preViewSize.height) + return DisplayCalculator.calcSurfaceDisplaySize(this.mScreenWidth, this.mScreenHeight, preViewSize.width, preViewSize.height) } public getAssistiveGrid() { @@ -247,35 +277,6 @@ export class SettingManager { return this.mCaptureMute } - private setDefault(force: boolean): void { - if (!this.mAspectRatio || force) { - this.mAspectRatio = AspectRatio.DEFAULT_VALUE - } - if (!this.mResolution || force) { - this.mResolution = Resolution.DEFAULT_VALUE - } - if (!this.mAssistiveGrid || force) { - this.mAssistiveGrid = AssistiveGrid.DEFAULT_VALUE - } - if (!this.mTimer || force) { - this.mTimer = Timer.DEFAULT_VALUE - } - if (!this.mSaveGeoLocation || force) { - this.mSaveGeoLocation = '1' - } - if (!this.mCaptureMute || force) { - this.mCaptureMute = Voice.MUTE - } - } - - private async commit(settingAlias, itemValue) { - Log.info(`${SettingManager.TAG} getInstance settingAlias: ${settingAlias} itemValue ${itemValue}`) - const settingItemInfo: SettingItemInfo = new SettingItemInfo() - settingItemInfo.itemName = settingAlias - settingItemInfo.itemValue = itemValue - await this.mRdbStoreManager.updateValue(settingItemInfo) - } - private convertToString(settingAlias, itemValue) { if (settingAlias == AspectRatio.ALIAS) { return AspectRatio.convertToString(itemValue)