From 708d6e8c45f3eeaa8141b0748134ca2750e83eea Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 20 Sep 2024 10:10:44 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Business/TagScanBusiness.cs         | 29 ++++++++++
 SlnMesnac.WPF/MainWindow.xaml                 | 12 ++---
 SlnMesnac.WPF/SlnMesnac.WPF.csproj            |  7 +++
 .../ViewModel/MainWindowViewModel.cs          | 53 ++++++++++++-------
 SlnMesnac.WPF/appsettings.json                | 39 +-------------
 5 files changed, 78 insertions(+), 62 deletions(-)

diff --git a/SlnMesnac.Business/TagScanBusiness.cs b/SlnMesnac.Business/TagScanBusiness.cs
index 28b7ad9..d118f37 100644
--- a/SlnMesnac.Business/TagScanBusiness.cs
+++ b/SlnMesnac.Business/TagScanBusiness.cs
@@ -2,6 +2,7 @@
 using SlnMesnac.TouchSocket;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 
 #region << 版 本 注 释 >>
@@ -38,6 +39,9 @@ namespace SlnMesnac.Business
         public delegate void RefreshDeviceAlarmMessage(string message);
         public event RefreshDeviceAlarmMessage? RefreshDeviceAlarmMessageEvent;
 
+        public delegate void RefreshDeviceStatus(bool rfidFlag,bool camFlag);
+        public event RefreshDeviceStatus? RefreshDeviceStatusEvent;
+
 
         public TagScanBusiness(ApiServer apiServer)
         {
@@ -65,8 +69,33 @@ namespace SlnMesnac.Business
                         {
                             RefreshDeviceAlarmMessageEvent?.Invoke(item);
                         }
+
+                        List<string> rfidList = new List<string>();
+                        List<string> camList = new List<string>();
+
+                        foreach (string str in info.device_status)
+                        {
+                            if (str.Length == 2)
+                            {
+                                int number;
+                                bool isNumber = int.TryParse(str, out number);
+                                if (isNumber && str[0] == '1')
+                                {
+                                    camList.Add(str);
+                                    continue;
+                                }
+                                rfidList.Add(str);
+                            }
+                        }
+
+                        RefreshDeviceStatusEvent?.Invoke(rfidList.Count > 0 ? true : false, camList.Count > 0 ? true : false);
+                        
                     }
                 }
+                else
+                {
+                    RefreshDeviceStatusEvent?.Invoke(false, false);
+                }
             };
         }
 
diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml
index c173496..b8ae1c9 100644
--- a/SlnMesnac.WPF/MainWindow.xaml
+++ b/SlnMesnac.WPF/MainWindow.xaml
@@ -67,13 +67,13 @@
                                             <Ellipse.Style>
                                                 <Style TargetType="Ellipse">
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="0">
+                                                        <DataTrigger Binding="{Binding RfidStatus}" Value="0">
                                                             <Setter Property="Shape.Fill" Value="Orange"/>
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="1">
+                                                        <DataTrigger Binding="{Binding RfidStatus}" Value="1">
                                                             <Setter Property="Shape.Fill" Value="Green"/>
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding ShellScannerStatus}" Value="2">
+                                                        <DataTrigger Binding="{Binding RfidStatus}" Value="2">
                                                             <Setter Property="Shape.Fill" Value="Red"/>
                                                         </DataTrigger>
                                                     </Style.Triggers>
@@ -98,13 +98,13 @@
                                             <Ellipse.Style>
                                                 <Style TargetType="Ellipse">
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="0">
+                                                        <DataTrigger Binding="{Binding CamStatus}" Value="0">
                                                             <Setter Property="Shape.Fill" Value="Orange"/>
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="1">
+                                                        <DataTrigger Binding="{Binding CamStatus}" Value="1">
                                                             <Setter Property="Shape.Fill" Value="Green"/>
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding BoldScannerStatus}" Value="2">
+                                                        <DataTrigger Binding="{Binding CamStatus}" Value="2">
                                                             <Setter Property="Shape.Fill" Value="Red"/>
                                                         </DataTrigger>
                                                     </Style.Triggers>
diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
index bfcc595..7634670 100644
--- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj
+++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
@@ -8,11 +8,18 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="appsettings.json" />
     <None Remove="Templates\image\background.jpg" />
     <None Remove="Templates\image\left.png" />
     <None Remove="Templates\image\right.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\SlnMesnac.Business\SlnMesnac.Business.csproj" />
     <ProjectReference Include="..\SlnMesnac.Common\SlnMesnac.Common.csproj" />
diff --git a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
index 3535a43..2439555 100644
--- a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
@@ -2,6 +2,7 @@
 using GalaSoft.MvvmLight.Command;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using SlnMesnac.Business;
 using SlnMesnac.WPF.Page;
 using SlnMesnac.WPF.Page.History;
 using System;
@@ -12,38 +13,30 @@ namespace SlnMesnac.WPF.ViewModel
     public class MainWindowViewModel: ViewModelBase
     {
         private readonly ILogger<MainWindowViewModel> _logger;
+        private readonly TagScanBusiness tagScanBusiness;
 
         private IndexControl indexControl = new IndexControl();
         private HistoryControl historyControl = new HistoryControl();
 
         #region 参数定义
         /// <summary>
-        /// PLC设备状态
+        /// RFID状态
         /// </summary>
-        private int _PlcStatus = 0;
-        public int PlcStatus
+        private int _RfidStatus = 0;
+        public int RfidStatus
         {
-            get { return _PlcStatus; }
-            set { _PlcStatus = value; RaisePropertyChanged(nameof(PlcStatus)); }
-        }
-        /// <summary>
-        /// 箱壳扫码器状态
-        /// </summary>
-        private int _ShellScannerStatus = 0;
-        public int ShellScannerStatus
-        {
-            get { return _ShellScannerStatus; }
-            set { _ShellScannerStatus = value; RaisePropertyChanged(nameof(ShellScannerStatus)); }
+            get { return _RfidStatus; }
+            set { _RfidStatus = value; RaisePropertyChanged(nameof(RfidStatus)); }
         }
 
         /// <summary>
-        /// 内胆扫码器状态
+        /// 相机状态
         /// </summary>
-        private int _BoldScannerStatus = 0;
-        public int BoldScannerStatus
+        private int _CamStatus = 0;
+        public int CamStatus
         {
-            get { return _BoldScannerStatus; }
-            set { _BoldScannerStatus = value; RaisePropertyChanged(nameof(BoldScannerStatus)); }
+            get { return _CamStatus; }
+            set { _CamStatus = value; RaisePropertyChanged(nameof(CamStatus)); }
         }
 
         public System.Windows.Controls.UserControl _content;
@@ -83,12 +76,34 @@ namespace SlnMesnac.WPF.ViewModel
             var sp = App.ServiceProvider;
 
            _logger = App.ServiceProvider.GetService<ILogger<MainWindowViewModel>>();
+            tagScanBusiness = App.ServiceProvider.GetService<TagScanBusiness>();
 
             ControlOnClickCommand = new RelayCommand<object>(obj => ControlOnClick(obj));
             FormControlCommand = new RelayCommand<object>(x => FormControl(x));
 
             UserContent = indexControl;
 
+            tagScanBusiness.RefreshDeviceStatusEvent += (rfid, cam) =>
+            {
+                if (rfid)
+                {
+                    RfidStatus = 2;
+                }
+                else
+                {
+                    RfidStatus = 1;
+                }
+
+                if (cam)
+                {
+                    CamStatus = 2;
+                }
+                else
+                {
+                    CamStatus = 1;
+                }
+            };
+
         }
 
         /// <summary>
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index 9b905e1..8d4a2ad 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -13,43 +13,8 @@
       {
         "configId": "mes",
         "dbType": 4,
-        "connStr": "PORT=5432;DATABASE=daxing;HOST=127.0.0.1;PASSWORD=123456;USER ID=postgres"
+        "connStr": "PORT=5432;DATABASE=daxing;HOST=192.168.0.101;PASSWORD=123456;USER ID=postgres"
       }
-    ],
-    "PlcConfig": [
-      {
-        "configId": 1,
-        "plcType": "MelsecBinaryPlc",
-        "plcIp": "127.0.0.1",
-        "plcPort": 6000,
-        "plcKey": "mcs",
-        "isFlage": true
-      },
-      {
-        "configId": 2,
-        "plcType": "MelsecBinaryPlc",
-        "plcIp": "127.0.0.1",
-        "plcPort": 6001,
-        "plcKey": "cwss",
-        "isFlage": true
-      }
-    ],
-    "RfidConfig": [
-      {
-        "configId": 1,
-        "equipIp": "127.0.0.1",
-        "equipPort": 6003,
-        "equipKey": "test1",
-        "isFlage": true
-      },
-      {
-        "configId": 2,
-        "equipIp": "127.0.0.1",
-        "equipPort": 6004,
-        "equipKey": "test2",
-        "isFlage": true
-      }
-    ],
-    "redisConfig": "175.27.215.92:6379,password=redis@2023"
+    ]
   }
 }