Skip to content

Commit

Permalink
修改更新日志从网络请求数据而不是写在程序内
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmbadmin
rmbadmin committed Feb 22, 2021
1 parent 927b652 commit 81aaa50
Show file tree
Hide file tree
Showing 7 changed files with 3,636 additions and 259 deletions.
1 change: 1 addition & 0 deletions source/SteamTool.Model/Const.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public class Const
public const string HOST_TAG = "#Steam++";

public const string REWARDMELIST_URL = "https://gitee.com/rmbgame/steam-tools_-data/raw/master/RewardRecord.json";
public const string UPDATEHISTORY_URL = "https://gitee.com/rmbgame/steam-tools_-data/raw/master/UpdateHistory";
//public const string REWARDMELIST_URL = "https://raw.githubusercontent.com/rmbadmin/SteamTools/develop/Data/RewardRecord.json";

public const string GITHUB_LATEST_RELEASEAPI_URL = "https://api.github.com/repos/rmbadmin/SteamTools/releases/latest";
Expand Down
2 changes: 0 additions & 2 deletions source/SteamTool.Proxy/HttpProxy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ public async Task OnResponse(object sender, SessionEventArgs e)
foreach (var req in script.Require)
{
var headIndex = doc.LastIndexOf("</head>", StringComparison.OrdinalIgnoreCase);
//<script type="text/javascript" src=""></script>
//var result = await httpServices.Get(req);
var temp1 = $"<script type=\"text/javascript\" src=\"{req}\"></script>\n";
doc = doc.Insert(headIndex, temp1);
}
Expand Down
3 changes: 3 additions & 0 deletions source/SteamTools/SteamTools.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,9 @@
<None Update="scripts\GM.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="scripts\Steam Economy Enhancer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="scripts\Steam历史最低价格查询.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
55 changes: 55 additions & 0 deletions source/SteamTools/ViewModels/Content/AboutUpdateHistoryViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
using System.Windows;
using SteamTools.Win32;
using MetroRadiance.Interop.Win32;
using System.Diagnostics;
using SteamTool.Core.Common;
using System.Runtime.InteropServices;
using SteamTools.Services;
using SteamTool.Core;
using System.IO;
using SteamTools.Properties;
using SteamTool.Model;
using Newtonsoft.Json;
using System.Threading;

namespace SteamTools.ViewModels
{
public class AboutUpdateHistoryViewModel : Livet.ViewModel
{
private readonly HttpServices httpServices = SteamToolCore.Instance.Get<HttpServices>();

private string _UpdateHistoryText;
public string UpdateHistoryText
{
get => this._UpdateHistoryText;
set
{
if (this._UpdateHistoryText != value)
{
this._UpdateHistoryText = value;
this.RaisePropertyChanged();
}
}
}

public AboutUpdateHistoryViewModel()
{
_ = Task.Run(() =>
{
httpServices.Get(Const.UPDATEHISTORY_URL).ContinueWith(s =>
{
if (!string.IsNullOrEmpty(s.Result))
{
UpdateHistoryText = s.Result;
}
});
}).ContinueWith(s => { Logger.Error(s.Exception); WindowService.Current.ShowDialogWindow(s.Exception.Message); }, TaskContinuationOptions.OnlyOnFaulted);
}
}
}
257 changes: 1 addition & 256 deletions source/SteamTools/Views/Content/About/AboutUpdateHistory.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,262 +34,7 @@
TextAlignment="Left"
MaxPageWidth="900">
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.1.3" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2021-02-21" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改部分提示文本，修复证书生成安装失败" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改证书生成方式避免324错误和100错误" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复faq文本错误" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复在某些情况下出现算法不同证书验证错误问题"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="库存游戏列表添加clienticon图标显示 "></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="准备制作跨平台版本支持Linux和Mac OS..." />
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.1.2" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2021-01-29" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增账号切换在账号切换的状态栏右下角位置登录新账号功能" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="账号切换功能可以实时刷新获取Steam新登录的账号数据" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="关于里加入FAQ常见问题疑难解答"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改谷歌验证码代理方式为全局跳转www.recaptcha.net"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="记录更详细错误日志" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复某些情况下开机自启失效问题"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复配置文件加载时提示根元素错误"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="配置文件备份机制完善，如果配置文件出错会提示还原上次读取成功的配置"></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.1.0" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2021-01-22" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="本地令牌市场交易确认功能上线" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增内置steam史低查询脚本" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增Steam启动消息通知设置项"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增github gist代理服务支持"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复设置文件的错误存储" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复discord更新下载和图片失效"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复twitch聊天频道连接失效"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复gihub头像资源加载失败"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增pixiv图片的代理选项来修复pixiv图片失效"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="还修复了一些没有记下来的bug..."></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.0.6" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2021-01-12" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增启用日志记录设置项（反馈bug时一起提交方便排查问题）" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复twitch反代聊天连接错误和直播视频无法观看" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="放宽令牌同步时网络请求超时时间以降低令牌同步时提示超时概率" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改生成的cer证书编码格式为utf8,解决火狐无法导入cer证书"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="增加80端口反代，以便自动跳转http访问到https请求上"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改了用户信息获取的api为steam官方社区api(没有启动软件的自动代理服务的话依然加载不出头像。)"></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.0.5" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2021-01-08" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="优化反代过程的逻辑" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="增加启动时自动运行Steam的设置项" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增令牌刷新功能" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="帐户切换增加了离线模式启动的选项"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复因为第三方steamdb api挂掉导致程序崩溃"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复刷新游戏缓存按钮程序闪退BUG"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="还修复了一些没有记下来的小错误..."></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.0.4" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2020-12-28" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="*此版本修改了配置文件的保存读取功能，会无法读取1.0.4版本以前的配置文件包括令牌数据。(可以通过设置-令牌设置-导入旧版本Steam++令牌数据按钮来恢复旧版本令牌数据)" />
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="还原steam社区反代上游地址修复部分请求会提示需要登录的问题" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增令牌导入导出备份功能" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增令牌可以选择保存在程序根目录下的设置选项(方便备份)" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改了自动更新的提示方式"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="自动更新可以自动覆盖升级，不再需要手动替换"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复令牌无法保存的问题"></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.0.3" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2020-12-26" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增pixiv本地反代服务支持" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增在欢迎页steam昵称后显示steam的登陆区域" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="添加steam图片修复的本地反代支持" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复最小化恢复时UI边框错位的BUG"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复令牌编辑和导入时出现的非空报错"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="帐户切换功能的最近登陆时间从北京时间改为当前系统时区时间"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复一个因为DNS解析错误会导致程序内存溢出闪退的BUG"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="SDA令牌导入不再支持导入加密文件，如果要导入加密的maFile请先在SDA移除加密"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修改初始化的方式和steam api的连接逻辑来避免steam游戏掉帧的BUG"></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.0.2" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2020-12-21" FontSize="10" />
<LineBreak />
<Run Text="更新内容"></Run>
<LineBreak />
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="更新了由Benares制作的图标" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增帐户切换删除功能" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="添加github图片资源文件代理服务与discord代理服务支持" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="因为有问题暂时去掉了GOG Galaxy代理选项"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复一个会导致程序启动没有反应的bug"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="修复托盘菜单steam昵称过长ui错位bug"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增steam启动参数设置"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增启动时程序最小化到托盘菜单设置"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增捐助列表的展示"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="新增工具自动更新功能"></Run>
</Paragraph>
<Paragraph Language="zh-cn">
<Run Text="Steam++ v1.0.0" FontSize="16"/>
<Run Text="&#160;"/>
<Run Text="2020-12-14" FontSize="10" />
<LineBreak />
<Run Text="发布第一个版本" />
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="主要功能：社区反代，帐户切换，成就解锁，本地令牌。"></Run>
<LineBreak/>
<Run Text="&#160;&#160;&#160;&#160;"/>
<Run Text="次要功能：强制无边框窗口化以及CSGO VAC屏蔽修复。"></Run>
<Run Text="{Binding UpdateHistoryText}"></Run>
</Paragraph>
</FlowDocument>
</FlowDocumentScrollViewer>
Expand Down
Loading

0 comments on commit 81aaa50

Please sign in to comment.