add:Dlass遥测
This commit is contained in:
@@ -298,10 +298,7 @@
|
||||
<Resource Include="Resources\Icons-Fluent\ic_fluent_delete_24_regular.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\privacy.txt">
|
||||
<Link>privacy.txt</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<EmbeddedResource Include="privacy.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Icons-Fluent\ic_fluent_cursorWITHdelete_24_regular.png" />
|
||||
|
||||
@@ -6,6 +6,7 @@ using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
@@ -35,6 +36,23 @@ namespace Ink_Canvas
|
||||
private bool _isChangingTelemetryInternally;
|
||||
private bool _isChangingTelemetryPrivacyInternally;
|
||||
|
||||
private static bool PrivacyFileExists()
|
||||
{
|
||||
try
|
||||
{
|
||||
var assembly = Assembly.GetExecutingAssembly();
|
||||
var resourceName = "Ink_Canvas.privacy.txt";
|
||||
using (Stream stream = assembly.GetManifestResourceStream(resourceName))
|
||||
{
|
||||
return stream != null;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckUpdateChannelAndTelemetryConsistency()
|
||||
{
|
||||
var currentChannel = Settings.Startup.UpdateChannel;
|
||||
@@ -59,13 +77,7 @@ namespace Ink_Canvas
|
||||
{
|
||||
try
|
||||
{
|
||||
string privacyPath = Path.Combine(App.RootPath, "privacy.txt");
|
||||
if (!File.Exists(privacyPath))
|
||||
{
|
||||
privacyPath = Path.Combine(App.RootPath, "privacy");
|
||||
}
|
||||
|
||||
if (!File.Exists(privacyPath))
|
||||
if (!PrivacyFileExists())
|
||||
{
|
||||
MessageBox.Show(
|
||||
"未找到隐私说明文件(privacy.txt 或 privacy)。\n\n将切换回正式通道。",
|
||||
@@ -330,10 +342,7 @@ namespace Ink_Canvas
|
||||
|
||||
if (isChecked)
|
||||
{
|
||||
string pathTxt = System.IO.Path.Combine(App.RootPath, "privacy.txt");
|
||||
string pathNoExt = System.IO.Path.Combine(App.RootPath, "privacy");
|
||||
|
||||
if (!System.IO.File.Exists(pathTxt) && !System.IO.File.Exists(pathNoExt))
|
||||
if (!PrivacyFileExists())
|
||||
{
|
||||
MessageBox.Show(
|
||||
"未找到隐私说明文件(privacy / privacy.txt),暂时无法启用匿名使用数据上传。",
|
||||
|
||||
@@ -2,6 +2,7 @@ using Ink_Canvas.Helpers;
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
@@ -73,21 +74,30 @@ namespace Ink_Canvas
|
||||
}), DispatcherPriority.Loaded);
|
||||
|
||||
string privacyText = null;
|
||||
string pathTxt = Path.Combine(App.RootPath, "privacy.txt");
|
||||
string pathNoExt = Path.Combine(App.RootPath, "privacy");
|
||||
|
||||
if (File.Exists(pathTxt))
|
||||
|
||||
try
|
||||
{
|
||||
privacyText = File.ReadAllText(pathTxt, System.Text.Encoding.UTF8);
|
||||
var assembly = Assembly.GetExecutingAssembly();
|
||||
var resourceName = "Ink_Canvas.privacy.txt";
|
||||
using (Stream stream = assembly.GetManifestResourceStream(resourceName))
|
||||
{
|
||||
if (stream != null)
|
||||
{
|
||||
using (StreamReader reader = new StreamReader(stream, System.Text.Encoding.UTF8))
|
||||
{
|
||||
privacyText = reader.ReadToEnd();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (File.Exists(pathNoExt))
|
||||
catch (Exception ex)
|
||||
{
|
||||
privacyText = File.ReadAllText(pathNoExt, System.Text.Encoding.UTF8);
|
||||
LogHelper.WriteLogToFile($"读取隐私说明失败: {ex.Message}", LogHelper.LogType.Warning);
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(privacyText))
|
||||
{
|
||||
privacyText = "未找到隐私说明文件(privacy.txt 或 privacy)。";
|
||||
privacyText = "未找到隐私说明文件(privacy.txt)。";
|
||||
}
|
||||
|
||||
TextBoxPrivacyContent.Text = privacyText;
|
||||
|
||||
Reference in New Issue
Block a user