diff --git a/README.md b/README.md index 85de618ffb487607c34435368b95983025334bc7..942d337502edc1bd94e6b84a77ac3a30f2b47434 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## 效果预览 | 数字盾预览 | |-----------------------------------------------| -| | +| | ## 使用说明 ### 数字盾服务签名申请 @@ -72,4 +72,5 @@ 3. DevEco Studio版本:DevEco Studio 6.0 Beta3及以上。 4. HarmonyOS SDK版本:HarmonyOS 6.0 Bete3 SDK及以上。 5. 需要在华为开发者联盟网站上注册成为开发者,并完成企业开发者实名认证 (https://developer.huawei.com/consumer/cn/) -6. 需要在AppGallery Connect页面申请数字盾权限 (https://developer.huawei.com/consumer/cn/service/josp/agc/index.html#/) \ No newline at end of file +6. 需要在AppGallery Connect页面申请数字盾权限 (https://developer.huawei.com/consumer/cn/service/josp/agc/index.html#/) +7. 当前数字盾人脸识别能力仅提供支持3D人脸识别的设备使用(Mate系列60之后的设备) \ No newline at end of file diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 3456b0ec297a28f516dfec075eb57a378362a221..e115ffb73bcb70de39a715d48847caf8b6f4b668 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { ConfigurationConstant, UIAbility } from '@kit.AbilityKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { window } from '@kit.ArkUI'; diff --git a/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets index 56fcf224e07114f043cf12f813993a6e398423a5..62715651f7172c90ef7d6a022a23818e8df5a3bc 100644 --- a/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets +++ b/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { hilog } from '@kit.PerformanceAnalysisKit'; import { BackupExtensionAbility, BundleVersion } from '@kit.CoreFileKit'; diff --git a/entry/src/main/ets/model/TrustedAuthentication.ets b/entry/src/main/ets/model/TrustedAuthentication.ets index 3c316df9cc196b270300b36e8db3b9a711e2a6d4..a86dfc6de6e5e2d9f0469e1a44f559a6bf5ddfec 100644 --- a/entry/src/main/ets/model/TrustedAuthentication.ets +++ b/entry/src/main/ets/model/TrustedAuthentication.ets @@ -12,14 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { resourceManager } from '@kit.LocalizationKit'; import { huks } from '@kit.UniversalKeystoreKit'; import { BusinessError } from '@kit.BasicServicesKit'; import { userAuth } from '@kit.UserAuthenticationKit'; import { trustedAuthentication } from '@kit.DeviceSecurityKit'; import { util } from '@kit.ArkTS'; -import AssetUtils from '../utils/AssetUtils'; import { hilog } from '@kit.PerformanceAnalysisKit'; +import AssetUtils from '../utils/AssetUtils'; const TUI_PIN_SET = 1 const TUI_PIN_MODIFY = 2 diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 0bb639c958658a3672778b942b5672f4b76f6b42..37ca07239f2f4455c96de6f2d5bc68816a7e0728 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + @Entry @Component struct Index { diff --git a/entry/src/main/ets/pages/MainPage.ets b/entry/src/main/ets/pages/MainPage.ets index c94764b13f2ef5b2fb122c7b9bc6db8c3a60a284..c53e05ae80edfc3911bb23bd0fb2f5daecef59b3 100644 --- a/entry/src/main/ets/pages/MainPage.ets +++ b/entry/src/main/ets/pages/MainPage.ets @@ -14,14 +14,13 @@ */ import { trustedAuthentication } from '@kit.DeviceSecurityKit'; -import TrustedAuth from '../model/TrustedAuthentication'; import { BusinessError } from '@kit.BasicServicesKit'; import { cryptoFramework } from '@kit.CryptoArchitectureKit'; import { userAuth } from '@kit.UserAuthenticationKit'; - +import { hilog } from '@kit.PerformanceAnalysisKit'; import { PromptAction } from '@kit.ArkUI'; import AssetUtils from '../utils/AssetUtils'; -import { hilog } from '@kit.PerformanceAnalysisKit'; +import TrustedAuth from '../model/TrustedAuthentication'; const TUI_PIN_DISABLE = 3 const TUI_BIND_FACE = 7 @@ -131,7 +130,7 @@ export struct MainPage { Text($r('app.string.DigitalShield')).textAlign(TextAlign.Start).margin({ left: 12 }) Blank() if (this.hasShield) { - Button($r('app.string.ModifyPassword')) + Button($r('app.string.ModifyWord')) .buttonStyle(ButtonStyleMode.NORMAL) .margin({ top: 14, bottom: 14, right: 12 }) .onClick(async () => { diff --git a/entry/src/main/ets/pages/PasswordSelectionPage.ets b/entry/src/main/ets/pages/PasswordSelectionPage.ets index 3e8ceeb53fadeb6e2786c0dea1819b9e142b2283..21b9fcd97a2dc6c366153073658604b1bb395185 100644 --- a/entry/src/main/ets/pages/PasswordSelectionPage.ets +++ b/entry/src/main/ets/pages/PasswordSelectionPage.ets @@ -12,9 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import TrustedAuth from '../model/TrustedAuthentication'; + import { PromptAction } from '@kit.ArkUI'; import { hilog } from '@kit.PerformanceAnalysisKit'; +import TrustedAuth from '../model/TrustedAuthentication'; const TUI_PIN_SET = 1 const TUI_PIN_MODIFY = 2 @@ -87,7 +88,7 @@ export struct PasswordSelectionPage { Blank() if (this.hasShield) { - Button($r('app.string.ModifyWord')).width('calc(100% - 32vp)').onClick(async () => { + Button($r('app.string.ModifyPassword')).width('calc(100% - 32vp)').onClick(async () => { this.message = ''; if (this.onlyNum) { this.type = TUI_PIN_MODIFY; diff --git a/entry/src/main/ets/pages/TradingPage.ets b/entry/src/main/ets/pages/TradingPage.ets index 88b8fccb3cf574203def6cc3bd7683b1395fa7e8..7e1c3b94ceaf2e20dfbb55bcaeff37345ede66cf 100644 --- a/entry/src/main/ets/pages/TradingPage.ets +++ b/entry/src/main/ets/pages/TradingPage.ets @@ -12,10 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import TrustedAuth from '../model/TrustedAuthentication'; + import { PromptAction } from '@kit.ArkUI'; import { trustedAuthentication } from '@kit.DeviceSecurityKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; +import TrustedAuth from '../model/TrustedAuthentication'; const TUI_CONTENT_PWD_VERIFY = 4 const TUI_CONTENT_FACE_VERIFY = 5 diff --git a/entry/src/main/ets/utils/AssetUtils.ets b/entry/src/main/ets/utils/AssetUtils.ets index 1e525d5a4579167c4d06bc7f0ae58a6ec07785cc..6f26015ee44eab53d79957d195ea7f931024bcde 100644 --- a/entry/src/main/ets/utils/AssetUtils.ets +++ b/entry/src/main/ets/utils/AssetUtils.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { util } from '@kit.ArkTS'; import { asset } from '@kit.AssetStoreKit'; import { BusinessError } from '@kit.BasicServicesKit'; diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index e0f4462ee2dc41594e829e63a76e0ce09cb8ed51..06069321d198fe988be2d45ebd97fa70a4c9f079 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -38,7 +38,7 @@ }, { "name": "CloseShieldWithVerification", - "value": "Unable shield with verification" + "value": "Unable shield with check" }, { "name": "CloseWord", @@ -58,7 +58,7 @@ }, { "name": "CloseShieldWithoutVerification", - "value": "Unable shield without verification" + "value": "Unable shield without check" }, { "name": "BioFeatureVerification", diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index cc9f5b7f8efd715ea9a3175798acc77c7951c039..06069321d198fe988be2d45ebd97fa70a4c9f079 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -38,7 +38,7 @@ }, { "name": "CloseShieldWithVerification", - "value": "Unable shield with verification" + "value": "Unable shield with check" }, { "name": "CloseWord", @@ -58,7 +58,7 @@ }, { "name": "CloseShieldWithoutVerification", - "value": "Unable shield without Verification" + "value": "Unable shield without check" }, { "name": "BioFeatureVerification", diff --git a/screenshots/index.png b/screenshots/index.png index af6be326a0025d3c0c0fba9d8221bfd8b558aafb..dce041118751f48d246ceb0e3c696563a2220aed 100644 Binary files a/screenshots/index.png and b/screenshots/index.png differ