From 4894993da03b9a3bacfbd1c12e62c3079df53c8d Mon Sep 17 00:00:00 2001 From: yeyedeshen Date: Sat, 2 Sep 2023 11:04:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Preferences=20ArkTs=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yeyedeshen --- .../src/main/ets/common/ThemeDesktop.ets | 14 +-- .../entry/src/main/ets/pages/Index.ets | 66 +++++++------- .../entry/src/main/ets/util/DataSource.ets | 24 ++--- .../src/ohosTest/ets/test/Ability.test.ets | 51 ----------- .../entry/src/ohosTest/ets/test/List.test.ets | 20 ----- .../ohosTest/ets/testability/TestAbility.ets | 72 --------------- .../ohosTest/ets/testability/pages/Index.ets | 53 ----------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 85 ------------------ .../entry/src/ohosTest/module.json5 | 51 ----------- .../resources/base/element/color.json | 8 -- .../resources/base/element/string.json | 16 ---- .../ohosTest/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/test_pages.json | 5 -- 13 files changed, 52 insertions(+), 413 deletions(-) delete mode 100644 data/Preferences/entry/src/ohosTest/ets/test/Ability.test.ets delete mode 100644 data/Preferences/entry/src/ohosTest/ets/test/List.test.ets delete mode 100644 data/Preferences/entry/src/ohosTest/ets/testability/TestAbility.ets delete mode 100644 data/Preferences/entry/src/ohosTest/ets/testability/pages/Index.ets delete mode 100644 data/Preferences/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts delete mode 100644 data/Preferences/entry/src/ohosTest/module.json5 delete mode 100644 data/Preferences/entry/src/ohosTest/resources/base/element/color.json delete mode 100644 data/Preferences/entry/src/ohosTest/resources/base/element/string.json delete mode 100644 data/Preferences/entry/src/ohosTest/resources/base/media/icon.png delete mode 100644 data/Preferences/entry/src/ohosTest/resources/base/profile/test_pages.json diff --git a/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets b/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets index 355ee44b..a518e582 100644 --- a/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets +++ b/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets @@ -15,13 +15,15 @@ import { MyDataSource } from '../util/DataSource' +class arrayType { + image: Resource | null = null; + name: string = ''; +} + @Component export default struct ThemeDesktop { - @Link themeDatas: Array<{ - image: Resource, - name: string - }> - @State default: any[] = [ + @Link themeDatas: Array + @State default: Array = [ { image: $r('app.media.dialer'), name: '电话' }, { image: $r('app.media.shopping'), name: '商城' }, { image: $r('app.media.notes'), name: '备忘录' }, @@ -34,7 +36,7 @@ export default struct ThemeDesktop { build() { Grid() { - ForEach(this.themeDatas, (item) => { + ForEach(this.themeDatas, (item: arrayType) => { GridItem() { Column() { Image(item.image) diff --git a/data/Preferences/entry/src/main/ets/pages/Index.ets b/data/Preferences/entry/src/main/ets/pages/Index.ets index 4e3ff3f4..730ad2fa 100644 --- a/data/Preferences/entry/src/main/ets/pages/Index.ets +++ b/data/Preferences/entry/src/main/ets/pages/Index.ets @@ -17,51 +17,49 @@ import Logger from '../model/Logger' import preferences from '@ohos.data.preferences' import ThemeDesktop from '../common/ThemeDesktop' -const THEMES = [ +const THEMES: Record[][] = [ [ - { image: $r('app.media.dialer'), name: '电话' }, - { image: $r('app.media.shopping'), name: '商城' }, - { image: $r('app.media.notes'), name: '备忘录' }, - { image: $r('app.media.settings'), name: '设置' }, - { image: $r('app.media.camera'), name: '相机' }, - { image: $r('app.media.gallery'), name: '相册' }, - { image: $r('app.media.music'), name: '音乐' }, - { image: $r('app.media.video'), name: '视频' }, + { 'image': $r('app.media.dialer'), 'name': '电话' }, + { 'image': $r('app.media.shopping'), 'name': '商城' }, + { 'image': $r('app.media.notes'), 'name': '备忘录' }, + { 'image': $r('app.media.settings'), 'name': '设置' }, + { 'image': $r('app.media.camera'), 'name': '相机' }, + { 'image': $r('app.media.gallery'), 'name': '相册' }, + { 'image': $r('app.media.music'), 'name': '音乐' }, + { 'image': $r('app.media.video'), 'name': '视频' }, ], [ - { image: $r('app.media.simplicityCall'), name: '电话' }, - { image: $r('app.media.simplicityShop'), name: '商城' }, - { image: $r('app.media.simplicityNotes'), name: '备忘录' }, - { image: $r('app.media.simplicitySetting'), name: '设置' }, - { image: $r('app.media.simplicityCamera'), name: '相机' }, - { image: $r('app.media.simplicityPhotos'), name: '相册' }, - { image: $r('app.media.simplicityMusic'), name: '音乐' }, - { image: $r('app.media.simplicityVideo'), name: '视频' }, + { 'image': $r('app.media.simplicityCall'), 'name': '电话' }, + { 'image': $r('app.media.simplicityShop'), 'name': '商城' }, + { 'image': $r('app.media.simplicityNotes'), 'name': '备忘录' }, + { 'image': $r('app.media.simplicitySetting'), 'name': '设置' }, + { 'image': $r('app.media.simplicityCamera'), 'name': '相机' }, + { 'image': $r('app.media.simplicityPhotos'), 'name': '相册' }, + { 'image': $r('app.media.simplicityMusic'), 'name': '音乐' }, + { 'image': $r('app.media.simplicityVideo'), 'name': '视频' }, ], [ - { image: $r('app.media.pwcall'), name: '电话' }, - { image: $r('app.media.pwshop'), name: '商城' }, - { image: $r('app.media.pwnotes'), name: '备忘录' }, - { image: $r('app.media.pwsetting'), name: '设置' }, - { image: $r('app.media.pwcamera'), name: '相机' }, - { image: $r('app.media.pwphotos'), name: '相册' }, - { image: $r('app.media.pwmusic'), name: '音乐' }, - { image: $r('app.media.pwvideo'), name: '视频' }, + { 'image': $r('app.media.pwcall'), 'name': '电话' }, + { 'image': $r('app.media.pwshop'), 'name': '商城' }, + { 'image': $r('app.media.pwnotes'), 'name': '备忘录' }, + { 'image': $r('app.media.pwsetting'), 'name': '设置' }, + { 'image': $r('app.media.pwcamera'), 'name': '相机' }, + { 'image': $r('app.media.pwphotos'), 'name': '相册' }, + { 'image': $r('app.media.pwmusic'), 'name': '音乐' }, + { 'image': $r('app.media.pwvideo'), 'name': '视频' }, ] ] const TAG: string = '[Index]' const PREFERENCES_NAME = 'theme.db' const THEME_NAMES: string[] = ['default', 'simplicity', 'pomeloWhtie'] -let preferenceTheme: preferences.Preferences = null +let preferenceTheme: preferences.Preferences | null = null + @Entry @Component struct Index { @State nowTheme: string = '' - @State themeDatas: Array<{ - image: Resource, - name: string - }> = [] + @State themeDatas: Record[] = [] async aboutToAppear() { //从内存中获取轻量级存储db文件 @@ -73,7 +71,7 @@ struct Index { } async getPreferencesFromStorage() { - let context = getContext(this) as any + let context = getContext(this) as Context preferenceTheme = await preferences.getPreferences(context, PREFERENCES_NAME) } @@ -85,13 +83,13 @@ struct Index { } } - async getPreference() { + async getPreference(): Promise { Logger.info(TAG, `Get begin`) let theme: string = '' if (preferenceTheme !== null) { - theme = await preferenceTheme.get('theme', 'default') - return theme + theme = await preferenceTheme.get('theme', 'default') as string } + return theme } changeTheme(themeNum: number) { diff --git a/data/Preferences/entry/src/main/ets/util/DataSource.ets b/data/Preferences/entry/src/main/ets/util/DataSource.ets index 4e58bc6b..57258301 100644 --- a/data/Preferences/entry/src/main/ets/util/DataSource.ets +++ b/data/Preferences/entry/src/main/ets/util/DataSource.ets @@ -16,11 +16,11 @@ class BasicDataSource implements IDataSource { private listeners: DataChangeListener[] = [] - public totalCount() { + public totalCount(): number { return 0 } - public getData(index: number) { + public getData(index: number): undefined | Object { return undefined } @@ -38,49 +38,49 @@ class BasicDataSource implements IDataSource { } notifyDataReload() { - this.listeners.forEach(listener => { + this.listeners.forEach((listener: DataChangeListener) => { listener.onDataReloaded() }) } notifyDataAdd(index: number) { - this.listeners.forEach(listener => { + this.listeners.forEach((listener: DataChangeListener) => { listener.onDataAdd(index) }) } notifyDataChange(index: number) { - this.listeners.forEach(listener => { + this.listeners.forEach((listener: DataChangeListener) => { listener.onDataChange(index) }) } notifyDataDelete(index: number) { - this.listeners.forEach(listener => { + this.listeners.forEach((listener: DataChangeListener) => { listener.onDataDelete(index) }) } notifyDataMove(from: number, to: number) { - this.listeners.forEach(listener => { + this.listeners.forEach((listener: DataChangeListener) => { listener.onDataMove(from, to) }) } } export class MyDataSource extends BasicDataSource { - private dataArray: any[] = [] + private dataArray: Array = [] - constructor(dataArray: any[]){ + constructor(dataArray: Array) { super() this.dataArray = dataArray } - public totalCount() { + public totalCount(): number { return this.dataArray.length } - public getData(index: number) { + public getData(index: number): Object { return this.dataArray[index] } @@ -94,7 +94,7 @@ export class MyDataSource extends BasicDataSource { this.notifyDataAdd(this.dataArray.length - 1) } - public replaceData(result: any[]) { + public replaceData(result: Array) { this.dataArray = result this.notifyDataReload() } diff --git a/data/Preferences/entry/src/ohosTest/ets/test/Ability.test.ets b/data/Preferences/entry/src/ohosTest/ets/test/Ability.test.ets deleted file mode 100644 index 675703dc..00000000 --- a/data/Preferences/entry/src/ohosTest/ets/test/Ability.test.ets +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 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 hilog from '@ohos.hilog' -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' - -export default function abilityTest() { - describe('ActsAbilityTest', function () { - // Defines a test suite. Two parameters are supported: test suite name and test suite function. - beforeAll(function () { - // Presets an action, which is performed only once before all test cases of the test suite start. - // This API supports only one parameter: preset action function. - }) - beforeEach(function () { - // Presets an action, which is performed before each unit test case starts. - // The number of execution times is the same as the number of test cases defined by **it**. - // This API supports only one parameter: preset action function. - }) - afterEach(function () { - // Presets a clear action, which is performed after each unit test case ends. - // The number of execution times is the same as the number of test cases defined by **it**. - // This API supports only one parameter: clear action function. - }) - afterAll(function () { - // Presets a clear action, which is performed after all test cases of the test suite end. - // This API supports only one parameter: clear action function. - }) - it('assertContain', 0, function () { - // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'it begin') - let a = 'abc' - let b = 'b' - // Defines a variety of assertion methods, which are used to declare expected boolean conditions. - expect(a).assertContain(b) - expect(a).assertEqual(a) - }) - }) -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/ets/test/List.test.ets b/data/Preferences/entry/src/ohosTest/ets/test/List.test.ets deleted file mode 100644 index 7e05ea60..00000000 --- a/data/Preferences/entry/src/ohosTest/ets/test/List.test.ets +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2022 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 abilityTest from './Ability.test' - -export default function testsuite() { - abilityTest() -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/ets/testability/TestAbility.ets b/data/Preferences/entry/src/ohosTest/ets/testability/TestAbility.ets deleted file mode 100644 index c400b428..00000000 --- a/data/Preferences/entry/src/ohosTest/ets/testability/TestAbility.ets +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2022 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 hilog from '@ohos.hilog' -import Ability from '@ohos.application.Ability' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from '@ohos/hypium' -import testsuite from '../test/List.test' -import Window from '@ohos.window' - -export default class TestAbility extends Ability { - onCreate(want, launchParam) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate') - hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? '') - hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:' + JSON.stringify(launchParam) ?? '') - var abilityDelegator: any - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var abilityDelegatorArguments: any - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!') - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) - } - - onDestroy() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy') - } - - onWindowStageCreate(windowStage: Window.WindowStage) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate') - windowStage.loadContent('testability/pages/Index', (err, data) => { - if (err.code) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR) - hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '') - return - } - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', - JSON.stringify(data) ?? '') - }) - } - - onWindowStageDestroy() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy') - } - - onForeground() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground') - } - - onBackground() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground') - } -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/ets/testability/pages/Index.ets b/data/Preferences/entry/src/ohosTest/ets/testability/pages/Index.ets deleted file mode 100644 index 7bdfcfcf..00000000 --- a/data/Preferences/entry/src/ohosTest/ets/testability/pages/Index.ets +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2022 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 hilog from '@ohos.hilog' - -@Entry -@Component -struct Index { - aboutToAppear() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear') - } - - @State message: string = 'Hello World' - - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(20) - .fontWeight(FontWeight.Bold) - } - .type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .width('35%') - .height('5%') - .onClick(() => { - }) - } - .width('100%') - } - .height('100%') - } -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/data/Preferences/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts deleted file mode 100644 index c3335700..00000000 --- a/data/Preferences/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2022 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 hilog from '@ohos.hilog' -import TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = '' - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - -async function onAbilityCreateCallback() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback') -} - -async function addAbilityMonitorCallback(err: any) { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? '') -} - -export default class OpenHarmonyTestRunner implements TestRunner { - constructor() { - } - - onPrepare() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare ') - } - - async onRun() { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run') - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility' - let lMonitor = { - abilityName: testAbilityName, - onAbilityCreate: onAbilityCreateCallback, - }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters['-D'] - if (debug == 'true') { - cmd += ' -D' - } - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd) - abilityDelegator.executeShellCommand(cmd, - (err: any, d: any) => { - hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO) - hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '') - hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? '') - hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? '') - }) - hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end') - } -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/module.json5 b/data/Preferences/entry/src/ohosTest/module.json5 deleted file mode 100644 index fd36ba53..00000000 --- a/data/Preferences/entry/src/ohosTest/module.json5 +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 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. - */ - -{ - "module": { - "name": "entry_test", - "type": "feature", - "description": "$string:module_test_desc", - "mainElement": "TestAbility", - "deviceTypes": [ - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:test_pages", - "abilities": [ - { - "name": "TestAbility", - "srcEntrance": "./ets/testability/TestAbility.ets", - "description": "$string:TestAbility_desc", - "icon": "$media:icon", - "label": "$string:TestAbility_label", - "visible": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:start_window_background", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ] - } -} diff --git a/data/Preferences/entry/src/ohosTest/resources/base/element/color.json b/data/Preferences/entry/src/ohosTest/resources/base/element/color.json deleted file mode 100644 index 3c712962..00000000 --- a/data/Preferences/entry/src/ohosTest/resources/base/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "start_window_background", - "value": "#FFFFFF" - } - ] -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/resources/base/element/string.json b/data/Preferences/entry/src/ohosTest/resources/base/element/string.json deleted file mode 100644 index 65d8fa5a..00000000 --- a/data/Preferences/entry/src/ohosTest/resources/base/element/string.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "string": [ - { - "name": "module_test_desc", - "value": "test ability description" - }, - { - "name": "TestAbility_desc", - "value": "the test ability" - }, - { - "name": "TestAbility_label", - "value": "test label" - } - ] -} \ No newline at end of file diff --git a/data/Preferences/entry/src/ohosTest/resources/base/media/icon.png b/data/Preferences/entry/src/ohosTest/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 Date: Tue, 12 Sep 2023 11:20:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?preferences=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yeyedeshen --- data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets b/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets index a518e582..7bba891e 100644 --- a/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets +++ b/data/Preferences/entry/src/main/ets/common/ThemeDesktop.ets @@ -39,7 +39,7 @@ export default struct ThemeDesktop { ForEach(this.themeDatas, (item: arrayType) => { GridItem() { Column() { - Image(item.image) + Image(item.image!) .width(70) .height(70) .objectFit(ImageFit.Fill) -- Gitee