From 5797a0334d3ab3fb5a83d3071b063304afd94e87 Mon Sep 17 00:00:00 2001 From: yulei <1002365491@qq.com> Date: Mon, 16 Jun 2025 16:48:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=84=E8=8C=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/ets/entryability/EntryAbility.ets | 2 ++ .../InsightIntentExecutorImpl.ets | 10 +++++-- entry/src/main/ets/pages/Index.ets | 29 ++++++++++++------- entry/src/main/ets/utils/FileReader.ets | 2 +- .../main/ets/utils/InsightIntentSharer.ets | 16 +++++----- 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index eda1bc0..2a181ad 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -11,6 +11,7 @@ const TAG: string = 'EntryAbility'; export default class EntryAbility extends UIAbility { private result: string = ''; + // [Start on_create] onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { Logger.info(TAG, 'onCreate'); @@ -18,6 +19,7 @@ export default class EntryAbility extends UIAbility { this.result = want.parameters?.['result'] as string; } } + // [End on_create] onDestroy(): void { Logger.info(TAG, 'onDestroy'); diff --git a/entry/src/main/ets/entryability/InsightIntentExecutorImpl.ets b/entry/src/main/ets/entryability/InsightIntentExecutorImpl.ets index 5de8adf..9d4e067 100644 --- a/entry/src/main/ets/entryability/InsightIntentExecutorImpl.ets +++ b/entry/src/main/ets/entryability/InsightIntentExecutorImpl.ets @@ -3,6 +3,7 @@ import { Logger } from '../utils/Logger'; import { insightIntent, InsightIntentExecutor } from '@kit.AbilityKit'; import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; + /** * 最佳实践：意图框架习惯推荐场景开发实践 */ @@ -14,6 +15,7 @@ const TAG: string = 'InsightIntentExecutorImpl'; export default class InsightIntentExecutorImpl extends InsightIntentExecutor { private static readonly PLAY_MUSIC = 'PlayMusic'; private static readonly PLAY_MUSIC_LIST = 'PlayMusicList'; + // [Start fore_mode] /** * Override the method to execute the intent in the foreground UIAbility. @@ -43,6 +45,7 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor { } } as insightIntent.ExecuteResult) } + // [End fore_mode] // [Start play_music] /** @@ -51,7 +54,8 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor { * @param param Intent parameters. * @param pageLoader Window. */ - private playMusic(param: Record, pageLoader: window.WindowStage): Promise { + private playMusic(param: Record, + pageLoader: window.WindowStage): Promise { return new Promise((resolve, reject) => { let para: Record = { 'result': `intent execute success, entityId: ${param.entityId}` @@ -81,6 +85,7 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor { }); }) } + // [End play_music] /** * Implement the playlist playback function. @@ -88,7 +93,8 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor { * @param param Intent parameters. * @param pageLoader Window. */ - private playMusicList(param: Record, pageLoader: window.WindowStage): Promise { + private playMusicList(param: Record, + pageLoader: window.WindowStage): Promise { return new Promise((resolve, reject) => { let para: Record = { 'result': JSON.stringify(param) diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index bcfe2e9..19f3683 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -46,7 +46,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -66,7 +67,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -93,7 +95,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -113,7 +116,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -140,7 +144,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -160,7 +165,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -170,7 +176,7 @@ struct Index { .backgroundColor('#0ddffb') .onClick(async () => { Logger.info(TAG, 'deleteEntity onclick'); - this.result = await InsightIntentSharer.deleteEntity(this.getUIContext().getHostContext()!, this.input); + this.result = await InsightIntentSharer.deleteEntity(this.getUIContext().getHostContext()!, this.input); }) } .width('100%') @@ -187,7 +193,8 @@ struct Index { .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -199,13 +206,15 @@ struct Index { Logger.info(TAG, 'getSid onclick'); this.result = await InsightIntentSharer.getSid(this.getUIContext().getHostContext()!); }) + Button() { Text('getSidRenew') .fontWeight(FontWeight.Bold) .maxLines(1) .maxFontSize(15) .minFontSize(9) - }.type(ButtonType.Capsule) + } + .type(ButtonType.Capsule) .layoutWeight(1) .height('100%') .margin({ @@ -225,7 +234,7 @@ struct Index { bottom: '4vp' }) - Column(){ + Column() { Text('Result:') .fontSize('16fp') .fontWeight(FontWeight.Regular) diff --git a/entry/src/main/ets/utils/FileReader.ets b/entry/src/main/ets/utils/FileReader.ets index 3193dee..adb203f 100644 --- a/entry/src/main/ets/utils/FileReader.ets +++ b/entry/src/main/ets/utils/FileReader.ets @@ -8,7 +8,7 @@ export class FileReader { try { return await FileReader.readJsonFile(context.getApplicationContext().filesDir + "/" + fileName); } catch (error) { - return await FileReader.readRawFile(context,'config/'+ fileName); + return await FileReader.readRawFile(context, 'config/' + fileName); } } diff --git a/entry/src/main/ets/utils/InsightIntentSharer.ets b/entry/src/main/ets/utils/InsightIntentSharer.ets index 55023b5..116209e 100644 --- a/entry/src/main/ets/utils/InsightIntentSharer.ets +++ b/entry/src/main/ets/utils/InsightIntentSharer.ets @@ -8,13 +8,13 @@ import type { Context } from '@kit.AbilityKit'; import { insightIntent } from '@kit.IntentsKit'; interface DeleteIntent { - intentName:string; - identifiers:string[]; + intentName: string; + identifiers: string[]; } interface DeleteEntity { - entityName:string; - entityIds:string[]; + entityName: string; + entityIds: string[]; } const TAG = 'InsightIntentSharer'; @@ -29,6 +29,7 @@ export class InsightIntentSharer { return 'invalid share intent message'; } } + // [Start share_Intent] static async shareIntent(context: Context, input: string): Promise { Logger.debug(TAG, 'shareIntent'); @@ -46,11 +47,12 @@ export class InsightIntentSharer { Logger.error(TAG, `shareIntent error message: ${JSON.stringify(err)}`); return `shareIntent error message: ${JSON.stringify(err)}`; }); - }catch (err) { + } catch (err) { Logger.error(TAG, 'shareIntent fail', err); } return Promise.reject('shareIntent fail'); } + // [End share_Intent] static async refreshDeleteIntentMessage(context: Context): Promise { Logger.debug(TAG, 'refreshDeleteIntentMessage'); @@ -65,7 +67,7 @@ export class InsightIntentSharer { static async deleteIntent(context: Context, input: string): Promise { Logger.debug(TAG, 'deleteIntent'); let deleteIntent: DeleteIntent = JSON.parse(input); - if (!deleteIntent){ + if (!deleteIntent) { Logger.error(TAG, 'deleteIntent: json invalid.'); return 'deleteIntent: json invalid.'; } @@ -91,7 +93,7 @@ export class InsightIntentSharer { static async deleteEntity(context: Context, input: string): Promise { Logger.debug(TAG, 'deleteEntity'); let deleteEntity: DeleteEntity = JSON.parse(input); - if (!deleteEntity){ + if (!deleteEntity) { Logger.error(TAG, 'deleteEntity: json invalid.'); return 'deleteEntity: json invalid.'; } -- Gitee