From 4847ec2b6b5ab316303052117f250d6e9d901cb0 Mon Sep 17 00:00:00 2001 From: czw <selecti@yeah.net> Date: 星期三, 02 七月 2025 10:52:08 +0800 Subject: [PATCH] 1 --- 2025年6月12日/AuxAllWCS/Views/View2.xaml | 4 + 2025年6月12日/AuxAllWCS/Build/Project/AuxAllWCS.csproj | 7 ++ 2025年6月12日/AuxAllWCS/Build/Project/界面/View1.xaml | 5 + 2025年6月12日/AuxAllWCS/Views/View1.xaml | 106 +++++++++++++++++++++++++++++++++- 2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/TcpServer.cs | 2 5 files changed, 118 insertions(+), 6 deletions(-) diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" index 6ca7ab6..14f7acc 100644 --- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" @@ -194,6 +194,9 @@ <DependentUpon>App.xaml</DependentUpon> <SubType>Code</SubType> </Compile> + <Compile Include="鐣岄潰\View2.xaml.cs"> + <DependentUpon>View2.xaml</DependentUpon> + </Compile> <Page Include="鐣岄潰\View1.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -213,6 +216,10 @@ <Compile Include="浠g爜\VS鑷畾涔夌被\TcpServer.cs" /> <Compile Include="浠g爜\VS鑷畾涔夌被\AutoThread.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Page Include="鐣岄潰\View2.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> </ItemGroup> <ItemGroup> <None Include="App.config" /> diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs" index f91b6bd..734b61f 100644 --- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs" +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs" @@ -222,6 +222,8 @@ // 杞崲鍥炲崄杩涘埗 return Convert.ToInt32(new string(binaryChars), 2); } + public static List<string> GetStaticClients() => clients.Keys.ToList(); + public static Dictionary<string, string> GetStaticScan() => TrayIps; } } diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\347\225\214\351\235\242/View1.xaml" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\347\225\214\351\235\242/View1.xaml" index 2b67554..bbc1df5 100644 --- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\347\225\214\351\235\242/View1.xaml" +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\347\225\214\351\235\242/View1.xaml" @@ -1,4 +1,7 @@ -<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="640" Height="480" x:Class="GZ.Projects.AuxAllWCS.View1" xmlns:local="clr-namespace:GZ.Projects.AuxAllWCS"> +<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="640" Height="480" x:Class="GZ.Projects.AuxAllWCS.View1" xmlns:local="clr-namespace:GZ.Projects.AuxAllWCS" + xmlns:local1="clr-namespace:GZ.Projects.AuxAllWCS.鐣岄潰" + Title="鍝堝搱wcs" + > <Grid> <Grid> <TabControl> diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View1.xaml" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View1.xaml" index 9a76484..2b67554 100644 --- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View1.xaml" +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View1.xaml" @@ -1,6 +1,102 @@ -<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="640" Height="480"> - <Canvas> - <Label Width="86" Height="25" Canvas.Left="31" Canvas.Top="172" /> - <TextBlock Text="鍝堝搱鍝� /> - </Canvas> +<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="640" Height="480" x:Class="GZ.Projects.AuxAllWCS.View1" xmlns:local="clr-namespace:GZ.Projects.AuxAllWCS"> + <Grid> + <Grid> + <TabControl> + <TabControl.Resources> + <Style TargetType="TabItem"> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="TabItem"> + <Border Name="Border" BorderThickness="1,1,1,0" BorderBrush="Gainsboro" CornerRadius="4,4,0,0" Margin="2,0"> + <ContentPresenter x:Name="ContentSite" + VerticalAlignment="Center" + HorizontalAlignment="Center" + ContentSource="Header" + Margin="10,2"/> + </Border> + <ControlTemplate.Triggers> + <Trigger Property="IsSelected" Value="True"> + <Setter TargetName="Border" Property="Background" Value="LightSkyBlue" /> + </Trigger> + <Trigger Property="IsSelected" Value="False"> + <Setter TargetName="Border" Property="Background" Value="GhostWhite" /> + </Trigger> + </ControlTemplate.Triggers> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> + </TabControl.Resources> + <TabItem> + <TabItem.Header> + <StackPanel Orientation="Horizontal"> + <TextBlock Text="emmm" Foreground="Yellow" /> + </StackPanel> + </TabItem.Header> + <TextBlock HorizontalAlignment="Center" FontFamily="Courier New" Text="
 +////////////////////////////////////////////////////////////////////
 +// _ooOoo_ //
 +// o8888888o //
 +// 88' 銆�'88 //
 +// (| ^_^ |) //
 +// O\ = /O //
 +// ____/`---'\____ //
 +// .' \\| |// `. //
 +// / \\||| : |||// \ //
 +// / _||||| -:- |||||- \ //
 +// | | \\\ - /// | | //
 +// | \_| ''\---/'' | | //
 +// \ .-\__ `-` ___/-. / //
 +// ___`. .' /--.--\ `. . ___ //
 +// .'' '銆奰.___\_銆妡銆媉/___.' 銆�''. //
 +// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
 +// \ \ `-. \_ __\ /__ _/ .-` / / //
 +// ========`-.____`-.___\_____/___.-`____.-'======== //
 +// `=---=' //
 +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
 +// 浣涚淇濅綉 姘告棤BUG 姘镐笉淇敼 //
 +////////////////////////////////////////////////////////////////////" + TextWrapping="Wrap" /> + </TabItem> + <TabItem> + <TabItem.Header> + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Rgv浠诲姟" Foreground="Purple" /> + </StackPanel> + </TabItem.Header> + <Label Content="Content goes here..." /> + </TabItem> + <TabItem> + <TabItem.Header> + <StackPanel Orientation="Horizontal"> + <TextBlock Text="AGV浠诲姟" Foreground="Black" /> + </StackPanel> + </TabItem.Header> + <Label Content="Content goes here..." /> + </TabItem> + <TabItem> + <TabItem.Header> + <StackPanel Orientation="Horizontal"> + <TextBlock Text="澹充綋涓嬫枡" Foreground="Blue" /> + </StackPanel> + </TabItem.Header> + <Label Content="Content goes here..." /> + </TabItem> + <TabItem> + <TabItem.Header> + <StackPanel Orientation="Horizontal"> + <TextBlock Text="鎬昏涓婃枡" Foreground="Red" /> + </StackPanel> + </TabItem.Header> + </TabItem> + <TabItem> + <TabItem.Header> + <StackPanel Orientation="Horizontal"> + <TextBlock Text="鎵爜澶� Foreground="Green" /> + </StackPanel> + </TabItem.Header> + </TabItem> + </TabControl> + </Grid> + </Grid> </Window> \ No newline at end of file diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View2.xaml" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View2.xaml" new file mode 100644 index 0000000..e5da1fe --- /dev/null +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Views/View2.xaml" @@ -0,0 +1,4 @@ +锘�Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="640" Height="480"> + <Canvas /> +</Window> \ No newline at end of file -- Gitblit v1.9.1