Skip to content

Commit 23725cb

Browse files
committed
优化错误上报逻辑
1 parent 801e276 commit 23725cb

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

llcom/App.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ private static void CurrentDomainOnUnhandledException(object sender, UnhandledEx
4040

4141
public static void SendReport(Exception exception, string developerMessage = "", bool silent = true)
4242
{
43-
MessageBox.Show("恭喜你触发了一个BUG!\r\n" +
44-
"你获得了去GitHub反馈bug的机会\r\n" +
45-
$"报错信息:{exception.Message}\r\n" +
46-
"请在关闭本对话框后耐心等待一会儿,以便自动上传错误信息");
43+
if(Tools.Global.setting.language == "zh-CN")
44+
MessageBox.Show("恭喜你触发了一个BUG\r\n" +
45+
"如果条件允许,请点击“Send Report”来上报这个BUG\r\n" +
46+
$"报错信息:{exception.Message}");
4747
var reportCrash = new ReportCrash("lolicon@papapoi.com")
4848
{
4949
DeveloperMessage = developerMessage
5050
};
51-
reportCrash.Silent = silent;
51+
//reportCrash.Silent = silent;
5252
reportCrash.CaptureScreen = true;
5353
reportCrash.Send(exception);
5454
}

llcom/llcom.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props')" />
3+
<Import Project="..\packages\PropertyChanged.Fody.3.2.8\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.3.2.8\build\PropertyChanged.Fody.props')" />
44
<Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
66
<PropertyGroup>
@@ -111,8 +111,8 @@
111111
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
112112
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
113113
</Reference>
114-
<Reference Include="PropertyChanged, Version=3.2.7.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
115-
<HintPath>..\packages\PropertyChanged.Fody.3.2.7\lib\net40\PropertyChanged.dll</HintPath>
114+
<Reference Include="PropertyChanged, Version=3.2.8.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
115+
<HintPath>..\packages\PropertyChanged.Fody.3.2.8\lib\net40\PropertyChanged.dll</HintPath>
116116
</Reference>
117117
<Reference Include="System" />
118118
<Reference Include="System.ComponentModel.Composition" />
@@ -272,7 +272,7 @@
272272
</PropertyGroup>
273273
<Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
274274
<Error Condition="!Exists('..\packages\Fody.6.1.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.1.1\build\Fody.targets'))" />
275-
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props'))" />
275+
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.3.2.8\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.3.2.8\build\PropertyChanged.Fody.props'))" />
276276
</Target>
277277
<Import Project="..\packages\Fody.6.1.1\build\Fody.targets" Condition="Exists('..\packages\Fody.6.1.1\build\Fody.targets')" />
278278
</Project>

llcom/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net472" />
1111
<package id="LibUsbDotNet" version="2.2.29" targetFramework="net472" />
1212
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
13-
<package id="PropertyChanged.Fody" version="3.2.7" targetFramework="net45" />
13+
<package id="PropertyChanged.Fody" version="3.2.8" targetFramework="net45" />
1414
<package id="System.Runtime" version="4.3.1" targetFramework="net45" />
1515
</packages>

0 commit comments

Comments
 (0)