Change text file encoding -d #18

Scighost · Scighost · commit bf03fc713b0d · 2021-09-17T15:23:35.000+08:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,19 @@
 # Change Log
 
+# v2
+
+## 2.0.1
+
+- 添加全球CDN
+- 修复排序功能
+
+### 2.0.0
+
+- 改用启动器模式
+- 关闭祈愿成就功能
+
+## v0 & v1
+
 ### 1.2.7912.22581
 
 - 修改了版本命名规则
diff --git a/README.md b/README.md
@@ -2,13 +2,11 @@
 
 # 刻记牛杂店
 
-出类拔萃为牛，包罗万象为杂。
-
-旅行者你好，欢迎来到**刻记牛杂店**，我是店长刻晴。
+**已更新到v2版本，需要重新下载。**
 
 ## 下载地址
 
-- [jsDelivr (最新)](https://cdn.jsdelivr.net/gh/Scighost/KeqingNiuza@cdn/KeqingNiuza/KeqingNiuza.zip)
+- [传送门](https://xw6dp97kei-1306705684.file.myqcloud.com/keqingniuza/meta/KeqingNiuza.zip)
 - Github Releases 中的文件**不是**最新版本
 
 ## 其他
@@ -42,8 +40,10 @@ Midi文件来源：[bilibili@恰空PurrLude](https://space.bilibili.com/2765893)
 - [ControlzEx](https://github.com/ControlzEx/ControlzEx)
 - [DryWetMidi](https://github.com/melanchall/drywetmidi)
 - [EPPlus](https://github.com/JanKallman/EPPlus)
+- [GenshinDailyHelper](https://github.com/yinghualuowu/GenshinDailyHelper)
 - [HandyControl](https://github.com/HandyOrg/HandyControl)
 - [Live-Charts](https://github.com/Live-Charts/Live-Charts)
+- [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
 - [TaskScheduler](https://github.com/dahall/taskscheduler)
 - [WebDavClient](https://github.com/skazantsev/WebDavClient)
 
diff --git a/src/KeqingNiuza/App.config b/src/KeqingNiuza/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+﻿<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<configSections>
 		<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
diff --git a/src/KeqingNiuza/App.xaml b/src/KeqingNiuza/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="KeqingNiuza.App"
+﻿<Application x:Class="KeqingNiuza.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:KeqingNiuza">
diff --git a/src/KeqingNiuza/App.xaml.cs b/src/KeqingNiuza/App.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Threading.Tasks;
 using System.Windows;
 using KeqingNiuza.Service;
diff --git a/src/KeqingNiuza/Converter/ImageConverter.cs b/src/KeqingNiuza/Converter/ImageConverter.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Globalization;
 using System.IO;
 using System.Windows.Data;
diff --git a/src/KeqingNiuza/Converter/MilliSecondToTimeConverter.cs b/src/KeqingNiuza/Converter/MilliSecondToTimeConverter.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Globalization;
 using System.Windows.Data;
 
diff --git a/src/KeqingNiuza/Converter/NoteLevelToNoteStringConverter.cs b/src/KeqingNiuza/Converter/NoteLevelToNoteStringConverter.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Windows.Data;
diff --git a/src/KeqingNiuza/Converter/TimeSpanToSliderValueConverter.cs b/src/KeqingNiuza/Converter/TimeSpanToSliderValueConverter.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Globalization;
 using System.Windows.Data;
 
diff --git a/src/KeqingNiuza/Converter/UidConverter.cs b/src/KeqingNiuza/Converter/UidConverter.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Globalization;
 using KeqingNiuza.Model;
 
diff --git a/src/KeqingNiuza/Converter/WishTypeConverter.cs b/src/KeqingNiuza/Converter/WishTypeConverter.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Globalization;
 using System.Windows.Data;
 using KeqingNiuza.Wish;
diff --git a/src/KeqingNiuza/Model/Config.cs b/src/KeqingNiuza/Model/Config.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+﻿using System.Collections.ObjectModel;
 
 namespace KeqingNiuza.Model
 {
diff --git a/src/KeqingNiuza/Model/UserData.cs b/src/KeqingNiuza/Model/UserData.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.ComponentModel;
 using System.IO;
 using System.Runtime.CompilerServices;
diff --git a/src/KeqingNiuza/Properties/AssemblyInfo.cs b/src/KeqingNiuza/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+﻿using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -50,4 +50,4 @@
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.2.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0")]
+[assembly: AssemblyFileVersion("2.0.1")]
diff --git a/src/KeqingNiuza/Properties/Settings.settings b/src/KeqingNiuza/Properties/Settings.settings
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+﻿<?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="KeqingNiuza.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
diff --git a/src/KeqingNiuza/Service/Log.cs b/src/KeqingNiuza/Service/Log.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.IO;
 using Microsoft.AppCenter.Crashes;
 using static KeqingNiuza.Service.Const;
diff --git a/src/KeqingNiuza/Service/LogType.cs b/src/KeqingNiuza/Service/LogType.cs
@@ -1,4 +1,4 @@
-namespace KeqingNiuza.Service
+﻿namespace KeqingNiuza.Service
 {
     enum LogType
     {
diff --git a/src/KeqingNiuza/Style/DataGridStyle.xaml b/src/KeqingNiuza/Style/DataGridStyle.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:hc="https://handyorg.github.io/handycontrol"
                     xmlns:s="clr-namespace:System;assembly=mscorlib">
diff --git a/src/KeqingNiuza/Style/PropertyDictionary.xaml b/src/KeqingNiuza/Style/PropertyDictionary.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:c="clr-namespace:KeqingNiuza.Converter"
                     xmlns:s="clr-namespace:System;assembly=mscorlib">
diff --git a/src/KeqingNiuza/Style/StyleDictionary.xaml b/src/KeqingNiuza/Style/StyleDictionary.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:hc="https://handyorg.github.io/handycontrol"
                     xmlns:s="clr-namespace:System;assembly=mscorlib">
diff --git a/src/KeqingNiuza/View/AboutView.xaml b/src/KeqingNiuza/View/AboutView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.AboutView"
+﻿<UserControl x:Class="KeqingNiuza.View.AboutView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -41,27 +41,6 @@
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
-                <!--<StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                    <Button Name="Button_TestUpdate" Click="Button_TestUpdate_Click" Content="检查更新" />
-                    <hc:LoadingCircle Name="LoadingCircle_TestUpdate"
-                                      Width="20"
-                                      Height="20"
-                                      Margin="10,0,0,0"
-                                      DotDiameter="3"
-                                      Foreground="Gray"
-                                      Visibility="Hidden" />
-                    <Button Name="Button_TestResource"
-                            Margin="10,0,0,0"
-                            Click="Button_TestResource_Click"
-                            Content="校验资源文件" />
-                    <hc:LoadingCircle Name="LoadingCircle_TestResource"
-                                      Width="20"
-                                      Height="20"
-                                      Margin="10,0,0,0"
-                                      DotDiameter="3"
-                                      Foreground="Gray"
-                                      Visibility="Hidden" />
-                </StackPanel>-->
                 <!--  常见问题  -->
                 <TextBlock Margin="0,20,0,0"
                            FontSize="20"
diff --git a/src/KeqingNiuza/View/AboutView.xaml.cs b/src/KeqingNiuza/View/AboutView.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
diff --git a/src/KeqingNiuza/View/ChangeAvatarDialog.xaml b/src/KeqingNiuza/View/ChangeAvatarDialog.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.ChangeAvatarDialog"
+﻿<UserControl x:Class="KeqingNiuza.View.ChangeAvatarDialog"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/ChangeAvatarDialog.xaml.cs b/src/KeqingNiuza/View/ChangeAvatarDialog.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/KeqingNiuza/View/CloudLoginDialog.xaml b/src/KeqingNiuza/View/CloudLoginDialog.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.CloudLoginDialog"
+﻿<UserControl x:Class="KeqingNiuza.View.CloudLoginDialog"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/CloudLoginDialog.xaml.cs b/src/KeqingNiuza/View/CloudLoginDialog.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/src/KeqingNiuza/View/ExcelImportDialog.xaml b/src/KeqingNiuza/View/ExcelImportDialog.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.ExcelImportDialog"
+﻿<UserControl x:Class="KeqingNiuza.View.ExcelImportDialog"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/ExcelImportDialog.xaml.cs b/src/KeqingNiuza/View/ExcelImportDialog.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
diff --git a/src/KeqingNiuza/View/MainWindow.xaml b/src/KeqingNiuza/View/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="KeqingNiuza.View.MainWindow"
+﻿<Window x:Class="KeqingNiuza.View.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ce="urn:controlzex"
diff --git a/src/KeqingNiuza/View/MainWindow.xaml.cs b/src/KeqingNiuza/View/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/KeqingNiuza/View/MidiView.xaml b/src/KeqingNiuza/View/MidiView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.MidiView"
+﻿<UserControl x:Class="KeqingNiuza.View.MidiView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/MidiView.xaml.cs b/src/KeqingNiuza/View/MidiView.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
diff --git a/src/KeqingNiuza/View/UpdateLogView.xaml b/src/KeqingNiuza/View/UpdateLogView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.UpdateLogView"
+﻿<UserControl x:Class="KeqingNiuza.View.UpdateLogView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/UpdateLogView.xaml.cs b/src/KeqingNiuza/View/UpdateLogView.xaml.cs
@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+﻿using System.Windows.Controls;
 
 namespace KeqingNiuza.View
 {
diff --git a/src/KeqingNiuza/View/WelcomeView.xaml b/src/KeqingNiuza/View/WelcomeView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.WelcomeView"
+﻿<UserControl x:Class="KeqingNiuza.View.WelcomeView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/WelcomeView.xaml.cs b/src/KeqingNiuza/View/WelcomeView.xaml.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Windows;
diff --git a/src/KeqingNiuza/View/WishAchievementView.xaml b/src/KeqingNiuza/View/WishAchievementView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.WishAchievementView"
+﻿<UserControl x:Class="KeqingNiuza.View.WishAchievementView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/WishAchievementView.xaml.cs b/src/KeqingNiuza/View/WishAchievementView.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/src/KeqingNiuza/View/WishOriginalDataView.xaml b/src/KeqingNiuza/View/WishOriginalDataView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="KeqingNiuza.View.WishOriginalDataView"
+﻿<UserControl x:Class="KeqingNiuza.View.WishOriginalDataView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/KeqingNiuza/View/WishOriginalDataView.xaml.cs b/src/KeqingNiuza/View/WishOriginalDataView.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/src/KeqingNiuza/View/WishSummaryView.xaml.cs b/src/KeqingNiuza/View/WishSummaryView.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/src/KeqingNiuza/ViewModel/ExcelImportViewModel.cs b/src/KeqingNiuza/ViewModel/ExcelImportViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
diff --git a/src/KeqingNiuza/ViewModel/MainWindowViewModel.cs b/src/KeqingNiuza/ViewModel/MainWindowViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
diff --git a/src/KeqingNiuza/ViewModel/MidiViewModel.cs b/src/KeqingNiuza/ViewModel/MidiViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
diff --git a/src/KeqingNiuza/ViewModel/WishAchievementViewModel.cs b/src/KeqingNiuza/ViewModel/WishAchievementViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using KeqingNiuza.Model;
diff --git a/src/KeqingNiuza/ViewModel/WishOriginalDataViewModel.cs b/src/KeqingNiuza/ViewModel/WishOriginalDataViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
diff --git a/src/KeqingNiuza/ViewModel/WishSummaryViewModel.cs b/src/KeqingNiuza/ViewModel/WishSummaryViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?xml version="1.0" encoding="utf-8" ?>`
	`1`	`+<?xml version="1.0" encoding="utf-8" ?>`
`2`	`2`	`<configuration>`
`3`	`3`	`<configSections>`
`4`	`4`	`<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Application x:Class="KeqingNiuza.App"`
	`1`	`+<Application x:Class="KeqingNiuza.App"`
`2`	`2`	`xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
`3`	`3`	`xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"`
`4`	`4`	`xmlns:local="clr-namespace:KeqingNiuza">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using System.Windows;`
`4`	`4`	`using KeqingNiuza.Service;`