();
+ for (int i = 0; i < list2.Count; i++)
+ {
+ var item =list2[i];
+ try
+ {
+ JArray jarr = JArray.Parse(item.LogJson);
+ for (int j = 0; j < jarr.Count; j++)
+ {
+ var item_json = jarr[j];
+ var eng_name = item_json.GetJsonValue("ProjectName", "");
+ if (ini.ReadIni("NoVerHtml", eng_name, 0) == 1)
+ {
+ continue;
+ }
+ var ProjectChsName = item_json.GetJsonValue("ProjectChsName", "");
+ if (ProjectChsName.Length> 0)
+ {
+ if (!dict_eng_to_chs.ContainsKey(eng_name))
+ { dict_eng_to_chs[eng_name] = ProjectChsName; }
+ }
+ if(!dict_up.ContainsKey(eng_name))
+ {
+ dict_up[eng_name] = new UpContentInfo();
+ }
+ var up_content = dict_up[eng_name];
+ var logs = item_json.GetJsonValue("LogText", "").Replace("\r", "\n").Replace("\n\n", "\n").Split('\n');
+ for (int m = 0; m < logs.Length; m++)
+ {
+ if (logs[m].Length == 0) { continue; }
+ var log_item = logs[m];
+ if (log_item.StartsWith("- *."))
+ {
+ log_item=log_item.Substring(2);
+ }
+ #region 更新日志
+ var name = log_item.GetStr("[", "]");
+ if (name == "新增")
+ {
+ up_content.AddInfo.Add(log_item);
+ }
+ else if (name == "改进" || name == "优化")
+ {
+ up_content.BetterInfo.Add(log_item);
+ }
+ else if (name == "删除")
+ {
+ up_content.DelInfo.Add(log_item);
+ }
+ else if (name == "修复")
+ {
+ up_content.FixInfo.Add(log_item);
+ }
+ else
+ {
+ up_content.OtherInfo.Add(log_item);
+ }
+ #endregion
+ }
+ }
+ }
+ catch { }
+ }
+ string log_text = "";
+ if (dict_up.ContainsKey(Main_Project))
+ {
+ log_text += "" + System.Web.HttpUtility.HtmlEncode(dict_eng_to_chs.ContainsKey(Main_Project)? dict_eng_to_chs[Main_Project]:Main_Project) + "
";
+ var main_info = dict_up[Main_Project];
+ for (int i = 0; i < main_info.AddInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.AddInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.BetterInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.BetterInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.DelInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.DelInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.FixInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.FixInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.OtherInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.OtherInfo[i]) + "
";
+ }
+ }
+ foreach (var item in dict_up)
+ {
+ if (item.Key == Main_Project) { continue; }
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(dict_eng_to_chs.ContainsKey(item.Key) ? dict_eng_to_chs[item.Key] : item.Key) + "
";
+ var main_info = item.Value;
+ for (int i = 0; i < main_info.AddInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.AddInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.BetterInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.BetterInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.DelInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.DelInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.FixInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.FixInfo[i]) + "
";
+ }
+ for (int i = 0; i < main_info.OtherInfo.Count; i++)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.OtherInfo[i]) + "
";
+ }
+ }
+ RyFiles.CopyToClip(log_text.Trim());
+ }
}
class UpLogItem
{
@@ -1311,5 +1470,9 @@ namespace 开发辅助工具.Tools
public string LogText { get; set; } = "";
public string LogJson { get; set; } = "";
public long AddTime { get; set; } = 0;
+ public int CompareTo(UpLogItem other)
+ {
+ return RySoft.CompareVer(Version, other.Version);
+ }
}
}
diff --git a/Source/开发辅助工具/Tools/FrmProject.resx b/Source/开发辅助工具/Tools/FrmProject.resx
index 9d3a98e..91b9b63 100644
--- a/Source/开发辅助工具/Tools/FrmProject.resx
+++ b/Source/开发辅助工具/Tools/FrmProject.resx
@@ -126,6 +126,9 @@
285, 17
+
+ 285, 17
+
388, 17
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.cs b/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.cs
index 00ebd9e..8820a3d 100644
--- a/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.cs
+++ b/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.cs
@@ -28,7 +28,7 @@ namespace SuperDesign.Tools.UpLog
{
JArray jarr = JArray.Parse(LogJson);
MdLog = SuperDesign.Manager.APIManager.GetMdLogText(jarr, DateTime.Now);
- HtmlLog = SuperDesign.Manager.APIManager.GetHtmlLogText(jarr, DateTime.Now);
+ HtmlLog = SuperDesign.Manager.APIManager.GetHtmlLogText(BFFolderPath, jarr, DateTime.Now);
}
catch { }
}