From f77a512451a3f18f67ec37f66f1af754d9e8f577 Mon Sep 17 00:00:00 2001
From: DevWiki <devwiki@qq.com>
Date: Tue, 5 Apr 2022 19:37:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebSocketTool/Client/ClientViewModel.cs   | 46 +++++++++++------------
 WebSocketTool/Client/ClientWindow.xaml    |  3 +-
 WebSocketTool/Client/ClientWindow.xaml.cs |  2 +-
 WebSocketTool/Client/SocketClient.cs      |  7 +++-
 WebSocketTool/Util/TimeUtil.cs            |  9 ++++-
 5 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/WebSocketTool/Client/ClientViewModel.cs b/WebSocketTool/Client/ClientViewModel.cs
index a562c99..52ec9f0 100644
--- a/WebSocketTool/Client/ClientViewModel.cs
+++ b/WebSocketTool/Client/ClientViewModel.cs
@@ -1,15 +1,17 @@
 using System;
-using System.Windows.Threading;
+using System.Timers;
 using log4net;
 using WebSocketSharp;
 using WebSocketTool.Base;
+using WebSocketTool.Util;
+using LogManager = log4net.LogManager;
 
 namespace WebSocketTool.Client
 {
     public class ClientViewModel : BaseViewModel
     {
         private static readonly ILog Log = LogManager.GetLogger(nameof(ClientViewModel));
-        private IClientView view;
+        private readonly IClientView view;
         private SocketClient mClient;
 
         public ClientViewModel(IClientView view)
@@ -54,7 +56,7 @@ namespace WebSocketTool.Client
         {
             if (string.IsNullOrEmpty(WsUrl))
             {
-                view.AppendInfo("请输入正确的WebSocket地址");
+                view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n 请输入正确的WebSocket地址");
                 return;
             }
 
@@ -65,17 +67,17 @@ namespace WebSocketTool.Client
 
             if (mClient.IsAlive())
             {
-                view.AppendInfo("WebSocket已连接,请先断开上次连接");
+                view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n WebSocket已连接,请先断开上次连接");
                 return;
             }
 
-            view.AppendInfo($"<=== start connect");
+            view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n Start Connect Socket");
             mClient.ConnectAsync();
         }
 
         public void Send()
         {
-            view.AppendInfo($"<=== socket send:{SendContent}");
+            view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n {SendContent}");
             mClient.Send(SendContent);
         }
 
@@ -127,11 +129,11 @@ namespace WebSocketTool.Client
 
         public void Close()
         {
-            view.AppendInfo($"<=== start close");
+            view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n Start Close Socket");
             mClient?.CloseAsync();
         }
 
-        private DispatcherTimer pingTimer;
+        private Timer pingTimer;
         public void StartPing()
         {
             if (!mIsAlive)
@@ -139,30 +141,26 @@ namespace WebSocketTool.Client
                 view.AppendInfo("start ping failure: ws is not connected");
                 return;
             }
-            if (pingTimer?.IsEnabled ?? false)
-            {
-                pingTimer.Stop();
-            }
-            pingTimer = new DispatcherTimer();
-            pingTimer.Interval = TimeSpan.FromMilliseconds(PingTime);
-            pingTimer.Tick += (sender, args) =>
+
+            pingTimer = new Timer {Interval = PingTime, AutoReset = false};
+            pingTimer.Elapsed += (s, e) =>
             {
                 Ping();
             };
             pingTimer.Start();
-            view.AppendInfo($"<===StartPing, time:{PingTime}");
+            view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n StartPing, TimeSpan:{PingTime}");
         }
 
         private void Ping(string msg = null)
         {
-            view.AppendInfo($"<=== ping:{msg}");
             mClient.Ping(msg);
+            App.RunOnUIThread(() => view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n Send Ping:{msg}"));
         }
 
         public void StopPing()
         {
-            view.AppendInfo("<===StopPing");
-            if (pingTimer?.IsEnabled ?? false)
+            view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n StopPing");
+            if (pingTimer != null)
             {
                 pingTimer.Stop();
                 pingTimer = null;
@@ -171,7 +169,7 @@ namespace WebSocketTool.Client
 
         private void InitSocketClient()
         {
-            view.AppendInfo("InitSocketClient");
+            view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n InitSocketClient");
             mClient = new SocketClient(WsUrl);
             mClient.OpenEvent += ClientOnOpenEvent;
             mClient.CloseEvent += ClientOnCloseEvent;
@@ -183,7 +181,7 @@ namespace WebSocketTool.Client
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"===> receive message: {e.Data}");
+                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n {e.Data}");
             });
         }
 
@@ -191,7 +189,7 @@ namespace WebSocketTool.Client
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"===> socket error: {e.Message}");
+                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n Socket Error: {e.Message}");
                 SetState(false);
             });
             StopPing();
@@ -222,7 +220,7 @@ namespace WebSocketTool.Client
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"===> socket closed:{e.Code}:{e.Reason}");
+                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n Socket Closed:{e.Code}:{e.Reason}");
                 SetState(false);
             });
             StopPing();
@@ -232,7 +230,7 @@ namespace WebSocketTool.Client
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"<=== socket connected");
+                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n Socket Connected");
                 SetState(true);
             });
         }
diff --git a/WebSocketTool/Client/ClientWindow.xaml b/WebSocketTool/Client/ClientWindow.xaml
index 7e9317c..72905bb 100644
--- a/WebSocketTool/Client/ClientWindow.xaml
+++ b/WebSocketTool/Client/ClientWindow.xaml
@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:WebSocketTool.Client"
         mc:Ignorable="d" WindowStartupLocation="CenterScreen"
         Closed="ClientWindow_OnClosed"
+        d:DataContext="{d:DesignInstance d:Type=local:ClientViewModel}"
         Title="ClientWindow" Height="450" Width="800">
     <Grid Margin="5">
         <Grid.RowDefinitions>
@@ -40,7 +41,7 @@
                     <RowDefinition Height="36"/>
                 </Grid.RowDefinitions>
                 <TextBlock Text="&lt;---------------------" VerticalAlignment="Center"/>
-                <Button x:Name="SendContentBtn" Width="80" Height="32" Content="发送" Click="SendContentBtn_OnClick" 
+                <Button Grid.Row="0" x:Name="SendContentBtn" Width="80" Height="32" Content="发送" Click="SendContentBtn_OnClick" 
                     HorizontalAlignment="Right" Cursor="Hand" IsEnabled="{Binding IsCloseEnable, Mode=OneWay}"/>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="1" HorizontalAlignment="Left">
                     <TextBlock Text="时间间隔:"></TextBlock>
diff --git a/WebSocketTool/Client/ClientWindow.xaml.cs b/WebSocketTool/Client/ClientWindow.xaml.cs
index e8256ba..95de842 100644
--- a/WebSocketTool/Client/ClientWindow.xaml.cs
+++ b/WebSocketTool/Client/ClientWindow.xaml.cs
@@ -22,7 +22,7 @@ namespace WebSocketTool.Client
     public partial class ClientWindow : Window, IClientView
     {
         private static readonly ILog Log = LogManager.GetLogger(nameof(ClientWindow));
-        private ClientViewModel viewModel;
+        private readonly ClientViewModel viewModel;
         public ClientWindow()
         {
             InitializeComponent();
diff --git a/WebSocketTool/Client/SocketClient.cs b/WebSocketTool/Client/SocketClient.cs
index 41ec91a..af134c3 100644
--- a/WebSocketTool/Client/SocketClient.cs
+++ b/WebSocketTool/Client/SocketClient.cs
@@ -10,7 +10,7 @@ namespace WebSocketTool.Client
     public class SocketClient
     {
         private static readonly ILog Log = LogManager.GetLogger(nameof(SocketClient));
-        private WebSocket mSocket;
+        private readonly WebSocket mSocket;
         public event EventHandler<MessageEventArgs> MessageEvent;
         public event EventHandler<ErrorEventArgs> ErrorEvent;
         public event EventHandler<EventArgs> OpenEvent;
@@ -20,7 +20,10 @@ namespace WebSocketTool.Client
         {
             Log.Info($"create socket:{url}");
             mSocket = new WebSocket(url);
-            mSocket.SslConfiguration.EnabledSslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12;
+            if (url.StartsWith("wss"))
+            {
+                mSocket.SslConfiguration.EnabledSslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12;
+            }
             mSocket.OnOpen += OnOpen;
             mSocket.OnClose += OnClose;
             mSocket.OnError += OnError;
diff --git a/WebSocketTool/Util/TimeUtil.cs b/WebSocketTool/Util/TimeUtil.cs
index 893abb5..e1b6ca4 100644
--- a/WebSocketTool/Util/TimeUtil.cs
+++ b/WebSocketTool/Util/TimeUtil.cs
@@ -5,9 +5,14 @@ namespace WebSocketTool.Util
 {
     public class TimeUtil
     {
-        public static string GetLogTime()
+        public static string GetCurrentTime()
         {
-            return DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss.ms]");
+            return DateTime.Now.ToString("HH:mm:ss.ms");
+        }
+        
+        public static string GetCurrentDateTime()
+        {
+            return DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ms");
         }
     }
 }
\ No newline at end of file