up 6.19

Update: 默认关闭硬件加速

v2rayN/v2rayN/App.xaml.cs

@@ -42,10 +42,11 @@ namespace v2rayN
             Global.processJob = new Job();
 
             Logging.Setup();
+            Init();
+            Logging.LoggingEnabled(_config.guiItem.enableLog);
             Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
-            Init();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
 

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -956,7 +956,7 @@ namespace v2rayN.Handler
                 //exist sub items
                 if (isSub && !Utils.IsNullOrEmpty(subid))
                 {
-                    var existItem = lstOriSub?.FirstOrDefault(t => CompareProfileItem(t, profileItem, true));
+                    var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub && CompareProfileItem(t, profileItem, true));
                     if (existItem != null)
                     {
                         profileItem.indexId = existItem.indexId;

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -156,6 +156,7 @@ namespace v2rayN.Handler
             if (Utils.IsNullOrEmpty(fileName))
             {
                 string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Utils.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -213,6 +214,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
+                Utils.SaveLog(Utils.ToJson(node));
                 Utils.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(true, msg);

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -197,6 +197,18 @@ namespace v2rayN.Handler
             {
                 dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
             }
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+            }
+            if (!Utils.IsNullOrEmpty(item.spiderX))
+            {
+                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+            }
 
             dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");
 
@@ -756,6 +768,10 @@ namespace v2rayN.Handler
             item.sni = query["sni"] ?? "";
             item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
             item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
+
             item.network = query["type"] ?? "tcp";
             switch (item.network)
             {

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -103,8 +103,10 @@ namespace v2rayN.Mode
         public bool enableSecurityProtocolTls13 { get; set; }
 
         public int trayMenuServersLimit { get; set; } = 20;
-        
+
-        public bool enableHWA { get; set; } = true;
+        public bool enableHWA { get; set; } = false;
+
+        public bool enableLog { get; set; } = true;
     }
 
     [Serializable]

v2rayN/v2rayN/Tool/Logging.cs

@@ -17,6 +17,13 @@ namespace v2rayN.Tool
             config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
             LogManager.Configuration = config;
         }
+        public static void LoggingEnabled(bool enable)
+        {
+            if (!enable)
+            {
+                LogManager.SuspendLogging();
+            }
+        }
 
         public static void ClearLogs()
         {

v2rayN/v2rayN/Tool/Utils.cs

@@ -282,6 +282,8 @@ namespace v2rayN
                   .Replace(Environment.NewLine, "")
                   .Replace("\n", "")
                   .Replace("\r", "")
+                  .Replace('_', '/')
+                  .Replace('-', '+')
                   .Replace(" ", "");
 
                 if (plainText.Length % 4 > 0)
@@ -312,7 +314,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                //SaveLog(ex.Message, ex);
                 return 0;
             }
         }
@@ -324,7 +326,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                //SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -337,7 +339,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                //SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -778,7 +780,7 @@ namespace v2rayN
             task.Settings.RunOnlyIfIdle = false;
             task.Settings.IdleSettings.StopOnIdleEnd = false;
             task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromMinutes(1) });
+            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
             task.Principal.RunLevel = TaskRunLevel.Highest;
             task.Actions.Add(new ExecAction(deamonFileName));
 
@@ -865,7 +867,7 @@ namespace v2rayN
                 string location = GetExePath();
                 if (blFull)
                 {
-                    return string.Format("v2rayN - V{0} - {1}",
+                    return string.Format("v2rayN - V{0} - {1}-Test",
                             FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
                             File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
                 }
@@ -907,13 +909,13 @@ namespace v2rayN
         /// <returns></returns>
         public static string? GetClipboardData()
         {
-            string strData = string.Empty;
+            string? strData = string.Empty;
             try
             {
                 IDataObject data = Clipboard.GetDataObject();
                 if (data.GetDataPresent(DataFormats.UnicodeText))
                 {
-                    strData = data.GetData(DataFormats.UnicodeText).ToString();
+                    strData = data.GetData(DataFormats.UnicodeText)?.ToString();
                 }
                 return strData;
             }
@@ -1150,17 +1152,23 @@ namespace v2rayN
 
         public static void SaveLog(string strContent)
         {
-            var logger = LogManager.GetLogger("Log1");
+            if (LogManager.IsLoggingEnabled())
-            logger.Info(strContent);
+            {
+                var logger = LogManager.GetLogger("Log1");
+                logger.Info(strContent);
+            }
         }
         public static void SaveLog(string strTitle, Exception ex)
         {
-            var logger = LogManager.GetLogger("Log2");
+            if (LogManager.IsLoggingEnabled())
-            logger.Debug($"{strTitle},{ex.Message}");
-            logger.Debug(ex.StackTrace);
-            if (ex?.InnerException != null)
             {
-                logger.Error(ex.InnerException);
+                var logger = LogManager.GetLogger("Log2");
+                logger.Debug($"{strTitle},{ex.Message}");
+                logger.Debug(ex.StackTrace);
+                if (ex?.InnerException != null)
+                {
+                    logger.Error(ex.InnerException);
+                }
             }
         }
 

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -197,7 +197,7 @@ namespace v2rayN.Views
             {
                 WindowState = WindowState.Minimized;
             }
-            
+
             if (!_config.guiItem.enableHWA)
             {
                 RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
@@ -445,8 +445,15 @@ namespace v2rayN.Views
                     var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
                     if (item2.ExName == item.Name)
                     {
-                        item2.Width = item.Width;
+                        if (item.Width <= 0)
-                        item2.DisplayIndex = i + 1;
+                        {
+                            item2.Visibility = Visibility.Hidden;
+                        }
+                        else
+                        {
+                            item2.Width = item.Width;
+                            item2.DisplayIndex = i + 1;
+                        }
                     }
                 }
             }
@@ -471,7 +478,7 @@ namespace v2rayN.Views
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,
-                    Width = Convert.ToInt32(item2.ActualWidth),
+                    Width = item2.Visibility == Visibility.Visible ? Convert.ToInt32(item2.ActualWidth) : 0,
                     Index = item2.DisplayIndex
                 });
             }

v2rayN/v2rayN/v2rayN.csproj

@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.18</FileVersion>
+		<FileVersion>6.19</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>