1
czw
2025-07-02 3492292c4f006945781714b731303a12b0f1dd3a
1
1个文件已添加
6个文件已修改
202 ■■■■■ 已修改文件
2025年6月12日/AuxAllWCS/Build/Project/AuxAllWCS.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/ConsoleInterceptor.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Views/View.json 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Views/View1.xaml 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Views/View2.xaml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/AuxAllWCS.csproj
@@ -194,6 +194,7 @@
      <DependentUpon>App.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="代码\VS自定义类\ConsoleInterceptor.cs" />
    <Compile Include="界面\View2.xaml.cs">
      <DependentUpon>View2.xaml</DependentUpon>
    </Compile>
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/ConsoleInterceptor.cs
New file
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GZ.Projects.AuxAllWCS
{
    // åˆ›å»ºè‡ªå®šä¹‰çš„ TextWriter
    public class ConsoleInterceptor : TextWriter
    {
        private readonly TextWriter _originalOut;
        public ConsoleInterceptor()
        {
            _originalOut = Console.Out;
        }
        public override Encoding Encoding => Encoding.UTF8;
        public override void WriteLine(string value = "")
        {
            // åœ¨è¿™é‡Œæ‹¦æˆªå¤„理输出
            //string intercepted = $"[拦截到的输出] {value}";
            //// å¯ä»¥é€‰æ‹©ç»§ç»­è¾“出到原控制台
            //_originalOut.WriteLine(intercepted);
        }
    }
}
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/½çÃæÊ¼þ.cs
@@ -62,10 +62,6 @@
            }
            View1_Init(sender, e);
            LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
            LogHelper.Info($"<<<<<<<<<<<<<<<<<程序·启动>>>>>>>>>>>>>>");
            LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
            /// <summary>
            /// ç¨‹åºç‰‡æ®µ:初始化配置
            /// æè¿°:
@@ -1056,6 +1052,14 @@
        /// <param name="e"></param>
        public void View1_Init(object sender, RoutedEventArgs e)
        {
            LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
            LogHelper.Info($"<<<<<<<<<<<<<<<<<程序·启动>>>>>>>>>>>>>>");
            // ä½¿ç”¨æ‹¦æˆªå™¨
            var interceptor = new ConsoleInterceptor();
            Console.SetOut(interceptor);
            LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
        }
        #endregion
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/×Ô¶¨ÒåÀà.cs
@@ -172,11 +172,11 @@
            // æ·»åŠ target-console
            var consoleTarget = new ColoredConsoleTarget();
            consoleTarget.Layout = @"${longdate} | ${level:uppercase=false:padding=-5} | ${message} ${onexception:${exception:format=tostring} ${newline} ${stacktrace} ${newline}";
            //var consoleTarget = new ColoredConsoleTarget();
            //consoleTarget.Layout = @"${longdate} | ${level:uppercase=false:padding=-5} | ${message} ${onexception:${exception:format=tostring} ${newline} ${stacktrace} ${newline}";
            config.AddTarget("console", consoleTarget);
            config.AddRule(LogLevel.Debug, LogLevel.Fatal, consoleTarget);
            //config.AddTarget("console", consoleTarget);
            //config.AddRule(LogLevel.Debug, LogLevel.Fatal, consoleTarget);
            //添加target-info
            var infoFileTarget = new FileTarget();
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Views/View.json
@@ -18,15 +18,7 @@
      "Controls": [
        {
          "Name": "",
          "Type": "Canvas",
          "FullType": "",
          "Assembly": "",
          "Events": [],
          "Commands": []
        },
        {
          "Name": "",
          "Type": "Label",
          "Type": "Grid",
          "FullType": "",
          "Assembly": "",
          "Events": [],
@@ -44,9 +36,36 @@
      "NamedControls": [],
      "Events": [],
      "Commands": []
    },
    {
      "ID": "20250702102310624",
      "Name": "View2",
      "Desc": "",
      "Directory": "/",
      "FilePath": "/View2.xaml",
      "FileName": "View2.xaml",
      "Content": "",
      "ParentID": "",
      "Children": [],
      "Type": "View",
      "IsStartup": false,
      "IsMainForm": false,
      "Controls": [
        {
          "Name": "",
          "Type": "Canvas",
          "FullType": "",
          "Assembly": "",
          "Events": [],
          "Commands": []
        }
      ],
      "NamedControls": [],
      "Events": [],
      "Commands": []
    }
  ],
  "Layouts": [],
  "CreationTime": "2025-02-26 15:31:21",
  "LastWriteTime": "2025-07-02 10:11:01"
  "LastWriteTime": "2025-07-02 10:54:40"
}
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Views/View1.xaml
@@ -1,102 +1,5 @@
<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="&#x0a;
////////////////////////////////////////////////////////////////////&#x0a;
//                          _ooOoo_                               //&#x0a;
//                         o8888888o                              //&#x0a;
//                         88' ã€‚ '88                              //&#x0a;
//                         (| ^_^ |)                              //&#x0a;
//                         O\  =  /O                              //&#x0a;
//                      ____/`---'\____                           //&#x0a;
//                    .'  \\|     |//  `.                         //&#x0a;
//                   /  \\|||  :  |||//  \                        //&#x0a;
//                  /  _||||| -:- |||||-  \                       //&#x0a;
//                  |   | \\\  -  /// |   |                       //&#x0a;
//                  | \_|  ''\---/''  |   |                       //&#x0a;
//                  \  .-\__  `-`  ___/-. /                       //&#x0a;
//                ___`. .'  /--.--\  `. . ___                     //&#x0a;
//               .'' '《`.___\_《|》_/___.'  ã€‹'''.                    //&#x0a;
//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //&#x0a;
//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //&#x0a;
//      ========`-.____`-.___\_____/___.-`____.-'========         //&#x0a;
//                           `=---='                              //&#x0a;
//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //&#x0a;
//           ä½›ç¥–保佑       æ°¸æ— BUG     æ°¸ä¸ä¿®æ”¹                     //&#x0a;
////////////////////////////////////////////////////////////////////"
                     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 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>
    <TextBlock HorizontalAlignment="Center" FontFamily="Courier New" Text="&#xA;&#xD;&#xA;////////////////////////////////////////////////////////////////////&#xA;&#xD;&#xA;//                          _ooOoo_                               //&#xA;&#xD;&#xA;//                         o8888888o                              //&#xA;&#xD;&#xA;//                         88' ã€‚ '88                              //&#xA;&#xD;&#xA;//                         (| ^_^ |)                              //&#xA;&#xD;&#xA;//                         O\  =  /O                              //&#xA;&#xD;&#xA;//                      ____/`---'\____                           //&#xA;&#xD;&#xA;//                    .'  \\|     |//  `.                         //&#xA;&#xD;&#xA;//                   /  \\|||  :  |||//  \                        //&#xA;&#xD;&#xA;//                  /  _||||| -:- |||||-  \                       //&#xA;&#xD;&#xA;//                  |   | \\\  -  /// |   |                       //&#xA;&#xD;&#xA;//                  | \_|  ''\---/''  |   |                       //&#xA;&#xD;&#xA;//                  \  .-\__  `-`  ___/-. /                       //&#xA;&#xD;&#xA;//                ___`. .'  /--.--\  `. . ___                     //&#xA;&#xD;&#xA;//               .'' '《`.___\_《|》_/___.'  ã€‹'''.                    //&#xA;&#xD;&#xA;//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //&#xA;&#xD;&#xA;//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //&#xA;&#xD;&#xA;//      ========`-.____`-.___\_____/___.-`____.-'========         //&#xA;&#xD;&#xA;//                           `=---='                              //&#xA;&#xD;&#xA;//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //&#xA;&#xD;&#xA;//           ä½›ç¥–保佑       æ°¸æ— BUG     æ°¸ä¸ä¿®æ”¹                     //&#xA;&#xD;&#xA;////////////////////////////////////////////////////////////////////" TextWrapping="Wrap" />
  </Grid>
</Window>
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Views/View2.xaml
@@ -1,4 +1,3 @@
<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 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="640" Height="480">
  <Canvas />
</Window>