From 4d2a8cffeceeab9441065978d004aa869904872a Mon Sep 17 00:00:00 2001 From: Andrey Kupriev Date: Fri, 10 Feb 2023 15:29:37 +0300 Subject: [PATCH 1/6] Audio Service Activity --- .../audioservice/AudioServiceActivity.java | 1 + .../audioservice/AudioServicePlugin.java | 8 ++++++ audio_service/pubspec.yaml | 26 +++++++++---------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServiceActivity.java b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServiceActivity.java index f91f663b..3c80e6cc 100644 --- a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServiceActivity.java +++ b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServiceActivity.java @@ -10,6 +10,7 @@ public class AudioServiceActivity extends FlutterActivity { @Override public FlutterEngine provideFlutterEngine(@NonNull Context context) { + AudioServicePlugin.setArmStartup(true); return AudioServicePlugin.getFlutterEngine(context); } } diff --git a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java index f6cbfa70..410f9414 100644 --- a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java +++ b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java @@ -57,6 +57,10 @@ * AudioservicePlugin */ public class AudioServicePlugin implements FlutterPlugin, ActivityAware { + private static boolean armStartup = false; + public static synchronized void setArmStartup(boolean enabled) { + armStartup = enabled; + } private static String flutterEngineId = "audio_service_engine"; /** Must be called BEFORE any FlutterEngine is created. e.g. in Application class. */ public static void setFlutterEngineId(String id) { @@ -65,7 +69,11 @@ public static void setFlutterEngineId(String id) { public static String getFlutterEngineId() { return flutterEngineId; } + public static synchronized FlutterEngine getFlutterEngine(Context context) { + if (armStartup == false) { + return null; + } FlutterEngine flutterEngine = FlutterEngineCache.getInstance().get(flutterEngineId); if (flutterEngine == null) { // XXX: The constructor triggers onAttachedToEngine so this variable doesn't help us. diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index fb28719f..574f0b37 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -1,6 +1,6 @@ name: audio_service description: Flutter plugin to play audio in the background while the screen is off. -version: 0.18.9 +version: 0.18.10 homepage: https://github.com/ryanheise/audio_service/tree/master/audio_service environment: @@ -15,20 +15,20 @@ dependencies: # path: ../audio_service_web # Use these deps when pushing to origin (for the benefit of testers) - # audio_service_platform_interface: - # git: - # url: https://github.com/ryanheise/audio_service.git - # ref: one-isolate - # path: audio_service_platform_interface - # audio_service_web: - # git: - # url: https://github.com/ryanheise/audio_service.git - # ref: one-isolate - # path: audio_service_web + audio_service_platform_interface: + git: + url: https://github.com/ryanheise/audio_service.git + ref: one-isolate + path: audio_service_platform_interface + audio_service_web: + git: + url: https://github.com/ryanheise/audio_service.git + ref: one-isolate + path: audio_service_web # Use these deps when publishing. - audio_service_platform_interface: ^0.1.0 - audio_service_web: ^0.1.1 +# audio_service_platform_interface: ^0.1.0 +# audio_service_web: ^0.1.1 audio_session: ^0.1.6+1 rxdart: '>=0.26.0 <0.28.0' From 7f192171f71e696bc97d4fd67dc069d462a8ca93 Mon Sep 17 00:00:00 2001 From: Andrey Kupriev Date: Fri, 10 Feb 2023 15:43:28 +0300 Subject: [PATCH 2/6] up version --- audio_service/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index 574f0b37..8a5eef59 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -1,6 +1,6 @@ name: audio_service description: Flutter plugin to play audio in the background while the screen is off. -version: 0.18.10 +version: 0.18.11 homepage: https://github.com/ryanheise/audio_service/tree/master/audio_service environment: @@ -30,7 +30,7 @@ dependencies: # audio_service_platform_interface: ^0.1.0 # audio_service_web: ^0.1.1 - audio_session: ^0.1.6+1 +# audio_session: ^0.1.6+1 rxdart: '>=0.26.0 <0.28.0' flutter_cache_manager: ^3.0.1 clock: ^1.1.0 From 55831eb4d217960b5bc01702320be76e120f1ed7 Mon Sep 17 00:00:00 2001 From: Andrey Kupriev Date: Fri, 10 Feb 2023 15:58:57 +0300 Subject: [PATCH 3/6] formatting --- audio_service/pubspec.yaml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index 8a5eef59..c9a76994 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -1,6 +1,6 @@ name: audio_service description: Flutter plugin to play audio in the background while the screen is off. -version: 0.18.11 +version: 0.18.12 homepage: https://github.com/ryanheise/audio_service/tree/master/audio_service environment: @@ -15,22 +15,17 @@ dependencies: # path: ../audio_service_web # Use these deps when pushing to origin (for the benefit of testers) - audio_service_platform_interface: - git: - url: https://github.com/ryanheise/audio_service.git - ref: one-isolate - path: audio_service_platform_interface - audio_service_web: - git: - url: https://github.com/ryanheise/audio_service.git - ref: one-isolate - path: audio_service_web - - # Use these deps when publishing. -# audio_service_platform_interface: ^0.1.0 -# audio_service_web: ^0.1.1 - -# audio_session: ^0.1.6+1 + audio_service_platform_interface: + git: + url: https://github.com/ryanheise/audio_service.git + ref: one-isolate + path: audio_service_platform_interface + audio_service_web: + git: + url: https://github.com/ryanheise/audio_service.git + ref: one-isolate + path: audio_service_web + audio_session: ^0.1.6+1 rxdart: '>=0.26.0 <0.28.0' flutter_cache_manager: ^3.0.1 clock: ^1.1.0 From df96b22b0277b947442647ec81a9d0bf0b9da89f Mon Sep 17 00:00:00 2001 From: Andrey Kupriev Date: Fri, 10 Feb 2023 16:00:35 +0300 Subject: [PATCH 4/6] delete ref --- audio_service/pubspec.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index c9a76994..14a71b03 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -18,12 +18,10 @@ dependencies: audio_service_platform_interface: git: url: https://github.com/ryanheise/audio_service.git - ref: one-isolate path: audio_service_platform_interface audio_service_web: git: url: https://github.com/ryanheise/audio_service.git - ref: one-isolate path: audio_service_web audio_session: ^0.1.6+1 rxdart: '>=0.26.0 <0.28.0' From 4b6480c9ef11049ce5620818247fdf93c46c3e0f Mon Sep 17 00:00:00 2001 From: Andrey Kupriev Date: Fri, 10 Feb 2023 16:03:06 +0300 Subject: [PATCH 5/6] correct dependency --- audio_service/pubspec.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index 14a71b03..3da92ba0 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -15,14 +15,16 @@ dependencies: # path: ../audio_service_web # Use these deps when pushing to origin (for the benefit of testers) - audio_service_platform_interface: - git: - url: https://github.com/ryanheise/audio_service.git - path: audio_service_platform_interface - audio_service_web: - git: - url: https://github.com/ryanheise/audio_service.git - path: audio_service_web +# audio_service_platform_interface: +# git: +# url: https://github.com/ryanheise/audio_service.git +# path: audio_service_platform_interface +# audio_service_web: +# git: +# url: https://github.com/ryanheise/audio_service.git +# path: audio_service_web + audio_service_platform_interface: ^0.1.0 + audio_service_web: ^0.1.1 audio_session: ^0.1.6+1 rxdart: '>=0.26.0 <0.28.0' flutter_cache_manager: ^3.0.1 From 372335eb4d98a757622d86cf42da78c59a17c087 Mon Sep 17 00:00:00 2001 From: Andrey Kupriev Date: Mon, 10 Apr 2023 01:48:12 +0300 Subject: [PATCH 6/6] format --- audio_service/pubspec.yaml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index 3da92ba0..ed8f7086 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -15,16 +15,21 @@ dependencies: # path: ../audio_service_web # Use these deps when pushing to origin (for the benefit of testers) -# audio_service_platform_interface: -# git: -# url: https://github.com/ryanheise/audio_service.git -# path: audio_service_platform_interface -# audio_service_web: -# git: -# url: https://github.com/ryanheise/audio_service.git -# path: audio_service_web + # audio_service_platform_interface: + # git: + # url: https://github.com/ryanheise/audio_service.git + # ref: one-isolate + # path: audio_service_platform_interface + # audio_service_web: + # git: + # url: https://github.com/ryanheise/audio_service.git + # ref: one-isolate + # path: audio_service_web + + # Use these deps when publishing. audio_service_platform_interface: ^0.1.0 audio_service_web: ^0.1.1 + audio_session: ^0.1.6+1 rxdart: '>=0.26.0 <0.28.0' flutter_cache_manager: ^3.0.1 @@ -53,4 +58,4 @@ flutter: macos: pluginClass: AudioServicePlugin web: - default_package: audio_service_web + default_package: audio_service_web \ No newline at end of file