Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs

@@ -345,9 +345,10 @@ namespace BeDesignerSCADA.Controls
                 {
                     System.Windows.Controls.ComboBox toggle = (System.Windows.Controls.ComboBox)sender;
                     if (toggle.Tag == null) return;
-                    if (Class_DataBus.GetInstance().Dic_DeviceData.ContainsKey(toggle.Tag.ToString()))
+                    CommunicationModel mode=viewModel.communicationPar?.CommunicationDevices?.ToList().Find(par => par.DeviceName == toggle.Tag.ToString());
+                    if (mode != null)
                     {
-                        Class_DataBus.GetInstance().Dic_DeviceData[toggle.Tag.ToString()].Keys?.ToList().ForEach(key => { viewModel.DevValueList.Add(key); });
+                        mode?.VarTableModels?.ToList().ForEach(par => { viewModel.DevValueList.Add(par.VarName); });
                     }
                 }
             }
@@ -390,7 +391,7 @@ namespace BeDesignerSCADA.Controls
         private void namebox_DropDownOpened(object sender, EventArgs e)
         {
             viewModel.DevNameList = new System.Collections.ObjectModel.ObservableCollection<string>();
-            Class_DataBus.GetInstance().Dic_DeviceData.Keys?.ToList().ForEach(key => { viewModel.DevNameList.Add(key); });
+            viewModel.communicationPar?.CommunicationDevices?.ToList().ForEach(x => { viewModel.DevNameList.Add(x.DeviceName); });
         }
         #endregion
     }

BeDesignerSCADA/ViewModel/MainViewModelNew.cs

@@ -1,6 +1,7 @@
 using BeDesignerSCADA.Common;
 using BeDesignerSCADA.Controls;
 using BeDesignerSCADA.View;
+using BPASmart.Model;
 using BPASmartClient.Compiler;
 using BPASmartClient.DATABUS;
 using BPASmartClient.MessageName;
@@ -12,6 +13,7 @@ using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Win32;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -35,7 +37,7 @@ namespace BeDesignerSCADA.ViewModel
             {
                 IsRunning = !IsRunning;
             });
-            DataBusModel.GetInstance().RefreshTheVariableManagerAction += RefreshTheVariableManagerActionHader;   
+            DataBusModel.GetInstance().RefreshTheVariableManagerAction += RefreshTheVariableManagerActionHader;
         }
 
         #region 变量
@@ -43,7 +45,10 @@ namespace BeDesignerSCADA.ViewModel
         /// 变量管理器地址
         /// </summary>
         public string VariablePath = string.Empty;
-
+        /// <summary>
+        /// 当前变量管理器变量
+        /// </summary>
+        public CommunicationPar communicationPar = new CommunicationPar();
         /// <summary>
         /// 是否正在运行状态
         /// </summary>
@@ -211,7 +216,10 @@ namespace BeDesignerSCADA.ViewModel
             {
                 if (path == VariablePath && !string.IsNullOrEmpty(VariablePath))
                 {
-                    
+                    if (DataBusModel.GetInstance().KeyValues.ContainsKey(VariablePath))
+                    {
+                        communicationPar = DataBusModel.GetInstance().KeyValues[VariablePath];
+                    }
                 }
             }
             catch (Exception ex)