Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

View/MachinePage.xaml

@@ -59,6 +59,11 @@
                     </Style.Triggers>
                 </Style>
             </DataGrid.CellStyle>
+            <DataGrid.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static lang:ResourceLanguage.information}" Click="MenuItem_information"/>
+                </ContextMenu>
+            </DataGrid.ContextMenu>
             <DataGrid.Columns>
                 <!--列信息绑定-->
                 <DataGridTextColumn Header="{x:Static lang:ResourceLanguage.information}" Width="200" FontSize="26" 

View/MachinePage.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using SunlightAggregationManager.UserWindow;
 
 namespace SunlightAggregationManager.View
 {
@@ -37,5 +38,12 @@ namespace SunlightAggregationManager.View
 
             }
         }
+
+        private void MenuItem_information(object sender, RoutedEventArgs e)
+        {
+            MachineSet machineSet = new MachineSet();
+            machineSet.Show();
+        }
+
     }
 }

View/SettingPage.xaml

@@ -24,7 +24,6 @@
         <Button Content="{x:Static lang:ResourceLanguage.Test}" HorizontalAlignment="Left" Height="35" Margin="370,335,0,0" VerticalAlignment="Top" Width="80" Click="test_Click"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,335,0,0" x:Name="textlog" TextWrapping="Wrap" Text="------------" VerticalAlignment="Top" Width="140" FontSize="20"/>
 
-
         <CheckBox x:Name="EnableTCP" Content="{x:Static lang:ResourceLanguage.EnableTCP}" HorizontalAlignment="Left" Margin="600,10,0,0" VerticalAlignment="Top" Height="40" Width="300" FontSize="24" 
                   Checked="EnableTCP_Checked" Unchecked="EnableTCP_Unchecked"/>
         <CheckBox x:Name="EnableHTTP" Content="{x:Static lang:ResourceLanguage.EnableHTTP}" HorizontalAlignment="Left" Margin="600,60,0,0" VerticalAlignment="Top" Height="40" Width="300" FontSize="24" 

View/SettingPage.xaml.cs

@@ -39,6 +39,35 @@ namespace SunlightAggregationManager.View
                 TEXT_SQMOD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL3");
                 TEXT_SQLUSER.Text = Configini.IniReadvalue("SQL_SERVER", "SQL4");
                 TEXT_SQLPASWORD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL5");
+
+
+                var tcp = Configini.IniReadvalue("NETWORK", "TCP");
+                if (tcp == "1")
+                {
+                    EnableTCP.IsChecked = true;
+                }
+                else
+                {
+                    EnableTCP.IsChecked = false;
+                }
+                var http = Configini.IniReadvalue("NETWORK", "HTTP");
+                if (http == "1")
+                {
+                    EnableHTTP.IsChecked = true;
+                }
+                else
+                {
+                    EnableHTTP.IsChecked = false;
+                }
+                var tls = Configini.IniReadvalue("NETWORK", "TLS");
+                if (tls == "1")
+                {
+                    EnableTLS.IsChecked = true;
+                }
+                else
+                {
+                    EnableTLS.IsChecked = false;
+                }
             }
             catch (Exception) { }
         }