From ed364ca9066fb465d5746aaa3960baf1c95b8497 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 15:58:53 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/components/NoteContentCompPortrait.ets | 8 +++++++- .../src/main/ets/components/NoteListComp.ets | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index bec867c..de9ae96 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -30,6 +30,7 @@ import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationU import router from '@system.router' import inputMethod from '@ohos.inputmethod'; import {folderTextMap} from '@ohos/utils/src/main/ets/default/model/NoteBaseData' +import rs from '@ohos.resourceManager' var time_id: number @@ -434,7 +435,12 @@ export struct DeleteNoteComp { .onClick(() => { this.selectedNoteData.is_deleted = Delete.No this.selectedNoteData.deleted_time = 0 - prompt.showToast({ message: $r('app.string.restore'), duration: 2000 }) + rs.getResourceManager().then((manager) => { + manager.getString($r('app.string.restore').id) + .then((strVal)=>{ + prompt.showToast({ message: strVal, duration: 2000 }); + }); + }); this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index f2db4da..bfa8143 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -27,6 +27,7 @@ import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleCons import SearchModel from '@ohos/utils/src/main/ets/default/model/searchModel/SearchModel' import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import router from '@system.router'; +import rs from '@ohos.resourceManager' const TAG = "NoteListComp" @@ -569,7 +570,12 @@ export struct OperateNoteComp { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 - prompt.showToast({ message: $r('app.string.restore'), duration: 2000 }) + rs.getResourceManager().then((manager) => { + manager.getString($r('app.string.restore').id) + .then((strVal)=>{ + prompt.showToast({ message: strVal, duration: 2000 }); + }); + }); // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid) @@ -878,7 +884,12 @@ export struct OperateNoteCompForPortrait { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 - prompt.showToast({ message: $r('app.string.restore'), duration: 2000 }) + rs.getResourceManager().then((manager) => { + manager.getString($r('app.string.restore').id) + .then((strVal)=>{ + prompt.showToast({ message: strVal, duration: 2000 }); + }); + }); // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid) -- Gitee From 0bc97b276bf67524632eca9cfa317f08be171d0f Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:01:37 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- product/phone/src/main/ets/pages/MyNoteHome.ets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/product/phone/src/main/ets/pages/MyNoteHome.ets b/product/phone/src/main/ets/pages/MyNoteHome.ets index b98cdca..632ae8c 100644 --- a/product/phone/src/main/ets/pages/MyNoteHome.ets +++ b/product/phone/src/main/ets/pages/MyNoteHome.ets @@ -54,7 +54,8 @@ export struct MyNoteHomeComp { "ohos.permission.DISTRIBUTED_DATASYNC" ] LogUtil.info(this.TAG, 'permissions need to require from user') - this.context.requestPermissionsFromUser(permissionList).then((data) => { + let context: any = getContext(this); + context.requestPermissionsFromUser(permissionList).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) let sum = 0 @@ -66,7 +67,7 @@ export struct MyNoteHomeComp { LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code); }) - let dbPath = this.context.databaseDir + "/db/note.db" + let dbPath = context.databaseDir + "/db/note.db" try { fileio.accessSync(dbPath) LogUtil.info(this.TAG, "db has created") -- Gitee From 6ef7e5f38fd5e817377cb6efe5889cad6e1f31c1 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:02:43 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- product/tablet/src/main/ets/pages/MyNoteHome.ets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/tablet/src/main/ets/pages/MyNoteHome.ets index 954459c..fdaeaf8 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/tablet/src/main/ets/pages/MyNoteHome.ets @@ -55,7 +55,8 @@ export struct MyNoteHomeComp { "ohos.permission.DISTRIBUTED_DATASYNC" ] LogUtil.info(this.TAG, 'permissions need to require from user') - this.context.requestPermissionsFromUser(permissionList).then((data) => { + let context: any = getContext(this); + context.requestPermissionsFromUser(permissionList).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) let sum = 0 @@ -67,7 +68,7 @@ export struct MyNoteHomeComp { LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code); }) - let dbPath = this.context.databaseDir + "/db/note.db" + let dbPath = context.databaseDir + "/db/note.db" try { fileio.accessSync(dbPath) LogUtil.info(this.TAG, "db has created") -- Gitee From dae2f2e01a2d6fe0f50b06679b271dc1ebb92830 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:20:35 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../src/main/ets/components/NoteContentCompPortrait.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index de9ae96..72987ef 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -434,7 +434,7 @@ export struct DeleteNoteComp { .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { this.selectedNoteData.is_deleted = Delete.No - this.selectedNoteData.deleted_time = 0 + this.selectedNoteData.deleted_time = 0; rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ -- Gitee From 00a87afd3884a68032d80bcdb1daa82fb9283552 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:21:14 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- common/component/src/main/ets/components/NoteListComp.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index bfa8143..3f9700d 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -883,7 +883,7 @@ export struct OperateNoteCompForPortrait { .onClick(() => { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No - noteItem.deleted_time = 0 + noteItem.deleted_time = 0; rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ -- Gitee From 778484f98d2ac72b467c888bae5530857736a190 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:22:05 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- product/phone/src/main/ets/pages/MyNoteHome.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/phone/src/main/ets/pages/MyNoteHome.ets b/product/phone/src/main/ets/pages/MyNoteHome.ets index 632ae8c..f608c81 100644 --- a/product/phone/src/main/ets/pages/MyNoteHome.ets +++ b/product/phone/src/main/ets/pages/MyNoteHome.ets @@ -54,7 +54,7 @@ export struct MyNoteHomeComp { "ohos.permission.DISTRIBUTED_DATASYNC" ] LogUtil.info(this.TAG, 'permissions need to require from user') - let context: any = getContext(this); + let context: any = getContext(this) context.requestPermissionsFromUser(permissionList).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) -- Gitee From 04f9273062c79a17f232024cdb1dceb19c1664dc Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:22:39 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- product/tablet/src/main/ets/pages/MyNoteHome.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/tablet/src/main/ets/pages/MyNoteHome.ets index fdaeaf8..e33ec39 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/tablet/src/main/ets/pages/MyNoteHome.ets @@ -55,7 +55,7 @@ export struct MyNoteHomeComp { "ohos.permission.DISTRIBUTED_DATASYNC" ] LogUtil.info(this.TAG, 'permissions need to require from user') - let context: any = getContext(this); + let context: any = getContext(this) context.requestPermissionsFromUser(permissionList).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) -- Gitee From 845511cf8abb16ff0013346301453ca14e7e1099 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:23:39 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../src/main/ets/components/NoteContentCompPortrait.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 72987ef..de9ae96 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -434,7 +434,7 @@ export struct DeleteNoteComp { .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { this.selectedNoteData.is_deleted = Delete.No - this.selectedNoteData.deleted_time = 0; + this.selectedNoteData.deleted_time = 0 rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ -- Gitee From fe3584d14d4a0cfe2ca256d796878ad91aa49189 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:23:48 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- common/component/src/main/ets/components/NoteListComp.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index 3f9700d..bfa8143 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -883,7 +883,7 @@ export struct OperateNoteCompForPortrait { .onClick(() => { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No - noteItem.deleted_time = 0; + noteItem.deleted_time = 0 rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ -- Gitee From fdd4778840672441ee0a1c05e223525365492214 Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:23:56 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- product/phone/src/main/ets/pages/MyNoteHome.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/phone/src/main/ets/pages/MyNoteHome.ets b/product/phone/src/main/ets/pages/MyNoteHome.ets index f608c81..632ae8c 100644 --- a/product/phone/src/main/ets/pages/MyNoteHome.ets +++ b/product/phone/src/main/ets/pages/MyNoteHome.ets @@ -54,7 +54,7 @@ export struct MyNoteHomeComp { "ohos.permission.DISTRIBUTED_DATASYNC" ] LogUtil.info(this.TAG, 'permissions need to require from user') - let context: any = getContext(this) + let context: any = getContext(this); context.requestPermissionsFromUser(permissionList).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) -- Gitee From d47c07550b394b0f7cb05952851c7e9c0045688b Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:24:03 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- product/tablet/src/main/ets/pages/MyNoteHome.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/tablet/src/main/ets/pages/MyNoteHome.ets index e33ec39..fdaeaf8 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/tablet/src/main/ets/pages/MyNoteHome.ets @@ -55,7 +55,7 @@ export struct MyNoteHomeComp { "ohos.permission.DISTRIBUTED_DATASYNC" ] LogUtil.info(this.TAG, 'permissions need to require from user') - let context: any = getContext(this) + let context: any = getContext(this); context.requestPermissionsFromUser(permissionList).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) -- Gitee From 23961fbae48c4a30a76ac176cfd1e177af0a6aea Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:37:23 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../src/main/ets/components/NoteContentCompPortrait.ets | 2 +- common/component/src/main/ets/components/NoteListComp.ets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index de9ae96..72987ef 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -434,7 +434,7 @@ export struct DeleteNoteComp { .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { this.selectedNoteData.is_deleted = Delete.No - this.selectedNoteData.deleted_time = 0 + this.selectedNoteData.deleted_time = 0; rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index bfa8143..3f9700d 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -883,7 +883,7 @@ export struct OperateNoteCompForPortrait { .onClick(() => { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No - noteItem.deleted_time = 0 + noteItem.deleted_time = 0; rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ -- Gitee From 7b5597d7c14d5967b57ab46d522c93df014a95eb Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 19 Jul 2022 16:37:55 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../src/main/ets/components/NoteContentCompPortrait.ets | 2 +- common/component/src/main/ets/components/NoteListComp.ets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 72987ef..de9ae96 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -434,7 +434,7 @@ export struct DeleteNoteComp { .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { this.selectedNoteData.is_deleted = Delete.No - this.selectedNoteData.deleted_time = 0; + this.selectedNoteData.deleted_time = 0 rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index 3f9700d..bfa8143 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -883,7 +883,7 @@ export struct OperateNoteCompForPortrait { .onClick(() => { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No - noteItem.deleted_time = 0; + noteItem.deleted_time = 0 rs.getResourceManager().then((manager) => { manager.getString($r('app.string.restore').id) .then((strVal)=>{ -- Gitee