From ed5ae94cba2c603c5bd7055057650f0066815932 Mon Sep 17 00:00:00 2001 From: nobbo Date: Mon, 1 Aug 2022 20:28:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=81=A2=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../components/NoteContentCompPortrait.ets | 16 ++++++--- .../src/main/ets/components/NoteListComp.ets | 33 +++++++++++++------ 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 3e25552..6a7bc46 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -441,11 +441,17 @@ export struct DeleteNoteComp { this.selectedNoteData.is_deleted = Delete.No this.selectedNoteData.deleted_time = 0 let context: any = getContext(this) - context.resourceManager.getResourceManager().then((manager) => { - manager.getString($r('app.string.restore').id) - .then((strVal) => { - prompt.showToast({ message: strVal, duration: 2000 }); - }); + let resource = { + bundleName: "com.ohos.note", + moduleName: "phone", + id: $r('app.string.restore').id + }; + context.resourceManager.getString(resource, (error, value) => { + if (error != null) { + console.log("error is " + error); + } else { + prompt.showToast({ message: value, duration: 2000 }); + } }); this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) // update note to db diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index a462659..de5dcce 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -571,11 +571,17 @@ export struct OperateNoteComp { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 let context: any = getContext(this) - context.resourceManager.getResourceManager().then((manager) => { - manager.getString($r('app.string.restore').id) - .then((strVal)=>{ - prompt.showToast({ message: strVal, duration: 2000 }); - }); + let resource = { + bundleName: "com.ohos.note", + moduleName: "tablet", + id: $r('app.string.restore').id + }; + context.resourceManager.getString(resource, (error, value) => { + if (error != null) { + console.log("error is " + error); + } else { + prompt.showToast({ message: value, duration: 2000 }); + } }); // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) @@ -886,11 +892,17 @@ export struct OperateNoteCompForPortrait { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 let context: any = getContext(this) - context.resourceManager.getResourceManager().then((manager) => { - manager.getString($r('app.string.restore').id) - .then((strVal)=>{ - prompt.showToast({ message: strVal, duration: 2000 }); - }); + let resource = { + bundleName: "com.ohos.note", + moduleName: "phone", + id: $r('app.string.restore').id + }; + context.resourceManager.getString(resource, (error, value) => { + if (error != null) { + console.log("error is " + error); + } else { + prompt.showToast({ message: value, duration: 2000 }); + } }); // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) @@ -939,6 +951,7 @@ export struct OperateNoteCompForPortrait { .alignItems(HorizontalAlign.Center) .justifyContent(FlexAlign.Center) } + .justifyContent(FlexAlign.Center) .width("100%") .height(56) .visibility(this.longpress && this.portraitModel == true ? Visibility.Visible : Visibility.None)