From f22720dfd267ba60535d7cfec97ab4d56c163123 Mon Sep 17 00:00:00 2001 From: guozejun Date: Mon, 9 May 2022 11:27:35 +0800 Subject: [PATCH 1/2] 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 b78d2d81607ff0607a6004555be7d335b7600ee7 Mon Sep 17 00:00:00 2001 From: guozejun Date: Mon, 9 May 2022 16:13:40 +0800 Subject: [PATCH 2/2] 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{