diff --git a/kvdb_stage_demo/entry/src/main/ets/MainAbility/MainAbility.ts b/kvdb_stage_demo/entry/src/main/ets/MainAbility/MainAbility.ts index 90b7f1db2be18fd070ae535e160a138093c5c04a..84fb458cf3685567e9589403d9debec2104fd3c5 100644 --- a/kvdb_stage_demo/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/kvdb_stage_demo/entry/src/main/ets/MainAbility/MainAbility.ts @@ -31,6 +31,7 @@ export default class MainAbility extends Ability { syncListenerStarted = false; dataListenerStarted = false; localDeviceId; + kvstoreStatus = 'close'; // 'open','close' onCreate(want,launchParam){ // Ability is creating, initialize resources for this ability @@ -200,6 +201,7 @@ export default class MainAbility extends Ability { self.logText += "kvStore options : " + JSON.stringify(options) +"\r\n"; self.logText += "getKVStore success\r\n"; self.kvStore = store; + self.kvstoreStatus = 'open'; }).catch((err) => { console.log("[JSDemo]: getKVStore err: " + JSON.stringify(err)); this.logText += "getKVStore err" + JSON.stringify(err) +"\r\n"; @@ -327,6 +329,26 @@ export default class MainAbility extends Ability { } }) + globalThis.CloseKVStore = (()=>{ + try{ + console.log('[JSDemo]CloseKVStore enter.'); + this.logText += "CloseKVStore enter.\r\n"; + let self = this; + this.kvManager.closeKVStore(this.appId, this.storeId, function (err, data) { + if (err != undefined) { + console.error(`Fail to close KVStore.code is ${err.code},message is ${err.message}`); + self.logText += "CloseKVStore, Fail to close KVStore.code is"+err.code+",message is"+err.message+".\r\n"; + return; + } + self.kvstoreStatus = 'close'; + console.log('[JSDemo]CloseKVStore success'); + self.logText += "CloseKVStore success.\r\n"; + }); + }catch(e){ + console.log("[JSDemo] CloseKVStore e " + e); + this.logText += "CloseKVStore e " + e + ".\r\n"; + } + }) globalThis.DeleteKvStore = (() =>{ console.info("[JSDemo] DeleteKvStore begin"); @@ -342,13 +364,15 @@ export default class MainAbility extends Ability { return; } try { - this.kvManager.closeKVStore(this.appId, this.storeId).then(() => { - console.log('closeKVStore success'); - this.logText += "closeKVStore success.\r\n"; - }).catch((err) => { - console.log('closeKVStore err'); - this.logText += "closeKVStore err." + JSON.stringify(err) + "\r\n"; - }); + if(this.kvstoreStatus == 'open'){ + this.kvManager.closeKVStore(this.appId, this.storeId).then(() => { + console.log('closeKVStore success'); + this.logText += "closeKVStore success.\r\n"; + }).catch((err) => { + console.log('closeKVStore err'); + this.logText += "closeKVStore err." + JSON.stringify(err) + "\r\n"; + }); + } this.kvManager.deleteKVStore(this.appId, this.storeId).then(() => { console.log('deleteKVStore success'); this.logText += "deleteKVStore success.\r\n"; diff --git a/kvdb_stage_demo/entry/src/main/ets/pages/index/index.ets b/kvdb_stage_demo/entry/src/main/ets/pages/index/index.ets index 121ed4360de787e71b79e7858616110080fe6ce4..e1c799d843b79b4dc7f36b6b6e0accb68f7ab036 100644 --- a/kvdb_stage_demo/entry/src/main/ets/pages/index/index.ets +++ b/kvdb_stage_demo/entry/src/main/ets/pages/index/index.ets @@ -262,9 +262,9 @@ struct Index { globalThis.Sync(); this.text = globalThis.printLogs(); }) - Button('DeleteKvStore').fontSize(10).fontWeight(FontWeight.Normal).type(ButtonType.Capsule).margin({}).width('33%').height('100%') + Button('CloseKvStore').fontSize(10).fontWeight(FontWeight.Normal).type(ButtonType.Capsule).margin({}).width('33%').height('100%') .backgroundColor('#f32dc400').onClick(() => { - globalThis.DeleteKvStore(); + globalThis.CloseKVStore(); this.text = globalThis.printLogs(); }) } @@ -273,6 +273,11 @@ struct Index { .height('6%') Row({space:2}){ + Button('DeleteKvStore').fontSize(10).fontWeight(FontWeight.Normal).type(ButtonType.Capsule).margin({}).width('33%').height('100%') + .backgroundColor('#f32dc400').onClick(() => { + globalThis.DeleteKvStore(); + this.text = globalThis.printLogs(); + }) Button('PrintLogs').fontSize(10).fontWeight(FontWeight.Normal).type(ButtonType.Capsule).margin({}).width('33%').height('100%') .backgroundColor('#f32dc400').onClick(() => { this.text = globalThis.printLogs(); @@ -295,7 +300,7 @@ struct Index { .backgroundColor(0xFFFFFF) .borderRadius(15) .gesture( - SwipeGesture({ direction: SwipeDirection.Vertical }) + SwipeGesture({ direction: SwipeDirection.Vertical }) // 垂直滑动 .onAction((event: GestureEvent) => { this.scroller.scrollBy(0, 150) }) @@ -303,10 +308,10 @@ struct Index { .width('100%') .height('500%') } - .scrollable(ScrollDirection.Vertical) - .scrollBar(BarState.On) - .scrollBarColor(Color.Gray) - .scrollBarWidth(3) + .scrollable(ScrollDirection.Vertical) // 滚动方向纵向 + .scrollBar(BarState.On) // 滚动条常驻显示 + .scrollBarColor(Color.Gray) // 滚动条颜色 + .scrollBarWidth(3) // 滚动条宽度 .edgeEffect(EdgeEffect.None) .onScroll((xOffset: number, yOffset: number) => { console.info(xOffset + ' ' + yOffset)