fix bugs

futrime · Jun 25, 2023 · 80b0845 · 80b0845
1 parent cbc963d
commit 80b0845
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/LipUI/Global.cs b/src/LipUI/Global.cs
@@ -535,7 +535,10 @@ await DispatcherInvokeAsync(async () =>
                 void Hide()
                 {
                     successAndHide = true;
+                    DispatcherInvoke(() =>
+                    {
                     dialog.Hide();
+                    });
                 }
                 RoutedEventHandler onDialogOnButtonLeftClick = (_, e) => Hide();
                 RoutedEventHandler onDialogOnButtonRightClick = (_, e) => Hide();

diff --git a/src/LipUI/ViewModels/InstallPageViewModel.cs b/src/LipUI/ViewModels/InstallPageViewModel.cs
@@ -147,6 +147,11 @@ public async Task Install()
                             //去除匹配并去除"[==>   ] "
                             Percentage = Regex.Replace(str, @"\[(=|>|\s)+?\]", "");
                         }
+                        //  79% |███████████████████████████████         | (101/126 kB, 151 kB/s) [0s:0s]
+                        else if (Regex.Match(x, @"(\d+%)") is { Success: true })
+                        {
+                            Percentage = Regex.Replace(x, @"\|(█|\s)+\|", "").Trim();
+                        }
                         else if (x.Trim().EndsWith("|"))
                             Percentage = x.Replace("|", "").Trim();
                         else

diff --git a/src/LipUI/ViewModels/ToothInfoPanelViewModel.cs b/src/LipUI/ViewModels/ToothInfoPanelViewModel.cs
@@ -33,12 +33,11 @@ public ToothInfoPanelViewModel(LipPackageVersions info, LipRegistry.LipRegistryI
         }
         public ToothInfoPanelViewModel(LipPackageVersions ver)
         {
+            _ver = ver;
             if (Versions?.FirstOrDefault() is not null and var v)
             {
                 SelectedVersion = v;
             }
-
-            _ver = ver;
         }
         [ObservableProperty] string _author = string.Empty;
         [ObservableProperty] string _description = string.Empty;