Compare commits

...

2 Commits

Author SHA1 Message Date
1ee59b6417 修改版本为1.0.3 2023-08-02 11:48:23 +08:00
a4a80afe73 1.修改依赖库的Framework版本为4.5.2
2.修复部分逻辑的crash问题
3.提升版本号为1.0.3
2023-08-02 11:41:24 +08:00
5 changed files with 23 additions and 7 deletions

View File

@ -6,6 +6,7 @@ using log4net;
using WebSocketSharp;
using WebSocketTool.Base;
using WebSocketTool.Util;
using WebSocketTool.View.Dialog;
using LogManager = log4net.LogManager;
namespace WebSocketTool.Client
@ -106,7 +107,7 @@ namespace WebSocketTool.Client
public void Connect()
{
if (string.IsNullOrEmpty(WsUrl))
if (string.IsNullOrEmpty(WsUrl) || (!WsUrl.StartsWith("wss://") && !WsUrl.StartsWith("ws://")))
{
view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n 请输入正确的WebSocket地址");
return;
@ -126,8 +127,16 @@ namespace WebSocketTool.Client
view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n Start Connect Socket");
if (IsProxyChecked)
{
view.AppendInfo($"use proxy: {ProxyAddress}");
mClient.SetHttpProxy(ProxyAddress, ProxyUserName, ProxyPassword);
if (!string.IsNullOrEmpty(ProxyAddress))
{
view.AppendInfo($"Hint use proxy: {ProxyAddress}");
mClient.SetHttpProxy(ProxyAddress, ProxyUserName, ProxyPassword);
}
else
{
view.ShowToast("请输入代理地址!");
view.AppendInfo($"use proxy address is empty!");
}
}
mClient.ConnectAsync();
}

View File

@ -75,11 +75,18 @@ namespace WebSocketTool.Client
{
viewModel.Close();
}
public Window GetWindow()
{
return this;
}
}
public interface IClientView
{
void ShowToast(string msg);
void AppendInfo(string info);
Window GetWindow();
}
}

View File

@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2")]
[assembly: AssemblyFileVersion("1.0.2")]
[assembly: AssemblyVersion("1.0.3")]
[assembly: AssemblyFileVersion("1.0.3")]

View File

@ -1,4 +1,4 @@
set version=1.0.0
set version=1.0.3
if not "%~1"=="" (
set version=%1

View File

@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<RootNamespace>WebSocketSharp</RootNamespace>
<AssemblyName>websocket-sharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>websocket-sharp.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>