From 1206bffb13f5b3b33b4d8968c8c36fbf41adbcfb Mon Sep 17 00:00:00 2001 From: "@two-thousand-or-three-thousand" Date: Wed, 14 Dec 2022 17:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @two-thousand-or-three-thousand --- features/src/main/ets/components/NoteContent.ets | 5 ++++- features/src/main/ets/components/NoteContentComp.ets | 2 +- features/src/main/ets/components/NoteContentCompPortrait.ets | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets index cb5f256..a231ce1 100644 --- a/features/src/main/ets/components/NoteContent.ets +++ b/features/src/main/ets/components/NoteContent.ets @@ -192,7 +192,7 @@ export struct NoteContent { .onPageEnd((e) => { if (this.dpi <= 240) { this.controllerShow.runJavaScript({ script: "changeSizeToRk()" }) - } else if (this.dpi >= 320 && this.dpi > 240) { + } else if (this.dpi <= 320 && this.dpi > 240) { this.controllerShow.runJavaScript({ script: "changeSizeToPhone()" }) } else { this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" }) @@ -250,6 +250,8 @@ export struct NoteContent { } aboutToDisappear(): void { + NoteUtil.refreshAll() + AppStorage.Set("refreshCurrentNote",true) clearInterval(timeID) LogUtil.info(TAG, "aboutToDisappear") } @@ -287,6 +289,7 @@ export struct ToolBarComp { LogUtil.info(TAG, "zoom, clearInterval timeID : " + timeID) clearInterval(timeID) } + AppStorage.Set("refreshCurrentNote",true) router.back() NoteUtil.refreshAll() }) diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index 5fee10b..aea3ed2 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -230,7 +230,7 @@ export struct NoteContentComp { .onPageEnd((e) => { if (this.dpi <= 240) { this.controllerShow.runJavaScript({ script: "changeSizeToRk()" }) - } else if (this.dpi >= 320 && this.dpi > 240) { + } else if (this.dpi <= 320 && this.dpi > 240) { this.controllerShow.runJavaScript({ script: "changeSizeToPhone()" }) } else { this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" }) diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index 3a269ce..8e22365 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -243,7 +243,7 @@ export struct NoteContentCompPortrait { .onPageEnd((e) => { if (this.dpi <= 240) { this.controllerShow.runJavaScript({ script: "changeSizeToRk()" }) - } else if (this.dpi >= 320 && this.dpi > 240) { + } else if (this.dpi <= 320 && this.dpi > 240) { this.controllerShow.runJavaScript({ script: "changeSizeToPhone()" }) } else { this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" }) @@ -301,6 +301,7 @@ export struct NoteContentCompPortrait { } aboutToDisappear(): void { + NoteUtil.refreshAll() clearInterval(time_id) LogUtil.info(TAG, "aboutToDisappear") } @@ -580,6 +581,7 @@ export struct DeleteNoteComp { let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid) RdbStoreUtil.delete(predicates_note, null) + NoteUtil.refreshAll() routePage() } AppStorage.SetOrCreate('isUpdate', false) -- Gitee