From b5dde9fe255c1bc07aaefe47c057f38c79b0d415 Mon Sep 17 00:00:00 2001 From: adslk Date: Wed, 10 Nov 2021 19:20:08 +0800 Subject: [PATCH 1/2] update ORM Crash Signed-off-by: adslk --- .../java/ohos/samples/orm/slice/OrmContextSlice.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java b/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java index e77bff3946..ceb972ae3f 100644 --- a/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java +++ b/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java @@ -26,6 +26,7 @@ import ohos.data.orm.OrmMigration; import ohos.data.orm.OrmObjectObserver; import ohos.data.orm.OrmPredicates; import ohos.data.preferences.Preferences; +import ohos.data.rdb.RdbException; import ohos.data.rdb.RdbStore; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; @@ -267,8 +268,13 @@ public class OrmContextSlice extends AbilitySlice { @Override public void onMigrate(RdbStore store) { - HiLog.info(LABEL_LOG, "DataBase Version 1->2 onMigrate called"); - store.executeSql("ALTER TABLE `Book` ADD COLUMN `addColumn12` INTEGER"); + try { + HiLog.info(LABEL_LOG, "DataBase Version 1->2 onMigrate called"); + store.executeSql("ALTER TABLE `Book` ADD COLUMN `addColumn12` INTEGER"); + } + catch (RdbException e) { + HiLog.error(LABEL_LOG, "TestOrmMigration12.onMigrate exception, %{public}s", e.getMessage()); + } } } -- Gitee From cb3aea3165533ac295786d909241f1809a81eee3 Mon Sep 17 00:00:00 2001 From: adslk Date: Thu, 18 Nov 2021 19:11:12 +0800 Subject: [PATCH 2/2] bugfix Jstimer and search crash problem Signed-off-by: adslk --- UI/JsTimer/entry/src/main/js/default/pages/index/index.js | 2 +- .../java/ohos/samples/search/slice/MainAbilitySlice.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/UI/JsTimer/entry/src/main/js/default/pages/index/index.js b/UI/JsTimer/entry/src/main/js/default/pages/index/index.js index ec4fdd504e..d1fc97b4da 100644 --- a/UI/JsTimer/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsTimer/entry/src/main/js/default/pages/index/index.js @@ -27,7 +27,7 @@ export default { }, dateTimeChange(e) { this.dataDateTime = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute; - var date = new Date(this.dataDateTime); + var date = new Date(e.year, e.month, e.day, e.hour, e.minute); this.time = date.getTime(); }, timeChange(e) { diff --git a/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java b/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java index 2d5fca3162..f708cc850a 100644 --- a/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java +++ b/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java @@ -74,9 +74,13 @@ public class MainAbilitySlice extends AbilitySlice { try { lock.await(3000, TimeUnit.MILLISECONDS); if (searchAbility.hasConnected()) { - searchResult.setText(ResourceTable.String_connect_service_succeed); + getUITaskDispatcher().asyncDispatch(() -> { + searchResult.setText(ResourceTable.String_connect_service_succeed); + }); } else { - searchResult.setText(ResourceTable.String_connect_service_failed); + getUITaskDispatcher().asyncDispatch(() -> { + searchResult.setText(ResourceTable.String_connect_service_failed); + }); } } catch (InterruptedException e) { LogUtils.info(TAG, "connect search service failed"); -- Gitee