Ver 2.2.0-Alpha.7: Finished URL Protocol Handler.

LoCyan-Team · Sep 10, 2024 · 703f68e · 703f68e
1 parent 32cc96d
commit 703f68e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/LoCyanFrpDesktop/App.xaml.cs b/LoCyanFrpDesktop/App.xaml.cs
@@ -31,7 +31,7 @@ public partial class App : Application
         private static string? Username = null;
         private static string? Password = null;
         private static bool DebugMode = Global.Config.DebugMode;
-        private static bool TokenMode = false;
+        public static bool TokenMode = false;
         [DllImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         static extern bool AllocConsole();
@@ -56,10 +56,7 @@ protected override void OnStartup(StartupEventArgs e)
             string[] args = e.Args;
 
             ProcessStartupParameters(args);
-            if (!TokenMode)
-            {
-                base.OnStartup(e);
-            }
+            base.OnStartup(e);
 
         }
         protected override void OnExit(ExitEventArgs e)

diff --git a/LoCyanFrpDesktop/Global.cs b/LoCyanFrpDesktop/Global.cs
@@ -17,7 +17,7 @@ internal static class Global
         public static bool LoginedByConsole = false;
         public const string Version = "2.2.0";
         public const string Branch = "Alpha";
-        public const int Revision = 6;
+        public const int Revision = 7;
         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
@@ -43,6 +43,17 @@ public partial class MainWindow : UiWindow
         private static string password;
 
         public MainWindow()
+        {
+            Init(App.TokenMode);
+            if (App.TokenMode)
+            {
+                this.Hide();
+            }
+
+
+
+        }
+        private void Init(bool TokenMode)
         {
             InitializeComponent();
             if (Random.Shared.Next(0, 10000) == 5000)
@@ -57,14 +68,13 @@ public MainWindow()
                 Login(Global.Config.Username, ConvertToUnsecureString(Global.Password));
             }
             Tips.Text = Global.Tips[Random.Shared.Next(0, Global.Tips.Count - 1)];
-            CheckNetworkAvailability();
+            if (!TokenMode) CheckNetworkAvailability();
             _Login.IsEnabled = true;
             DataContext = this;
             Access.MainWindow = this;
-            Update.Init();
-            ScheduledTask.Init();
-            ProtocolHandler.Init();
-
+            if (!TokenMode) Update.Init();
+            if (!TokenMode) ScheduledTask.Init();
+            if (!TokenMode) ProtocolHandler.Init();
         }
         private async void CheckNetworkAvailability()
         {

diff --git a/LoCyanFrpDesktop/Properties/launchSettings.json b/LoCyanFrpDesktop/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "LoCyanFrpDesktop": {
       "commandName": "Project",
-      "commandLineArgs": "--debug"
+      "commandLineArgs": "--debug locyanfrp://7296178fe9bb7cb3b88d27bb700a81a6/55158"
     }
   }
 }
diff --git a/LoCyanFrpDesktop/Utils/Config.cs b/LoCyanFrpDesktop/Utils/Config.cs
@@ -19,7 +19,7 @@ internal class Config
         //public string Password = "";
         public string FrpToken = "";
         public string FrpcPath = "";
-        public bool DebugMode = false;
+        public bool DebugMode = true;
         public bool AutoStartUp = false;
         public int AppliedTheme = 0;
         public List<Proxy> AutoLaunch = new();

diff --git a/LoCyanFrpDesktop/Utils/Logger.cs b/LoCyanFrpDesktop/Utils/Logger.cs
@@ -51,7 +51,7 @@ public static void Output(LogType type, params object?[] objects)
             if (type == LogType.Error) {
                 Console.WriteLine("[Error] " + line); return;
             }
-            Access.Status.Dispatcher.Invoke(() => Access.Status.Append(LogPreProcess.Color(type, line)));
+            try { Access.Status.Dispatcher.Invoke(() => Access.Status.Append(LogPreProcess.Color(type, line))); } catch (Exception e) { }
             LogPreProcess.Process.Cache.Add(new(type, line));
             if (LogPreProcess.Process.Cache.Count > 200)
             {