WebSocketTool/Client/ClientViewModel.cs

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

WebSocketTool/Client/ClientWindow.xaml.cs

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

WebSocketTool/Properties/AssemblyInfo.cs

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

WebSocketTool/pack/build.bat

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

websocket-sharp/websocket-sharp.csproj

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