Skip to content

Commit 01f4b49

Browse files
author
huifeng.liu
committed
fix 线程同步问题
1 parent 30d8171 commit 01f4b49

20 files changed

+406
-85
lines changed

‎.idea/.idea.ProxySU/.idea/codeStyles/codeStyleConfig.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/contentModel.xml

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/encodings.xml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/indexLayout.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/projectSettingsUpdater.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/.idea/workspace.xml

+121
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.ProxySU/riderModule.iml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ProxySU.Core/App.xaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Application x:Class="ProxySU.Core.App"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:local="clr-namespace:ProxySU.Core"
5+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
6+
StartupUri="MainWindow.xaml">
7+
<Application.Resources>
8+
9+
</Application.Resources>
10+
</Application>

‎ProxySU.Core/App.xaml.cs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Configuration;
4+
using System.Data;
5+
using System.Linq;
6+
using System.Threading.Tasks;
7+
using System.Windows;
8+
9+
namespace ProxySU.Core
10+
{
11+
/// <summary>
12+
/// Interaction logic for App.xaml
13+
/// </summary>
14+
public partial class App : Application
15+
{
16+
}
17+
}

‎ProxySU.Core/AssemblyInfo.cs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System.Windows;
2+
3+
[assembly: ThemeInfo(
4+
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
5+
//(used if a resource is not found in the page,
6+
// or application resource dictionaries)
7+
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
8+
//(used if a resource is not found in the page,
9+
// app, or any theme specific resource dictionaries)
10+
)]

‎ProxySU.Core/MainWindow.xaml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Window x:Class="ProxySU.Core.MainWindow"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
xmlns:local="clr-namespace:ProxySU.Core"
7+
mc:Ignorable="d"
8+
9+
Title="MainWindow" Height="450" Width="800">
10+
<Grid>
11+
<Menu Style="{DynamicResource MaterialDesignMenu}">
12+
<MenuItem Header="文件" Style="{DynamicResource MaterialDesignMenuItem}">
13+
<MenuItem Header="SubMenu">肖文杰</MenuItem>
14+
</MenuItem>
15+
<MenuItem Header="文件" Style="{DynamicResource MaterialDesignMenuItem}"></MenuItem>
16+
<MenuItem Header="文件" Style="{DynamicResource MaterialDesignMenuItem}"></MenuItem>
17+
</Menu>
18+
19+
20+
<!--<TabControl Style="{DynamicResource MaterialDesignNavigatilRailTabControl}" >
21+
<TabItem Header="Item2" Style="{DynamicResource MaterialDesignNavigationRailTabItem}">
22+
<Button Style="{DynamicResource MaterialDesignRaisedButton}" Content="Hello!"></Button>
23+
</TabItem>
24+
<TabItem Header="Item2"></TabItem>
25+
26+
</TabControl>-->
27+
</Grid>
28+
</Window>

‎ProxySU.Core/MainWindow.xaml.cs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Windows;
7+
using System.Windows.Controls;
8+
using System.Windows.Data;
9+
using System.Windows.Documents;
10+
using System.Windows.Input;
11+
using System.Windows.Media;
12+
using System.Windows.Media.Imaging;
13+
using System.Windows.Navigation;
14+
using System.Windows.Shapes;
15+
16+
namespace ProxySU.Core
17+
{
18+
/// <summary>
19+
/// Interaction logic for MainWindow.xaml
20+
/// </summary>
21+
public partial class MainWindow : Window
22+
{
23+
public MainWindow()
24+
{
25+
InitializeComponent();
26+
}
27+
}
28+
}

‎ProxySU.Core/ProxySU.Core.csproj

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="MaterialDesignThemes" Version="3.2.0" />
11+
</ItemGroup>
12+
13+
</Project>

‎ProxySU/MainWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:ProxySU"
77
mc:Ignorable="d"
8-
Title="ProxySU - v2.5.5" Height="720" Width="660">
8+
Title="ProxySU - v2.5.6" Height="720" Width="660">
99
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
1010
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
1111
<Window.Resources>

0 commit comments

Comments
 (0)