t

Blessing-Studio · Jan 20, 2023 · bd67c08 · bd67c08
1 parent a5787dc
commit bd67c08
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 1 deletion.
diff --git a/WonderLab/Program.cs b/WonderLab/Program.cs
@@ -18,6 +18,7 @@ internal class Program
         [STAThread]
         public static void Main(string[] args)
         {
+<<<<<<< Updated upstream
             //if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             //{
             //    if (File.Exists(Path.Combine("updata-cache", "UpdataNextTime")))
@@ -28,6 +29,18 @@ public static void Main(string[] args)
             //        return;
             //    }
             //}
+=======
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                //if (File.Exists(Path.Combine("updata-cache", "UpdataNextTime")))
+                //{
+                //    Process pro = new Process();
+                //    pro.StartInfo.FileName = "Updata.exe";
+                //    pro.Start();
+                //    return;
+                //}
+            }
+>>>>>>> Stashed changes
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);

diff --git a/WonderLab/ViewModels/OtherViewModel.cs b/WonderLab/ViewModels/OtherViewModel.cs
@@ -21,6 +21,7 @@ public partial class OtherViewModel : ViewModelBase
     {
         public async Task Check()
         {
+<<<<<<< Updated upstream
             try
             {
                 await Task.Run(() =>
@@ -40,6 +41,23 @@ await Task.Run(() =>
             {
 
             }
+=======
+            await Task.Run(async () =>
+            {
+                IsCheckVersion = true;
+                await Task.Delay(2000);
+                IsCheckVersion = false;
+                //string releaseUrl = GithubLib.GithubLib.GetRepoLatestReleaseUrl("Blessing-Studio", "WonderLab");
+                //Release? release = GithubLib.GithubLib.GetRepoLatestRelease(releaseUrl);
+                //if (release != null)
+                //{
+                //    if (release.name != GetVersion())
+                //    {
+                //        ShowInfoBarAsync("自动更新", "发现新版本" + release.name + "  当前版本" + GetVersion() + "  ", InfoBarSeverity.Informational, 7000);
+                //    }
+                //}
+            });
+>>>>>>> Stashed changes
         }
     }
 
@@ -56,11 +74,17 @@ public string ButtonContent
             set => RaiseAndSetIfChanged(ref _ButtonContent, value);
         }
 
+        public bool IsCheckVersion
+        {
+            get => _IsCheckVersion;
+            set => RaiseAndSetIfChanged(ref _IsCheckVersion, value);
+        }
     }
 
     partial class OtherViewModel
     {
         public string _Version = MainWindow.GetVersion(); 
         public string _ButtonContent = "检查更新";
+        public bool _IsCheckVersion = false;
     }
 }
diff --git a/WonderLab/Views/OtherView.axaml b/WonderLab/Views/OtherView.axaml
@@ -38,6 +38,7 @@
 			</card:OptionsDisplayItem>
 
 			<card:OptionsDisplayItem Expands="True" Margin="10,15,10,0" Header="Blessing Studio" Description="本启动器的开发团队">
+<<<<<<< Updated upstream
 					<!--<card:OptionsDisplayItem.Icon>
 					<ui:SymbolIcon Symbol="People"/>
 				</card:OptionsDisplayItem.Icon>-->
@@ -62,6 +63,32 @@
 						</StackPanel>
 					</card:OptionsDisplayItem.Content>
 				</card:OptionsDisplayItem>
+=======
+				<!--<card:OptionsDisplayItem.Icon>
+					<ui:SymbolIcon Symbol="People"/>
+				</card:OptionsDisplayItem.Icon>-->
+				<card:OptionsDisplayItem.Content>
+					<StackPanel Orientation="Vertical" Spacing="10">
+						<StackPanel Orientation="Horizontal" Spacing="50">
+							<TextBlock Text="前端开发"/>
+							<TextBlock Text="西路Baka"/>
+						</StackPanel>
+						<StackPanel Orientation="Horizontal" Spacing="50">
+							<TextBlock Text="后端开发"/>
+							<TextBlock Text="Ddggdd135、[mailset@arch ~ ]$"/>
+						</StackPanel>
+						<StackPanel Orientation="Horizontal" Spacing="35">
+							<TextBlock Text="跨平台编译"/>
+							<TextBlock Text="[mailset@arch ~ ]$"/>
+						</StackPanel>
+						<StackPanel Orientation="Horizontal" Spacing="60">
+							<TextBlock Text="UI 审查"/>
+							<TextBlock Text="Starcloudsea"/>
+						</StackPanel>
+					</StackPanel>
+				</card:OptionsDisplayItem.Content>
+			</card:OptionsDisplayItem>
+>>>>>>> Stashed changes
 
 				<card:OptionsDisplayItem Expands="True" Margin="10,15,10,0" Header="特别鸣谢" Description="感谢所有为本启动器开发提供帮助的大佬">
 				<!--<card:OptionsDisplayItem.Icon>
@@ -85,7 +112,8 @@
 				</card:OptionsDisplayItem.Content>
 			</card:OptionsDisplayItem>
 
-			<card:OptionsDisplayItem IsExpanded="True" Expands="True" Margin="10,15,10,0" Header="开源项目使用声明" Description="本启动器所使用的开源项目">
+			<card:OptionsDisplayItem IsExpanded="True" Expands="True"
+									 Margin="10,15,10,10" Header="开源项目使用声明" Description="本启动器所使用的开源项目">
 				<!--<card:OptionsDisplayItem.Icon>
 					<ui:SymbolIcon Symbol="Page"/>
 				</card:OptionsDisplayItem.Icon>-->