openharmony/applications_settings
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_settings synced 2024-11-27 08:30:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

新需求辅助功能色彩校正

Browse Source 
Signed-off-by:pemgyu <yss1204418@163.com>
This commit is contained in:
pengyu 2023-10-08 17:07:15 +08:00
parent bdd96f3606
commit 6941aa2d1c
8 changed files with 443 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
product/phone/src/main/ets/model/accessibilityImpl/AccessibilitySettingModel.ets
View File

@ -77,6 +77,13 @@ export class AccessibilitySettingModel {
LogUtil.error(`${TAG} captions set ${isOn} err: ${JSON.stringify(err)}`);
});
break;
case 'daltonizationState':
config.daltonizationState.set(isOn).then(() => {
LogUtil.info(`${TAG} daltonizationState set ${isOn} success`);
}).catch((err: BusinessError) => {
LogUtil.error(`${TAG} daltonizationState set ${isOn} err: ${JSON.stringify(err)}`);
});
break;
default:
break;
}
@ -99,4 +106,13 @@ export class AccessibilitySettingModel {
LogUtil.error(`${TAG} accessibilityshortkeyTargete config fail: ${targetName} err: ${JSON.stringify(err)}`);
});
}
static accessibilityColorCorrectionSet(targetName: config.DaltonizationColorFilter): void {
LogUtil.info(`${TAG} accessibilityColorCorrection config begin: ${targetName}`);
config.daltonizationColorFilter.set(targetName).then(() => {
LogUtil.info(`${TAG} daltonizationColorFilter config success`);
}).catch((err: object) => {
console.error(`${TAG} failed to set daltonizationColorFilter`);
});
}
}

32
product/phone/src/main/ets/pages/accessibility.ets
View File

@ -42,6 +42,7 @@ struct AccessibilitySettings {
@State shortKeyIsOn: boolean = false;
@State shortKeyStatusText: string = '';
@State highContrastTextIsOn: boolean = false;
@State colorCorrectionStatusText: string = '';
@State audioMonoIsOn: boolean = false;
@State inSetValueAudioBalance: number = 0;
@State serviceNum: number = 0;
@ -79,11 +80,19 @@ struct AccessibilitySettings {
.height($r('app.float.wh_value_56'))
.width(ConfigData.WH_100_100)
.alignItems(VerticalAlign.Center)
.padding({ left: $r("app.float.wh_value_12"), right: $r('app.float.wh_value_6') })
.padding({ left: $r('app.float.wh_value_12'), right: $r('app.float.wh_value_6') })
.backgroundColor($r("app.color.white_bg_color"))
.borderRadius($r('app.float.radius_24'));
SubEntryComponentWithEndText({
targetPage: 'pages/accessibilityColorCorrection',
title: $r('app.string.color_correction'),
endText: $colorCorrectionStatusText
})
.width(ConfigData.WH_100_100)
.margin({ bottom: $r('app.float.distance_12'), top: $r('app.float.distance_8') });
}
.height($r('app.float.wh_value_56'))
.height($r('app.float.wh_value_118'))
.width(ConfigData.WH_100_100)
.borderRadius($r('app.float.radius_24'))
.backgroundColor($r("sys.color.ohos_id_color_foreground_contrary"));
@ -192,7 +201,7 @@ struct AccessibilitySettings {
SubHeader({ titleContent: $r('app.string.operate_accessibility') });
SubEntryComponentWithEndText({
targetPage: "pages/accessibilityShortKey",
targetPage: 'pages/accessibilityShortKey',
title: $r("app.string.accessibility_shortcuts"),
endText: $shortKeyStatusText
})
@ -245,7 +254,7 @@ struct AccessibilitySettings {
.height($r('app.float.wh_value_56'))
.borderRadius($r('app.float.radius_24'))
.enabled(this.serviceNum > 0 ? true : false)
.backgroundColor($r("sys.color.ohos_id_color_foreground_contrary"));
.backgroundColor($r('sys.color.ohos_id_color_foreground_contrary'));
}
}
.useSizeType({
@ -332,6 +341,19 @@ struct AccessibilitySettings {
LogUtil.info(`${this.TAG} aboutToAppear out`);
}
async getColorCorrectionState(): Promise<void> {
await config.daltonizationState.get().then((data) => {
LogUtil.info(`${this.TAG} get daltonizationState success: ${data}`);
if (data) {
this.colorCorrectionStatusText = (Object)($r('app.string.enabled'));
} else {
this.colorCorrectionStatusText = (Object)($r('app.string.disabled'));
}
}).catch((err: object) => {
LogUtil.error(`${this.TAG} failed to get daltonizationState, because ${JSON.stringify(err)}`);
});
}
aboutToAppear(): void {
LogUtil.info(`${this.TAG} aboutToAppear in`);
config.highContrastText.get().then((data) => {
@ -355,6 +377,7 @@ struct AccessibilitySettings {
LogUtil.error(`${this.TAG} failed to get audioBalance, because ${JSON.stringify(err)}`);
});
this.openStatusListener();
this.getColorCorrectionState();
this.getShortKeyStateAndTargetByStatus();
this.getAbilityList();
LogUtil.info(`${this.TAG} aboutToAppear out`);
@ -396,6 +419,7 @@ struct AccessibilitySettings {
LogUtil.info(`${this.TAG} onPageShow in`);
this.getShortKeyStateAndTargetByStatus();
this.openExtendedServicesListener();
this.getColorCorrectionState();
this.getAbilityList();
LogUtil.info(`${this.TAG} onPageShow out`);
}

289
product/phone/src/main/ets/pages/accessibilityColorCorrection.ets Normal file
View File

@ -0,0 +1,289 @@
/**
* Copyright (c) 2023-2023 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import config from '@ohos.accessibility.config';
import { BusinessError } from '@ohos.base';
import LogUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import ConfigData from '../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';
import HeadComponent from '../../../../../../common/component/src/main/ets/default/headComponent';
import { AccessibilitySettingModel } from '../model/accessibilityImpl/AccessibilitySettingModel';
const TAG = ConfigData.TAG + 'Accessibility ColorCorrection: ';
const BASIC_MODE_GREEN_AMBLYOPIA = 'Deuteranomaly';
const BASIC_MODE_RED_AMBLYOPIA = 'Protanomaly';
const BASIC_MODE_BLUE_AMBLYOPIA = 'Tritanomaly';
@Entry
@Component
struct AccessibilityColorCorrection {
@State colorCorrectionIsOn: boolean = false;
@State colorModeStatusText: string = '';
@State checked: config.DaltonizationColorFilter = 'Normal';
@State allModeNameList: config.DaltonizationColorFilter[] = [BASIC_MODE_GREEN_AMBLYOPIA, BASIC_MODE_RED_AMBLYOPIA, BASIC_MODE_BLUE_AMBLYOPIA];
private SelectAbilityScalingDialog: CustomDialogController = new CustomDialogController({
builder: SelectAbilityScalingInformation({
allModeNameList: $allModeNameList,
colorModeStatusText: $colorModeStatusText,
checked: $checked
}),
alignment: DialogAlignment.Bottom,
offset: ({ dx: 0, dy: '-12dp' }),
autoCancel: true,
customStyle: true,
});
build() {
Column() {
GridContainer({ gutter: ConfigData.GRID_CONTAINER_GUTTER_24, margin: ConfigData.GRID_CONTAINER_MARGIN_24 }) {
Column() {
HeadComponent({ headName: $r('app.string.color_correction'), isActive: true });
Column() {
List() {
ListItem() {
Column() {
Row() {
Text($r('app.string.color_correction'))
.fontSize($r('sys.float.ohos_id_text_size_body1'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontWeight(FontWeight.Medium)
.textAlign(TextAlign.Start);
Blank();
Toggle({ type: ToggleType.Switch, isOn: this.colorCorrectionIsOn })
.width('36vp')
.height('20vp')
.selectedColor('#007DFF')
.onChange((isOn: boolean) => {
this.setColorCorrectionState(isOn);
});
}
.height($r('app.float.wh_value_56'))
.width(ConfigData.WH_100_100)
.alignItems(VerticalAlign.Center)
.padding({ left: $r('app.float.wh_value_12'), right: $r('app.float.wh_value_6') })
.backgroundColor($r('app.color.white_bg_color'))
.borderRadius($r('app.float.radius_24'));
}
.height($r('app.float.wh_value_56'))
.width(ConfigData.WH_100_100)
.borderRadius($r('app.float.radius_24'))
.backgroundColor($r('sys.color.ohos_id_color_foreground_contrary'));
}
ListItem() {
Row() {
Column() {
Text($r('app.string.mode_of_correction'))
.fontColor($r('sys.color.ohos_fa_text_primary'))
.fontFamily('HarmonyHeiTi')
.fontWeight(FontWeight.Medium)
.fontSize($r("sys.float.ohos_id_text_size_body1"));
}
.alignItems(HorizontalAlign.Start);
Blank();
Row() {
Text(this.colorModeStatusText)
.margin({ right: $r('app.float.distance_4') })
.fontSize($r('sys.float.ohos_id_text_size_body2'))
.fontColor($r('sys.color.ohos_fa_text_secondary'));
Image('/res/image/ic_settings_arrow.svg')
.width($r('app.float.wh_value_12'))
.height($r('app.float.wh_value_24'))
.fillColor($r('sys.color.ohos_id_color_primary'))
.opacity($r('app.float.opacity_0_2'));
}
}
.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('app.float.distance_8') })
.alignItems(VerticalAlign.Center)
.enabled(this.colorCorrectionIsOn)
.opacity(this.colorCorrectionIsOn ? 1 : 0.4)
.width(ConfigData.WH_100_100)
.height($r('app.float.wh_value_48'))
.onClick(() => {
this.SelectAbilityScalingDialog.open();
});
}
}
.width(ConfigData.WH_100_100)
.divider({
strokeWidth: $r('app.float.divider_wh'),
color: $r('sys.color.ohos_id_color_list_separator'),
startMargin: $r('app.float.wh_value_15'),
endMargin: $r('app.float.wh_value_15'),
})
}
.borderRadius($r('app.float.wh_value_24'))
.backgroundColor($r('app.color.white_bg_color'))
.width(ConfigData.WH_100_100)
.margin({ top: $r('app.float.distance_12') })
.padding({
top: $r('app.float.distance_4'),
bottom: $r('app.float.distance_4'),
});
}
.useSizeType({
sm: { span: 4, offset: 0 },
md: { span: 6, offset: 1 },
lg: { span: 8, offset: 2 },
});
}
.width(ConfigData.WH_100_100)
.height(ConfigData.WH_100_100);
}
.backgroundColor($r('sys.color.ohos_id_color_sub_background'))
.width(ConfigData.WH_100_100)
.height(ConfigData.WH_100_100);
}
setColorCorrectionState(isOn: boolean): void {
LogUtil.info(`${TAG} setColorCorrectionState ${isOn}`);
if (isOn) {
this.colorCorrectionIsOn = true;
AccessibilitySettingModel.accessibilityConfigSetting('daltonizationState', true);
} else {
this.colorCorrectionIsOn = false;
AccessibilitySettingModel.accessibilityConfigSetting('daltonizationState', false);
}
}
async getColorCorrectionStateAndTarget(): Promise<void> {
await config.daltonizationState.get().then((data) => {
LogUtil.info(`${TAG} get daltonizationState success: ${data}`);
this.colorCorrectionIsOn = data;
}).catch((err: object) => {
LogUtil.error(`${TAG} failed to get daltonizationState, because ${JSON.stringify(err)}`);
});
await config.daltonizationColorFilter.get().then((data) => {
LogUtil.info(`${TAG} get daltonizationColorFilter success: ${data}`);
if (data === 'Normal') {
this.colorModeStatusText = (Object)($r('app.string.none'));
return;
}
if (data === 'Deuteranomaly') {
this.checked = BASIC_MODE_GREEN_AMBLYOPIA;
this.colorModeStatusText = (Object)($r('app.string.green_amblyopia'));
} else if (data === 'Tritanomaly') {
this.checked = BASIC_MODE_BLUE_AMBLYOPIA;
this.colorModeStatusText = (Object)($r('app.string.blue_amblyopia'));
} else {
this.checked = BASIC_MODE_RED_AMBLYOPIA;
this.colorModeStatusText = (Object)($r('app.string.red_amblyopia'));
}
}).catch((err: BusinessError) => {
LogUtil.error(`${TAG} failed to get daltonizationColorFilter, because ${JSON.stringify(err)}`);
});
}
aboutToAppear(): void {
LogUtil.info(`${TAG} aboutToAppear in`);
this.getColorCorrectionStateAndTarget();
LogUtil.info(`${TAG} aboutToAppear out`);
}
aboutToDisappear(): void {
LogUtil.info(`${TAG} aboutToDisappear`);
}
}
@CustomDialog
struct SelectAbilityScalingInformation {
controller?: CustomDialogController;
@Link colorModeStatusText: string;
@Link checked: string;
@Link allModeNameList: Array<string>;
build() {
Column() {
Column() {
Text($r('app.string.mode_of_correction'))
.fontFamily('HarmonyHeiTi')
.fontSize($r('sys.float.ohos_id_text_size_headline8'))
.fontWeight(FontWeight.Medium)
.height($r('app.float.wh_value_56'))
.alignSelf(ItemAlign.Start);
List() {
ForEach(this.allModeNameList, (item: config.DaltonizationColorFilter, index) => {
ListItem() {
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
Text((item === BASIC_MODE_GREEN_AMBLYOPIA) ? $r('app.string.green_amblyopia') :
((item === BASIC_MODE_RED_AMBLYOPIA) ? $r('app.string.red_amblyopia') : $r('app.string.blue_amblyopia')))
.fontFamily('HarmonyHeiTi')
.fontSize($r('sys.float.ohos_id_text_size_body1'))
.fontWeight(FontWeight.Medium);
Radio({ value: '', group: 'radioGroup' })
.checked(this.checked === item ? true : false)
.height($r('app.float.wh_value_24'))
.width($r('app.float.wh_value_24'))
.onChange((value: boolean) => {
if (value) {
this.controller?.close();
this.setAbilityText(item);
this.setColorCorrectionStatusText(item);
this.checked = item;
}
})
}
.height($r('app.float.wh_value_48'))
}
.height($r('app.float.wh_value_48'))
})
}
Text($r('app.string.Cancel_Animation'))
.fontSize($r('sys.float.ohos_id_text_size_button1'))
.fontColor($r('sys.color.ohos_id_color_text_primary_activated'))
.alignSelf(ItemAlign.Center)
.width($r('app.float.wh_value_40'))
.height($r('app.float.wh_value_40'))
.margin({ top: $r('app.float.distance_8') })
.onClick(() => {
this.controller?.close();
})
}
.padding({
left: $r('app.float.padding_24'),
right: $r('app.float.padding_24'),
})
.width(ConfigData.WH_100_100)
.alignItems(HorizontalAlign.Center)
.backgroundColor($r('app.color.white_bg_color'))
.borderRadius($r('app.float.radius_24'));
}
.width(ConfigData.WH_100_100)
.padding({ left: $r('app.float.distance_12'), right: $r('app.float.distance_12') });
}
setAbilityText(ability: config.DaltonizationColorFilter): void {
LogUtil.info(`${TAG} set ability text ${ability}`);
AccessibilitySettingModel.accessibilityColorCorrectionSet(ability);
}
setColorCorrectionStatusText(text: string): void {
if (text === BASIC_MODE_GREEN_AMBLYOPIA) {
this.colorModeStatusText = (Object)($r('app.string.green_amblyopia'));
} else if (text === BASIC_MODE_RED_AMBLYOPIA) {
this.colorModeStatusText = (Object)($r('app.string.red_amblyopia'));
} else {
this.colorModeStatusText = (Object)($r('app.string.blue_amblyopia'));
}
}
}

24
product/phone/src/main/resources/base/element/string.json
View File

@ -1419,6 +1419,30 @@
{
"name": "APPLICATION_EXTENDED_SERVICE_ACCESS",
"value": "应用扩展服务访问"
},
{
"name": "color_correction",
"value": "色彩校正"
},
{
"name": "mode_of_correction",
"value": "校正模式"
},
{
"name": "red_amblyopia",
"value": "红色弱视 (红绿色)"
},
{
"name": "green_amblyopia",
"value": "绿色弱视 (红绿色)"
},
{
"name": "blue_amblyopia",
"value": "蓝色弱视 (蓝-黄)"
},
{
"name": "none",
"value": "无"
}
]
}

3
product/phone/src/main/resources/base/profile/main_pages.json
View File

@ -40,6 +40,7 @@
"pages/nfc",
"pages/compatibilityAssessment",
"pages/mobileNetwork",
"pages/accessibilityShortKey"
"pages/accessibilityShortKey",
"pages/accessibilityColorCorrection"
]
}

28
product/phone/src/main/resources/en_US/element/string.json
View File

@ -1403,6 +1403,34 @@
{
"name": "START_INVISIBLE_ABILITY",
"value": "Start_Invisible_Ability"
},
{
"name": "APPLICATION_EXTENDED_SERVICE_ACCESS",
"value": "应用扩展服务访问"
},
{
"name": "color_correction",
"value": "Color correction"
},
{
"name": "mode_of_correction",
"value": "Correction mode"
},
{
"name": "red_amblyopia",
"value": "Red amblyopia (red-green)"
},
{
"name": "green_amblyopia",
"value": "Green amblyopia (red-green)"
},
{
"name": "blue_amblyopia",
"value": "Blue amblyopia (blue-yellow)"
},
{
"name": "none",
"value": "None"
}
]
}

28
product/phone/src/main/resources/phone/element/string.json
View File

@ -1339,6 +1339,34 @@
{
"name": "START_INVISIBLE_ABILITY",
"value": "跨应用启动"
},
{
"name": "APPLICATION_EXTENDED_SERVICE_ACCESS",
"value": "应用扩展服务访问"
},
{
"name": "color_correction",
"value": "色彩校正"
},
{
"name": "mode_of_correction",
"value": "校正模式"
},
{
"name": "red_amblyopia",
"value": "红色弱视 (红绿色)"
},
{
"name": "green_amblyopia",
"value": "绿色弱视 (红绿色)"
},
{
"name": "blue_amblyopia",
"value": "蓝色弱视 (蓝-黄)"
},
{
"name": "none",
"value": "无"
}
]
}

28
product/phone/src/main/resources/zh_CN/element/string.json
View File

@ -1403,6 +1403,34 @@
{
"name": "START_INVISIBLE_ABILITY",
"value": "跨应用启动"
},
{
"name": "APPLICATION_EXTENDED_SERVICE_ACCESS",
"value": "应用扩展服务访问"
},
{
"name": "color_correction",
"value": "色彩校正"
},
{
"name": "mode_of_correction",
"value": "校正模式"
},
{
"name": "red_amblyopia",
"value": "红色弱视 (红绿色)"
},
{
"name": "green_amblyopia",
"value": "绿色弱视 (红绿色)"
},
{
"name": "blue_amblyopia",
"value": "蓝色弱视 (蓝-黄)"
},
{
"name": "none",
"value": "无"
}
]
}