openharmony/applications_notes
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_notes synced 2024-10-07 05:33:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!80 Bugfix

Browse Source 
Merge pull request !80 from nobbo/master
This commit is contained in:
openharmony_ci 2022-07-28 02:41:28 +00:00 committed by Gitee
commit 8929fe9c26
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/component/src/main/ets/components/NoteContentCompPortrait.ets
View File

@ -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)

15
common/component/src/main/ets/components/NoteListComp.ets
View File

@ -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)

5
product/phone/src/main/ets/pages/MyNoteHome.ets
View File

@ -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")

5
product/tablet/src/main/ets/pages/MyNoteHome.ets
View File

@ -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")