SenGao 5 時間 前
コミット
9d580030c4
共有2 個のファイルを変更した11 個の追加8 個の削除を含む
  1. 6 3
      EEMSUIClient/ViewModels/MainWindowViewModel.cs
  2. 5 5
      EEMSUIClient/Views/MainWindow.xaml

+ 6 - 3
EEMSUIClient/ViewModels/MainWindowViewModel.cs

@@ -175,7 +175,7 @@ public partial class MainWindowViewModel : ObservableObject
 
             GuidStr = guid.ToString();
             MessageBox.Show("设备注册成功。");
-
+            deviceInfo.Guid = guid;
             var jsonString = JsonSerializer.Serialize(deviceInfo);
             File.WriteAllText(Path.Combine(_settingsFolder, _deviceInfoFileName), jsonString);
         }
@@ -190,8 +190,11 @@ public partial class MainWindowViewModel : ObservableObject
     {
         try
         {
-            _count++;
-            _realtimeData[_count.ToString()]=_count;
+            _realtimeData.Clear();
+            for (int i = 0; i < 100; i++)
+            {
+                _realtimeData[i.ToString()] = DateTime.Now.ToString();
+            }
             _clientService.UpdateRealTimeData(_realtimeData);
         }
         catch (Exception ex)

+ 5 - 5
EEMSUIClient/Views/MainWindow.xaml

@@ -27,18 +27,18 @@
             </Grid.ColumnDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" Margin="3,3,3,3" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <Label Content="IP:" Height="30"/>
-                <TextBox Text="{Binding IpAddress}" Width="150" Height="30"/>
+                <TextBox Text="{Binding IpAddress}" Width="150" Height="30" IsEnabled="{Binding IsNotConnected}"/>
             </StackPanel>
             <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Margin="3,3,3,3" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <Label Content="Port:" Height="30"/>
-                <TextBox Text="{Binding Port}" Width="150" Height="30"/>
+                <TextBox Text="{Binding Port}" Width="150" Height="30" IsEnabled="{Binding IsNotConnected}"/>
             </StackPanel>
             <StackPanel Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Margin="3,3,3,3" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <Label Content="HubName:" Height="30"/>
-                <TextBox Text="{Binding HubName}" Width="100" Height="30"/>
+                <TextBox Text="{Binding HubName}" Width="100" Height="30" IsEnabled="{Binding IsNotConnected}"/>
             </StackPanel>
             <StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal" Margin="3,3,3,3" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Button Content="Connect" Command="{Binding ConnectCommand}" Height="30" Width="60"/>
+                <Button Content="Connect" Command="{Binding ConnectCommand}" Height="30" Width="60" IsEnabled="{Binding IsNotConnected}"/>
             </StackPanel>
             <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Margin="3,3,3,3" HorizontalAlignment="Right" VerticalAlignment="Center">
                 <Button Content="Recipe" Command="{Binding SelectRecipeCommand}" Height="30" Width="60"/>
@@ -81,7 +81,7 @@
             <Label Grid.Row="5" Grid.Column="0" Content="DB Connection String:" HorizontalAlignment="Right" Height="30"/>
             <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding DBConnectionString}" Height="30"/>
             <Label Grid.Row="6" Grid.Column="0" Content="Guid:" HorizontalAlignment="Right" Height="30"/>
-            <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding GuidStr}" Height="30"/>
+            <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding GuidStr}" Height="30" IsReadOnly="True"/>
             <Button Grid.Row="6" Grid.Column="2" Content="Register" Command="{Binding RegisterCommand}" Height="30" Width="100"/>
             <Button Grid.Row="0" Grid.Column="2" Content="Trigger" Command="{Binding TriggerCommand}" Height="30" Width="100"/>
         </Grid>