Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-07-02 04:52:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve

Browse source
This commit is contained in:
2dust 2024-03-07 11:51:45 +08:00
parent 028c9ea0b5
commit 2cda2b53ed
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
v2rayN/v2rayN/Handler/CoreHandler.cs
View file

@ -195,7 +195,7 @@ namespace v2rayN.Handler
var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType); var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
var displayLog = node.configType != EConfigType.Custom || node.displayLog; var displayLog = node.configType != EConfigType.Custom || node.displayLog;
var proc = RunProcess(node, coreInfo, "", displayLog, ShowMsg); var proc = RunProcess(node, coreInfo, "", displayLog);
if (proc is null) if (proc is null)
{ {
return; return;
@ -218,7 +218,7 @@ namespace v2rayN.Handler
if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0) if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
{ {
var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box); var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true, ShowMsg); var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
if (proc2 is not null) if (proc2 is not null)
{ {
_processPre = proc2; _processPre = proc2;
@ -236,7 +236,7 @@ namespace v2rayN.Handler
try try
{ {
var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType); var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg); var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
if (proc is null) if (proc is null)
{ {
return -1; return -1;
@ -253,16 +253,16 @@ namespace v2rayN.Handler
} }
} }
private void ShowMsg(bool updateToTrayTooltip, string msg) private void ShowMsg(bool notify, string msg)
{ {
_updateFunc(updateToTrayTooltip, msg); _updateFunc(notify, msg);
} }
#endregion Private #endregion Private
#region Process #region Process
private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update) private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
{ {
try try
{ {
@ -295,7 +295,7 @@ namespace v2rayN.Handler
if (!string.IsNullOrEmpty(e.Data)) if (!string.IsNullOrEmpty(e.Data))
{ {
string msg = e.Data + Environment.NewLine; string msg = e.Data + Environment.NewLine;
update(false, msg); ShowMsg(false, msg);
} }
}; };
proc.ErrorDataReceived += (sender, e) => proc.ErrorDataReceived += (sender, e) =>
@ -303,7 +303,7 @@ namespace v2rayN.Handler
if (!string.IsNullOrEmpty(e.Data)) if (!string.IsNullOrEmpty(e.Data))
{ {
string msg = e.Data + Environment.NewLine; string msg = e.Data + Environment.NewLine;
update(false, msg); ShowMsg(false, msg);
if (!startUpSuccessful) if (!startUpSuccessful)
{ {
@ -336,7 +336,7 @@ namespace v2rayN.Handler
{ {
Logging.SaveLog(ex.Message, ex); Logging.SaveLog(ex.Message, ex);
string msg = ex.Message; string msg = ex.Message;
update(true, msg); ShowMsg(true, msg);
return null; return null;
} }
} }

14
v2rayN/v2rayN/Handler/NoticeHandler.cs
View file

@ -10,12 +10,14 @@ namespace v2rayN.Handler
public NoticeHandler(ISnackbarMessageQueue snackbarMessageQueue) public NoticeHandler(ISnackbarMessageQueue snackbarMessageQueue)
{ {
_snackbarMessageQueue = snackbarMessageQueue ?? throw new ArgumentNullException(nameof(snackbarMessageQueue)); _snackbarMessageQueue = snackbarMessageQueue ?? throw new ArgumentNullException(nameof(snackbarMessageQueue));
//_snackbarMessageQueue = snackbarMessageQueue;
} }
public void Enqueue(object content) public void Enqueue(string content)
{ {
if (content.IsNullOrEmpty())
{
return;
}
_snackbarMessageQueue?.Enqueue(content); _snackbarMessageQueue?.Enqueue(content);
} }
@ -27,13 +29,13 @@ namespace v2rayN.Handler
public void SendMessage(string msg, bool time) public void SendMessage(string msg, bool time)
{ {
msg = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {msg}"; msg = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {msg}";
MessageBus.Current.SendMessage(msg, Global.CommandSendMsgView); SendMessage(msg);
} }
public void SendMessageAndEnqueue(string msg) public void SendMessageAndEnqueue(string msg)
{ {
_snackbarMessageQueue?.Enqueue(msg); Enqueue(msg);
MessageBus.Current.SendMessage(msg, Global.CommandSendMsgView); SendMessage(msg);
} }
} }
} }

4
v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
View file

@ -610,6 +610,10 @@ namespace v2rayN.ViewModels
private void UpdateHandler(bool notify, string msg) private void UpdateHandler(bool notify, string msg)
{ {
_noticeHandler?.SendMessage(msg); _noticeHandler?.SendMessage(msg);
if (notify)
{
_noticeHandler?.Enqueue(msg);
}
} }
private void UpdateTaskHandler(bool success, string msg) private void UpdateTaskHandler(bool success, string msg)