修复xbox闪退的问题

Richasy · Dec 10, 2020 · 2f2ef6f · 2f2ef6f
1 parent 069d4eb
commit 2f2ef6f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/BiliBili-UWP/App.xaml.cs b/BiliBili-UWP/App.xaml.cs
@@ -19,6 +19,7 @@
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.UI.Notifications;
+using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -47,12 +48,7 @@ sealed partial class App : Application
         public App()
         {
             this.InitializeComponent();
-            bool isDisableScale = AppTool.GetBoolSetting(Settings.DisableXboxScale);
-            if (SystemInformation.DeviceFamily == "Windows.Xbox" && isDisableScale)
-            {
-                Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().SetDesiredBoundsMode(Windows.UI.ViewManagement.ApplicationViewBoundsMode.UseCoreWindow);
-                Windows.UI.ViewManagement.ApplicationViewScaling.TrySetDisableLayoutScaling(true);
-            }
+
             CustomXamlResourceLoader.Current = new CustomResourceLoader();
             this.Suspending += OnSuspending;
             UnhandledException += OnUnhandleException;
@@ -147,9 +143,9 @@ private void OnLaunchedOrActivated(IActivatedEventArgs e)
                     if (rootFrame.Content == null)
                     {
                         if (_isTabletMode)
-                            rootFrame.Navigate(typeof(TabletMainPage),null);
+                            rootFrame.Navigate(typeof(TabletMainPage), null);
                         else
-                            rootFrame.Navigate(typeof(DesktopMainPage),null);
+                            rootFrame.Navigate(typeof(DesktopMainPage), null);
                     }
                 }
                 else if (e is ToastNotificationActivatedEventArgs toastActivationArgs)
@@ -183,6 +179,14 @@ private void OnLaunchedOrActivated(IActivatedEventArgs e)
                 }
                 Window.Current.Activate();
                 UIHelper.SetTitleBarColor();
+                bool isDisableScale = AppTool.GetBoolSetting(Settings.DisableXboxScale);
+                if (SystemInformation.DeviceFamily == "Windows.Xbox")
+                {
+                    var view = ApplicationView.GetForCurrentView();
+                    view.SetDesiredBoundsMode(ApplicationViewBoundsMode.UseCoreWindow);
+                    if (isDisableScale)
+                        ApplicationViewScaling.TrySetDisableLayoutScaling(true);
+                }
             }
             catch (Exception ex)
             {

diff --git a/BiliBili-UWP/BiliBili-UWP.csproj b/BiliBili-UWP/BiliBili-UWP.csproj
@@ -21,7 +21,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxPackageDir>E:\Package\BiliBili\</AppxPackageDir>
+    <AppxPackageDir>D:\Package\BiliBili\</AppxPackageDir>
     <GenerateTestArtifacts>False</GenerateTestArtifacts>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>

diff --git a/BiliBili-UWP/Others/Update.txt b/BiliBili-UWP/Others/Update.txt
@@ -4,8 +4,7 @@
 
 更新说明：
 
-1. 添加了优先HEVC的设置项，修复此前部分新电影无法播放音频的问题
-2. 调整新动态通知的弹出顺序
+1. 修复了在XBOX上无法打开的问题
 
 祝使用愉快，
 

diff --git a/BiliBili-UWP/Package.appxmanifest b/BiliBili-UWP/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="60520B029E250.4264454043325"
     Publisher="CN=9EFA2047-A580-400B-A5B2-0C7ABB0DB5C0"
-    Version="1.3.10.0" />
+    Version="1.3.11.0" />
 
   <mp:PhoneIdentity PhoneProductId="f3e42c1a-303e-47c7-8e3d-d37473c0ec73" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>