From b343d0141109614427dd8f2c969be58b2664af11 Mon Sep 17 00:00:00 2001
From: xxe <xxe@163.com>
Date: Mon, 12 Sep 2022 09:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=AB=AF=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HKCardIN/Helper/DataBus.cs           |  6 ++++
 HKCardIN/ViewModels/RootViewModel.cs | 15 ++--------
 HKCardIN/Views/RootView.xaml         | 44 +++++++++++++---------------
 HKCardIN/Views/RootView.xaml.cs      |  2 +-
 4 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/HKCardIN/Helper/DataBus.cs b/HKCardIN/Helper/DataBus.cs
index b8de17e..10a69fa 100644
--- a/HKCardIN/Helper/DataBus.cs
+++ b/HKCardIN/Helper/DataBus.cs
@@ -18,7 +18,13 @@ namespace HKCardIN.Helper
     }
     public class ApiRoute
     {
+        /// <summary>
+        /// 拉取用户和卡信息
+        /// </summary>
         public static string PullUserAndCardInfo = DataBus.SaasRoute + "";
+        /// <summary>
+        /// 推送充值到服务器
+        /// </summary>
         public static string PushMoneyToServer = DataBus.SaasRoute + "";
     }
 }
diff --git a/HKCardIN/ViewModels/RootViewModel.cs b/HKCardIN/ViewModels/RootViewModel.cs
index 2991e41..01a6ab2 100644
--- a/HKCardIN/ViewModels/RootViewModel.cs
+++ b/HKCardIN/ViewModels/RootViewModel.cs
@@ -36,12 +36,6 @@ namespace HKCardIN.ViewModels
             get => _CodeVisible;
             set => SetAndNotify(ref _CodeVisible, value);
         }
-        string _LockCode;
-        public string LockCode
-        {
-            get => _LockCode;
-            set => SetAndNotify(ref _LockCode, value);
-        }
         string _InputMoney;
         public string InputMoney
         {
@@ -67,20 +61,15 @@ namespace HKCardIN.ViewModels
             ContentVisible = Visibility.Collapsed;
             CodeVisible = Visibility.Visible;
         }
-        public void UnLockAction()
+        public void UnLockAction(HandyControl.Controls.PasswordBox input)
         {
-            if (LockCode.Equals(DataBus.LockCode))
+            if (input.Password.Equals(DataBus.LockCode))
             {
                 IsLocker = false;
                 CodeVisible = Visibility.Collapsed;
                 ContentVisible = Visibility.Visible;
-                LockCode = string.Empty;
             }
         }
-        public void ResetAction()
-        {
-            LockCode = string.Empty;
-        }
         public void SaveAction()
         {
             if (!DataBus.NetWordState)
diff --git a/HKCardIN/Views/RootView.xaml b/HKCardIN/Views/RootView.xaml
index 983b8f0..6263d80 100644
--- a/HKCardIN/Views/RootView.xaml
+++ b/HKCardIN/Views/RootView.xaml
@@ -1,4 +1,4 @@
-<hc:Window
+<Window
     x:Class="HKCardIN.Views.RootView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,11 +13,9 @@
     Width="800"
     Height="420"
     d:DataContext="{d:DesignInstance Type=viewModels:RootViewModel}"
-    ShowMaxButton="False"
-    ShowTitle="True"
     WindowStartupLocation="CenterScreen"
-    mc:Ignorable="d">
-    <hc:Window.Resources>
+    mc:Ignorable="d" ResizeMode="CanMinimize">
+    <Window.Resources>
         <Style
             x:Key="充值"
             BasedOn="{StaticResource ButtonDefault}"
@@ -44,11 +42,15 @@
             TargetType="TextBlock">
             <Setter Property="Foreground" Value="WhiteSmoke" />
         </Style>
-    </hc:Window.Resources>
-    <hc:Window.Background>
+    </Window.Resources>
+    <Window.Background>
         <ImageBrush ImageSource="/HKResouces/背景.jpg" />
-    </hc:Window.Background>
-    <hc:Window.InputBindings>
+    </Window.Background>
+    <Window.InputBindings>
+        <KeyBinding
+            Key="E"
+            Command="{s:Action UnLockAction}"
+            CommandParameter="{Binding ., ElementName=Pwd}" />
         <KeyBinding
             Key="F1"
             Command="{s:Action InputAction}"
@@ -66,31 +68,27 @@
             Command="{s:Action InputAction}"
             CommandParameter="500" />
         <KeyBinding Key="F5" Command="{s:Action LockSreenAction}" />
-    </hc:Window.InputBindings>
+    </Window.InputBindings>
     <Grid>
         <StackPanel
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Visibility="{Binding CodeVisible}">
-            <TextBox
+            <hc:PasswordBox
+                x:Name="Pwd"
                 Width="200"
                 hc:InfoElement.Placeholder="请输入解锁码"
-                Style="{StaticResource TextBoxExtend}"
-                Text="{Binding LockCode}" />
+                hc:PasswordBoxAttach.PasswordLength="20"
+                ShowClearButton="True"
+                Style="{StaticResource PasswordBoxPlusBaseStyle}" />
             <WrapPanel Margin="0,10,0,0" HorizontalAlignment="Center">
                 <Button
-                    Width="60"
+                    Width="70"
                     Height="40"
                     Margin="0,0,10,0"
                     Command="{s:Action UnLockAction}"
-                    Content="确定"
-                    FontSize="15" />
-                <Button
-                    Width="60"
-                    Height="40"
-                    Margin="10,0,0,0"
-                    Command="{s:Action ResetAction}"
-                    Content="取消"
+                    CommandParameter="{Binding ., ElementName=Pwd}"
+                    Content="确定[E]"
                     FontSize="15" />
             </WrapPanel>
         </StackPanel>
@@ -307,4 +305,4 @@
             </StackPanel>
         </Grid>
     </Grid>
-</hc:Window>
+</Window>
diff --git a/HKCardIN/Views/RootView.xaml.cs b/HKCardIN/Views/RootView.xaml.cs
index e5b6fa5..ac65664 100644
--- a/HKCardIN/Views/RootView.xaml.cs
+++ b/HKCardIN/Views/RootView.xaml.cs
@@ -4,7 +4,7 @@ using System.Windows.Media;
 
 namespace HKCardIN.Views
 {
-    public partial class RootView : HandyControl.Controls.Window
+    public partial class RootView : Window
     {
         public RootView()
         {