screen size self-adaptive

SCADA/Program/BatchCoreService/DAService.cs

@@ -1485,7 +1485,9 @@ namespace BatchCoreService
                 byte[] dt = BitConverter.GetBytes(id);
                 sendBuffer[j++] = dt[0];
                 sendBuffer[j++] = dt[1];
-                switch (_list[GetItemProperties(id)].DataType)
+                var index = GetItemProperties(id);
+                if (index < 0 || index >= _list.Count) continue;
+                switch (_list[index].DataType)
                 {
                     case DataType.BOOL:
                         sendBuffer[j++] = 1;

SCADA/Program/CoreTest/MainWindow.xaml.cs

@@ -163,10 +163,11 @@ namespace CoreTest
                     ContentControl ctrl = Activator.CreateInstance(Type.GetType(txt)) as ContentControl;
                     if (ctrl != null)
                     {
-                        ScaleControl(ctrl);
+                        var win = ctrl as Window;
+                        if (win == null)
+                            ScaleControl(ctrl);
                         ctrl.Loaded += new RoutedEventHandler(ctrl_Loaded);
                         ctrl.Unloaded += new RoutedEventHandler(ctrl_Unloaded);
-                        var win = ctrl as Window;
                         if (win != null)
                         {
                             win.Owner = this;

SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt

@@ -20,6 +20,6 @@ E:\Project\牧羊上位机\WpfApplication1\obj\Debug\DataService.dll
 E:\Project\牧羊上位机\WpfApplication1\obj\Debug\DataService.pdb
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.pdb
+C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache

SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt

@@ -98,6 +98,5 @@ F:\牧羊上位机\WpfApplication1\obj\Release\DataService.dll
 F:\牧羊上位机\WpfApplication1\obj\Release\DataService.pdb
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.csprojResolveAssemblyReference.cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.pdb

SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt

@@ -331,7 +331,6 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Mi
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Controls.xml
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.xml
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.lref
@@ -341,3 +340,4 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HM
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.GenerateResource.Cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb
+C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache

SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt

@@ -443,4 +443,3 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csproj.GenerateResource.Cache
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.dll
 C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.pdb
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csprojResolveAssemblyReference.cache