From bf1e5f27eb73c732bb52c77ee810109d92481d72 Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Fri, 4 Jul 2025 23:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Views/Dialogs/MqttDialog.xaml | 79 ++++++++++++++++++++++++++++-------
 Views/MqttsView.xaml          | 56 +++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 16 deletions(-)

diff --git a/Views/Dialogs/MqttDialog.xaml b/Views/Dialogs/MqttDialog.xaml
index 4def479..7752a40 100644
--- a/Views/Dialogs/MqttDialog.xaml
+++ b/Views/Dialogs/MqttDialog.xaml
@@ -17,27 +17,39 @@
                   d:DataContext="{d:DesignInstance vmd:MqttDialogViewModel}"
                   mc:Ignorable="d">
     <ui:ContentDialog.Resources>
-        <ex:EnumBindingSource x:Key="mqttPlatform" EnumType="{x:Type en:MqttPlatform}" />
+        <ex:EnumBindingSource x:Key="mqttPlatform"
+                              EnumType="{x:Type en:MqttPlatform}" />
         <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
     </ui:ContentDialog.Resources>
 
-    <Grid Width="480" Margin="10">
+    <Grid Width="480"
+          Margin="10">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" />
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <!-- 左边列 -->
-        <ikw:SimpleStackPanel Grid.Column="0" Margin="10 10 20 10 " Spacing="12">
+        <ikw:SimpleStackPanel Grid.Column="0"
+                              Margin="10 10 20 10 "
+                              Spacing="12">
             <!-- MQTT名称 -->
-            <TextBlock Text="MQTT名称" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="MQTT名称"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <TextBox Text="{Binding Mqtt.Name, UpdateSourceTrigger=PropertyChanged}" />
             <!-- MQTT IP地址 -->
-            <TextBlock Text="MQTT IP地址" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <TextBox AcceptsReturn="True" Text="{Binding Mqtt.Host, UpdateSourceTrigger=PropertyChanged}" />
+            <TextBlock Text="MQTT IP地址"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox AcceptsReturn="True"
+                     Text="{Binding Mqtt.Host, UpdateSourceTrigger=PropertyChanged}" />
 
             <!-- Mqtt平台 -->
-            <TextBlock Text="Mqtt平台" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <ComboBox SelectedItem="{Binding Mqtt.Platform}" ItemsSource="{Binding Source={StaticResource mqttPlatform} }">
+            <TextBlock Text="Mqtt平台"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <ComboBox SelectedItem="{Binding Mqtt.Platform}"
+                      ItemsSource="{Binding Source={StaticResource mqttPlatform} }">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
@@ -45,28 +57,63 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
 
-            <CheckBox FontSize="16" Content="是否设为默认" Margin="0 30 0 0" IsChecked="{Binding Mqtt.IsDefault}" />
 
+            <!-- PublishTopic -->
+            <TextBlock Text="发布主题"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox Text="{Binding Mqtt.PublishTopic, UpdateSourceTrigger=PropertyChanged}" />
+
+            <!-- SubTopics -->
+            <TextBlock Text="订阅主题"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox Text="{Binding Mqtt.SubTopics, UpdateSourceTrigger=PropertyChanged}" />
+            <CheckBox FontSize="16"
+                      Content="是否设为默认"
+                      Margin="0 30 0 0"
+                      IsChecked="{Binding Mqtt.IsDefault}" />
         </ikw:SimpleStackPanel>
         <!-- 右边列 -->
-        <ikw:SimpleStackPanel Margin="10" Grid.Column="1" Spacing="12">
+        <ikw:SimpleStackPanel Margin="10"
+                              Grid.Column="1"
+                              Spacing="12">
 
             <!-- MQTT备注 -->
-            <TextBlock Text="MQTT备注" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="MQTT备注"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <TextBox Text="{Binding Mqtt.Remark, UpdateSourceTrigger=PropertyChanged}" />
             <!-- MQTT端口 -->
-            <TextBlock Text="MQTT端口" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
-            <TextBox AcceptsReturn="True" Text="{Binding Mqtt.Port, UpdateSourceTrigger=PropertyChanged}" />
+            <TextBlock Text="MQTT端口"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox AcceptsReturn="True"
+                     Text="{Binding Mqtt.Port, UpdateSourceTrigger=PropertyChanged}" />
 
             <!-- 用户名 -->
-            <TextBlock Text="用户名" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="用户名"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <TextBox Text="{Binding Mqtt.UserName, UpdateSourceTrigger=PropertyChanged}" />
 
             <!-- 密码 -->
-            <TextBlock Text="密码" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" />
+            <TextBlock Text="密码"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
             <TextBox Text="{Binding Mqtt.PassWord, UpdateSourceTrigger=PropertyChanged}" />
 
-            <CheckBox FontSize="16" Content="是否启用" Margin="0 30 0 0" IsChecked="{Binding Mqtt.IsActive}" />
+            <!-- ClientID -->
+            <TextBlock Text="ClientID"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <TextBox Text="{Binding Mqtt.ClientID, UpdateSourceTrigger=PropertyChanged}" />
+
+
+            <CheckBox FontSize="16"
+                      Content="是否启用"
+                      Margin="0 30 0 0"
+                      IsChecked="{Binding Mqtt.IsActive}" />
 
         </ikw:SimpleStackPanel>
     </Grid>
diff --git a/Views/MqttsView.xaml b/Views/MqttsView.xaml
index 89e1f1b..2043e77 100644
--- a/Views/MqttsView.xaml
+++ b/Views/MqttsView.xaml
@@ -79,6 +79,62 @@
                                 <Run Text="{Binding Platform, FallbackValue='EMQX'}" />
                             </TextBlock>
                         </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Contact}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding ClientID}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.OtherUser}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding UserName}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Lock}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding PassWord}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Send}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding PublishTopic}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.SubscriptionAdd}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding SubTopics}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Calendar}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding ConnTime}" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal"
+                                    Margin="0,2">
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FavoriteStar}"
+                                         VerticalAlignment="Center"
+                                         Margin="0,0,8,0"
+                                         FontSize="14" />
+                            <TextBlock Text="{Binding IsDefault}" />
+                        </StackPanel>
                     </StackPanel>
                 </Grid>
             </Border>