diff --git a/app/oh-package-lock.json5 b/app/oh-package-lock.json5 index a9ec621..c41ead6 100644 --- a/app/oh-package-lock.json5 +++ b/app/oh-package-lock.json5 @@ -5,24 +5,25 @@ "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "@szyx/sdk_ywx@../sdk_ywx": "@szyx/sdk_ywx@../sdk_ywx", - "@szyx/sdk_base@../basic": "@szyx/sdk_base@../basic" + "@szyx/sdk_base@^1.0.3": "@szyx/sdk_base@1.0.3", + "@szyx/sdk_ywx@../sdk_ywx": "@szyx/sdk_ywx@../sdk_ywx" }, "packages": { "@szyx/sdk_ywx@../sdk_ywx": { "name": "@szyx/sdk_ywx", - "version": "1.0.0", + "version": "1.0.6", "resolved": "../sdk_ywx", "registryType": "local", "dependencies": { - "@szyx/sdk_base": "file:../basic" + "@szyx/sdk_base": "^1.0.3" } }, - "@szyx/sdk_base@../basic": { + "@szyx/sdk_base@1.0.3": { "name": "@szyx/sdk_base", - "version": "1.0.1", - "resolved": "../basic", - "registryType": "local" + "version": "1.0.3", + "integrity": "sha512-t+ffa0bk6+AIpTveiarcCWX5qCYtEMDEVayjfQlH9HPk7qqg26DZJVyPv32zzYGJVOreby0ToEiL6Z5UFrxuMw==", + "resolved": "http://127.0.0.1:8088/repos/ohpm/@szyx/sdk_base/-/@szyx/sdk_base-1.0.3.har", + "registryType": "ohpm" } } } \ No newline at end of file diff --git a/app/oh-package.json5 b/app/oh-package.json5 index fc32a70..dc6ceca 100644 --- a/app/oh-package.json5 +++ b/app/oh-package.json5 @@ -6,11 +6,9 @@ "author": "", "license": "", "dependencies": { - "@szyx/sdk_ywx": "file:../sdk_ywx", -// "@szyx/sdk_ywx": "^1.0.4", - "@szyx/sdk_base": "file:../basic", -// "@szyx/sdk_base": "^1.0.2", -// "@yunkss/eftool": "^1.1.8" + "@szyx/sdk_base": "^1.0.3", +// "@szyx/sdk_ywx": "^1.0.6" + "@szyx/sdk_ywx": "file:../sdk_ywx" }, "devDependencies": {}, "dynamicDependencies": {} diff --git a/app/src/main/ets/pages/setting/SettingView.ets b/app/src/main/ets/pages/setting/SettingView.ets index 8dd5744..8425e3c 100644 --- a/app/src/main/ets/pages/setting/SettingView.ets +++ b/app/src/main/ets/pages/setting/SettingView.ets @@ -1,5 +1,5 @@ import { ToolsHelper } from '@szyx/sdk_base'; -import { BJCASDK } from '@szyx/sdk_ywx'; +import { BJCASDK, PinDialog } from '@szyx/sdk_ywx'; @Component @Preview @@ -9,7 +9,6 @@ export struct SettingView { @State clientId: string | undefined = BJCASDK.settingManager().getClientId() @State clientIdEdit: string | undefined = '2015112716143758' - build() { NavDestination() { Column() { @@ -59,30 +58,36 @@ export struct SettingView { this.pageInfos.pushPathByName('ChangeEvnView', undefined) }) .margin({ top: 10 }) - Button('设置语言-中文', { stateEffect: true, type: ButtonType.Normal, buttonStyle: ButtonStyleMode.NORMAL }) - .width('80%') - .fontColor('#333333') - .height(40) - .onClick(() => { - ToolsHelper.showMessage('hello world1') - }) - .margin({ top: 30 }) - Button('设置语言-英文', { stateEffect: true, type: ButtonType.Normal, buttonStyle: ButtonStyleMode.NORMAL }) - .width('80%') - .fontColor('#333333') - .height(40) - .onClick(() => { - ToolsHelper.showMessage('hello world1') - }) - .margin({ top: 10 }) + // Button('设置语言-中文', { stateEffect: true, type: ButtonType.Normal, buttonStyle: ButtonStyleMode.NORMAL }) + // .width('80%') + // .fontColor('#333333') + // .height(40) + // .onClick(() => { + // ToolsHelper.showMessage('hello world1') + // }) + // .margin({ top: 30 }) + // Button('设置语言-英文', { stateEffect: true, type: ButtonType.Normal, buttonStyle: ButtonStyleMode.NORMAL }) + // .width('80%') + // .fontColor('#333333') + // .height(40) + // .onClick(() => { + // ToolsHelper.showMessage('hello world1') + // }) + // .margin({ top: 10 }) Button('显示pin码输入框', { stateEffect: true, type: ButtonType.Normal, buttonStyle: ButtonStyleMode.NORMAL }) .width('80%') .fontColor('#333333') .height(40) .onClick(() => { - ToolsHelper.showMessage('hello world1') + BJCASDK.signManager().showPinWindow(res => { + ToolsHelper.showMessage(JSON.stringify(res)) + }) }) .margin({ top: 10 }) + + PinDialog({ + controller: BJCASDK.signManager().dialogController + }) } }.padding({ left: 15, right: 15, top: 100 }).hideTitleBar(true) } diff --git a/basic b/basic index b6cbcd7..81b538e 160000 --- a/basic +++ b/basic @@ -1 +1 @@ -Subproject commit b6cbcd79ba4794ac6a24c4db2d2402c8f9ed6bec +Subproject commit 81b538e43e32c1541ee58e234f7996d2470febef diff --git a/sdk_ywx b/sdk_ywx index caef131..09c66f0 160000 --- a/sdk_ywx +++ b/sdk_ywx @@ -1 +1 @@ -Subproject commit caef1318dc8ffbf875b37347c764a6b0e6cd7c5d +Subproject commit 09c66f0dc8d6e0a192d5a2df35236272003e0149