mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2025-04-14 22:50:58 +00:00
Code Issues Projects Releases Wiki Activity

fix bugs

Browse source
This commit is contained in:
ProxySU 2020-10-01 17:21:33 +08:00
parent a884d850b4
commit dc05f990d8
4 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ProxySU/MainWindow.xaml
View file

@ -589,7 +589,7 @@
<Button x:Name="ButtonClearOccupiedPorts" Content="{DynamicResource ButtonClearOccupiedPorts}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonClearOccupiedPorts_Click"></Button> <Button x:Name="ButtonClearOccupiedPorts" Content="{DynamicResource ButtonClearOccupiedPorts}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonClearOccupiedPorts_Click"></Button>
<Button x:Name="ButtonTestAndEnableBBR" Content="{DynamicResource ButtonTestAndEnableBBR}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTestAndEnableBBR_Click"></Button> <Button x:Name="ButtonTestAndEnableBBR" Content="{DynamicResource ButtonTestAndEnableBBR}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonTestAndEnableBBR_Click"></Button>
<Button x:Name="ButtonRemoveAllSoft" Content="{DynamicResource ButtonRemoveAllSoft}" Grid.Column="3" Grid.Row="0" Margin="5" Click="ButtonRemoveAllSoft_Click"></Button> <Button x:Name="ButtonRemoveAllSoft" Content="{DynamicResource ButtonRemoveAllSoft}" Grid.Column="3" Grid.Row="0" Margin="5" Click="ButtonRemoveAllSoft_Click"></Button>
<Button Content="test" Grid.Column="0" Grid.Row="1" Margin="10" Click="Button_Click"></Button> <Button Content="test" Grid.Column="0" Grid.Row="1" Margin="10" Click="Button_Click" Visibility="Collapsed"></Button>
</Grid> </Grid>
</TabItem> </TabItem>

12
ProxySU/ResultClientInformation.xaml
View file

@ -52,7 +52,7 @@
<TextBlock Text="{DynamicResource TextBlockEncryption}" Grid.Column="0" Grid.Row="4" Margin="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock> <TextBlock Text="{DynamicResource TextBlockEncryption}" Grid.Column="0" Grid.Row="4" Margin="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBox x:Name="TextBoxEncryption" IsReadOnly="True" Grid.Column="1" Grid.Row="4" Margin="2" MouseDoubleClick="TextBoxEncryption_MouseDoubleClick"></TextBox> <TextBox x:Name="TextBoxEncryption" IsReadOnly="True" Grid.Column="1" Grid.Row="4" Margin="2" MouseDoubleClick="TextBoxEncryption_MouseDoubleClick"></TextBox>
<TextBlock Text="{DynamicResource TextBlockEncryptionIsAuto}" Grid.Column="2" Grid.Row="4" VerticalAlignment="Center"></TextBlock> <TextBlock Text="{DynamicResource TextBlockEncryptionIsAuto}" Grid.Column="2" Grid.Row="4" Visibility="Collapsed" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="{DynamicResource TextBlockTransferProtocol}" Grid.Column="0" Grid.Row="5" Margin="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock> <TextBlock Text="{DynamicResource TextBlockTransferProtocol}" Grid.Column="0" Grid.Row="5" Margin="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
<TextBox x:Name="TextBoxTransmission" IsReadOnly="True" Grid.Column="1" Grid.Row="5" Margin="2" MouseDoubleClick="TextBoxTransmission_MouseDoubleClick"></TextBox> <TextBox x:Name="TextBoxTransmission" IsReadOnly="True" Grid.Column="1" Grid.Row="5" Margin="2" MouseDoubleClick="TextBoxTransmission_MouseDoubleClick"></TextBox>
@ -308,7 +308,15 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock x:Name="TextBlockQrURLexplain" Text="{DynamicResource TextBlockQrURLexplainV2Ray}" TextWrapping="Wrap" Grid.Column="0"></TextBlock> <TextBlock x:Name="TextBlockQrURLexplain" Text="{DynamicResource TextBlockQrURLexplainV2Ray}" TextWrapping="Wrap" Grid.Column="0"></TextBlock>
<Image x:Name="ImageShareQRcode" Grid.Column="1"></Image> <Image x:Name="ImageShareQRcode" Grid.Column="1"></Image>
<TextBox x:Name="TextBoxURL" TextWrapping="Wrap" Grid.Column="2"></TextBox> <Grid x:Name="GridShareURL" Grid.Column="2">
<Grid.RowDefinitions>
<RowDefinition></RowDefinition>
<RowDefinition Height="0.15*"></RowDefinition>
</Grid.RowDefinitions>
<TextBox x:Name="TextBoxURL" TextWrapping="Wrap" Grid.Row="0" MouseDoubleClick="TextBoxURL_MouseDoubleClick"></TextBox>
<TextBlock Text="{DynamicResource TextBlockCopyToClipExplain}" TextWrapping="Wrap" Grid.Row="1"></TextBlock>
</Grid>
</Grid> </Grid>
</GroupBox> </GroupBox>

48
ProxySU/ResultClientInformation.xaml.cs
View file

@ -18,6 +18,7 @@ using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using System.Drawing; using System.Drawing;
using QRCoder; using QRCoder;
using System.Runtime.InteropServices;
namespace ProxySU namespace ProxySU
@ -29,6 +30,10 @@ namespace ProxySU
{ {
private static string saveFileFolder = ""; private static string saveFileFolder = "";
private static string server = MainWindow.ReceiveConfigurationParameters[4]; private static string server = MainWindow.ReceiveConfigurationParameters[4];
[DllImport("user32.dll")]
private static extern int MessageBoxTimeoutA(IntPtr hWnd, string msg, string Caps, int type, int Id, int time); //引用DLL
public ResultClientInformation() public ResultClientInformation()
{ {
InitializeComponent(); InitializeComponent();
@ -112,9 +117,7 @@ namespace ProxySU
HideAlterId(); HideAlterId();
ShowHostName(); ShowHostName();
ShowPathV2ray(); ShowPathV2ray();
//TextBlockQrURLexplain.Text = Application.Current.FindResource("TabItemHeaderV2RayVlessProtocol").ToString(); HideGroupBoxClientQRandURL();
ImageShareQRcode.Visibility = Visibility.Collapsed;
TextBoxURL.Visibility = Visibility.Collapsed;
} }
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessTcpTlsWeb")) else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessTcpTlsWeb"))
{ {
@ -127,9 +130,7 @@ namespace ProxySU
HideAlterId(); HideAlterId();
ShowHostName(); ShowHostName();
ShowPathV2ray(); ShowPathV2ray();
//TextBlockQrURLexplain.Text = Application.Current.FindResource("TabItemHeaderV2RayVlessProtocol").ToString(); HideGroupBoxClientQRandURL();
ImageShareQRcode.Visibility = Visibility.Collapsed;
TextBoxURL.Visibility = Visibility.Collapsed;
} }
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessWebSocketTlsWeb")) else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessWebSocketTlsWeb"))
{ {
@ -142,9 +143,7 @@ namespace ProxySU
HideAlterId(); HideAlterId();
ShowHostName(); ShowHostName();
ShowPathV2ray(); ShowPathV2ray();
//TextBlockQrURLexplain.Text = Application.Current.FindResource("TabItemHeaderV2RayVlessProtocol").ToString(); HideGroupBoxClientQRandURL();
ImageShareQRcode.Visibility = Visibility.Collapsed;
TextBoxURL.Visibility = Visibility.Collapsed;
} }
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessHttp2Web")) else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "VlessHttp2Web"))
{ {
@ -157,9 +156,7 @@ namespace ProxySU
HideAlterId(); HideAlterId();
ShowHostName(); ShowHostName();
ShowPathV2ray(); ShowPathV2ray();
//TextBlockQrURLexplain.Text = Application.Current.FindResource("TabItemHeaderV2RayVlessProtocol").ToString(); HideGroupBoxClientQRandURL();
ImageShareQRcode.Visibility = Visibility.Collapsed;
TextBoxURL.Visibility = Visibility.Collapsed;
} }
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "webSocket")) else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "webSocket"))
{ {
@ -560,7 +557,18 @@ namespace ProxySU
} }
//显示二维码与链接分享
private void ShowGroupBoxClientQRandURL()
{
GroupBoxClientQRandURL.Visibility = Visibility.Visible;
}
//隐藏二维码与链接分享
private void HideGroupBoxClientQRandURL()
{
GroupBoxClientQRandURL.Visibility = Visibility.Collapsed;
}
//private void HidePath() //private void HidePath()
//{ //{
// TextBlockPath.Visibility = Visibility.Collapsed; // TextBlockPath.Visibility = Visibility.Collapsed;
@ -593,11 +601,15 @@ namespace ProxySU
if (content != "") if (content != "")
{ {
Clipboard.SetDataObject(content); Clipboard.SetDataObject(content);
MessageBox.Show(Application.Current.FindResource("MessageBoxShow_V2RayUUIDcopyedToClip").ToString()); //MessageBox.Show(Application.Current.FindResource("MessageBoxShow_V2RayUUIDcopyedToClip").ToString());
string message = Application.Current.FindResource("MessageBoxShow_V2RayUUIDcopyedToClip").ToString();
MessageBoxTimeoutA((IntPtr)0, message, "", 0, 0, 600); // 直接调用 0.6秒后自动关闭
} }
else else
{ {
MessageBox.Show(Application.Current.FindResource("MessageBoxShow_V2RayEmptyToClip").ToString()); //MessageBox.Show(Application.Current.FindResource("MessageBoxShow_V2RayEmptyToClip").ToString());
string message = Application.Current.FindResource("MessageBoxShow_V2RayEmptyToClip").ToString();
MessageBoxTimeoutA((IntPtr)0, message, "", 0, 0, 600); // 直接调用 0.6秒后自动关闭
} }
} }
@ -650,16 +662,24 @@ namespace ProxySU
CopyToClipboard(TextBoxHostQuicEncryption.Text); CopyToClipboard(TextBoxHostQuicEncryption.Text);
} }
//复制Quic Key/mKCP Seed/路径Path 到剪贴板中
private void TextBoxQuicKeyMkcpSeedPath_MouseDoubleClick(object sender, MouseButtonEventArgs e) private void TextBoxQuicKeyMkcpSeedPath_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{ {
CopyToClipboard(TextBoxQuicKeyMkcpSeedPath.Text); CopyToClipboard(TextBoxQuicKeyMkcpSeedPath.Text);
} }
//复制TLS 到剪贴板中
private void TextBoxTLS_MouseDoubleClick(object sender, MouseButtonEventArgs e) private void TextBoxTLS_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{ {
CopyToClipboard(TextBoxTLS.Text); CopyToClipboard(TextBoxTLS.Text);
} }
//复制URL链接到剪贴板中
private void TextBoxURL_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
CopyToClipboard(TextBoxURL.Text);
}
#endregion #endregion
//生成v2rayN客户端导入文件 //生成v2rayN客户端导入文件

BIN
ProxySU/bin/Beta/Beta.zip
View file

Binary file not shown.