open-source/RevokeMsgPatcher
1
0
Fork 0
mirror of https://github.com/huiyadanli/RevokeMsgPatcher.git synced 2025-05-24 22:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

[+] 优化了可选功能的展现形式、UI交互

Browse Source 
每次切换应用的时候都会读取dll信息并显示补丁安装情况
This commit is contained in:
huiyadanli 2020-07-25 12:13:54 +08:00
parent 07f52a4bdf
commit 2ceda42417
5 changed files with 96 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RevokeMsgPatcher/FormMain.Designer.cs generated
View File

@ -339,7 +339,7 @@
// //
this.panelCategories.Location = new System.Drawing.Point(83, 85); this.panelCategories.Location = new System.Drawing.Point(83, 85);
this.panelCategories.Name = "panelCategories"; this.panelCategories.Name = "panelCategories";
this.panelCategories.Size = new System.Drawing.Size(201, 18); this.panelCategories.Size = new System.Drawing.Size(393, 18);
this.panelCategories.TabIndex = 22; this.panelCategories.TabIndex = 22;
// //
// FormMain // FormMain

75
RevokeMsgPatcher/FormMain.cs
View File

@ -3,6 +3,7 @@ using RevokeMsgPatcher.Model;
using RevokeMsgPatcher.Modifier; using RevokeMsgPatcher.Modifier;
using RevokeMsgPatcher.Utils; using RevokeMsgPatcher.Utils;
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
@ -71,13 +72,36 @@ namespace RevokeMsgPatcher
{ {
// 自动获取应用安装路径 // 自动获取应用安装路径
txtPath.Text = modifier.FindInstallPath(); txtPath.Text = modifier.FindInstallPath();
btnRestore.Enabled = false; // 显示是否能够备份还原、版本和功能
// 显示是否能够备份还原 InitEditorsAndUI(txtPath.Text);
if (!string.IsNullOrEmpty(txtPath.Text))
}
private void InitEditorsAndUI(string path)
{
if (!string.IsNullOrEmpty(path))
{ {
modifier.InitEditors(txtPath.Text); EnableAllButton(false);
// 清空界面元素
lblVersion.Text = "";
panelCategories.Controls.Clear();
// 重新计算并修改界面元素
modifier.InitEditors(path);
modifier.SetVersionLabelAndCategoryCategories(lblVersion, panelCategories); modifier.SetVersionLabelAndCategoryCategories(lblVersion, panelCategories);
EnableAllButton(true);
// 重新显示备份状态
btnRestore.Enabled = false;
btnRestore.Enabled = modifier.BackupExists(); btnRestore.Enabled = modifier.BackupExists();
List<string> categories = UIController.GetCategoriesFromPanel(panelCategories);
if (categories != null && categories.Count == 0)
{
btnPatch.Enabled = false;
}
} }
} }
@ -97,9 +121,9 @@ namespace RevokeMsgPatcher
EnableAllButton(false); EnableAllButton(false);
// a.重新初始化编辑器 // a.重新初始化编辑器
modifier.InitEditors(txtPath.Text); modifier.InitEditors(txtPath.Text);
// b.获取选择的功能 // b.获取选择的功能 （精准匹配返回null）
string[] categories = UIController.GetCategoriesFromPanel(panelCategories); List<string> categories = UIController.GetCategoriesFromPanel(panelCategories);
if (panelCategories.Controls.Count > 0 && (categories == null || categories.Length == 0)) if (categories != null && categories.Count == 0)
{ {
MessageBox.Show("请至少选择一项功能"); MessageBox.Show("请至少选择一项功能");
EnableAllButton(true); EnableAllButton(true);
@ -142,6 +166,7 @@ namespace RevokeMsgPatcher
modifier.Patch(); modifier.Patch();
ga.RequestPageView($"{enName}/{version}/patch/succ", "补丁安装成功"); ga.RequestPageView($"{enName}/{version}/patch/succ", "补丁安装成功");
MessageBox.Show("补丁安装成功！"); MessageBox.Show("补丁安装成功！");
} }
catch (BusinessException ex) catch (BusinessException ex)
{ {
@ -157,8 +182,7 @@ namespace RevokeMsgPatcher
} }
finally finally
{ {
EnableAllButton(true); InitEditorsAndUI(txtPath.Text);
btnRestore.Enabled = modifier.BackupExists();
} }
} }
@ -167,11 +191,12 @@ namespace RevokeMsgPatcher
{ {
if (modifier.IsAllFilesExist(txtPath.Text)) if (modifier.IsAllFilesExist(txtPath.Text))
{ {
modifier.InitEditors(txtPath.Text); InitEditorsAndUI(txtPath.Text);
btnRestore.Enabled = modifier.BackupExists();
} }
else else
{ {
UIController.AddMsgToPanel(panelCategories, "请输入正确的应用路径");
lblVersion.Text = "";
btnPatch.Enabled = false; btnPatch.Enabled = false;
btnRestore.Enabled = false; btnRestore.Enabled = false;
} }
@ -190,14 +215,8 @@ namespace RevokeMsgPatcher
else else
{ {
txtPath.Text = dialog.SelectedPath; txtPath.Text = dialog.SelectedPath;
btnRestore.Enabled = false; // 显示是否能够备份还原、版本和功能
// 显示是否能够备份还原 InitEditorsAndUI(txtPath.Text);
if (!string.IsNullOrEmpty(txtPath.Text))
{
modifier.InitEditors(txtPath.Text);
modifier.SetVersionLabelAndCategoryCategories(lblVersion, panelCategories);
btnRestore.Enabled = modifier.BackupExists();
}
} }
} }
} }
@ -219,12 +238,13 @@ namespace RevokeMsgPatcher
MessageBox.Show(ex.Message); MessageBox.Show(ex.Message);
} }
EnableAllButton(true); EnableAllButton(true);
btnRestore.Enabled = modifier.BackupExists(); // 重新计算显示是否能够备份还原、版本和功能
InitEditorsAndUI(txtPath.Text);
} }
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
System.Diagnostics.Process.Start("https://github.com/huiyadanli/RevokeMsgPatcher"); Process.Start("https://github.com/huiyadanli/RevokeMsgPatcher");
} }
private async void FormMain_Load(object sender, EventArgs e) private async void FormMain_Load(object sender, EventArgs e)
@ -313,16 +333,9 @@ namespace RevokeMsgPatcher
} }
txtPath.Text = modifier.FindInstallPath(); txtPath.Text = modifier.FindInstallPath();
EnableAllButton(true); EnableAllButton(true);
lblVersion.Text = "";
btnRestore.Enabled = false; // 重新计算显示是否能够备份还原、版本和功能
panelCategories.Controls.Clear(); InitEditorsAndUI(txtPath.Text);
// 显示是否能够备份还原
if (!string.IsNullOrEmpty(txtPath.Text))
{
modifier.InitEditors(txtPath.Text);
modifier.SetVersionLabelAndCategoryCategories(lblVersion, panelCategories);
btnRestore.Enabled = modifier.BackupExists();
}
ga.RequestPageView($"{GetCheckedRadioButtonNameEn()}/{lblVersion.Text}/switch", "切换标签页"); ga.RequestPageView($"{GetCheckedRadioButtonNameEn()}/{lblVersion.Text}/switch", "切换标签页");
} }

26
RevokeMsgPatcher/Forms/UIController.cs
View File

@ -10,7 +10,7 @@ namespace RevokeMsgPatcher.Forms
{ {
public class UIController public class UIController
{ {
public static void AddCategoryCheckBoxToPanel(Panel panel, string[] categories = null) public static void AddCategoryCheckBoxToPanel(Panel panel, string[] categories, string[] installed)
{ {
if (categories != null && categories.Length != 0) if (categories != null && categories.Length != 0)
{ {
@ -24,9 +24,9 @@ namespace RevokeMsgPatcher.Forms
Checked = true, Checked = true,
AutoSize = true AutoSize = true
}; };
// 只有一个选项时,必选 if (installed.Contains(categories[i]))
if (categories.Length == 1)
{ {
chk.Text = chk.Text + "（已安装）";
chk.Enabled = false; chk.Enabled = false;
} }
panel.Controls.Add(chk); panel.Controls.Add(chk);
@ -45,22 +45,30 @@ namespace RevokeMsgPatcher.Forms
{ {
Name = "lblCategoriesMsg", Name = "lblCategoriesMsg",
Text = msg, Text = msg,
TextAlign = ContentAlignment.MiddleLeft TextAlign = ContentAlignment.MiddleLeft,
Size = new Size(panel.Width, panel.Height)
}; };
panel.Controls.Add(label); panel.Controls.Add(label);
} }
public static string[] GetCategoriesFromPanel(Panel panel) public static List<string> GetCategoriesFromPanel(Panel panel)
{ {
List<string> categories = new List<string>(); List<string> categories = new List<string>();
foreach (CheckBox checkBox in panel.Controls) foreach (Control ctrl in panel.Controls)
{ {
if (checkBox.Checked) if (ctrl is CheckBox checkBox)
{ {
categories.Add(checkBox.Text); if (checkBox.Enabled && checkBox.Checked)
{
categories.Add(checkBox.Text);
}
}
else if (ctrl is Label label)
{
return null; // 如果是标签, 说明是精准匹配, 直接返回null
} }
} }
return categories.ToArray(); return categories;
} }
} }
} }

7
RevokeMsgPatcher/Matcher/ModifyFinder.cs
View File

@ -79,6 +79,13 @@ namespace RevokeMsgPatcher.Matcher
} }
} }
public static SortedSet<string> FindReplacedFunction(string path, List<ReplacePattern> replacePatterns)
{
byte[] fileByteArray = File.ReadAllBytes(path);
Tuple<bool, SortedSet<string>> res = IsAllReplaced(fileByteArray, replacePatterns);
return res.Item2;
}
private static Tuple<bool, SortedSet<string>> IsAllReplaced(byte[] fileByteArray, List<ReplacePattern> replacePatterns) private static Tuple<bool, SortedSet<string>> IsAllReplaced(byte[] fileByteArray, List<ReplacePattern> replacePatterns)
{ {
int matchNum = 0; int matchNum = 0;

39
RevokeMsgPatcher/Modifier/AppModifier.cs
View File

@ -51,8 +51,8 @@ namespace RevokeMsgPatcher.Modifier
string version = GetVersion(); string version = GetVersion();
// 补丁信息中是否都有对应的版本 // 补丁信息中是否都有对应的版本
int i = 0, j = 0; int i = 0, j = 0;
// 特征码匹配的时候的可选功能项
SortedSet<string> categories = new SortedSet<string>(); // 精确版本匹配
foreach (FileHexEditor editor in editors) // 多种文件 foreach (FileHexEditor editor in editors) // 多种文件
{ {
// 精确版本匹配 // 精确版本匹配
@ -69,7 +69,22 @@ namespace RevokeMsgPatcher.Modifier
{ {
i++; i++;
} }
}
if (i == editors.Count)
{
label.Text = version + "（已支持）";
label.ForeColor = Color.Green;
UIController.AddMsgToPanel(panel, "只有基于特征的补丁才能选择功能");
return;
}
// 模糊版本匹配（特征码）
// 特征码匹配的时候的可选功能项
SortedSet<string> categories = new SortedSet<string>();
SortedSet<string> installed = new SortedSet<string>();
foreach (FileHexEditor editor in editors) // 多种文件
{
// 匹配出对应版本是否有可以使用的特征 // 匹配出对应版本是否有可以使用的特征
if (config.FileCommonModifyInfos != null) if (config.FileCommonModifyInfos != null)
{ {
@ -87,6 +102,12 @@ namespace RevokeMsgPatcher.Modifier
categories.Add(c); categories.Add(c);
} }
} }
// 获取已经安装过的功能类型
SortedSet<string> replaced = ModifyFinder.FindReplacedFunction(editor.FilePath, commonModifyInfo.ReplacePatterns);
foreach (string c in replaced)
{
installed.Add(c);
}
inRange = true; inRange = true;
break; break;
} }
@ -99,17 +120,11 @@ namespace RevokeMsgPatcher.Modifier
} }
// 全部都有对应匹配的版本 // 全部都有对应匹配的版本
if (i == editors.Count) if (j == editors.Count)
{
label.Text = version + "（已支持）";
label.ForeColor = Color.Green;
UIController.AddMsgToPanel(panel, "只有基于特征的补丁才能选择功能");
}
else if (j == editors.Count)
{ {
label.Text = version + "（支持特征防撤回）"; label.Text = version + "（支持特征防撤回）";
label.ForeColor = Color.LimeGreen; label.ForeColor = Color.LimeGreen;
UIController.AddCategoryCheckBoxToPanel(panel, categories.ToArray()); UIController.AddCategoryCheckBoxToPanel(panel, categories.ToArray(), installed.ToArray());
} }
else else
{ {
@ -236,7 +251,7 @@ namespace RevokeMsgPatcher.Modifier
/// b.验证文件完整性，寻找对应的补丁信息 /// b.验证文件完整性，寻找对应的补丁信息
/// </summary> /// </summary>
/// <param name="categories">操作类型（防撤回或者多开等）,为空则是所有操作</param> /// <param name="categories">操作类型（防撤回或者多开等）,为空则是所有操作</param>
public void ValidateAndFindModifyInfo(string[] categories) public void ValidateAndFindModifyInfo(List<string> categories)
{ {
// 寻找对应文件版本与SHA1的修改信息 // 寻找对应文件版本与SHA1的修改信息
foreach (FileHexEditor editor in editors) // 多种文件 foreach (FileHexEditor editor in editors) // 多种文件
@ -291,7 +306,7 @@ namespace RevokeMsgPatcher.Modifier
{ {
List<ReplacePattern> replacePatterns = editor.FileCommonModifyInfo.ReplacePatterns; List<ReplacePattern> replacePatterns = editor.FileCommonModifyInfo.ReplacePatterns;
// 根据需要操作的功能类型（防撤回或者多开等）筛选特征码 // 根据需要操作的功能类型（防撤回或者多开等）筛选特征码
if (categories.Length > 0) if (categories != null && categories.Count > 0)
{ {
replacePatterns = editor.FileCommonModifyInfo.ReplacePatterns.Where(info => categories.Contains(info.Category)).ToList(); replacePatterns = editor.FileCommonModifyInfo.ReplacePatterns.Where(info => categories.Contains(info.Category)).ToList();
} }