Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-05-29 10:25:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

+

Browse Source
This commit is contained in:
辉鸭蛋
2025-01-13 23:46:00 +08:00
parent ee36818314
commit d57564c74c
3 changed files with 90 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
BetterGenshinImpact/Model/KeyMouseScriptItem.cs
View File

@@ -63,6 +63,9 @@ public partial class KeyMouseScriptItem : ObservableObject
private DateTime _lastProgressUpdateTime = DateTime.Now;
private long _lastUploadedSize = 0;
[ObservableProperty]
private bool _isPartiallyUploaded;
private string FormatSpeed(double bytesPerSecond)
{
if (bytesPerSecond >= 1024 * 1024) // MB/s
@@ -99,8 +102,9 @@ public partial class KeyMouseScriptItem : ObservableObject
var collection = DbLiteService.Instance.UserDb.GetCollection<FileUploadItem>("FileUploads");
var files = Directory.GetFiles(Path, "*.*", SearchOption.AllDirectories);
// 检查是否所有文件都已上传成功
var hasUploadedFiles = false;
var allFilesUploaded = true;
foreach (var file in files)
{
try
@@ -108,25 +112,31 @@ public partial class KeyMouseScriptItem : ObservableObject
var remotePath = GetRemotePath(file);
var fileUploadItem = collection.FindById(remotePath);
if (fileUploadItem == null || fileUploadItem.Status != UploadStatus.UploadSuccess.ToString())
if (fileUploadItem?.Status == UploadStatus.UploadSuccess.ToString())
{
hasUploadedFiles = true;
}
else
{
allFilesUploaded = false;
break;
}
}
catch (InvalidOperationException)
{
IsUploadSuccess = false;
IsPartiallyUploaded = false;
return;
}
}
IsUploadSuccess = allFilesUploaded;
IsPartiallyUploaded = !allFilesUploaded && hasUploadedFiles;
}
catch (Exception ex)
{
_logger.LogError(ex, "检查上传状态出错");
IsUploadSuccess = false;
IsPartiallyUploaded = false;
}
}
@@ -287,6 +297,18 @@ public partial class KeyMouseScriptItem : ObservableObject
[RelayCommand]
private async Task DeleteUploadedFiles()
{
try
{
// 提前验证用户信息，避免开始上传后才发现问题
_ = GetRemotePath(Path);
}
catch (InvalidOperationException)
{
await MessageBox.ErrorAsync("请先设置用户名和UID");
return;
}
try
{
var dirName = new DirectoryInfo(Path).Name;

4
BetterGenshinImpact/View/Pages/HomePage.xaml
View File

@@ -436,7 +436,7 @@
</ui:CardExpander>
<!-- 用户信息设置 -->
<ui:CardExpander Margin="0,0,0,12"
<!--<ui:CardExpander Margin="0,0,0,12"
ContentPadding="0"
Icon="{ui:SymbolIcon Person24}">
<ui:CardExpander.Header>
@@ -506,7 +506,7 @@
Text="{Binding Config.CommonConfig.Uid, Mode=TwoWay}" />
</Grid>
</StackPanel>
</ui:CardExpander>
</ui:CardExpander>-->
<!--<ui:Button x:Name="Test" Margin="0,20,0,0" Content="测试" Command="{Binding TestCommand}" />-->

79
BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml
View File

@@ -30,21 +30,54 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<ui:TextBlock Grid.Row="0"
Margin="0,0,0,8"
FontTypography="BodyStrong"
Text="键鼠录制回放功能" />
<ui:TextBlock Grid.Row="1"
Margin="0,0,0,8"
Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
TextWrapping="Wrap">
建议在游戏内使用快捷键进行录制，
</ui:TextBlock>
<Grid Grid.Row="0" Margin="0,0,0,8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ui:TextBlock Grid.Column="0"
FontTypography="BodyStrong"
Text="键鼠录制回放功能" />
<ui:TextBlock Grid.Column="1"
Margin="12,0,0,0"
VerticalAlignment="Center"
Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
Text="建议在游戏内使用快捷键进行录制" />
</Grid>
<StackPanel Grid.Row="2" Orientation="Horizontal">
<!-- 用户信息配置 -->
<Grid Grid.Row="1" Margin="0,0,0,12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="20" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:TextBlock Grid.Column="0"
VerticalAlignment="Center"
Text="用户名：" />
<ui:TextBox Grid.Column="1"
PlaceholderText="请输入用户名"
Text="{Binding Config.CommonConfig.UserName, Mode=TwoWay}" />
<ui:TextBlock Grid.Column="3"
VerticalAlignment="Center"
Text="UID：" />
<ui:TextBox Grid.Column="4"
PlaceholderText="请输入UID"
Text="{Binding Config.CommonConfig.Uid, Mode=TwoWay}" />
</Grid>
<StackPanel Grid.Row="3" Orientation="Horizontal">
<ui:Button Command="{Binding OpenScriptFolderCommand}"
Content="打开目录"
Icon="{ui:SymbolIcon FolderOpen24}" />
@@ -76,11 +109,11 @@
IsChecked="{Binding Config.RecordConfig.PaimonSwitchEnabled, Mode=TwoWay}" />
</StackPanel>
<Separator Grid.Row="3"
<Separator Grid.Row="4"
Height="10"
Opacity="0" />
<Grid Grid.Row="4">
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="180" />
@@ -91,7 +124,7 @@
<Grid x:Name="Col2" Grid.Column="1" />
<Grid x:Name="Col3" Grid.Column="2" />
</Grid>
<ui:ListView Grid.Row="5"
<ui:ListView Grid.Row="6"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ItemsSource="{Binding ScriptItems}"
@@ -133,8 +166,22 @@
<ui:Button Command="{Binding DeleteUploadedFilesCommand}"
Content="撤销上传"
Icon="{ui:SymbolIcon Delete24}"
Margin="5,0,0,0"
IsEnabled="{Binding IsUploading, Converter={StaticResource InverseBooleanConverter}}" />
Margin="5,0,0,0">
<ui:Button.Style>
<Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsUploading}" Value="False" />
<Condition Binding="{Binding IsUploadSuccess}" Value="False" />
<Condition Binding="{Binding IsPartiallyUploaded}" Value="False" />
</MultiDataTrigger.Conditions>
<Setter Property="IsEnabled" Value="False" />
</MultiDataTrigger>
</Style.Triggers>
</Style>
</ui:Button.Style>
</ui:Button>
<ui:TextBlock Margin="5,0,0,0"
VerticalAlignment="Center">