Ver 2.1.0-RC2: Remove Banner Because of Useless.

LoCyan-Team · Jun 12, 2024 · 202c0d7 · 202c0d7
1 parent a375adb
commit 202c0d7
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 13 deletions.
diff --git a/LoCyanFrpDesktop/App.xaml.cs b/LoCyanFrpDesktop/App.xaml.cs
@@ -47,14 +47,12 @@ protected override void OnStartup(StartupEventArgs e)
             //string Password;
             // 处理启动参数
             string[] args = e.Args;
-            InitialBanner initialBanner = new();
 
-            initialBanner.Show();
             base.OnStartup(e);
 
             Thread.Sleep(3000);
             //MainWindow mainWindow = new();
-            initialBanner.Hide();
+
 
             if (args.Length > 0)
             {   

diff --git a/LoCyanFrpDesktop/DashBoard.xaml.cs b/LoCyanFrpDesktop/DashBoard.xaml.cs
@@ -47,6 +47,25 @@ public DashBoard()
             Uri iconUri = new Uri("pack://application:,,,/LoCyanFrpDesktop;component/Resource/favicon.ico", UriKind.RelativeOrAbsolute);
             this.Icon = new BitmapImage(iconUri);
             Access.DashBoard = this;
+            Task.Run(() => {
+                string Status;
+                if (CheckForUpdate(out Status))
+                {
+                    //Output.Text = "检测到更新，如果没有自动更新记得自己去更新哦~";
+                    Update.Init();
+                }
+
+            });
+
+        }
+        public bool CheckForUpdate(out string reason)
+        {
+            Console.WriteLine("Checking Update...");
+            bool a = false;
+            string Reason;
+            Update.CheckVersion(out a, out Reason);
+            reason = Reason;
+            return a;
         }
         public bool CheckIfFrpcInstalled()
         {

diff --git a/LoCyanFrpDesktop/Global.cs b/LoCyanFrpDesktop/Global.cs
@@ -14,7 +14,7 @@ internal static class Global
         public static bool LoginedByConsole = false;
         public const string Version = "2.1.0";
         public const string Branch = "RC";
-        public const int Revision = 1;
+        public const int Revision = 2;
         public static readonly BuildInfo BuildInfo = new();
         public const string Developer = "Shiroiame-Kusu & Daiyangcheng";
         public const string Copyright = "Copyright © 2021 - 2024 杭州樱芸网络科技有限公司 All Rights Reserved";

diff --git a/LoCyanFrpDesktop/MainWindow.xaml.cs b/LoCyanFrpDesktop/MainWindow.xaml.cs
@@ -52,7 +52,10 @@ public partial class MainWindow : UiWindow
         public static long Traffic;
         public MainWindow()
         {
-
+            //InitialBanner initialBanner = new();
+
+            //initialBanner.Show();
+            //initialBanner.Hide();
             InitializeComponent();
             Uri iconUri = new Uri("pack://application:,,,/LoCyanFrpDesktop;component/Resource/favicon.ico", UriKind.RelativeOrAbsolute);
             this.Icon = new BitmapImage(iconUri);

diff --git a/LoCyanFrpDesktop/Utils/InitialBanner.xaml.cs b/LoCyanFrpDesktop/Utils/InitialBanner.xaml.cs
@@ -56,7 +56,9 @@ public InitialBanner()
 
         }
         public bool CheckForUpdate(out string reason)
-        {   bool a = false;
+        {
+            Console.WriteLine("Checking Update...");
+            bool a = false;
             string Reason;
             Update.CheckVersion(out a,out Reason);
             reason = Reason;

diff --git a/LoCyanFrpDesktop/Utils/Logger.cs b/LoCyanFrpDesktop/Utils/Logger.cs
@@ -39,7 +39,13 @@ public static void Output(LogType type, params object?[] objects)
             {
                 line = line.TrimEnd(' ');
             }
-            Access.Status.Dispatcher.Invoke(() => Access.Status.Append(LogPreProcess.Color(type, line)));
+            if (type == LogType.Debug || type == LogType.DetailDebug)
+            {
+                Console.WriteLine(line);
+                return;
+            }
+
+                Access.Status.Dispatcher.Invoke(() => Access.Status.Append(LogPreProcess.Color(type, line)));
             LogPreProcess.Process.Cache.Add(new(type, line));
             if (LogPreProcess.Process.Cache.Count > 200)
             {

diff --git a/LoCyanFrpDesktop/Utils/Update.cs b/LoCyanFrpDesktop/Utils/Update.cs
@@ -70,14 +70,17 @@ public static void CheckVersion(out bool isProgramHasNewerVersion,out string Int
         {
             InterruptReason = "";
             isProgramHasNewerVersion = false;
-            if (!Global.Branch.Equals("Release") || !Global.Branch.Equals("RC"))
+            if (!Global.Branch.Equals("Release") && !Global.Branch.Equals("RC"))
             {
                 InterruptReason = "You Are On Preview Branch!!!";
                 return;
             }
+
+
             try
-            {
-                JObject? jsonObject = JsonConvert.DeserializeObject<JObject>(Net.Get("https://api.github.com/repos/LoCyan-Team/LoCyanFrpCSDesktop/releases/latest", "application/vnd.github.v3+json", "Hakuu").Await().Content.ReadAsStringAsync().Await());
+            {   
+
+                JObject? jsonObject = JsonConvert.DeserializeObject<JObject>(Net.Get("https://api.github.com/repos/LoCyan-Team/LoCyanFrpCSDesktop/releases/latest", "application/vnd.github.v3+json", "LoCyanFrpCSDesktop").Await().Content.ReadAsStringAsync().Await());
                 if (jsonObject is null)
                 {
                     InterruptReason = "无法检测更新, 请检查网络连接";
@@ -92,7 +95,11 @@ public static void CheckVersion(out bool isProgramHasNewerVersion,out string Int
                     if (version != CurrentVersion)
                     {       
                             isProgramHasNewerVersion = true;
-                            DownloadNewVersion(jsonObject);
+
+                                Console.WriteLine("Downloading...");
+                                DownloadNewVersion(jsonObject);
+
+
 
                     }
                 }
@@ -104,8 +111,9 @@ public static void CheckVersion(out bool isProgramHasNewerVersion,out string Int
                 Logger.Output(LogType.Error, e.Message);
                 Logger.Output(LogType.Debug, e);
 
+                }
             }
-        }
+
 
         /// <summary>
         /// 下载新版本
@@ -240,9 +248,12 @@ internal static class Net
             _httpClient.DefaultRequestHeaders.AcceptCharset.Add(new StringWithQualityHeaderValue("UTF-8"));
             _httpClient.DefaultRequestHeaders.Remove("user-agent");
             _httpClient.DefaultRequestHeaders.Add("user-agent", userAgent);
+            _httpClient.Timeout = TimeSpan.FromSeconds(5);
             HttpResponseMessage response = await _httpClient.GetAsync(url);
             Logger.Output(LogType.DetailDebug, "Response Headers\n", response.Headers.ToString());
-            Logger.Output(LogType.DetailDebug, "Content\n", await response.Content.ReadAsStringAsync());
+            var content = await response.Content.ReadAsStringAsync();
+            Logger.Output(LogType.DetailDebug, "Content\n", content);
+            Console.WriteLine(content);
             return response;
         }
     }