chore: 修改存在更新时的问题反馈界面描述

src/MaaWpfGui/Helper/LocalizationHelper.cs

@@ -200,10 +200,10 @@ namespace MaaWpfGui.Helper
         {
             return CustomCultureInfo.Name.ToLowerInvariant() switch
             {
-                "zh-cn" => $" - {resourceVersion}{resourceDateTime:#MMdd}",
-                "zh-tw" => $" - {resourceVersion}{resourceDateTime:#MMdd}",
-                "en-us" => $" - {resourceDateTime:dd/MM} {resourceVersion}",
-                _ => $" - {resourceDateTime.ToString(CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {resourceVersion}",
+                "zh-cn" => $"{resourceVersion}{resourceDateTime:#MMdd}",
+                "zh-tw" => $"{resourceVersion}{resourceDateTime:#MMdd}",
+                "en-us" => $"{resourceDateTime:dd/MM} {resourceVersion}",
+                _ => $"{resourceDateTime.ToString(CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {resourceVersion}",
             };
         }
 

src/MaaWpfGui/Res/Localizations/en-us.xaml

@@ -899,6 +899,7 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla
     <!--  !About  -->
     <!--  Issues  -->
     <system:String x:Key="CheckHelpBeforeReportingIssue">Please check the FAQ before reporting any issues</system:String>
+    <system:String x:Key="CheckUpdateBeforeReportingIssue">Please upgrade first and test if the issue persists in the new version. Confirm it's not a common issue before reporting.</system:String>
     <system:String x:Key="Help">FAQ</system:String>
     <system:String x:Key="Issue">Issues</system:String>
     <system:String x:Key="GenerateSupportPayload">Generate Support Payload</system:String>

src/MaaWpfGui/Res/Localizations/ja-jp.xaml

@@ -902,6 +902,7 @@ C:\\leidian\\LDPlayer9
     <!--  !About  -->
     <!--  Issues  -->
     <system:String x:Key="CheckHelpBeforeReportingIssue">問題を報告する前に、よくある質問に該当しないことを確認してください</system:String>
+    <system:String x:Key="CheckUpdateBeforeReportingIssue">まずアップグレードして新しいバージョンで問題が再現するか確認し、一般的な問題でないことを確認してから報告してください。</system:String>
     <system:String x:Key="Help">よくある質問</system:String>
     <system:String x:Key="Issue">フィードバック</system:String>
     <system:String x:Key="GenerateSupportPayload">サポート用ZIPを生成</system:String>

src/MaaWpfGui/Res/Localizations/ko-kr.xaml

@@ -902,6 +902,7 @@ C:\\leidian\\LDPlayer9
     <!--  !About  -->
     <!--  Issues  -->
     <system:String x:Key="CheckHelpBeforeReportingIssue">문제를 신고하기 전에 자주 묻는 질문에 해당하지 않는지 확인해 주세요</system:String>
+    <system:String x:Key="CheckUpdateBeforeReportingIssue">먼저 업그레이드 후 새 버전에서도 동일한 문제가 발생하는지 테스트해 보시고, 일반적인 문제가 아님을 확인한 후 피드백해 주세요.</system:String>
     <system:String x:Key="Help">자주 묻는 질문</system:String>
     <system:String x:Key="Issue">이슈 제보</system:String>
     <system:String x:Key="GenerateSupportPayload">지원용 ZIP 파일 생성</system:String>

src/MaaWpfGui/Res/Localizations/zh-cn.xaml

@@ -277,8 +277,8 @@
     <system:String x:Key="MirrorChyan">Mirror酱</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">切换更新源后填写</system:String>
     <system:String x:Key="MirrorChyanSoftwareUpdateTip">检测到软件更新。请前往「设置-更新设置」配置 Mirror酱 CDK 或切换海外源。</system:String>
-    <system:String x:Key="MirrorChyanResourceUpdateTip">检测到资源更新{0}。请前往「设置-更新设置-资源更新」手动更新，或配置 Mirror酱 CDK 以自动更新。</system:String>
-    <system:String x:Key="MirrorChyanResourceUpdateShortTip">检测到资源更新{0}</system:String>
+    <system:String x:Key="MirrorChyanResourceUpdateTip">检测到资源更新: {0}。请前往「设置-更新设置-资源更新」手动更新，或配置 Mirror酱 CDK 以自动更新。</system:String>
+    <system:String x:Key="MirrorChyanResourceUpdateShortTip">检测到资源更新: {0}</system:String>
     <system:String x:Key="MirrorChyanCdkExpired">CDK 已过期，请使用新的 CDK 进行授权。</system:String>
     <system:String x:Key="MirrorChyanCdkInvalid">CDK 无效，请检查输入是否正确。</system:String>
     <system:String x:Key="MirrorChyanCdkQuotaExhausted">CDK 今日下载次数已达上限，请明日再试。</system:String>
@@ -901,7 +901,8 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="Discord">Discord</system:String>
     <!--  !About  -->
     <!--  Issues  -->
-    <system:String x:Key="CheckHelpBeforeReportingIssue">请在确认您的问题不属于常见问题后，再进行问题反馈</system:String>
+    <system:String x:Key="CheckHelpBeforeReportingIssue">请在确认您的问题不属于「常见问题」后，再进行「问题反馈」</system:String>
+    <system:String x:Key="CheckUpdateBeforeReportingIssue">请先升级并测试新版是否仍有此问题，确认非「常见问题」后再进行「问题反馈」</system:String>
     <system:String x:Key="Help">常见问题</system:String>
     <system:String x:Key="Issue">问题反馈</system:String>
     <system:String x:Key="GenerateSupportPayload">生成日志压缩包</system:String>

src/MaaWpfGui/Res/Localizations/zh-tw.xaml

@@ -277,8 +277,8 @@
     <system:String x:Key="MirrorChyan">MirrorChyan</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">切換更新源後填寫</system:String>
     <system:String x:Key="MirrorChyanSoftwareUpdateTip">偵測到軟體更新。請前往「設定-更新設定」設定 MirrorChyan CDK 或切換到全域來源。</system:String>
-    <system:String x:Key="MirrorChyanResourceUpdateTip">偵測到資源更新{0}。請前往「設定-更新設定-資源更新」手動更新，或設定 MirrorChayn CDK 以自動更新。</system:String>
-    <system:String x:Key="MirrorChyanResourceUpdateShortTip">偵測到資源更新{0}</system:String>
+    <system:String x:Key="MirrorChyanResourceUpdateTip">偵測到資源更新: {0}。請前往「設定-更新設定-資源更新」手動更新，或設定 MirrorChayn CDK 以自動更新。</system:String>
+    <system:String x:Key="MirrorChyanResourceUpdateShortTip">偵測到資源更新: {0}</system:String>
     <system:String x:Key="MirrorChyanCdkExpired">CDK 已過期，請使用新的 CDK 進行授權。</system:String>
     <system:String x:Key="MirrorChyanCdkInvalid">CDK 無效，請檢查輸入是否正確。</system:String>
     <system:String x:Key="MirrorChyanCdkQuotaExhausted">CDK 今日下載次數已達上限，請明日再試。</system:String>
@@ -900,7 +900,8 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="Discord">Discord</system:String>
     <!--  !About  -->
     <!--  Issues  -->
-    <system:String x:Key="CheckHelpBeforeReportingIssue">請在確認您的問題不屬於常見問題後，再進行問題回饋</system:String>
+    <system:String x:Key="CheckHelpBeforeReportingIssue">請在確認您的問題不屬於「常見問題」後，再進行「問題回饋」</system:String>
+    <system:String x:Key="CheckUpdateBeforeReportingIssue">請先升級並測試新版是否仍有此問題，確認非「常見問題」後再進行「問題回饋」</system:String>
     <system:String x:Key="Help">常見問題</system:String>
     <system:String x:Key="Issue">問題回饋</system:String>
     <system:String x:Key="GenerateSupportPayload">產生紀錄壓縮包</system:String>

src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs

@@ -688,7 +688,7 @@ namespace MaaWpfGui.ViewModels.UI
             var isDebug = Instances.VersionUpdateViewModel.IsDebugVersion();
             if (newVersionFoundInfo != coreVersion && !isDebug && !string.IsNullOrEmpty(newVersionFoundInfo) && startupUpdateCheck)
             {
-                updateTip = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {newVersionFoundInfo} - ";
+                updateTip = $"{newVersionFoundInfo} - ";
             }
 
             var newResourceFoundInfo = VersionUpdateSettings.NewResourceFoundInfo;
@@ -739,9 +739,9 @@ namespace MaaWpfGui.ViewModels.UI
             }
 
             string resourceVersion = !string.IsNullOrEmpty(VersionUpdateSettings.ResourceVersion)
-                ? LocalizationHelper.FormatResourceVersion(VersionUpdateSettings.ResourceVersion, VersionUpdateSettings.ResourceDateTime)
+                ? $" - {LocalizationHelper.FormatResourceVersion(VersionUpdateSettings.ResourceVersion, VersionUpdateSettings.ResourceDateTime)}"
                 : string.Empty;
-            rvm.WindowTitle = $"{updateTip}{prefix}MAA{currentConfiguration} - {VersionUpdateSettingsUserControlModel.CoreVersion}{resourceVersion}{connectConfigName}{connectAddress}{clientName}";
+            rvm.WindowTitle = $"{updateTip}{prefix}MAA{currentConfiguration} - {coreVersion}{resourceVersion}{connectConfigName}{connectAddress}{clientName}";
         }
 
         /// <summary>

src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs

@@ -82,7 +82,6 @@ public class VersionUpdateViewModel : Screen
         {
             SetAndNotify(ref _updateTag, value);
             ConfigurationHelper.SetGlobalValue(ConfigurationKeys.VersionName, value);
-            SettingsViewModel.VersionUpdateSettings.NewVersionFoundInfo = value;
         }
     }
 
@@ -536,6 +535,7 @@ public class VersionUpdateViewModel : Screen
         // 保存新版本的信息
         var name = _latestJson?["name"]?.ToString();
         UpdateTag = string.IsNullOrEmpty(name) ? (_latestJson?["tag_name"]?.ToString() ?? string.Empty) : name;
+        SettingsViewModel.VersionUpdateSettings.NewVersionFoundInfo = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {UpdateTag}";
         var body = _latestJson?["body"]?.ToString() ?? string.Empty;
         if (string.IsNullOrEmpty(body))
         {
@@ -730,6 +730,7 @@ public class VersionUpdateViewModel : Screen
 
         UpdateTag = _mirrorcVersionName ?? string.Empty;
         UpdateInfo = _mirrorcReleaseNote ?? string.Empty;
+        SettingsViewModel.VersionUpdateSettings.NewVersionFoundInfo = $"{LocalizationHelper.GetString("NewVersionFoundTitle")}: {UpdateTag}";
 
         bool goDownload = SettingsViewModel.VersionUpdateSettings.AutoDownloadUpdatePackage;
         if (!goDownload)

src/MaaWpfGui/Views/UserControl/Settings/IssueReportUserControl.xaml

@@ -2,6 +2,7 @@
     x:Class="MaaWpfGui.Views.UserControl.Settings.IssueReportUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:constants="clr-namespace:MaaWpfGui.Constants"
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,6 +10,7 @@
     xmlns:helper="clr-namespace:MaaWpfGui.Helper"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
+    xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
     xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels.UserControl.Settings"
     d:Background="White"
     d:DataContext="{d:DesignInstance {x:Type viewModels:IssueReportUserControlModel}}"
@@ -16,10 +18,20 @@
     s:View.ActionTarget="{Binding}"
     mc:Ignorable="d">
     <StackPanel>
+        <StackPanel HorizontalAlignment="Center" Visibility="{c:Binding 'NewVersionFoundInfo.Length + NewResourceFoundInfo.Length > 0', Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}">
+            <controls:TextBlock Text="{Binding NewVersionFoundInfo, Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}" Visibility="{c:Binding 'NewVersionFoundInfo.Length > 0', Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}" />
+            <controls:TextBlock Text="{Binding NewResourceFoundInfo, Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}" Visibility="{c:Binding 'NewResourceFoundInfo.Length > 0', Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}" />
+            <controls:TextBlock
+                Margin="5,0,5,5"
+                HorizontalAlignment="Center"
+                Text="{DynamicResource CheckUpdateBeforeReportingIssue}" />
+        </StackPanel>
         <controls:TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            Text="{DynamicResource CheckHelpBeforeReportingIssue}" />
+            Text="{DynamicResource CheckHelpBeforeReportingIssue}"
+            Visibility="{c:Binding 'NewVersionFoundInfo.Length + NewResourceFoundInfo.Length == 0',
+                                   Source={x:Static ui:SettingsViewModel.VersionUpdateSettings}}" />
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />