Browse Source

mxg:垃圾数据检查进度条问题未修正

mengxiangge 5 years ago
parent
commit
26870c503a

+ 2 - 1
MBI/SAGA.MBI/ToolsData/CheckBase/CheckProgressBarClient.cs

@@ -52,7 +52,8 @@ namespace SAGA.MBI.ToolsData.CheckBase
 
         public static void Stop()
         {
-            m_ProgressBar?.CloseExt();
+            m_ProgressBar?.Close();
+            m_ProgressBar =null;
             CurValue = 0;
         }
 

+ 16 - 15
MBI/SAGA.MBI/ToolsData/CheckBase/WinDataCheckProgressBar.xaml.cs

@@ -10,23 +10,27 @@ namespace SAGA.MBI.ToolsData.CheckBase
         private WinDataCheckProgressBar()
         {
             InitializeComponent();
+            TraceLog = "";
         }
         public double MaxValue { get {return myProgrssBar.Maximum; } }
 
         public static WinDataCheckProgressBar Init(string tip,int max)
         {
             WinDataCheckProgressBar bar =new WinDataCheckProgressBar();
-            bar.Dispatcher.Invoke(
-                () =>
-                {
-                    bar.myTraceLog.Text = "";
-                    bar.myBigTip.Content = tip;
-                    bar.myProgrssBar.Maximum = max;
-                },
-                System.Windows.Threading.DispatcherPriority.Background);
+            bar.myBigTip.Content = tip;
+            bar.myProgrssBar.Maximum = max;
             bar.Update("数据准备中",0);
             return bar;
         }
+
+        private string m_TraceLog;
+
+        public string TraceLog
+        {
+            get { return myTraceLog.Text; }
+            set { myTraceLog.Text = value; }
+        }
+
         /// <summary>
         /// 更新大标题显示内容
         /// </summary>
@@ -61,11 +65,8 @@ namespace SAGA.MBI.ToolsData.CheckBase
         /// </summary>
         public void CloseExt()
         {
-            this.Dispatcher.Invoke(() =>
-                {
-                    this.Visibility = Visibility.Collapsed;
-                },
-                System.Windows.Threading.DispatcherPriority.Background);
+            TraceLog = "";
+            this.Visibility = Visibility.Collapsed;
         }
         /// <summary>
         /// 更新日志
@@ -73,11 +74,11 @@ namespace SAGA.MBI.ToolsData.CheckBase
         /// <param name="tip"></param>
         public void UpdataLog(string tip)
         {
-            string txt = myTraceLog.Text;
+            string txt = TraceLog;
             txt += $"{tip}\r\n";
             this.Dispatcher.Invoke(() =>
                 {
-                    myTraceLog.Text = txt;
+                    TraceLog = txt;
                     this.myTraceLog.Focus();//获取焦点
                     this.myTraceLog.Select(txt.Length, 0);//光标定位到文本最后
                     this.myTraceLog.ScrollToEnd();//滚动到光标处