From b5960393af4942201cc2c15f52fdd3e3e7549abd Mon Sep 17 00:00:00 2001 From: xdongs Date: Sat, 14 Dec 2024 15:11:13 +0800 Subject: [PATCH 1/2] prebuilt-hap Signed-off-by: xdongs --- services/ans/BUILD.gn | 27 ++++++++++++++++++ services/ans/etc/downloadTemplate.abc | Bin 0 -> 9940 bytes services/ans/etc/downloadTemplate.js | 2 ++ services/ans/etc/external.json | 3 ++ .../enable_notification_dialog/BUILD.gn | 4 +-- 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 services/ans/etc/downloadTemplate.abc create mode 100644 services/ans/etc/downloadTemplate.js create mode 100644 services/ans/etc/external.json diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index 6f83c2825..4f46ad43b 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -112,6 +112,9 @@ ohos_source_set("ans_service_sources") { "${frameworks_module_reminder_path}:reminder_innerkits", "../ans:ans.para", "../ans:ans.para.dac", + "../ans:downloadTemplate.abc", + "../ans:downloadTemplate.js", + "../ans:external.json", ] if (is_double_framework) { @@ -256,6 +259,9 @@ ohos_shared_library("libans") { "${services_path}/ans:ans_service_sources", "../ans:ans.para", "../ans:ans.para.dac", + "../ans:downloadTemplate.abc", + "../ans:downloadTemplate.js", + "../ans:external.json", "//third_party/icu/icu4c:shared_icuuc", "//third_party/libxml2:libxml2", ] @@ -342,3 +348,24 @@ ohos_prebuilt_etc("ans.para.dac") { subsystem_name = "${subsystem_name}" part_name = "${component_name}" } + +ohos_prebuilt_etc("external.json") { + source = "etc/external.json" + relative_install_dir = "notification_template" + subsystem_name = "${subsystem_name}" + part_name = "${component_name}" +} + +ohos_prebuilt_etc("downloadTemplate.abc") { + source = "etc/downloadTemplate.abc" + relative_install_dir = "notification_template/assets/js" + subsystem_name = "${subsystem_name}" + part_name = "${component_name}" +} + +ohos_prebuilt_etc("downloadTemplate.js") { + source = "etc/downloadTemplate.js" + relative_install_dir = "notification_template/assets/js" + subsystem_name = "${subsystem_name}" + part_name = "${component_name}" +} \ No newline at end of file diff --git a/services/ans/etc/downloadTemplate.abc b/services/ans/etc/downloadTemplate.abc new file mode 100644 index 0000000000000000000000000000000000000000..4bee22f50ceb0cca9eb1b6c188d438bd5680640b GIT binary patch literal 9940 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 OHh^#ApDzcoANxO!>jKXJ literal 0 HcmV?d00001 diff --git a/services/ans/etc/downloadTemplate.js b/services/ans/etc/downloadTemplate.js new file mode 100644 index 000000000..fe795e0e6 --- /dev/null +++ b/services/ans/etc/downloadTemplate.js @@ -0,0 +1,2 @@ +(()=>{"use strict";var e={};(()=>{var t=e;Object.defineProperty(t,"__esModule",{value:!0});const o="Template-DownloadTemplate";class i extends View{constructor(e,t,o){super(e,t),this.icon=null,this.__title=new ObservedPropertySimple("",this,"title"),this.__detailedInfo=new ObservedPropertySimple("",this,"detailedInfo"),this.__passTime=new ObservedPropertySimple(0,this,"passTime"),this.__fileName=new ObservedPropertySimple("",this,"fileName"),this.__progressValue=new ObservedPropertySimple(40,this,"progressValue"),this.__isShowDetailedInfo=new ObservedPropertySimple(!1,this,"isShowDetailedInfo"),this.updateWithValueParams(o)}updateWithValueParams(e){void 0!==e.icon&&(this.icon=e.icon),void 0!==e.title&&(this.title=e.title),void 0!==e.detailedInfo&&(this.detailedInfo=e.detailedInfo),void 0!==e.passTime&&(this.passTime=e.passTime),void 0!==e.fileName&&(this.fileName=e.fileName),void 0!==e.progressValue&&(this.progressValue=e.progressValue),void 0!==e.isShowDetailedInfo&&(this.isShowDetailedInfo=e.isShowDetailedInfo)}aboutToBeDeleted(){this.__title.aboutToBeDeleted(),this.__detailedInfo.aboutToBeDeleted(),this.__passTime.aboutToBeDeleted(),this.__fileName.aboutToBeDeleted(),this.__progressValue.aboutToBeDeleted(),this.__isShowDetailedInfo.aboutToBeDeleted(),SubscriberManager.Get().delete(this.id())}get title(){return this.__title.get()}set title(e){this.__title.set(e)}get detailedInfo(){return this.__detailedInfo.get()}set detailedInfo(e){this.__detailedInfo.set(e)}get passTime(){return this.__passTime.get()}set passTime(e){this.__passTime.set(e)}get fileName(){return this.__fileName.get()}set fileName(e){this.__fileName.set(e)}get progressValue(){return this.__progressValue.get()}set progressValue(e){this.__progressValue.set(e)}get isShowDetailedInfo(){return this.__isShowDetailedInfo.get()}set isShowDetailedInfo(e){this.__isShowDetailedInfo.set(e)}aboutToAppear(){console.log(`${o} ------\x3e aboutToAppear, icon: ${JSON.stringify(this.icon)}`),console.log(`${o} ------\x3e aboutToAppear, title: ${this.title}`),console.log(`${o} ------\x3e aboutToAppear, detailedInfo: ${this.detailedInfo}`),console.log(`${o} ------\x3e aboutToAppear, passTime: ${this.passTime}`),console.log(`${o} ------\x3e aboutToAppear, fileName: ${this.fileName}`),console.log(`${o} ------\x3e aboutToAppear, progressValue: ${this.progressValue}`)}render(){Flex.create({direction:FlexDirection.Column,alignItems:ItemAlign.Center,justifyContent:FlexAlign.Start}),Flex.width("100%"),Flex.margin({top:12,bottom:12}),Flex.border({width:1,color:Color.White,radius:30}),Flex.backgroundColor(Color.White),Column.create({space:10}),Column.alignItems(HorizontalAlign.Center),Column.width("100%"),Row.create({space:10}),Row.alignItems(VerticalAlign.Center),Row.align(Alignment.Start),Row.margin({bottom:12}),Row.width("100%"),If.create(),this.icon&&(If.branchId(0),Image.create(this.icon),Image.objectFit(ImageFit.Contain),Image.width(16),Image.height(16)),If.pop(),Text.create(this.title),Text.fontColor("#182431"),Text.fontSize("12"),Text.fontWeight(FontWeight.Regular),Text.align(Alignment.Start),Text.pop(),Text.create("已完成:"),Text.fontColor("#182431"),Text.fontSize("12"),Text.fontWeight(FontWeight.Regular),Text.pop(),Text.create(`${this.progressValue}%`),Text.fontColor("#182431"),Text.fontSize("12"),Text.fontWeight(FontWeight.Regular),Text.pop(),Text.create(`${this.passTime}分钟前`),Text.fontColor("#182431"),Text.fontSize("12"),Text.fontWeight(FontWeight.Regular),Text.pop(),Row.pop(),Flex.create({justifyContent:FlexAlign.SpaceBetween}),Flex.width("100%"),Row.create({space:5}),Row.flexShrink(0),Row.alignItems(VerticalAlign.Center),Row.align(Alignment.Start),Text.create("标题：正在接收"),Text.fontColor("#182431"),Text.fontSize("14"),Text.pop(),Text.create(this.fileName),Text.fontColor("#182431"),Text.fontSize("14"),Text.pop(),Row.pop(),Row.create(),Row.alignItems(VerticalAlign.Center),Row.align(Alignment.End),Row.onClick((()=>this.isShowDetailedInfo=!this.isShowDetailedInfo)),Text.create("文件详情"),Text.fontColor("#182431"),Text.fontSize("14"),Text.fontWeight(FontWeight.Regular),Text.pop(),Row.pop(),Flex.pop(),If.create(),this.isShowDetailedInfo&&(If.branchId(0),Row.create(),Row.alignItems(VerticalAlign.Center),Row.align(Alignment.Start),Row.width("100%"),Text.create(this.detailedInfo),Text.maxLines(3),Text.textOverflow({overflow:TextOverflow.Ellipsis}),Text.fontColor("#182431"),Text.fontSize("14"),Text.pop(),Row.pop()),If.pop(),Column.create(),Column.alignItems(HorizontalAlign.Start),Column.width("100%"),Progress.create({value:this.progressValue,total:100,style:ProgressStyle.Linear}),Progress.color(Color.Blue),Progress.value(this.progressValue),Progress.width("100%"),Column.pop(),Column.pop(),Flex.pop()}}t.default=i,loadDocument(new i("1",void 0,{}))})()})(); +//# sourceMappingURL=../_releaseMap/pages/downloadTemplate.js.map \ No newline at end of file diff --git a/services/ans/etc/external.json b/services/ans/etc/external.json new file mode 100644 index 000000000..5ad954018 --- /dev/null +++ b/services/ans/etc/external.json @@ -0,0 +1,3 @@ +{ + "downloadTemplate": "/system/etc/notification_template/assets/js/downloadTemplate.js" +} \ No newline at end of file diff --git a/services/dialog_ui/enable_notification_dialog/BUILD.gn b/services/dialog_ui/enable_notification_dialog/BUILD.gn index a30682425..660fb8af6 100644 --- a/services/dialog_ui/enable_notification_dialog/BUILD.gn +++ b/services/dialog_ui/enable_notification_dialog/BUILD.gn @@ -25,8 +25,8 @@ ohos_hap("enable_notification_dialog_hap") { certificate_profile = "signature/openharmony_sx.p7b" hap_name = "enable_notification_dialog" - subsystem_name = "application" - part_name = "prebuilt_hap" + subsystem_name = "notification" + part_name = "distributed_notification_service" module_install_dir = "app/com.ohos.notificationdialog" if (defined(sign_hap_py_path)) { certificate_profile = "${certificate_profile_path}" -- Gitee From c9c3c4222941aa18ac085ff9553ffd1264db02c5 Mon Sep 17 00:00:00 2001 From: xdongs Date: Sat, 14 Dec 2024 18:29:55 +0800 Subject: [PATCH 2/2] codecheck Signed-off-by: xdongs --- services/ans/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index 4f46ad43b..49647f55a 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -355,17 +355,17 @@ ohos_prebuilt_etc("external.json") { subsystem_name = "${subsystem_name}" part_name = "${component_name}" } - + ohos_prebuilt_etc("downloadTemplate.abc") { source = "etc/downloadTemplate.abc" relative_install_dir = "notification_template/assets/js" subsystem_name = "${subsystem_name}" part_name = "${component_name}" } - + ohos_prebuilt_etc("downloadTemplate.js") { source = "etc/downloadTemplate.js" relative_install_dir = "notification_template/assets/js" subsystem_name = "${subsystem_name}" part_name = "${component_name}" -} \ No newline at end of file +} -- Gitee