逻辑规则和CAN结合的更改

CapMachine.Wpf/ViewModels/CANConfigViewModel.cs

@@ -53,9 +53,11 @@ namespace CapMachine.Wpf.ViewModels
             Mapper = mapper;
             this.MachineRtDataService = machineRtDataService;
 
-            //MachineDataService = machineDataService;
+            //MachineDataService = machineDataService; 
             DialogService = dialogService;
 
+            EventAggregator.GetEvent<LogicRuleChangeEvent>().Subscribe(LogicRuleChangeEventCall);
+
             WriteNameCbxItems = new ObservableCollection<CbxItems>()
             {
                 new CbxItems(){ Key="转速",Text="转速"},
@@ -77,16 +79,8 @@ namespace CapMachine.Wpf.ViewModels
 
             InitLoadCanConfigPro();
 
-            WriteRuleCbxItems = new ObservableCollection<CbxItems>();
-            //选择的读写规则
-            foreach (var itemRule in LogicRuleService.LogicRuleDtos)
-            {
-                WriteRuleCbxItems.Add(new CbxItems()
-                {
-                    Key = itemRule.Id.ToString(),
-                    Text = itemRule.Name
-                });
-            }
+            //初始化写规则下拉框
+            InitWriteRuleCbx();
 
         }
 
@@ -110,6 +104,38 @@ namespace CapMachine.Wpf.ViewModels
         /// </summary>
         public IDialogService DialogService { get; }
 
+        #region 规则
+
+
+        /// <summary>
+        /// 逻辑更改事件
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void LogicRuleChangeEventCall(string msg)
+        {
+            //InitWriteRuleCbx();
+        }
+
+        /// <summary>
+        /// 初始化写规则下拉框
+        /// </summary>
+        private void InitWriteRuleCbx()
+        {
+            WriteRuleCbxItems = new ObservableCollection<CbxItems>();
+            //选择的读写规则
+            foreach (var itemRule in LogicRuleService.LogicRuleDtos)
+            {
+                WriteRuleCbxItems.Add(new CbxItems()
+                {
+                    Key = itemRule.Id.ToString(),
+                    Text = itemRule.Name
+                });
+            }
+        }
+
+
+        #endregion
 
 
         #region CanConfigPro
@@ -150,7 +176,9 @@ namespace CapMachine.Wpf.ViewModels
                             MsgName = item.MsgFrameName,
                             SignalName = item.SignalName,
                             SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
+                            LogicRuleDto = Mapper.Map<LogicRuleDto>(item.LogicRule),
                         });
+
                         //CanDriveService.CmdData.Add(new CanCmdData()
                         //{
                         //    ConfigName = item.Name,
@@ -1124,7 +1152,11 @@ namespace CapMachine.Wpf.ViewModels
                 System.Windows.MessageBox.Show("选中CAN配置名称后再操作", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
                 return;
             }
-
+            if (CanDriveService.ToomossCanDrive.IsCycleSend)
+            {
+                System.Windows.MessageBox.Show("正在循环发送中，此时编辑可能会出现错误，请关闭循环发送后再操作", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
+                return;
+            }
 
             switch (Par)
             {
@@ -1260,6 +1292,11 @@ namespace CapMachine.Wpf.ViewModels
                 System.Windows.MessageBox.Show("选中CAN配置名称后再操作", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
                 return;
             }
+            if (CanDriveService.ToomossCanDrive.IsCycleRevice)
+            {
+                System.Windows.MessageBox.Show("正在循环接受中，此时编辑可能会出现错误，请关闭循环发送后再操作", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
+                return;
+            }
 
             switch (Par)
             {