修改4K优先为高画质优先 (#292)

Richasy · Sep 25, 2021 · a7775dd · a7775dd
1 parent f15a10f
commit a7775dd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/src/App/Controls/Settings/PlayerControlSettingSection.xaml b/src/App/Controls/Settings/PlayerControlSettingSection.xaml
@@ -37,13 +37,13 @@
                 <exp:ExpanderExWrapper Style="{StaticResource WrapperInExpanderContentStyle}">
                     <exp:ExpanderExWrapper.MainContent>
                         <exp:ExpanderExDescriptor
-                            Title="{loc:LocaleLocator Name=Prefer4K}"
-                            Description="{loc:LocaleLocator Name=Prefer4KDescription}"
+                            Title="{loc:LocaleLocator Name=PreferHighQuality}"
+                            Description="{loc:LocaleLocator Name=PreferHighQualityDescription}"
                             IconVisibility="Collapsed"
                             IsAutoHideIcon="False" />
                     </exp:ExpanderExWrapper.MainContent>
                     <exp:ExpanderExWrapper.WrapContent>
-                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsPrefer4K, Mode=TwoWay}" />
+                        <ToggleSwitch Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" IsOn="{x:Bind ViewModel.IsPreferHighQuality, Mode=TwoWay}" />
                     </exp:ExpanderExWrapper.WrapContent>
                 </exp:ExpanderExWrapper>
 

diff --git a/src/App/Resources/Strings/zh-CN/Resources.resw b/src/App/Resources/Strings/zh-CN/Resources.resw
@@ -455,7 +455,7 @@
     <value>AVC/H.264</value>
   </data>
   <data name="H265" xml:space="preserve">
-    <value>HVEC/H.265</value>
+    <value>HEVC/H.265</value>
   </data>
   <data name="HelpAndSupport" xml:space="preserve">
     <value>帮助 &amp; 支持</value>
@@ -719,6 +719,12 @@
   <data name="PreferCodecDescription" xml:space="preserve">
     <value>优先选择该编码的视频流，HEVC/H.265需要额外安装解码器</value>
   </data>
+  <data name="PreferHighQuality" xml:space="preserve">
+    <value>画质优先</value>
+  </data>
+  <data name="PreferHighQualityDescription" xml:space="preserve">
+    <value>优先播放最高清画质的视频源</value>
+  </data>
   <data name="Prelaunch" xml:space="preserve">
     <value>预启动</value>
   </data>

diff --git a/src/Models/Models.Enums/App/LanguageNames.cs b/src/Models/Models.Enums/App/LanguageNames.cs
@@ -343,6 +343,8 @@ public enum LanguageNames
         PlayPause,
         DoubleClickBehavior,
         DoubleClickBehaviorDescription,
+        PreferHighQuality,
+        PreferHighQualityDescription,
 #pragma warning restore SA1602 // Enumeration items should be documented
     }
 }
diff --git a/src/Models/Models.Enums/App/SettingNames.cs b/src/Models/Models.Enums/App/SettingNames.cs
@@ -15,7 +15,7 @@ public enum SettingNames
         IsStartup,
         IsAutoPlayWhenLoaded,
         DefaultPlayerDisplayMode,
-        IsPrefer4K,
+        IsPreferHighQuality,
         PreferCodec,
         SingleFastForwardAndRewindSpan,
         DefaultMTCControlMode,

diff --git a/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Methods.cs b/src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Methods.cs
@@ -438,11 +438,10 @@ private async Task InitializeVideoPlayInformationAsync(PlayerDashInformation vid
                 _settingsToolkit.ReadLocalSetting(SettingNames.DefaultVideoFormat, 64) :
                 CurrentFormat.Quality;
 
-            // 如果用户选择了4K优先，则优先播放4K片源.
-            if (_settingsToolkit.ReadLocalSetting(SettingNames.IsPrefer4K, false) &&
-                FormatCollection.Any(p => p.Data.Quality == 120))
+            // 如果用户选择了画质优先，则优先播放高画质片源.
+            if (_settingsToolkit.ReadLocalSetting(SettingNames.IsPreferHighQuality, false))
             {
-                formatId = 120;
+                formatId = FormatCollection.Max(p => p.Data.Quality);
             }
 
             await ChangeFormatAsync(formatId);

diff --git a/src/ViewModels/ViewModels.Uwp/Common/SettingViewModel/SettingViewModel.Properties.cs b/src/ViewModels/ViewModels.Uwp/Common/SettingViewModel/SettingViewModel.Properties.cs
@@ -95,10 +95,10 @@ public partial class SettingViewModel
         public MTCControlMode DefaultMTCControlMode { get; set; }
 
         /// <summary>
-        /// 优先4K.
+        /// 优先高画质.
         /// </summary>
         [Reactive]
-        public bool IsPrefer4K { get; set; }
+        public bool IsPreferHighQuality { get; set; }
 
         /// <summary>
         /// 偏好的解码模式.

diff --git a/src/ViewModels/ViewModels.Uwp/Common/SettingViewModel/SettingViewModel.cs b/src/ViewModels/ViewModels.Uwp/Common/SettingViewModel/SettingViewModel.cs
@@ -35,7 +35,7 @@ public void InitializeSettings()
             _initializeTheme = AppTheme;
             IsPrelaunch = ReadSetting(SettingNames.IsPrelaunch, true);
             IsAutoPlayWhenLoaded = ReadSetting(SettingNames.IsAutoPlayWhenLoaded, true);
-            IsPrefer4K = ReadSetting(SettingNames.IsPrefer4K, false);
+            IsPreferHighQuality = ReadSetting(SettingNames.IsPreferHighQuality, false);
             SingleFastForwardAndRewindSpan = ReadSetting(SettingNames.SingleFastForwardAndRewindSpan, 30d);
             PreferCodecInit();
             DoubleClickInit();
@@ -70,8 +70,8 @@ private async void OnPropertyChangedAsync(object sender, PropertyChangedEventArg
                 case nameof(DefaultPlayerDisplayMode):
                     WriteSetting(SettingNames.DefaultPlayerDisplayMode, DefaultPlayerDisplayMode);
                     break;
-                case nameof(IsPrefer4K):
-                    WriteSetting(SettingNames.IsPrefer4K, IsPrefer4K);
+                case nameof(IsPreferHighQuality):
+                    WriteSetting(SettingNames.IsPreferHighQuality, IsPreferHighQuality);
                     break;
                 case nameof(PreferCodec):
                     WriteSetting(SettingNames.PreferCodec, PreferCodec);