优化重复登记提示方式

Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Core/AppointmentDetailPageHandler.cs

@@ -21,10 +21,25 @@ namespace GS.Terminal.VisitorSelfService.Logic.Core
         public override void Init()
         {
             VM.OnExitClick += VM_OnExitClick;
+            VM.OnConfirmYesClick += VM_OnConfirmYesClick;
             VM.OnSubmitClick += VM_OnSubmitClick;
         }
 
-        private void VM_OnSubmitClick(AppointmentItem info)
+        private void VM_OnSubmitClick(AppointmentItem obj)
+        {
+            if (obj != null && obj.todayvisittimes > 0)
+            {
+                var msg = Program._Context.DictionaryValue("defaultconfig", "RepeatMessage");
+                if (string.IsNullOrEmpty(msg)) msg = "你已经完成确认，欢迎进入";
+                VM.Alert(msg);
+            }
+            else
+            {
+                VM.ShowConfirm = true;
+            }
+        }
+
+        private void VM_OnConfirmYesClick(AppointmentItem info)
         {
             var photoContent = "";
             using (var photo = FaceRecognization.GetCurrentVideoFrame())
@@ -128,6 +143,7 @@ namespace GS.Terminal.VisitorSelfService.Logic.Core
                 item.id = ss.id;
                 item.areaName = ss.visitArea;
                 item.beVisitPerson = ss.visitPerson;
+                item.todayvisittimes = ss.todayvisittimes;
                 item.endDate = ss.endDate;
                 item.idCardNum = ss.visitorIdNum;
                 item.phoneNum = ss.visitorPhone;

Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Program.cs

@@ -18,7 +18,7 @@ namespace GS.Terminal.VisitorSelfService.Logic
         internal static IAddonContext _Context;
         internal static IObjectSpace _ObjectSpace;
         internal static Locator vmLocator;
-        internal static string _logicVersion = "0721.11";
+        internal static string _logicVersion = "0815.11";
 
         public void Start(IAddonContext Context)
         {

Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Remote/Models/Appointment.cs

@@ -18,6 +18,7 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote.Models
         public string visitArea { get; set; }
         public int numberOfPeople { get; set; }
         public string visitPerson { get; set; }
+        public int todayvisittimes { get; set; }
         public List<AppointmentExtendInfo> extendInfo { get; set; }
     }
 

Src/GS.Terminal.VisitorSelfService/ViewModelView/ViewModels/Pages/AppointmentDetailPage/ViewModel.cs

@@ -152,19 +152,18 @@ namespace ViewModels.Pages.AppointmentDetailPage
         public event Action<AppointmentItem> OnSubmitClick;
         public RelayCommand SubmitCommand => new RelayCommand(() =>
         {
-            ShowConfirm = true;
-            //OnSubmitClick?.Invoke(info);
+            OnSubmitClick?.Invoke(Appointment);
         });
 
         public RelayCommand ConfirmClose => new RelayCommand(() =>
         {
             ShowConfirm = false;
         });
-
+        public event Action<AppointmentItem> OnConfirmYesClick;
         public RelayCommand ConfirmYes => new RelayCommand(() =>
         {
             ShowConfirm = false;
-            OnSubmitClick?.Invoke(Appointment);
+            OnConfirmYesClick?.Invoke(Appointment);
         });
 
         public void Reset()
@@ -188,6 +187,7 @@ namespace ViewModels.Pages.AppointmentDetailPage
         public string areaName { get; set; }
         public int visitPeople { get; set; }
         public string beVisitPerson { get; set; }
+        public int todayvisittimes { get; set; }
         public List<AppointmentExtendGroup> extends { get; set; }
 
     }