调试001
This commit is contained in:
@@ -1,22 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using linesider_screen_bankend.Core;
|
||||
using Prism.Commands;
|
||||
using System.Windows.Controls;
|
||||
using Prism.Regions;
|
||||
using SqlSugar;
|
||||
|
||||
namespace linesider_screen_bankend.Modules.ModuleName.Views
|
||||
{
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
<UserControl x:Class="linesider_screen_bankend.Views.HomePage"
|
||||
<UserControl x:Class="linesider_screen_bankend.Modules.ModuleName.Views.HomePage"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:linesider_screen_bankend.Views"
|
||||
mc:Ignorable="d"
|
||||
xmlns:local="clr-namespace:linesider_screen_bankend.Modules.ModuleName.Views"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:prism="http://prismlibrary.com/"
|
||||
d:DesignHeight="800" d:DesignWidth="1200">
|
||||
prism:ViewModelLocator.AutoWireViewModel="True">
|
||||
<Grid>
|
||||
<!-- 内容区域 -->
|
||||
<StackPanel>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace linesider_screen_bankend.Views
|
||||
namespace linesider_screen_bankend.Modules.ModuleName.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// HomePage.xaml 的交互逻辑
|
||||
|
||||
@@ -1,16 +1,94 @@
|
||||
<UserControl x:Class="linesider_screen_bankend.Views.SettingsPage"
|
||||
<UserControl x:Class="linesider_screen_bankend.Modules.ModuleName.Views.SettingsPage"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:linesider_screen_bankend.Views"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid Cursor="">
|
||||
<StackPanel>
|
||||
<TextBox TextWrapping="Wrap" Text="菜单1" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
<TextBox TextWrapping="Wrap" Text="菜单2" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
<TextBox TextWrapping="Wrap" Text="菜单3" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
xmlns:local="clr-namespace:linesider_screen_bankend.Modules.ModuleName.Views"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:prism="http://prismlibrary.com/"
|
||||
prism:ViewModelLocator.AutoWireViewModel="True">
|
||||
<StackPanel Orientation="Vertical">
|
||||
<GroupBox Margin="0,0,0,5" Header="数据库" Style="{StaticResource MaterialDesignGroupBox}">
|
||||
<StackPanel Orientation="Vertical">
|
||||
<StackPanel Margin="0,0,0,20" Orientation="Horizontal">
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="地址:" />
|
||||
<TextBox TextWrapping="Wrap" Text="{Binding Message}" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="端口号:" />
|
||||
<TextBox TextWrapping="Wrap" Text="3308" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="用户名:" />
|
||||
<TextBox TextWrapping="Wrap" Text="root" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="密码:" />
|
||||
<TextBox TextWrapping="Wrap" Text="123456" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="数据库:" />
|
||||
<TextBox TextWrapping="Wrap" Text="GXAssembly" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,0,20" Orientation="Horizontal">
|
||||
<Button Margin="0,0,20,0" Content="连接测试" Background="Gray" Foreground="White" Style="{StaticResource MaterialDesignRaisedButton}"/>
|
||||
<Button Content="保存" Background="Green" Foreground="White" Style="{StaticResource MaterialDesignRaisedButton}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
<GroupBox Margin="0,0,0,5" Header="MQTT" Style="{StaticResource MaterialDesignGroupBox}">
|
||||
<StackPanel Orientation="Vertical">
|
||||
<StackPanel Margin="0,0,0,20" Orientation="Horizontal">
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="地址:" />
|
||||
<TextBox TextWrapping="Wrap" Text="{Binding MqttAddress}" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="端口号:" />
|
||||
<TextBox TextWrapping="Wrap" Text="{Binding MqttPort}" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="设备编号:" />
|
||||
<TextBox TextWrapping="Wrap" Text="{Binding MqttClientId}" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="Topic:" />
|
||||
<TextBox TextWrapping="Wrap" Text="{Binding MqttTopic}" Width="150" Style="{StaticResource MaterialDesignTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,0,20" Orientation="Horizontal">
|
||||
<Button Margin="0,0,20,0" Content="连接测试" Background="Gray" Foreground="White" Style="{StaticResource MaterialDesignRaisedButton}"/>
|
||||
<Button Content="保存" Background="Green" Foreground="White" Style="{StaticResource MaterialDesignRaisedButton}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
<GroupBox Margin="0,0,0,5" Header="串口" Style="{StaticResource MaterialDesignGroupBox}">
|
||||
<StackPanel Orientation="Vertical">
|
||||
<StackPanel Margin="0,0,0,20" Orientation="Horizontal">
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="串口号:" />
|
||||
<ComboBox x:Name="PortComboBox" Width="256"
|
||||
IsEnabled="{Binding Path=IsChecked, ElementName=OutlinedComboBoxEnabledCheckBox}"
|
||||
ItemsSource="{Binding PortList}"
|
||||
Style="{StaticResource MaterialDesignOutlinedComboBox}" />
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,20,0" Orientation="Horizontal">
|
||||
<TextBlock Padding="0" Margin="0,0,10,0" Text="波特率:" />
|
||||
<ComboBox
|
||||
x:Name="BaudComboBox"
|
||||
Width="256"
|
||||
IsEnabled="{Binding Path=IsChecked, ElementName=OutlinedComboBoxEnabledCheckBox}"
|
||||
ItemsSource="{Binding BaudList}"
|
||||
Style="{StaticResource MaterialDesignOutlinedComboBox}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,0,0,20" Orientation="Horizontal">
|
||||
<Button Margin="0,0,20,0" Content="连接测试" Background="Gray" Foreground="White" Style="{StaticResource MaterialDesignRaisedButton}"/>
|
||||
<Button Content="保存" Background="Green" Foreground="White" Style="{StaticResource MaterialDesignRaisedButton}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
using System.Windows.Controls;
|
||||
using Prism.Regions;
|
||||
|
||||
namespace linesider_screen_bankend.Views
|
||||
namespace linesider_screen_bankend.Modules.ModuleName.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// SettingsPage.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class SettingsPage : UserControl
|
||||
{
|
||||
public SettingsPage()
|
||||
public SettingsPage(IRegionManager regionManager)
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user