diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index bec867cc7a7ee4791ccafcc413772cbc5a60dbbf..de9ae9606695d4b70aa79910d7cb7dd7fd26f71a 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 f2db4dae61a7c8a8653bad1a500e9ed034e5adbd..bfa8143fa22057b649ef48e38f95eb164495245a 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) diff --git a/product/phone/src/main/ets/pages/MyNoteHome.ets b/product/phone/src/main/ets/pages/MyNoteHome.ets index b98cdcae866ff208ed8d88df368cde7602931185..632ae8cc88389fe14cf79bc9ed2d52df2b18e069 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") diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/tablet/src/main/ets/pages/MyNoteHome.ets index 954459ce2b1c3a4367667655c53fc04c2791a9b7..fdaeaf85fbed9f4ba31ceb32e52a8b46fc877b69 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")