mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-21 20:56:08 +03:00
Code Issues Projects Releases Wiki Activity

naiveproxy闪退

Browse Source
This commit is contained in:
autumn 2021-09-02 18:56:01 +08:00
parent fc131ededd
commit e4bd5a9167
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProxySuper.Core/Models/Record.cs
View File

@ -42,7 +42,7 @@ namespace ProxySuper.Core.Models
[JsonProperty("trojanGoSettings")]
public TrojanGoSettings TrojanGoSettings { get; set; }
[JsonProperty("naiveProtoSettings")]
[JsonProperty("naiveProxySettings")]
public NaiveProxySettings NaiveProxySettings { get; set; }
[JsonProperty("brook")]

18
ProxySuper.WPF/ProxySuper.WPF.csproj
View File

@ -144,14 +144,14 @@
<Compile Include="Views\MTProxyGo\MTProxyGoInstallView.xaml.cs">
<DependentUpon>MTProxyGoInstallView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\NaiveProto\NaiveProtoConfigView.xaml.cs">
<DependentUpon>NaiveProtoConfigView.xaml</DependentUpon>
<Compile Include="Views\NaiveProxy\NaiveProxyConfigView.xaml.cs">
<DependentUpon>NaiveProxyConfigView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\NaiveProto\NaiveProtoEditorView.xaml.cs">
<DependentUpon>NaiveProtoEditorView.xaml</DependentUpon>
<Compile Include="Views\NaiveProxy\NaiveProxyEditorView.xaml.cs">
<DependentUpon>NaiveProxyEditorView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\NaiveProto\NaiveProtoInstallView.xaml.cs">
<DependentUpon>NaiveProtoInstallView.xaml</DependentUpon>
<Compile Include="Views\NaiveProxy\NaiveProxyInstallView.xaml.cs">
<DependentUpon>NaiveProxyInstallView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ShareLinkView.xaml.cs">
<DependentUpon>ShareLinkView.xaml</DependentUpon>
@ -299,15 +299,15 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\NaiveProto\NaiveProtoConfigView.xaml">
<Page Include="Views\NaiveProxy\NaiveProxyConfigView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\NaiveProto\NaiveProtoEditorView.xaml">
<Page Include="Views\NaiveProxy\NaiveProxyEditorView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\NaiveProto\NaiveProtoInstallView.xaml">
<Page Include="Views\NaiveProxy\NaiveProxyInstallView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml
View File

@ -1,4 +1,4 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoConfigView"
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyConfigView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -8,7 +8,7 @@
mc:Ignorable="d"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
Title="NaiveProxyConfigView" Height="450" Width="800">
Title="NaiveProxy配置" Height="450" Width="800">
<Grid Margin="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="140" />

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs
View File

@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views
/// <summary>
/// NaiveProxyConfigView.xaml 的交互逻辑
/// </summary>
public partial class NaiveProtoConfigView : MvxWindow
public partial class NaiveProxyConfigView : MvxWindow
{
public NaiveProtoConfigView()
public NaiveProxyConfigView()
{
InitializeComponent();
}

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
View File

@ -1,4 +1,4 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoEditorView"
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyEditorView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
Title="NaiveProxy" Height="600" Width="1000">
Title="NaiveProxy编辑配置" Height="600" Width="1000">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="310" />

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs
View File

@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views
/// <summary>
/// NaiveProxyEditorView.xaml 的交互逻辑
/// </summary>
public partial class NaiveProtoEditorView : MvxWindow
public partial class NaiveProxyEditorView : MvxWindow
{
public NaiveProtoEditorView()
public NaiveProxyEditorView()
{
InitializeComponent();
}

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml
View File

@ -1,4 +1,4 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProtoInstallView"
<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProxyInstallView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -8,7 +8,7 @@
xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
Title="TrojanGoInstallView" Height="600" Width="1000">
Title="TrojanGo安装" Height="600" Width="1000">
<StackPanel>
<ctrl:ProgressControl />

4
ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs → ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs
View File

@ -18,9 +18,9 @@ namespace ProxySuper.WPF.Views.NaiveProxy
/// <summary>
/// NaiveProxyInstallViewModel.xaml 的交互逻辑
/// </summary>
public partial class NaiveProtoInstallView : MvxWindow
public partial class NaiveProxyInstallView : MvxWindow
{
public NaiveProtoInstallView()
public NaiveProxyInstallView()
{
InitializeComponent();
}