#8 Add the way to use without init

BeautifulPilgrim · Jul 14, 2023 · 269704b · 269704b
1 parent fe1cecf
commit 269704b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/MauiAudio.Sample/Services/PlayerService.cs b/MauiAudio.Sample/Services/PlayerService.cs
@@ -17,9 +17,9 @@ public partial class PlayerService:ObservableObject
     public event EventHandler NewEpisodeAdded;
     public event EventHandler IsPlayingChanged;
 
-    public PlayerService(INativeAudioService audioService)
+    public PlayerService()
     {
-        this.audioService = audioService;
+        this.audioService = NativeAudioService.Current;
         PlayList = new List<MediaPlay>();
         audioService.PlayNext += AudioService_PlayNext;
         audioService.PlayPrevious += AudioService_PlayPrevious;

diff --git a/MauiAudio/INativeAudioService.cs b/MauiAudio/INativeAudioService.cs
@@ -2,6 +2,7 @@
 
 public interface INativeAudioService
 {
+    public static INativeAudioService Current;
     Task InitializeAsync(string audioURI);
     Task InitializeAsync(MediaPlay media);
     Task PlayAsync(double position = 0);

diff --git a/MauiAudio/MauiAudio.csproj b/MauiAudio/MauiAudio.csproj
@@ -12,7 +12,7 @@
 		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
-		<Version>1.2.1</Version>
+		<Version>1.2.2</Version>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
 		<AssemblyName>$(MSBuildProjectName)</AssemblyName>
 		<PackageId>Plugin.MauiAudio</PackageId>

diff --git a/MauiAudio/NativeAudioService.android.cs b/MauiAudio/NativeAudioService.android.cs
@@ -8,6 +8,8 @@ namespace MauiAudio;
 
 public class NativeAudioService : INativeAudioService
 {
+    static NativeAudioService current;
+    public static INativeAudioService Current => current ??= new NativeAudioService();
     IAudioActivity instance;
     double volume = 1;
     double balance = 0;

diff --git a/MauiAudio/NativeAudioService.macios.cs b/MauiAudio/NativeAudioService.macios.cs
@@ -6,6 +6,8 @@ namespace MauiAudio;
 
 public class NativeAudioService : INativeAudioService
 {
+    static NativeAudioService current;
+    public static INativeAudioService Current => current ??= new NativeAudioService();
     //AVPlayer avPlayer;
     AVAudioPlayer avPlayer;
     float volume = 1;

diff --git a/MauiAudio/NativeAudioService.windows.cs b/MauiAudio/NativeAudioService.windows.cs
@@ -6,6 +6,8 @@ namespace MauiAudio;
 
 public class NativeAudioService : INativeAudioService
 {
+    static NativeAudioService current;
+    public static INativeAudioService Current => current ??= new NativeAudioService();
     MediaPlayer mediaPlayer;
 
     public bool IsPlaying => mediaPlayer != null

diff --git a/README.md b/README.md
@@ -18,10 +18,15 @@ Add the [NuGet package](https://www.nuget.org/packages/Plugin.MauiAudio/) to the
 - Select Plugin.MauiAudio
 
 ## Init
-
-In CreateMauiApp()[MauiProgram.cs]
+#### Version ≥ 1.2.2 
+No Need init！
+Directly using it!
+```c#
+var audioService = NativeAudioService.Current;
+```
 
 #### Version ≥ 1.0.3：
+In CreateMauiApp()[MauiProgram.cs]
 
 ```c#
 using MauiAudio;
@@ -30,6 +35,7 @@ builder.UseMauiAudio()
 ```
 
 #### Version < 1.0.3:
+In CreateMauiApp()[MauiProgram.cs]
 
 ```c#
 #if WINDOWS
@@ -123,6 +129,15 @@ await audioService.PauseAsync();
 ```
 
 ## Interface
+### Version ≥ 1.2.2
+
+```c#
+public interface INativeAudioService
+{
+    public static INativeAudioService Current;
+    ······
+}
+```
 
 ### Version ≥ 1.0.6