From 377bfcb3a21da8b40e9bca00bdc5ec9d37d51080 Mon Sep 17 00:00:00 2001 From: guozejun Date: Mon, 9 May 2022 11:27:35 +0800 Subject: [PATCH 1/5] stability fix Signed-off-by: guozejun --- common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index f251f1d..fa17a64 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -410,6 +410,9 @@ export default { * @param callback */ update(valueBucket, predicates, callback) { + if (!rdbStore) { + return; + } rdbStore.update(valueBucket, predicates).then((affectedRowCount) => { LogUtil.info(TAG, "update success, affectedRowCount is " + affectedRowCount) if (callback != null) { From 5bbc1f4151f09c61d4d059896add4c7411a52e73 Mon Sep 17 00:00:00 2001 From: guozejun Date: Mon, 9 May 2022 16:13:40 +0800 Subject: [PATCH 2/5] fix onbackpress return type, fix note edit input method behavior Signed-off-by: guozejun --- product/tablet/src/main/ets/pages/MyNoteHome.ets | 2 +- product/tablet/src/main/ets/pages/NoteContentHome.ets | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/tablet/src/main/ets/pages/MyNoteHome.ets index 38b6da8..954459c 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/tablet/src/main/ets/pages/MyNoteHome.ets @@ -93,7 +93,7 @@ export struct MyNoteHomeComp { this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) } - onBackPress():void{ + onBackPress() { LogUtil.info(this.TAG, "onBackPress") // 退出键盘 inputMethod.getInputMethodController().stopInput(); diff --git a/product/tablet/src/main/ets/pages/NoteContentHome.ets b/product/tablet/src/main/ets/pages/NoteContentHome.ets index c279248..2dc3305 100644 --- a/product/tablet/src/main/ets/pages/NoteContentHome.ets +++ b/product/tablet/src/main/ets/pages/NoteContentHome.ets @@ -16,6 +16,7 @@ import {NoteContent} from '@ohos/component/src/main/ets/components/NoteContent' import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' +import inputMethod from '@ohos.inputmethod' @Entry @Component @@ -40,6 +41,7 @@ struct NoteContentHome { LogUtil.info(this.TAG, "onBackPress") this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) this.controllerShow.runJavaScript({ script: "get_html_content()" }) + inputMethod.getInputMethodController().stopInput() } aboutToAppear(): void{ From 2eef5c4e0cb8c733723825c6d2fbac69df78eb4e Mon Sep 17 00:00:00 2001 From: guozejun Date: Mon, 9 May 2022 11:27:35 +0800 Subject: [PATCH 3/5] stability fix Signed-off-by: guozejun --- common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index f251f1d..fa17a64 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -410,6 +410,9 @@ export default { * @param callback */ update(valueBucket, predicates, callback) { + if (!rdbStore) { + return; + } rdbStore.update(valueBucket, predicates).then((affectedRowCount) => { LogUtil.info(TAG, "update success, affectedRowCount is " + affectedRowCount) if (callback != null) { From d6559afc11dc77cce8c0ed47d7ddfce221587460 Mon Sep 17 00:00:00 2001 From: guozejun Date: Mon, 9 May 2022 16:13:40 +0800 Subject: [PATCH 4/5] fix onbackpress return type, fix note edit input method behavior Signed-off-by: guozejun --- product/tablet/src/main/ets/pages/MyNoteHome.ets | 2 +- product/tablet/src/main/ets/pages/NoteContentHome.ets | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/tablet/src/main/ets/pages/MyNoteHome.ets index 38b6da8..954459c 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/tablet/src/main/ets/pages/MyNoteHome.ets @@ -93,7 +93,7 @@ export struct MyNoteHomeComp { this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) } - onBackPress():void{ + onBackPress() { LogUtil.info(this.TAG, "onBackPress") // 退出键盘 inputMethod.getInputMethodController().stopInput(); diff --git a/product/tablet/src/main/ets/pages/NoteContentHome.ets b/product/tablet/src/main/ets/pages/NoteContentHome.ets index c279248..2dc3305 100644 --- a/product/tablet/src/main/ets/pages/NoteContentHome.ets +++ b/product/tablet/src/main/ets/pages/NoteContentHome.ets @@ -16,6 +16,7 @@ import {NoteContent} from '@ohos/component/src/main/ets/components/NoteContent' import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' +import inputMethod from '@ohos.inputmethod' @Entry @Component @@ -40,6 +41,7 @@ struct NoteContentHome { LogUtil.info(this.TAG, "onBackPress") this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) this.controllerShow.runJavaScript({ script: "get_html_content()" }) + inputMethod.getInputMethodController().stopInput() } aboutToAppear(): void{ From 937c783effbc86c075ddc0de139a9299fdeb0c39 Mon Sep 17 00:00:00 2001 From: guozejun Date: Tue, 10 May 2022 14:32:24 +0800 Subject: [PATCH 5/5] note layout on note list Signed-off-by: guozejun --- common/component/src/main/ets/components/NoteListComp.ets | 8 ++++---- product/tablet/src/main/ets/pages/NoteHome.ets | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index 6669164..2668414 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -372,7 +372,7 @@ export struct NoteItemListComp { .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) .visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.None : Visibility.Visible) - Stack() { + Column() { Flex({ justifyContent: FlexAlign.Center }) { Text($r("app.string.permanently_delete_tips")) .fontSize(12) @@ -416,7 +416,7 @@ export struct NoteItemListComp { .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) }, noteItem => noteItem.uuid.toString()) } - .height("100%") + .layoutWeight(1) .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) .listDirection(Axis.Vertical) .edgeEffect(EdgeEffect.Spring) @@ -434,10 +434,10 @@ export struct NoteItemListComp { .visibility(this.search ? Visibility.Visible : Visibility.Hidden) } .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) - .flexGrow(1) + .flexShrink(1) } .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) - .flexGrow(1) + .flexShrink(1) .onClick(() => { this.search = false }) diff --git a/product/tablet/src/main/ets/pages/NoteHome.ets b/product/tablet/src/main/ets/pages/NoteHome.ets index 2fec720..b800fa2 100644 --- a/product/tablet/src/main/ets/pages/NoteHome.ets +++ b/product/tablet/src/main/ets/pages/NoteHome.ets @@ -87,7 +87,7 @@ export struct NoteHomeComp { .opacity(StyleConstants.OPACITY_10) NoteListComp({ controllerShow: this.controllerShow }) } - .flexShrink(0) + .flexShrink(1) .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) .layoutWeight(2) .height(StyleConstants.PERCENTAGE_100)