不再用MessageBox提示登录注销错误

Berrysoft · Jun 9, 2018 · 3a4ff4c · 3a4ff4c
1 parent 4f777f7
commit 3a4ff4c
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 65 deletions.
diff --git a/TsinghuaNet/MainWindow.xaml.vb b/TsinghuaNet/MainWindow.xaml.vb
@@ -31,24 +31,22 @@ Class MainWindow
         WriteEvent("开始登录")
         CancelGetFlux()
         Dim helper As IConnect = Model.Helper
-        Dim connected As Boolean = False
         Using getFluxCancellationTokeSource = New CancellationTokenSource()
             Dim token = getFluxCancellationTokeSource.Token
             SetFlux(My.Resources.Connecting)
             Try
                 Dim res = Await helper.LoginAsync()
-                connected = True
                 WriteLog($"回复: {res}")
                 WriteEvent("登录成功")
             Catch ex As Exception
                 If Not token.IsCancellationRequested Then
-                    MessageBox.Show(String.Format(My.Resources.ConnectionFailedWithResult, ex.Message), My.Resources.ConnectionFailed, MessageBoxButton.OK, MessageBoxImage.Error)
+                    SetFlux(My.Resources.ConnectionFailed)
                     WriteException(ex)
                 End If
                 SetFlux(My.Resources.NoNetwork)
             End Try
         End Using
-        If connected Then Await GetFlux(helper)
+        Await GetFlux(helper)
     End Sub
     Private Async Sub LogOut()
         WriteEvent("开始注销")
@@ -63,7 +61,7 @@ Class MainWindow
                 WriteEvent("注销成功")
             Catch ex As Exception
                 If Not token.IsCancellationRequested Then
-                    MessageBox.Show(String.Format(My.Resources.LogOutFailedWithResult, ex.Message), My.Resources.LogOutFailed, MessageBoxButton.OK, MessageBoxImage.Error)
+                    SetFlux(My.Resources.LogOutFailed)
                     WriteException(ex)
                 End If
                 SetFlux(My.Resources.NoNetwork)

diff --git a/TsinghuaNet/My Project/Resources.Designer.vb b/TsinghuaNet/My Project/Resources.Designer.vb
diff --git a/TsinghuaNet/My Project/Resources.en.resx b/TsinghuaNet/My Project/Resources.en.resx
@@ -123,9 +123,6 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>Login failed</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>Login failed: {0}</value>
-  </data>
   <data name="Disconnected" xml:space="preserve">
     <value>Logged out.</value>
   </data>
@@ -135,9 +132,6 @@
   <data name="LogOutFailed" xml:space="preserve">
     <value>Logout failed</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>Logout failed: {0}</value>
-  </data>
   <data name="NoNetwork" xml:space="preserve">
     <value>No network.</value>
   </data>

diff --git a/TsinghuaNet/My Project/Resources.ja.resx b/TsinghuaNet/My Project/Resources.ja.resx
@@ -135,15 +135,9 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>ログイン失敗しました</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>ログイン失敗しました：{0}</value>
-  </data>
   <data name="LogOutFailed" xml:space="preserve">
     <value>ログアウトに失敗しました</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>ログアウトに失敗しました：{0}</value>
-  </data>
   <data name="NoNetwork" xml:space="preserve">
     <value>ネットワークなし</value>
   </data>

diff --git a/TsinghuaNet/My Project/Resources.ko.resx b/TsinghuaNet/My Project/Resources.ko.resx
@@ -177,18 +177,12 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>로그인 실패</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>로그인 실패：{0}</value>
-  </data>
   <data name="LoggingOut" xml:space="preserve">
     <value>로그 아웃</value>
   </data>
   <data name="LogOutFailed" xml:space="preserve">
     <value>로그 아웃 실패</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>로그 아웃 실패：{0}</value>
-  </data>
   <data name="NoNetwork" xml:space="preserve">
     <value>네트워크 예외</value>
   </data>

diff --git a/TsinghuaNet/My Project/Resources.resx b/TsinghuaNet/My Project/Resources.resx
@@ -123,9 +123,6 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>登录错误</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>登录错误：{0}</value>
-  </data>
   <data name="Disconnected" xml:space="preserve">
     <value>未登录</value>
   </data>
@@ -135,9 +132,6 @@
   <data name="LogOutFailed" xml:space="preserve">
     <value>注销错误</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>注销错误：{0}</value>
-  </data>
   <data name="NoNetwork" xml:space="preserve">
     <value>网络异常</value>
   </data>

diff --git a/TsinghuaNet/My Project/Resources.ru.resx b/TsinghuaNet/My Project/Resources.ru.resx
@@ -174,18 +174,12 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>Ошибка входа</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>Ошибка входа: {0}</value>
-  </data>
   <data name="Disconnected" xml:space="preserve">
     <value>Вышли.</value>
   </data>
   <data name="LogOutFailed" xml:space="preserve">
     <value>Сбой при выходе</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>Сбой при выходе: {0}</value>
-  </data>
   <data name="NoNetwork" xml:space="preserve">
     <value>Нет сети.</value>
   </data>

diff --git a/TsinghuaNet/My Project/Resources.vi.resx b/TsinghuaNet/My Project/Resources.vi.resx
@@ -183,15 +183,9 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>Đăng nhập thất bại</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>Đăng nhập thất bại: {0}</value>
-  </data>
   <data name="LogOutFailed" xml:space="preserve">
     <value>Đăng xuất thất bại</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>Đăng xuất thất bại: {0}</value>
-  </data>
   <data name="CloseText" xml:space="preserve">
     <value>Thoát</value>
   </data>

diff --git a/TsinghuaNet/My Project/Resources.zh-Hant.resx b/TsinghuaNet/My Project/Resources.zh-Hant.resx
@@ -123,9 +123,6 @@
   <data name="ConnectionFailed" xml:space="preserve">
     <value>登入錯誤</value>
   </data>
-  <data name="ConnectionFailedWithResult" xml:space="preserve">
-    <value>登入錯誤：{0}</value>
-  </data>
   <data name="Disconnected" xml:space="preserve">
     <value>未登入</value>
   </data>
@@ -135,9 +132,6 @@
   <data name="LogOutFailed" xml:space="preserve">
     <value>登出錯誤</value>
   </data>
-  <data name="LogOutFailedWithResult" xml:space="preserve">
-    <value>登出錯誤：{0}</value>
-  </data>
   <data name="NoNetwork" xml:space="preserve">
     <value>網路異常</value>
   </data>

diff --git a/TsinghuaNet/Program.vb b/TsinghuaNet/Program.vb
@@ -1,5 +1,6 @@
 Imports System.Globalization
 Imports System.IO
+Imports System.Reflection
 
 Module Program
     Private Const FileName As String = "event.log"
@@ -23,6 +24,7 @@ Module Program
                         ShowError(ex.ToString())
                         Return False
                     End Try
+                    WriteLog($"程序启动: {Assembly.GetExecutingAssembly().GetName().Version}")
                     Dim app As New Application
                     app.Run()
                     WriteEvent("程序结束")