From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码,别 合并

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
index 42ad680..417d083 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
@@ -54,14 +54,15 @@
                         Application.RunOnMainThread(() =>
                         {
                             //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                            var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+                            var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
                             alert.Show();
+                            //鍑虹幇寮傚父,鍒欏叧闂繘搴︽潯
+                            ProgressBar.Close();
                         });
                     }
                     //Log鍑哄姏
                     string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
-                    HdlLogLogic.Current.WriteLog(-1, msg);
-                    HdlLogLogic.Current.WriteLog(ex);
+                    HdlLogLogic.Current.WriteLog(ex, msg);
                 }
             })
             { IsBackground = true }.Start();
@@ -88,13 +89,14 @@
                         if (mode == ShowErrorMode.YES)
                         {
                             //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                            var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+                            var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
                             alert.Show();
                         }
                         //Log鍑哄姏
                         string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
-                        HdlLogLogic.Current.WriteLog(-1, msg);
-                        HdlLogLogic.Current.WriteLog(ex);
+                        HdlLogLogic.Current.WriteLog(ex, msg);
+                        //鍑虹幇寮傚父,鍒欏叧闂繘搴︽潯
+                        ProgressBar.Close();
                     }
                 });
                 
@@ -121,14 +123,15 @@
                     if (mode == ShowErrorMode.YES)
                     {
                         //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                        var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+                        var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
                         alert.Show();
                     }
 
                     //Log鍑哄姏
                     string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
-                    HdlLogLogic.Current.WriteLog(-1, msg);
-                    HdlLogLogic.Current.WriteLog(ex);
+                    HdlLogLogic.Current.WriteLog(ex, msg);
+                    //鍑虹幇寮傚父,鍒欏叧闂繘搴︽潯
+                    ProgressBar.Close();
                 }
             });
         }

--
Gitblit v1.8.0