fix Android ThirdPartyLoginHelper.StartServer catch & update android …

…screenshot & fix NotificationServiceImpl
Moonmiracle · Apr 2, 2022 · 2f76b78 · 2f76b78
1 parent 5179ad8
commit 2f76b78
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 14 deletions.
diff --git a/resources/screenshot-android.en.png b/resources/screenshot-android.en.png
diff --git a/resources/screenshot-android.png b/resources/screenshot-android.png
diff --git a/resources/screenshots.en.jpg b/resources/screenshots.en.jpg
diff --git a/resources/screenshots.jpg b/resources/screenshots.jpg
diff --git a/src/ST.Client.Android/UI/MainApplication.cs b/src/ST.Client.Android/UI/MainApplication.cs
@@ -2,6 +2,7 @@
 using Android.Runtime;
 using System.Application.UI.Resx;
 using System.Application.UI.ViewModels;
+using System.Application.Mvvm;
 using System.Diagnostics;
 using System.Text;
 using Xamarin.Essentials;
@@ -250,7 +251,7 @@ void OnActivityStateChanged(object? sender, ActivityStateChangedEventArgs e)
         const AppTheme _DefaultActualTheme = AppTheme.Light;
         AppTheme IApplication.DefaultActualTheme => _DefaultActualTheme;
 
-        public bool IsRuntimeSwitchXFAppTheme { get; set; } = true;
+        //public bool IsRuntimeSwitchXFAppTheme { get; set; } = true;
 
         #region AppTheme
 
@@ -340,7 +341,7 @@ public AppTheme RealTheme
 
         readonly CompositeDisposable compositeDisposable = new();
 
-        CompositeDisposable IApplication.CompositeDisposable => compositeDisposable;
+        ICollection<IDisposable> IDisposableHolder.CompositeDisposable => compositeDisposable;
 
         #endregion
 

diff --git a/src/ST.Client/Services/Implementation/NotificationServiceImpl.cs b/src/ST.Client/Services/Implementation/NotificationServiceImpl.cs
@@ -3,17 +3,20 @@
 using System.Text;
 using System.Windows;
 using static System.Application.Services.INotificationService;
+using System.Runtime.Versioning;
 
 namespace System.Application.Services.Implementation
 {
     /// <inheritdoc cref="INotificationService"/>
     internal sealed class NotificationServiceImpl : INotificationService
     {
-        readonly NotifyIcon notifyIcon;
+        [SupportedOSPlatform("windows")]
+        [SupportedOSPlatform("macos")]
+        [SupportedOSPlatform("linux")]
+        static NotifyIcon? NotifyIcon => DI.Get_Nullable<NotifyIcon>();
 
-        public NotificationServiceImpl(NotifyIcon notifyIcon)
+        public NotificationServiceImpl()
         {
-            this.notifyIcon = notifyIcon;
         }
 
         bool INotificationService<NotificationType, Entrance, INotificationService>.AreNotificationsEnabled() => true;
@@ -22,15 +25,19 @@ void INotificationService<NotificationType, Entrance, INotificationService>.Canc
         {
             if (OperatingSystem2.IsWindows && NotifyIconHelper.IsInitialized)
             {
-                notifyIcon.HideBalloonTip();
+#pragma warning disable CA1416 // 验证平台兼容性
+                NotifyIcon?.HideBalloonTip();
+#pragma warning restore CA1416 // 验证平台兼容性
             }
         }
 
         void INotificationService<NotificationType, Entrance, INotificationService>.CancelAll()
         {
             if (OperatingSystem2.IsWindows && NotifyIconHelper.IsInitialized)
             {
-                notifyIcon.HideBalloonTip();
+#pragma warning disable CA1416 // 验证平台兼容性
+                NotifyIcon?.HideBalloonTip();
+#pragma warning restore CA1416 // 验证平台兼容性
             }
         }
 
@@ -40,7 +47,9 @@ void INotificationService<NotificationType, Entrance, INotificationService>.Noti
             {
                 title ??= ThisAssembly.AssemblyTrademark;
                 // 调用托盘显示通知
-                notifyIcon.ShowBalloonTip(title, text, ToolTipIcon.None);
+#pragma warning disable CA1416 // 验证平台兼容性
+                NotifyIcon?.ShowBalloonTip(title, text, ToolTipIcon.None);
+#pragma warning restore CA1416 // 验证平台兼容性
             }
         }
 

diff --git a/src/ST.Client/UI/IApplication.Desktop.cs b/src/ST.Client/UI/IApplication.Desktop.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Application.Models;
 using System.Application.Mvvm;
 using System.Collections.Generic;
@@ -36,14 +35,20 @@ void SetTopmostOneTime() { }
         /// </summary>
         IReadOnlyDictionary<string, ICommand> NotifyIconMenus { get; }
 
-        new CompositeDisposable CompositeDisposable { get; }
-
-        ICollection<IDisposable> IDisposableHolder.CompositeDisposable => CompositeDisposable;
-
         /// <summary>
         /// 是否有活动窗口
         /// </summary>
         /// <returns></returns>
         bool HasActiveWindow();
     }
-}
+
+#if NET6_0_OR_GREATER
+    // 接口默认实现在 Xamarin.Android 上不可用，将引发 Java.Lang.AbstractMethodError: Exception of type 'Java.Lang.AbstractMethodError' was thrown.
+    partial interface IApplication
+    {
+        new CompositeDisposable CompositeDisposable { get; }
+
+        ICollection<IDisposable> IDisposableHolder.CompositeDisposable => CompositeDisposable;
+    }
+#endif
+}