From a61542489c49508598eb6ac375d3d2b2b65ecb21 Mon Sep 17 00:00:00 2001
From: xxe <xxe@163.com>
Date: Tue, 20 Sep 2022 15:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8D=A1=E5=86=99=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HKCardIN/COM/COMHelper.cs            | 36 --------------------
 HKCardIN/HKCardIN.csproj             |  2 +-
 HKCardIN/ViewModels/RootViewModel.cs | 46 ++++++++++++++++++++++++--
 HKCardIN/Views/CardView.xaml         | 49 ++++++++++++++++++++++++++++
 HKCardIN/Views/CardView.xaml.cs      | 35 ++++++++++++++++++++
 HKCardIN/Views/RootView.xaml         | 10 ++++--
 HKCardOUT/COM/COMHelper.cs           | 34 -------------------
 HKCardOUT/HKCardOUT.csproj           |  1 -
 HKLog/HKLog.csproj                   |  2 +-
 9 files changed, 138 insertions(+), 77 deletions(-)
 delete mode 100644 HKCardIN/COM/COMHelper.cs
 create mode 100644 HKCardIN/Views/CardView.xaml
 create mode 100644 HKCardIN/Views/CardView.xaml.cs
 delete mode 100644 HKCardOUT/COM/COMHelper.cs

diff --git a/HKCardIN/COM/COMHelper.cs b/HKCardIN/COM/COMHelper.cs
deleted file mode 100644
index b51c08e..0000000
--- a/HKCardIN/COM/COMHelper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using HKCardIN.Helper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO.Ports;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace COM
-{
-    public class COMHelper : Singleton<COMHelper>
-    {
-        public SerialPort serialPort;
-        public void OpenCOM(string input)
-        {
-            serialPort = new SerialPort(input, 9600, Parity.None, 8, StopBits.One);
-            //数据接收
-            serialPort.DataReceived += new SerialDataReceivedEventHandler(DataReceived);
-            serialPort.ReceivedBytesThreshold = 1;
-            serialPort.RtsEnable = true;
-            try
-            {
-                if (serialPort.IsOpen) return;
-                serialPort.Open();
-            }
-            catch { }
-        }
-        /// 数据接收事件
-        private void DataReceived(object sender, SerialDataReceivedEventArgs e)
-        {
-            byte[] readBuffer = new byte[serialPort.ReadBufferSize];
-            serialPort.Read(readBuffer, 0, readBuffer.Length);
-            string str = Encoding.Default.GetString(readBuffer);
-        }
-    }
-}
diff --git a/HKCardIN/HKCardIN.csproj b/HKCardIN/HKCardIN.csproj
index 73c723f..8e122f9 100644
--- a/HKCardIN/HKCardIN.csproj
+++ b/HKCardIN/HKCardIN.csproj
@@ -33,13 +33,13 @@
     <PackageReference Include="HandyControls" Version="3.4.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Stylet" Version="1.3.6" />
-    <PackageReference Include="System.IO.Ports" Version="6.0.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.2.7" />
     <PackageReference Include="XExten.Advance" Version="1.2.4.2-preview" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HKLog\HKLog.csproj" />
+    <ProjectReference Include="..\UHFHelper\UHFHelper.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="HKResouces\头像.png" />
diff --git a/HKCardIN/ViewModels/RootViewModel.cs b/HKCardIN/ViewModels/RootViewModel.cs
index 02fcb06..fc3a272 100644
--- a/HKCardIN/ViewModels/RootViewModel.cs
+++ b/HKCardIN/ViewModels/RootViewModel.cs
@@ -1,11 +1,16 @@
-using HKCardIN.Helper;
+using HandyControl.Data;
+using HKCardIN.Helper;
 using HKCardIN.Logic;
 using HKCardIN.Logic.Model;
+using HKCardIN.Views;
+using HKLog;
 using Stylet;
 using System;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using UHFHelper;
 
 namespace HKCardIN.ViewModels
 {
@@ -64,6 +69,44 @@ namespace HKCardIN.ViewModels
         #endregion
 
         #region 命令
+
+        public void ReadAction()
+        {
+            if (!UHFCardHelper.GetInstance().ComOpen)
+            {
+                var res = UHFCardHelper.GetInstance().OpenPort();
+                HKLogImport.WriteInfo(res.ResMes);
+            }
+            var RCardNo = UHFCardHelper.GetInstance().ReadCard();
+            if (!Regex.IsMatch(RCardNo, "\\d{19}"))
+            {
+                var res = HandyControl.Controls.MessageBox.Show(new MessageBoxInfo
+                {
+                    Button = MessageBoxButton.YesNo,
+                    IconKey = "InfoGeometry",
+                    IconBrushKey = "InfoBrush",
+                    YesContent = "是",
+                    NoContent = "否",
+                    Message = "此卡是新卡，前往制卡",
+                    Caption = "提示！"
+                });
+                if (res == MessageBoxResult.Yes)
+                {
+                    CardView view = new CardView();
+                    if (view.ShowDialog().Value) HandyControl.Controls.Growl.InfoGlobal("制卡成功");
+                    else HandyControl.Controls.Growl.InfoGlobal("制卡失败");
+                }
+                Info = BaseLogic.GetInstance().PullUserAndCardInfo(CardNo);
+                UHFCardHelper.GetInstance().ClosePort();
+            }
+            else
+            {
+                CardNo = RCardNo;
+                Info = BaseLogic.GetInstance().PullUserAndCardInfo(CardNo);
+                UHFCardHelper.GetInstance().ClosePort();
+            }
+
+        }
         public void InputAction(string input)
         {
             if (IsLocker) return;
@@ -110,7 +153,6 @@ namespace HKCardIN.ViewModels
         protected override void OnViewLoaded()
         {
             MainThread();
-            //Info = BaseLogic.GetInstance().PullUserAndCardInfo("1569245210230263808");
         }
         private void MainThread()
         {
diff --git a/HKCardIN/Views/CardView.xaml b/HKCardIN/Views/CardView.xaml
new file mode 100644
index 0000000..4cfe333
--- /dev/null
+++ b/HKCardIN/Views/CardView.xaml
@@ -0,0 +1,49 @@
+<Window
+    x:Class="HKCardIN.Views.CardView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
+    xmlns:local="clr-namespace:HKCardIN.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="海科智慧一卡通平台"
+    Width="300"
+    Height="200"
+    ResizeMode="CanMinimize"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <Window.Background>
+        <ImageBrush ImageSource="/HKResouces/背景.jpg" />
+    </Window.Background>
+    <WrapPanel
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Orientation="Vertical">
+        <TextBox
+            x:Name="Phone"
+            Width="200"
+            hc:InfoElement.Placeholder="请输入手机号"
+            Style="{StaticResource TextBoxExtend}" />
+        <WrapPanel Margin="0,10,0,0" HorizontalAlignment="Center">
+            <Button
+                x:Name="Query"
+                Width="80"
+                Height="50"
+                Margin="0,0,10,0"
+                Click="QueryClick"
+                Content="查询"
+                FontSize="18"
+                Style="{StaticResource ButtonDefault}" />
+            <Button
+                x:Name="Create"
+                Width="80"
+                Height="50"
+                Margin="10,0,0,0"
+                Click="CreateClick"
+                Content="制卡"
+                FontSize="18"
+                IsEnabled="False"
+                Style="{StaticResource ButtonDefault}" />
+        </WrapPanel>
+    </WrapPanel>
+</Window>
diff --git a/HKCardIN/Views/CardView.xaml.cs b/HKCardIN/Views/CardView.xaml.cs
new file mode 100644
index 0000000..16f66ec
--- /dev/null
+++ b/HKCardIN/Views/CardView.xaml.cs
@@ -0,0 +1,35 @@
+using HKLog;
+using System.Text.RegularExpressions;
+using System.Windows;
+using UHFHelper;
+using XExten.Advance.LinqFramework;
+
+namespace HKCardIN.Views
+{
+    /// <summary>
+    /// CardView.xaml 的交互逻辑
+    /// </summary>
+    public partial class CardView : System.Windows.Window
+    {
+        public CardView()
+        {
+            InitializeComponent();
+        }
+
+        private void QueryClick(object sender, RoutedEventArgs e)
+        {
+            if (this.Phone.Text.IsNullOrEmpty()) HandyControl.Controls.Growl.InfoGlobal("手机号不能为空!");
+            if (!Regex.IsMatch(this.Phone.Text, "\\d{11}")) HandyControl.Controls.Growl.InfoGlobal("请输入正确的手机号!");
+            //查询接口
+            Create.IsEnabled = true;
+        }
+
+        private void CreateClick(object sender, RoutedEventArgs e)
+        {
+            var res = UHFCardHelper.GetInstance().WriteCard("1569245210230263808");
+            HKLogImport.WriteInfo(res.ResMes);
+            DialogResult = true;
+            Close();
+        }
+    }
+}
diff --git a/HKCardIN/Views/RootView.xaml b/HKCardIN/Views/RootView.xaml
index 28edc01..4ca46df 100644
--- a/HKCardIN/Views/RootView.xaml
+++ b/HKCardIN/Views/RootView.xaml
@@ -10,8 +10,8 @@
     xmlns:viewModels="clr-namespace:HKCardIN.ViewModels"
     x:Name="Root"
     Title="海科智慧一卡通平台"
-    Width="800"
-    Height="460"
+    Width="900"
+    Height="480"
     d:DataContext="{d:DesignInstance Type=viewModels:RootViewModel}"
     ResizeMode="CanMinimize"
     WindowStartupLocation="CenterScreen"
@@ -52,6 +52,7 @@
             Key="E"
             Command="{s:Action UnLockAction}"
             CommandParameter="{Binding ., ElementName=Pwd}" />
+        <KeyBinding Key="R" Command="{s:Action ReadAction}" />
         <KeyBinding
             Key="F1"
             Command="{s:Action InputAction}"
@@ -301,6 +302,11 @@
                     FontWeight="Bold"
                     Foreground="WhiteSmoke" />
                 <WrapPanel HorizontalAlignment="Center">
+                    <Button
+                        Command="{s:Action ReadAction}"
+                        Content="读卡[R]"
+                        IsDefault="True"
+                        Style="{StaticResource 操作}" />
                     <Button
                         Command="{s:Action SaveAction}"
                         Content="确定[Enter]"
diff --git a/HKCardOUT/COM/COMHelper.cs b/HKCardOUT/COM/COMHelper.cs
deleted file mode 100644
index a402b64..0000000
--- a/HKCardOUT/COM/COMHelper.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using HKCardOUT.Helper;
-using System;
-using System.Collections.Generic;
-using System.IO.Ports;
-using System.Text;
-
-namespace COM
-{
-    public class COMHelper : Singleton<COMHelper>
-    {
-        public SerialPort serialPort;
-        public void OpenCOM()
-        {
-            serialPort = new SerialPort("COM3", 9600, Parity.None, 8, StopBits.One);
-            //数据接收
-            serialPort.DataReceived += new SerialDataReceivedEventHandler(DataReceived);
-            serialPort.ReceivedBytesThreshold = 1;
-            serialPort.RtsEnable = true;
-            try
-            {
-                if (serialPort.IsOpen) return;
-                serialPort.Open();
-            }
-            catch { }
-        }
-        /// 数据接收事件
-        private void DataReceived(object sender, SerialDataReceivedEventArgs e)
-        {
-            byte[] readBuffer = new byte[serialPort.ReadBufferSize];
-            serialPort.Read(readBuffer, 0, readBuffer.Length);
-            string str = Encoding.Default.GetString(readBuffer);
-        }
-    }
-}
diff --git a/HKCardOUT/HKCardOUT.csproj b/HKCardOUT/HKCardOUT.csproj
index efa8a67..64fea3c 100644
--- a/HKCardOUT/HKCardOUT.csproj
+++ b/HKCardOUT/HKCardOUT.csproj
@@ -38,7 +38,6 @@
     <PackageReference Include="Quartz" Version="3.4.0" />
     <PackageReference Include="Stylet" Version="1.3.6" />
     <PackageReference Include="SqlSugarCore" Version="5.1.2.7" />
-    <PackageReference Include="System.IO.Ports" Version="6.0.0" />
     <PackageReference Include="XExten.Advance" Version="1.2.4.2-preview" />
   </ItemGroup>
   <ItemGroup>
diff --git a/HKLog/HKLog.csproj b/HKLog/HKLog.csproj
index f2c6300..162cab6 100644
--- a/HKLog/HKLog.csproj
+++ b/HKLog/HKLog.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Platforms>AnyCPU;x86</Platforms>
+    <Platforms>x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>