diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
index 982cbd6c2..cea1d729d 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
@@ -12,6 +12,7 @@
+
@@ -25,7 +26,11 @@
M8.75 13C9.99264 13 11 14.0074 11 15.25V18.75C11 19.9926 9.99264 21 8.75 21H5.25C4.00736 21 3 19.9926 3 18.75V15.25C3 14.0074 4.00736 13 5.25 13H8.75ZM18.75 13C19.9926 13 21 14.0074 21 15.25V18.75C21 19.9926 19.9926 21 18.75 21H15.25C14.0074 21 13 19.9926 13 18.75V15.25C13 14.0074 14.0074 13 15.25 13H18.75ZM8.75 3C9.99264 3 11 4.00736 11 5.25V8.75C11 9.99264 9.99264 11 8.75 11H5.25C4.00736 11 3 9.99264 3 8.75V5.25C3 4.00736 4.00736 3 5.25 3H8.75ZM18.75 3C19.9926 3 21 4.00736 21 5.25V8.75C21 9.99264 19.9926 11 18.75 11H15.25C14.0074 11 13 9.99264 13 8.75V5.25C13 4.00736 14.0074 3 15.25 3H18.75Z
-
+
+
+ M9 7.5C9 7.22386 8.77614 7 8.5 7C8.22386 7 8 7.22386 8 7.5V12.5C8 12.7761 8.22386 13 8.5 13C8.77614 13 9 12.7761 9 12.5V7.5ZM12 7.5C12 7.22386 11.7761 7 11.5 7C11.2239 7 11 7.22386 11 7.5V12.5C11 12.7761 11.2239 13 11.5 13C11.7761 13 12 12.7761 12 12.5V7.5ZM10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2ZM3 10C3 6.13401 6.13401 3 10 3C13.866 3 17 6.13401 17 10C17 13.866 13.866 17 10 17C6.13401 17 3 13.866 3 10Z
+
+
M10 3.5C13.5899 3.5 16.5 6.41015 16.5 10C16.5 10.4142 16.8358 10.75 17.25 10.75C17.6642 10.75 18 10.4142 18 10C18 5.58172 14.4183 2 10 2C5.58172 2 2 5.58172 2 10C2 12.6785 3.31631 15.0485 5.33552 16.5H4.25C3.83579 16.5 3.5 16.8358 3.5 17.25C3.5 17.6642 3.83579 18 4.25 18H7.25C7.66421 18 8 17.6642 8 17.25V14.25C8 13.8358 7.66421 13.5 7.25 13.5C6.83579 13.5 6.5 13.8358 6.5 14.25V15.4784C4.6949 14.3227 3.5 12.3003 3.5 10C3.5 6.41015 6.41015 3.5 10 3.5Z
M7.5 10C7.5 11.3807 8.61929 12.5 10 12.5C11.3807 12.5 12.5 11.3807 12.5 10C12.5 8.61929 11.3807 7.5 10 7.5C8.61929 7.5 7.5 8.61929 7.5 10ZM9 10C9 9.44772 9.44772 9 10 9C10.5523 9 11 9.44772 11 10C11 10.5523 10.5523 11 10 11C9.44772 11 9 10.5523 9 10Z
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml
index 3aad20567..fa143d075 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml
@@ -30,52 +30,52 @@
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
diff --git a/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs b/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs
index 3da193df3..1884d65e8 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs
@@ -465,7 +465,7 @@ namespace System.Application.Services
public static async void AddOrUpdateSaveAuthenticators(MyAuthenticator auth)
{
var repository = DI.Get();
- await repository.InsertOrUpdateAsync(auth.AuthenticatorData, true);
+ await repository.InsertOrUpdateAsync(auth.AuthenticatorData, false);
if (Current.Authenticators.Items.Any(s => s.Id == auth.Id))
{
return;
@@ -498,13 +498,10 @@ namespace System.Application.Services
}
- public async void EncryptionAuthenticators(string password)
+ public async void EncryptionAuthenticators(bool isLocal, string password)
{
var repository = DI.Get();
- foreach (var item in Authenticators.Items)
- {
- await repository.InsertOrUpdateAsync(item.AuthenticatorData, true, password);
- }
+ await repository.SwitchEncryptionModeAsync(isLocal, password, Authenticators.Items.Select(s => s.AuthenticatorData));
}
}
}
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index 56d0e7143..42aa2357d 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -1088,6 +1088,51 @@ namespace System.Application.UI.Resx {
}
}
+ ///
+ /// 查找类似 无边框窗口化 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_BorderlessWindow {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_BorderlessWindow", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 类名 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_ClassName {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_ClassName", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 隐藏 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Hide {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Hide", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 结束进程 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_KillProcess {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_KillProcess", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 最大化 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Maximize {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Maximize", resourceCulture);
+ }
+ }
+
///
/// 查找类似 拖拽十字到游戏窗口,即可获取游戏信息执行对应操作。 的本地化字符串。
///
@@ -1097,6 +1142,78 @@ namespace System.Application.UI.Resx {
}
}
+ ///
+ /// 查找类似 默认大小 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Normal {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Normal", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 程序路径 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Path {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Path", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 进程 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Process {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Process", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 刷新壁纸 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_ResetWallerpaper {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_ResetWallerpaper", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 显示 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Show {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Show", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 标题 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_Title {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_Title", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 置于壁纸层 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_ToWallerpaper {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_ToWallerpaper", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 置于壁纸层的游戏可能会无法操控,这个问题可以解决但是目前开发精力不在这,目前这个功能就这样了。游戏结束后桌面会依然留下冻结的画面,这时可以点击刷新壁纸来恢复默认壁纸。并且将窗口放置于桌面壁纸层功能与Wallpaper Engine和其它动态桌面软件不兼容,使用时注意关掉Wallpaper Engine等软件。 的本地化字符串。
+ ///
+ public static string GameRelated_Borderless_ToWallerpaperTip {
+ get {
+ return ResourceManager.GetString("GameRelated_Borderless_ToWallerpaperTip", resourceCulture);
+ }
+ }
+
///
/// 查找类似 性别 的本地化字符串。
///
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index 48308f466..030173353 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -462,9 +462,48 @@
无边框窗口化
+
+ 无边框窗口化
+
+
+ 类名
+
+
+ 隐藏
+
+
+ 结束进程
+
+
+ 最大化
+
拖拽十字到游戏窗口,即可获取游戏信息执行对应操作。
+
+ 默认大小
+
+
+ 程序路径
+
+
+ 进程
+
+
+ 刷新壁纸
+
+
+ 显示
+
+
+ 标题
+
+
+ 置于壁纸层
+
+
+ 置于壁纸层的游戏可能会无法操控,这个问题可以解决但是目前开发精力不在这,目前这个功能就这样了。游戏结束后桌面会依然留下冻结的画面,这时可以点击刷新壁纸来恢复默认壁纸。并且将窗口放置于桌面壁纸层功能与Wallpaper Engine和其它动态桌面软件不兼容,使用时注意关掉Wallpaper Engine等软件。
+
性别
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/BindPhoneNumberWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/BindPhoneNumberWindowViewModel.cs
index 3380b55a6..3a54d4466 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/BindPhoneNumberWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/BindPhoneNumberWindowViewModel.cs
@@ -8,7 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using static System.Application.Services.CloudService.Constants;
-namespace System.Application.UI.ViewModels.Windows
+namespace System.Application.UI.ViewModels
{
public class BindPhoneNumberWindowViewModel : WindowViewModel
{
@@ -23,5 +23,12 @@ namespace System.Application.UI.ViewModels.Windows
get => _IsLoading;
set => this.RaiseAndSetIfChanged(ref _IsLoading, value);
}
+
+ string _PhoneNumber;
+ public string PhoneNumber
+ {
+ get => _PhoneNumber;
+ set => this.RaiseAndSetIfChanged(ref _PhoneNumber, value);
+ }
}
}
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs
index 0451cc116..28d4eebd2 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs
@@ -41,10 +41,5 @@ namespace System.Application.UI.ViewModels
set => this.RaiseAndSetIfChanged(ref _IsOnlyCurrentComputerEncrypt, value);
}
-
- public void Encryption()
- {
-
- }
}
}
\ No newline at end of file