fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: rename UILogColor

Browse Source
This commit is contained in:
MistEO
2022-10-31 22:20:02 +08:00
parent 4fcb51013c
commit 00c223cd9c
6 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -357,16 +357,16 @@ namespace MeoAsstGui
case "UnsupportedResolution":
connected = false;
mainModel.AddLog(Localization.GetString("ResolutionNotSupported"), LogColor.Error);
mainModel.AddLog(Localization.GetString("ResolutionNotSupported"), UILogColor.Error);
break;
case "ResolutionError":
connected = false;
mainModel.AddLog(Localization.GetString("ResolutionAcquisitionFailure"), LogColor.Error);
mainModel.AddLog(Localization.GetString("ResolutionAcquisitionFailure"), UILogColor.Error);
break;
case "Reconnecting":
mainModel.AddLog($"{Localization.GetString("TryToReconnect")}({Convert.ToUInt32(details["details"]["times"]) + 1})", LogColor.Error);
mainModel.AddLog($"{Localization.GetString("TryToReconnect")}({Convert.ToUInt32(details["details"]["times"]) + 1})", UILogColor.Error);
break;
case "Reconnected":
@@ -375,7 +375,7 @@ namespace MeoAsstGui
case "Disconnect":
connected = false;
mainModel.AddLog(Localization.GetString("ReconnectFailed"), LogColor.Error);
mainModel.AddLog(Localization.GetString("ReconnectFailed"), UILogColor.Error);
if (mainModel.Idle)
{
break;
@@ -388,7 +388,7 @@ namespace MeoAsstGui
{
if (settingsModel.RetryOnDisconnected)
{
mainModel.AddLog(Localization.GetString("TryToStartEmulator"), LogColor.Error);
mainModel.AddLog(Localization.GetString("TryToStartEmulator"), UILogColor.Error);
mainModel.KillEmulator();
await Task.Delay(3000);
mainModel.Stop();
@@ -400,7 +400,7 @@ namespace MeoAsstGui
break;
case "ScreencapFailed":
mainModel.AddLog(Localization.GetString("ScreencapFailed"), LogColor.Error);
mainModel.AddLog(Localization.GetString("ScreencapFailed"), UILogColor.Error);
break;
}
}
@@ -441,11 +441,11 @@ namespace MeoAsstGui
break;
case AsstMsg.TaskChainError:
mainModel.AddLog(Localization.GetString("TaskError") + taskChain, LogColor.Error);
mainModel.AddLog(Localization.GetString("TaskError") + taskChain, UILogColor.Error);
if (isCoplitTaskChain)
{
copilotModel.Idle = true;
copilotModel.AddLog(Localization.GetString("CombatError"), LogColor.Error);
copilotModel.AddLog(Localization.GetString("CombatError"), UILogColor.Error);
}
break;
@@ -473,7 +473,7 @@ namespace MeoAsstGui
if (isCoplitTaskChain)
{
copilotModel.Idle = true;
copilotModel.AddLog(Localization.GetString("CompleteCombat"), LogColor.Info);
copilotModel.AddLog(Localization.GetString("CompleteCombat"), UILogColor.Info);
}
break;
@@ -565,29 +565,29 @@ namespace MeoAsstGui
switch (subTask)
{
case "StartGameTask":
mainModel.AddLog(Localization.GetString("FailedToOpenClient"), LogColor.Error);
mainModel.AddLog(Localization.GetString("FailedToOpenClient"), UILogColor.Error);
break;
case "AutoRecruitTask":
{
var why_str = details.TryGetValue("why", out var why) ? why.ToString() : Localization.GetString("ErrorOccurred");
mainModel.AddLog(why_str + "，" + Localization.GetString("HasReturned"), LogColor.Error);
mainModel.AddLog(why_str + "，" + Localization.GetString("HasReturned"), UILogColor.Error);
break;
}
case "RecognizeDrops":
mainModel.AddLog(Localization.GetString("DropRecognitionError"), LogColor.Error);
mainModel.AddLog(Localization.GetString("DropRecognitionError"), UILogColor.Error);
break;
case "ReportToPenguinStats":
{
var why = details["why"].ToString();
mainModel.AddLog(why + "，" + Localization.GetString("GiveUpUploadingPenguins"), LogColor.Error);
mainModel.AddLog(why + "，" + Localization.GetString("GiveUpUploadingPenguins"), UILogColor.Error);
break;
}
case "CheckStageValid":
mainModel.AddLog(Localization.GetString("TheEX"), LogColor.Error);
mainModel.AddLog(Localization.GetString("TheEX"), UILogColor.Error);
break;
}
}
@@ -606,40 +606,40 @@ namespace MeoAsstGui
{
case "StartButton2":
case "AnnihilationConfirm":
mainModel.AddLog(Localization.GetString("MissionStart") + $" {execTimes} " + Localization.GetString("UnitTime"), LogColor.Info);
mainModel.AddLog(Localization.GetString("MissionStart") + $" {execTimes} " + Localization.GetString("UnitTime"), UILogColor.Info);
break;
case "MedicineConfirm":
mainModel.AddLog(Localization.GetString("MedicineUsed") + $" {execTimes} " + Localization.GetString("UnitTime"), LogColor.Info);
mainModel.AddLog(Localization.GetString("MedicineUsed") + $" {execTimes} " + Localization.GetString("UnitTime"), UILogColor.Info);
break;
case "StoneConfirm":
mainModel.AddLog(Localization.GetString("StoneUsed") + $" {execTimes} " + Localization.GetString("UnitTime"), LogColor.Info);
mainModel.AddLog(Localization.GetString("StoneUsed") + $" {execTimes} " + Localization.GetString("UnitTime"), UILogColor.Info);
break;
case "AbandonAction":
mainModel.AddLog(Localization.GetString("ActingCommandError"), LogColor.Error);
mainModel.AddLog(Localization.GetString("ActingCommandError"), UILogColor.Error);
break;
case "RecruitRefreshConfirm":
mainModel.AddLog(Localization.GetString("LabelsRefreshed"), LogColor.Info);
mainModel.AddLog(Localization.GetString("LabelsRefreshed"), UILogColor.Info);
break;
case "RecruitConfirm":
mainModel.AddLog(Localization.GetString("RecruitConfirm"), LogColor.Info);
mainModel.AddLog(Localization.GetString("RecruitConfirm"), UILogColor.Info);
break;
case "InfrastDormDoubleConfirmButton":
mainModel.AddLog(Localization.GetString("InfrastDormDoubleConfirmed"), LogColor.Error);
mainModel.AddLog(Localization.GetString("InfrastDormDoubleConfirmed"), UILogColor.Error);
break;
/* 肉鸽相关 */
case "StartExplore":
mainModel.AddLog(Localization.GetString("BegunToExplore") + $" {execTimes} " + Localization.GetString("UnitTime"), LogColor.Info);
mainModel.AddLog(Localization.GetString("BegunToExplore") + $" {execTimes} " + Localization.GetString("UnitTime"), UILogColor.Info);
break;
case "StageTraderInvestConfirm":
mainModel.AddLog(Localization.GetString("HasInvested") + $" {execTimes} " + Localization.GetString("UnitTime"), LogColor.Info);
mainModel.AddLog(Localization.GetString("HasInvested") + $" {execTimes} " + Localization.GetString("UnitTime"), UILogColor.Info);
break;
case "ExitThenAbandon":
@@ -686,19 +686,19 @@ namespace MeoAsstGui
break;
case "StageTraderInvestSystemFull":
mainModel.AddLog(Localization.GetString("UpperLimit"), LogColor.Info);
mainModel.AddLog(Localization.GetString("UpperLimit"), UILogColor.Info);
break;
case "RestartGameAndContinue":
mainModel.AddLog(Localization.GetString("GameCrash"), LogColor.Warning);
mainModel.AddLog(Localization.GetString("GameCrash"), UILogColor.Warning);
break;
case "OfflineConfirm":
mainModel.AddLog(Localization.GetString("GameDrop"), LogColor.Warning);
mainModel.AddLog(Localization.GetString("GameDrop"), UILogColor.Warning);
break;
case "GamePass":
mainModel.AddLog(Localization.GetString("RoguelikeGamePass"), LogColor.RareOperator);
mainModel.AddLog(Localization.GetString("RoguelikeGamePass"), UILogColor.RareOperator);
break;
}
}
@@ -760,7 +760,7 @@ namespace MeoAsstGui
break;
case "ProductIncorrect":
mainModel.AddLog(Localization.GetString("ProductIncorrect"), LogColor.Error);
mainModel.AddLog(Localization.GetString("ProductIncorrect"), UILogColor.Error);
break;
case "RecruitTagsDetected":
@@ -816,11 +816,11 @@ namespace MeoAsstGui
toast.AppendContentText(new string('★', level)).ShowRecruit(row: 2);
}
mainModel.AddLog(level + " ★ Tags", LogColor.RareOperator, "Bold");
mainModel.AddLog(level + " ★ Tags", UILogColor.RareOperator, "Bold");
}
else
{
mainModel.AddLog(level + " ★ Tags", LogColor.Info);
mainModel.AddLog(level + " ★ Tags", UILogColor.Info);
}
/*
@@ -864,7 +864,7 @@ namespace MeoAsstGui
case "NotEnoughStaff":
{
mainModel.AddLog(Localization.GetString("NotEnoughStaff"), LogColor.Error);
mainModel.AddLog(Localization.GetString("NotEnoughStaff"), UILogColor.Error);
}
break;
@@ -879,7 +879,7 @@ namespace MeoAsstGui
case "StageInfoError":
{
mainModel.AddLog(Localization.GetString("StageInfoError"), LogColor.Error);
mainModel.AddLog(Localization.GetString("StageInfoError"), UILogColor.Error);
}
break;
@@ -912,7 +912,7 @@ namespace MeoAsstGui
if (doc.Length != 0)
{
string color = subTaskDetails["doc_color"].ToString();
copilotModel.AddLog(doc, color.Length == 0 ? LogColor.Message : color);
copilotModel.AddLog(doc, color.Length == 0 ? UILogColor.Message : color);
}
var action = subTaskDetails["action"].ToString();
@@ -934,7 +934,7 @@ namespace MeoAsstGui
break;
case "UnsupportedLevel":
copilotModel.AddLog(Localization.GetString("UnsupportedLevel"), LogColor.Error);
copilotModel.AddLog(Localization.GetString("UnsupportedLevel"), UILogColor.Error);
break;
case "CustomInfrastRoomOperators":

2
src/MeoAsstGui/Helper/LogItemViewModel.cs
View File

@@ -27,7 +27,7 @@ namespace MeoAsstGui
/// <param name="content">The content.</param>
/// <param name="color">The font color.</param>
/// <param name="weight">The font weight.</param>
public LogItemViewModel(string content, string color = LogColor.Message, string weight = "Regular")
public LogItemViewModel(string content, string color = UILogColor.Message, string weight = "Regular")
{
Time = DateTime.Now.ToString("MM'-'dd' 'HH':'mm':'ss");
this.Content = content;

2
src/MeoAsstGui/Helper/LogColor.cs → src/MeoAsstGui/Helper/UILogColor.cs
View File

@@ -16,7 +16,7 @@ namespace MeoAsstGui
/// <summary>
/// The recommended colors for logs.
/// </summary>
public static class LogColor
public static class UILogColor
{
/// <summary>
/// The recommended color for error logs.

2
src/MeoAsstGui/MeoAsstGui.csproj
View File

@@ -112,7 +112,7 @@
<Compile Include="Helper\GenericCombData{TValueType}.cs" />
<Compile Include="Helper\IMainWindowManager.cs" />
<Compile Include="Helper\Localization.cs" />
<Compile Include="Helper\LogColor.cs" />
<Compile Include="Helper\UILogColor.cs" />
<Compile Include="Helper\LogItemViewModel.cs" />
<Compile Include="Helper\MaaHotKeys\IMaaHotKeyActionHandler.cs" />
<Compile Include="Helper\MaaHotKeys\IMaaHotKeyManager.cs" />

38
src/MeoAsstGui/ViewModels/CopilotViewModel.cs
View File

@@ -63,7 +63,7 @@ namespace MeoAsstGui
Localization.GetString("CopilotTip3") + "\n\n" +
Localization.GetString("CopilotTip4"),
/* Localization.GetString("CopilotTip5"),*/
LogColor.Message);
UILogColor.Message);
}
/// <summary>
@@ -72,7 +72,7 @@ namespace MeoAsstGui
/// <param name="content">The content.</param>
/// <param name="color">The font color.</param>
/// <param name="weight">The font weight.</param>
public void AddLog(string content, string color = LogColor.Trace, string weight = "Regular")
public void AddLog(string content, string color = UILogColor.Trace, string weight = "Regular")
{
LogItemViewModels.Add(new LogItemViewModel(content, color, weight));
@@ -86,7 +86,7 @@ namespace MeoAsstGui
/// <param name="url">The URL.</param>
/// <param name="color">The font color.</param>
/// <param name="weight">The font weight.</param>
public void AddLogWithUrl(string content, string url, string color = LogColor.Trace, string weight = "Regular")
public void AddLogWithUrl(string content, string url, string color = UILogColor.Trace, string weight = "Regular")
{
LogItemViewModels.Add(new LogItemViewModel(content, color, weight));
@@ -145,7 +145,7 @@ namespace MeoAsstGui
}
catch (Exception)
{
AddLog(Localization.GetString("CopilotFileReadError"), LogColor.Error);
AddLog(Localization.GetString("CopilotFileReadError"), UILogColor.Error);
return;
}
}
@@ -193,14 +193,14 @@ namespace MeoAsstGui
}
else
{
AddLog(Localization.GetString("CopilotNoFound"), LogColor.Error);
AddLog(Localization.GetString("CopilotNoFound"), UILogColor.Error);
return string.Empty;
}
}
}
catch (Exception)
{
AddLog(Localization.GetString("NetworkServiceError"), LogColor.Error);
AddLog(Localization.GetString("NetworkServiceError"), UILogColor.Error);
return string.Empty;
}
}
@@ -217,7 +217,7 @@ namespace MeoAsstGui
var json = (JObject)JsonConvert.DeserializeObject(jsonStr);
if (json == null)
{
AddLog(Localization.GetString("CopilotJsonError"), LogColor.Error);
AddLog(Localization.GetString("CopilotJsonError"), UILogColor.Error);
return;
}
@@ -231,7 +231,7 @@ namespace MeoAsstGui
if (title.Length != 0)
{
string title_color = LogColor.Message;
string title_color = UILogColor.Message;
if (doc.ContainsKey("title_color"))
{
title_color = doc["title_color"].ToString();
@@ -248,7 +248,7 @@ namespace MeoAsstGui
if (details.Length != 0)
{
string details_color = LogColor.Message;
string details_color = UILogColor.Message;
if (doc.ContainsKey("details_color"))
{
details_color = doc["details_color"].ToString();
@@ -277,12 +277,12 @@ namespace MeoAsstGui
}
}
AddLog(string.Empty, LogColor.Message);
AddLog(string.Empty, UILogColor.Message);
int count = 0;
foreach (var oper in json["opers"].Cast<JObject>())
{
count++;
AddLog(string.Format("{0}, {1} 技能", oper["name"], oper["skill"]), LogColor.Message);
AddLog(string.Format("{0}, {1} 技能", oper["name"], oper["skill"]), UILogColor.Message);
}
if (json.ContainsKey("groups"))
@@ -297,11 +297,11 @@ namespace MeoAsstGui
operInfos.Add(string.Format("{0} {1}", oper["name"], oper["skill"]));
}
AddLog(group_name + string.Join(" / ", operInfos), LogColor.Message);
AddLog(group_name + string.Join(" / ", operInfos), UILogColor.Message);
}
}
AddLog(string.Format("共 {0} 名干员", count), LogColor.Message);
AddLog(string.Format("共 {0} 名干员", count), UILogColor.Message);
_curStageName = json["stage_name"].ToString();
_curCopilotData = json.ToString();
@@ -316,7 +316,7 @@ namespace MeoAsstGui
}
catch (Exception)
{
AddLog(Localization.GetString("CopilotJsonError"), LogColor.Error);
AddLog(Localization.GetString("CopilotJsonError"), UILogColor.Error);
}
}
@@ -362,7 +362,7 @@ namespace MeoAsstGui
{
Filename = string.Empty;
ClearLog();
AddLog(Localization.GetString("NotCopilotJson"), LogColor.Error);
AddLog(Localization.GetString("NotCopilotJson"), UILogColor.Error);
}
}
@@ -402,13 +402,13 @@ namespace MeoAsstGui
_caught = await task;
if (!_caught)
{
AddLog(errMsg, LogColor.Error);
AddLog(errMsg, UILogColor.Error);
return;
}
if (errMsg.Length != 0)
{
AddLog(errMsg, LogColor.Error);
AddLog(errMsg, UILogColor.Error);
}
UpdateFileDoc(Filename);
@@ -423,7 +423,7 @@ namespace MeoAsstGui
}
else
{
AddLog(Localization.GetString("CopilotFileReadError") + "\n" + Localization.GetString("CheckTheFile"), LogColor.Error);
AddLog(Localization.GetString("CopilotFileReadError") + "\n" + Localization.GetString("CheckTheFile"), UILogColor.Error);
}
}
@@ -510,7 +510,7 @@ namespace MeoAsstGui
switch (text)
{
case "/help":
AddLog(Localization.GetString("HelloWorld"), LogColor.Message);
AddLog(Localization.GetString("HelloWorld"), UILogColor.Message);
break;
}
}

30
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -458,7 +458,7 @@ namespace MeoAsstGui
/// <param name="content">The content.</param>
/// <param name="color">The font color.</param>
/// <param name="weight">The font weight.</param>
public void AddLog(string content, string color = LogColor.Trace, string weight = "Regular")
public void AddLog(string content, string color = UILogColor.Trace, string weight = "Regular")
{
var log = new LogItemViewModel(content, color, weight);
LogItemViewModels.Add(log);
@@ -640,7 +640,7 @@ namespace MeoAsstGui
if (!caught)
{
AddLog(errMsg, LogColor.Error);
AddLog(errMsg, UILogColor.Error);
AddLog(Localization.GetString("ConnectFailed") + "\n" + Localization.GetString("TryToStartEmulator"));
var settingsModel = _container.Get<SettingsViewModel>();
var subtask = Task.Run(() =>
@@ -655,7 +655,7 @@ namespace MeoAsstGui
caught = await task;
if (!caught)
{
AddLog(errMsg, LogColor.Error);
AddLog(errMsg, UILogColor.Error);
Idle = true;
SetStopped();
return;
@@ -1194,7 +1194,7 @@ namespace MeoAsstGui
var asstProxy = _container.Get<AsstProxy>();
if (!asstProxy.AsstStartCloseDown())
{
AddLog(Localization.GetString("CloseArknightsFailed"), LogColor.Error);
AddLog(Localization.GetString("CloseArknightsFailed"), UILogColor.Error);
}
break;
@@ -1209,7 +1209,7 @@ namespace MeoAsstGui
case ActionType.ExitEmulator:
if (!KillEumlatorbyWindow())
{
AddLog(Localization.GetString("ExitEmulatorFailed"), LogColor.Error);
AddLog(Localization.GetString("ExitEmulatorFailed"), UILogColor.Error);
}
break;
@@ -1217,7 +1217,7 @@ namespace MeoAsstGui
case ActionType.ExitEmulatorAndSelf:
if (!KillEumlatorbyWindow())
{
AddLog(Localization.GetString("ExitEmulatorFailed"), LogColor.Error);
AddLog(Localization.GetString("ExitEmulatorFailed"), UILogColor.Error);
}
// Shutdown 会调用 OnExit 但 Exit 不会
@@ -1246,7 +1246,7 @@ namespace MeoAsstGui
case ActionType.Hibernate:
// 休眠提示
AddLog(Localization.GetString("HibernatePrompt"), LogColor.Error);
AddLog(Localization.GetString("HibernatePrompt"), UILogColor.Error);
// 休眠不能加时间参数，https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1133
Process.Start("shutdown.exe", "-h");
@@ -1255,11 +1255,11 @@ namespace MeoAsstGui
case ActionType.ExitEmulatorAndSelfAndHibernate:
if (!KillEumlatorbyWindow())
{
AddLog(Localization.GetString("ExitEmulatorFailed"), LogColor.Error);
AddLog(Localization.GetString("ExitEmulatorFailed"), UILogColor.Error);
}
// 休眠提示
AddLog(Localization.GetString("HibernatePrompt"), LogColor.Error);
AddLog(Localization.GetString("HibernatePrompt"), UILogColor.Error);
// 休眠不能加时间参数，https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1133
Process.Start("shutdown.exe", "-h");
@@ -1579,7 +1579,7 @@ namespace MeoAsstGui
if (value != _customInfrastPlanIndex)
{
var plan = CustomInfrastPlanInfoList[value];
AddLog(plan.Name, LogColor.Message);
AddLog(plan.Name, UILogColor.Message);
foreach (var period in plan.PeriodList)
{
@@ -1648,8 +1648,8 @@ namespace MeoAsstGui
if (root.ContainsKey("title"))
{
AddLog(Localization.GetString("CustomInfrastTitle"), LogColor.Message);
AddLog(root["title"].ToString(), LogColor.Info);
AddLog(Localization.GetString("CustomInfrastTitle"), UILogColor.Message);
AddLog(root["title"].ToString(), UILogColor.Info);
if (root.ContainsKey("description"))
{
AddLog(root["description"].ToString());
@@ -1664,7 +1664,7 @@ namespace MeoAsstGui
CustomInfrastPlanList.Add(new GenericCombData<int> { Display = display, Value = i });
string desc = plan.ContainsKey("description") ? plan["description"].ToString() : string.Empty;
AddLog(display, LogColor.Message);
AddLog(display, UILogColor.Message);
var periodList = new List<CustomInfrastPlanInfo.Period>();
if (plan.ContainsKey("period"))
@@ -1710,7 +1710,7 @@ namespace MeoAsstGui
}
catch (Exception)
{
AddLog(Localization.GetString("CustomInfrastFileParseFailed"), LogColor.Error);
AddLog(Localization.GetString("CustomInfrastFileParseFailed"), UILogColor.Error);
return;
}
@@ -1751,7 +1751,7 @@ namespace MeoAsstGui
return;
}
AddLog(Localization.GetString("CustomInfrastPlanIndexAutoSwitch"), LogColor.Message);
AddLog(Localization.GetString("CustomInfrastPlanIndexAutoSwitch"), UILogColor.Message);
if (CustomInfrastPlanIndex >= CustomInfrastPlanList.Count - 1)
{
CustomInfrastPlanIndex = 0;