fix error

This commit is contained in:
rmbgame
2021-05-19 13:27:37 +08:00
parent 364a0f5c23
commit 71d7ee8cff
5 changed files with 26 additions and 5 deletions
@@ -42,7 +42,7 @@
<DockPanel>
<WrapPanel>
<TextBlock Text="{ReflectionBinding Path=Res.LocalAuth_ProtectionAuth_IsOnlyCurrentComputerEncrypt,Source={x:Static resx:R.Current},Mode=OneWay,StringFormat={}{0}:}"/>
<TextBlock Text="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_ExportPath,Source={x:Static resx:R.Current},Mode=OneWay,StringFormat={}{0}:}"/>
<TextBlock Text="{Binding Path}"></TextBlock>
</WrapPanel>
@@ -50,11 +50,11 @@
</DockPanel>
<Separator Classes="Separator"></Separator>
<DockPanel>
<TextBlock Text="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_ExportPassword,Source={x:Static resx:R.Current},Mode=OneWay}"/>
<TextBlock Text="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_EncryptionExport,Source={x:Static resx:R.Current},Mode=OneWay}"/>
<ToggleSwitch IsChecked="{Binding IsEncryption}"/>
</DockPanel>
<StackPanel Spacing="10" IsEnabled="{Binding IsEncryption}">
<TextBlock Text="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_ConfirmExport,Source={x:Static resx:R.Current},Mode=OneWay}" TextWrapping="WrapWithOverflow"></TextBlock>
<TextBlock Text="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_ExportPassword,Source={x:Static resx:R.Current},Mode=OneWay}" TextWrapping="WrapWithOverflow"></TextBlock>
<TextBox Watermark="{ReflectionBinding Path=Res.LocalAuth_ProtectionAuth_Password,Source={x:Static resx:R.Current},Mode=OneWay}" PasswordChar="*"></TextBox>
<TextBox Watermark="{ReflectionBinding Path=Res.LocalAuth_ProtectionAuth_IsOnlyCurrentComputerEncryptTip,Source={x:Static resx:R.Current},Mode=OneWay}" PasswordChar="*"></TextBox>
</StackPanel>
@@ -67,11 +67,19 @@ namespace System.Application.Services
//else
// ToastService.Current.Notify(AppResources.LocalAuth_RefreshAuthSuccess);
}
else if (auths.Any_Nullable() && !list.Any_Nullable())
{
Toast.Show(AppResources.LocalAuth_ProtectionAuth_PasswordError);
}
}
public async Task<bool> HasPasswordEncryptionShowPassWordWindow()
{
var auths = await repository.GetAllSourceAsync();
if (!auths.Any_Nullable())
{
return false;
}
var hasPassword = repository.HasSecondaryPassword(auths);
if (hasPassword)
{
@@ -81,6 +89,7 @@ namespace System.Application.Services
{
return true;
}
Toast.Show(AppResources.LocalAuth_ProtectionAuth_PasswordError);
return false;
}
else
+9
View File
@@ -1917,6 +1917,15 @@ namespace System.Application.UI.Resx {
}
}
/// <summary>
/// 查找类似 密码错误 的本地化字符串。
/// </summary>
public static string LocalAuth_ProtectionAuth_PasswordError {
get {
return ResourceManager.GetString("LocalAuth_ProtectionAuth_PasswordError", resourceCulture);
}
}
/// <summary>
/// 查找类似 请输入正确的密码 的本地化字符串。
/// </summary>
@@ -741,6 +741,9 @@
<data name="LocalAuth_ProtectionAuth_Password" xml:space="preserve">
<value>自定义密码</value>
</data>
<data name="LocalAuth_ProtectionAuth_PasswordError" xml:space="preserve">
<value>密码错误</value>
</data>
<data name="LocalAuth_ProtectionAuth_PasswordErrorTip" xml:space="preserve">
<value>请输入正确的密码</value>
</data>
@@ -25,8 +25,8 @@ namespace System.Application.UI.ViewModels
IsOnlyCurrentComputerEncrypt = repository.HasLocal(auths);
if (IsPasswordEncrypt)
{
Password = "******";
VerifyPassword = "******";
//Password = "******";
//VerifyPassword = "******";
}
}