From 431857a9c5e28ad3703e42df175a600b6f698dfd Mon Sep 17 00:00:00 2001 From: Kautsar Al Bana Date: Thu, 13 Feb 2025 11:22:56 +0700 Subject: [PATCH 1/6] Implement widevine drm protected content --- android/build.gradle | 4 +- .../pigeon/PlaybackPlatformApi.java | 408 ++++++++++++------ .../bccm_player/players/PlayerController.kt | 110 ++++- .../chromecast/CastMediaItemConverter.kt | 10 +- .../bccm_player/views/FlutterCastButton.kt | 2 +- .../bccm_player/views/FlutterExoPlayerView.kt | 8 +- .../bccm_player/views/FullscreenPlayerView.kt | 8 +- android/src/main/res/values/strings.xml | 2 +- example/android/app/build.gradle | 5 +- example/android/build.gradle | 2 +- example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- example/lib/examples/drm_player.dart | 68 +++ example/lib/main.dart | 9 +- example/pubspec.lock | 59 +-- ios/Classes/Pigeon/PlaybackPlatformApi.h | 49 ++- ios/Classes/Pigeon/PlaybackPlatformApi.m | 199 +++++---- lib/bccm_player.dart | 5 +- .../pigeon/playback_platform_pigeon.g.dart | 181 ++++---- lib/src/playback_platform_interface.dart | 10 +- .../state/player_state_notifier.freezed.dart | 17 +- .../state/plugin_state_notifier.freezed.dart | 17 +- pigeons/playback_platform_pigeon.dart | 20 + pubspec.yaml | 7 +- test/utils/mocks.mocks.dart | 40 ++ 25 files changed, 836 insertions(+), 409 deletions(-) create mode 100644 example/lib/examples/drm_player.dart diff --git a/android/build.gradle b/android/build.gradle index 39620b23..7f0a5f77 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } @@ -32,6 +32,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' android { + namespace = "media.bcc.bccm_player" compileSdkVersion 33 compileOptions { @@ -63,6 +64,7 @@ dependencies { def media3_version = "1.3.1" implementation "androidx.media3:media3-exoplayer:$media3_version" implementation "androidx.media3:media3-exoplayer-hls:$media3_version" + implementation "androidx.media3:media3-exoplayer-dash:$media3_version" implementation "androidx.media3:media3-cast:$media3_version" implementation "androidx.media3:media3-test-utils:$media3_version" implementation "androidx.media3:media3-session:$media3_version" diff --git a/android/src/main/java/media/bcc/bccm_player/pigeon/PlaybackPlatformApi.java b/android/src/main/java/media/bcc/bccm_player/pigeon/PlaybackPlatformApi.java index ef985c16..ca1a65c1 100644 --- a/android/src/main/java/media/bcc/bccm_player/pigeon/PlaybackPlatformApi.java +++ b/android/src/main/java/media/bcc/bccm_player/pigeon/PlaybackPlatformApi.java @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.3.0), do not edit directly. +// Autogenerated from Pigeon (v21.2.0), do not edit directly. // See also: https://pub.dev/packages/pigeon package media.bcc.bccm_player.pigeon; @@ -94,6 +94,17 @@ public enum RepeatMode { } } + public enum DrmType { + WIDEVINE(0), + FAIRPLAY(1); + + final int index; + + DrmType(final int index) { + this.index = index; + } + } + public enum PlaybackState { STOPPED(0), PAUSED(1), @@ -404,83 +415,167 @@ ArrayList toList() { Object analyticsId = pigeonVar_list.get(3); pigeonResult.setAnalyticsId((String) analyticsId); Object sessionId = pigeonVar_list.get(4); - pigeonResult.setSessionId((Long) sessionId); + pigeonResult.setSessionId((sessionId == null) ? null : ((sessionId instanceof Integer) ? (Integer) sessionId : (Long) sessionId)); return pigeonResult; } } /** Generated class from Pigeon that represents data sent in messages. */ - public static final class User { - private @Nullable String id; + public static final class DrmConfiguration { + private @NonNull DrmType drmType; - public @Nullable String getId() { - return id; + public @NonNull DrmType getDrmType() { + return drmType; } - public void setId(@Nullable String setterArg) { - this.id = setterArg; + public void setDrmType(@NonNull DrmType setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"drmType\" is null."); + } + this.drmType = setterArg; + } + + private @Nullable String contentKeyId; + + public @Nullable String getContentKeyId() { + return contentKeyId; + } + + public void setContentKeyId(@Nullable String setterArg) { + this.contentKeyId = setterArg; + } + + private @Nullable String fpsCertificateUrl; + + public @Nullable String getFpsCertificateUrl() { + return fpsCertificateUrl; + } + + public void setFpsCertificateUrl(@Nullable String setterArg) { + this.fpsCertificateUrl = setterArg; + } + + private @NonNull String licenseServerUrl; + + public @NonNull String getLicenseServerUrl() { + return licenseServerUrl; } + public void setLicenseServerUrl(@NonNull String setterArg) { + if (setterArg == null) { + throw new IllegalStateException("Nonnull field \"licenseServerUrl\" is null."); + } + this.licenseServerUrl = setterArg; + } + + private @Nullable Map licenseRequestHeaders; + + public @Nullable Map getLicenseRequestHeaders() { + return licenseRequestHeaders; + } + + public void setLicenseRequestHeaders(@Nullable Map setterArg) { + this.licenseRequestHeaders = setterArg; + } + + /** Constructor is non-public to enforce null safety; use Builder. */ + DrmConfiguration() {} + @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } - User that = (User) o; - return Objects.equals(id, that.id); + DrmConfiguration that = (DrmConfiguration) o; + return drmType.equals(that.drmType) && Objects.equals(contentKeyId, that.contentKeyId) && Objects.equals(fpsCertificateUrl, that.fpsCertificateUrl) && licenseServerUrl.equals(that.licenseServerUrl) && Objects.equals(licenseRequestHeaders, that.licenseRequestHeaders); } @Override public int hashCode() { - return Objects.hash(id); + return Objects.hash(drmType, contentKeyId, fpsCertificateUrl, licenseServerUrl, licenseRequestHeaders); } public static final class Builder { - private @Nullable String id; + private @Nullable DrmType drmType; @CanIgnoreReturnValue - public @NonNull Builder setId(@Nullable String setterArg) { - this.id = setterArg; + public @NonNull Builder setDrmType(@NonNull DrmType setterArg) { + this.drmType = setterArg; return this; } - public @NonNull User build() { - User pigeonReturn = new User(); - pigeonReturn.setId(id); + private @Nullable String contentKeyId; + + @CanIgnoreReturnValue + public @NonNull Builder setContentKeyId(@Nullable String setterArg) { + this.contentKeyId = setterArg; + return this; + } + + private @Nullable String fpsCertificateUrl; + + @CanIgnoreReturnValue + public @NonNull Builder setFpsCertificateUrl(@Nullable String setterArg) { + this.fpsCertificateUrl = setterArg; + return this; + } + + private @Nullable String licenseServerUrl; + + @CanIgnoreReturnValue + public @NonNull Builder setLicenseServerUrl(@NonNull String setterArg) { + this.licenseServerUrl = setterArg; + return this; + } + + private @Nullable Map licenseRequestHeaders; + + @CanIgnoreReturnValue + public @NonNull Builder setLicenseRequestHeaders(@Nullable Map setterArg) { + this.licenseRequestHeaders = setterArg; + return this; + } + + public @NonNull DrmConfiguration build() { + DrmConfiguration pigeonReturn = new DrmConfiguration(); + pigeonReturn.setDrmType(drmType); + pigeonReturn.setContentKeyId(contentKeyId); + pigeonReturn.setFpsCertificateUrl(fpsCertificateUrl); + pigeonReturn.setLicenseServerUrl(licenseServerUrl); + pigeonReturn.setLicenseRequestHeaders(licenseRequestHeaders); return pigeonReturn; } } @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList<>(1); - toListResult.add(id); + ArrayList toListResult = new ArrayList<>(5); + toListResult.add(drmType); + toListResult.add(contentKeyId); + toListResult.add(fpsCertificateUrl); + toListResult.add(licenseServerUrl); + toListResult.add(licenseRequestHeaders); return toListResult; } - static @NonNull User fromList(@NonNull ArrayList pigeonVar_list) { - User pigeonResult = new User(); - Object id = pigeonVar_list.get(0); - pigeonResult.setId((String) id); + static @NonNull DrmConfiguration fromList(@NonNull ArrayList pigeonVar_list) { + DrmConfiguration pigeonResult = new DrmConfiguration(); + Object drmType = pigeonVar_list.get(0); + pigeonResult.setDrmType((DrmType) drmType); + Object contentKeyId = pigeonVar_list.get(1); + pigeonResult.setContentKeyId((String) contentKeyId); + Object fpsCertificateUrl = pigeonVar_list.get(2); + pigeonResult.setFpsCertificateUrl((String) fpsCertificateUrl); + Object licenseServerUrl = pigeonVar_list.get(3); + pigeonResult.setLicenseServerUrl((String) licenseServerUrl); + Object licenseRequestHeaders = pigeonVar_list.get(4); + pigeonResult.setLicenseRequestHeaders((Map) licenseRequestHeaders); return pigeonResult; } } /** Generated class from Pigeon that represents data sent in messages. */ - public static final class SetUrlArgs { - private @NonNull String playerId; - - public @NonNull String getPlayerId() { - return playerId; - } - - public void setPlayerId(@NonNull String setterArg) { - if (setterArg == null) { - throw new IllegalStateException("Nonnull field \"playerId\" is null."); - } - this.playerId = setterArg; - } - + public static final class CastMedia { private @NonNull String url; public @NonNull String getUrl() { @@ -494,42 +589,34 @@ public void setUrl(@NonNull String setterArg) { this.url = setterArg; } - private @Nullable Boolean isLive; + private @Nullable Map customData; - public @Nullable Boolean getIsLive() { - return isLive; + public @Nullable Map getCustomData() { + return customData; } - public void setIsLive(@Nullable Boolean setterArg) { - this.isLive = setterArg; + public void setCustomData(@Nullable Map setterArg) { + this.customData = setterArg; } /** Constructor is non-public to enforce null safety; use Builder. */ - SetUrlArgs() {} + CastMedia() {} @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } - SetUrlArgs that = (SetUrlArgs) o; - return playerId.equals(that.playerId) && url.equals(that.url) && Objects.equals(isLive, that.isLive); + CastMedia that = (CastMedia) o; + return url.equals(that.url) && Objects.equals(customData, that.customData); } @Override public int hashCode() { - return Objects.hash(playerId, url, isLive); + return Objects.hash(url, customData); } public static final class Builder { - private @Nullable String playerId; - - @CanIgnoreReturnValue - public @NonNull Builder setPlayerId(@NonNull String setterArg) { - this.playerId = setterArg; - return this; - } - private @Nullable String url; @CanIgnoreReturnValue @@ -538,40 +625,36 @@ public static final class Builder { return this; } - private @Nullable Boolean isLive; + private @Nullable Map customData; @CanIgnoreReturnValue - public @NonNull Builder setIsLive(@Nullable Boolean setterArg) { - this.isLive = setterArg; + public @NonNull Builder setCustomData(@Nullable Map setterArg) { + this.customData = setterArg; return this; } - public @NonNull SetUrlArgs build() { - SetUrlArgs pigeonReturn = new SetUrlArgs(); - pigeonReturn.setPlayerId(playerId); + public @NonNull CastMedia build() { + CastMedia pigeonReturn = new CastMedia(); pigeonReturn.setUrl(url); - pigeonReturn.setIsLive(isLive); + pigeonReturn.setCustomData(customData); return pigeonReturn; } } @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList<>(3); - toListResult.add(playerId); + ArrayList toListResult = new ArrayList<>(2); toListResult.add(url); - toListResult.add(isLive); + toListResult.add(customData); return toListResult; } - static @NonNull SetUrlArgs fromList(@NonNull ArrayList pigeonVar_list) { - SetUrlArgs pigeonResult = new SetUrlArgs(); - Object playerId = pigeonVar_list.get(0); - pigeonResult.setPlayerId((String) playerId); - Object url = pigeonVar_list.get(1); + static @NonNull CastMedia fromList(@NonNull ArrayList pigeonVar_list) { + CastMedia pigeonResult = new CastMedia(); + Object url = pigeonVar_list.get(0); pigeonResult.setUrl((String) url); - Object isLive = pigeonVar_list.get(2); - pigeonResult.setIsLive((Boolean) isLive); + Object customData = pigeonVar_list.get(1); + pigeonResult.setCustomData((Map) customData); return pigeonResult; } } @@ -668,17 +751,37 @@ public void setLastKnownSubtitleLanguage(@Nullable String setterArg) { this.lastKnownSubtitleLanguage = setterArg; } + private @Nullable DrmConfiguration drmConfiguration; + + public @Nullable DrmConfiguration getDrmConfiguration() { + return drmConfiguration; + } + + public void setDrmConfiguration(@Nullable DrmConfiguration setterArg) { + this.drmConfiguration = setterArg; + } + + private @Nullable CastMedia castMedia; + + public @Nullable CastMedia getCastMedia() { + return castMedia; + } + + public void setCastMedia(@Nullable CastMedia setterArg) { + this.castMedia = setterArg; + } + @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } MediaItem that = (MediaItem) o; - return Objects.equals(id, that.id) && Objects.equals(url, that.url) && Objects.equals(mimeType, that.mimeType) && Objects.equals(metadata, that.metadata) && Objects.equals(isLive, that.isLive) && Objects.equals(isOffline, that.isOffline) && Objects.equals(playbackStartPositionMs, that.playbackStartPositionMs) && Objects.equals(lastKnownAudioLanguage, that.lastKnownAudioLanguage) && Objects.equals(lastKnownSubtitleLanguage, that.lastKnownSubtitleLanguage); + return Objects.equals(id, that.id) && Objects.equals(url, that.url) && Objects.equals(mimeType, that.mimeType) && Objects.equals(metadata, that.metadata) && Objects.equals(isLive, that.isLive) && Objects.equals(isOffline, that.isOffline) && Objects.equals(playbackStartPositionMs, that.playbackStartPositionMs) && Objects.equals(lastKnownAudioLanguage, that.lastKnownAudioLanguage) && Objects.equals(lastKnownSubtitleLanguage, that.lastKnownSubtitleLanguage) && Objects.equals(drmConfiguration, that.drmConfiguration) && Objects.equals(castMedia, that.castMedia); } @Override public int hashCode() { - return Objects.hash(id, url, mimeType, metadata, isLive, isOffline, playbackStartPositionMs, lastKnownAudioLanguage, lastKnownSubtitleLanguage); + return Objects.hash(id, url, mimeType, metadata, isLive, isOffline, playbackStartPositionMs, lastKnownAudioLanguage, lastKnownSubtitleLanguage, drmConfiguration, castMedia); } public static final class Builder { @@ -755,6 +858,22 @@ public static final class Builder { return this; } + private @Nullable DrmConfiguration drmConfiguration; + + @CanIgnoreReturnValue + public @NonNull Builder setDrmConfiguration(@Nullable DrmConfiguration setterArg) { + this.drmConfiguration = setterArg; + return this; + } + + private @Nullable CastMedia castMedia; + + @CanIgnoreReturnValue + public @NonNull Builder setCastMedia(@Nullable CastMedia setterArg) { + this.castMedia = setterArg; + return this; + } + public @NonNull MediaItem build() { MediaItem pigeonReturn = new MediaItem(); pigeonReturn.setId(id); @@ -766,13 +885,15 @@ public static final class Builder { pigeonReturn.setPlaybackStartPositionMs(playbackStartPositionMs); pigeonReturn.setLastKnownAudioLanguage(lastKnownAudioLanguage); pigeonReturn.setLastKnownSubtitleLanguage(lastKnownSubtitleLanguage); + pigeonReturn.setDrmConfiguration(drmConfiguration); + pigeonReturn.setCastMedia(castMedia); return pigeonReturn; } } @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList<>(9); + ArrayList toListResult = new ArrayList<>(11); toListResult.add(id); toListResult.add(url); toListResult.add(mimeType); @@ -782,6 +903,8 @@ ArrayList toList() { toListResult.add(playbackStartPositionMs); toListResult.add(lastKnownAudioLanguage); toListResult.add(lastKnownSubtitleLanguage); + toListResult.add(drmConfiguration); + toListResult.add(castMedia); return toListResult; } @@ -805,6 +928,10 @@ ArrayList toList() { pigeonResult.setLastKnownAudioLanguage((String) lastKnownAudioLanguage); Object lastKnownSubtitleLanguage = pigeonVar_list.get(8); pigeonResult.setLastKnownSubtitleLanguage((String) lastKnownSubtitleLanguage); + Object drmConfiguration = pigeonVar_list.get(9); + pigeonResult.setDrmConfiguration((DrmConfiguration) drmConfiguration); + Object castMedia = pigeonVar_list.get(10); + pigeonResult.setCastMedia((CastMedia) castMedia); return pigeonResult; } } @@ -1240,7 +1367,7 @@ ArrayList toList() { Object playbackPositionMs = pigeonVar_list.get(7); pigeonResult.setPlaybackPositionMs((Double) playbackPositionMs); Object textureId = pigeonVar_list.get(8); - pigeonResult.setTextureId((Long) textureId); + pigeonResult.setTextureId((textureId == null) ? null : ((textureId instanceof Integer) ? (Integer) textureId : (Long) textureId)); Object volume = pigeonVar_list.get(9); pigeonResult.setVolume((Double) volume); Object error = pigeonVar_list.get(10); @@ -1409,9 +1536,9 @@ ArrayList toList() { static @NonNull VideoSize fromList(@NonNull ArrayList pigeonVar_list) { VideoSize pigeonResult = new VideoSize(); Object width = pigeonVar_list.get(0); - pigeonResult.setWidth((Long) width); + pigeonResult.setWidth((width == null) ? null : ((width instanceof Integer) ? (Integer) width : (Long) width)); Object height = pigeonVar_list.get(1); - pigeonResult.setHeight((Long) height); + pigeonResult.setHeight((height == null) ? null : ((height instanceof Integer) ? (Integer) height : (Long) height)); return pigeonResult; } } @@ -1981,11 +2108,11 @@ ArrayList toList() { Object frameRate = pigeonVar_list.get(3); pigeonResult.setFrameRate((Double) frameRate); Object bitrate = pigeonVar_list.get(4); - pigeonResult.setBitrate((Long) bitrate); + pigeonResult.setBitrate((bitrate == null) ? null : ((bitrate instanceof Integer) ? (Integer) bitrate : (Long) bitrate)); Object width = pigeonVar_list.get(5); - pigeonResult.setWidth((Long) width); + pigeonResult.setWidth((width == null) ? null : ((width instanceof Integer) ? (Integer) width : (Long) width)); Object height = pigeonVar_list.get(6); - pigeonResult.setHeight((Long) height); + pigeonResult.setHeight((height == null) ? null : ((height instanceof Integer) ? (Integer) height : (Long) height)); Object downloaded = pigeonVar_list.get(7); pigeonResult.setDownloaded((Boolean) downloaded); Object isSelected = pigeonVar_list.get(8); @@ -2605,63 +2732,67 @@ protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { switch (type) { case (byte) 129: { Object value = readValue(buffer); - return value == null ? null : BufferMode.values()[((Long) value).intValue()]; + return value == null ? null : BufferMode.values()[(int) value]; } case (byte) 130: { Object value = readValue(buffer); - return value == null ? null : RepeatMode.values()[((Long) value).intValue()]; + return value == null ? null : RepeatMode.values()[(int) value]; } case (byte) 131: { Object value = readValue(buffer); - return value == null ? null : PlaybackState.values()[((Long) value).intValue()]; + return value == null ? null : DrmType.values()[(int) value]; } case (byte) 132: { Object value = readValue(buffer); - return value == null ? null : CastConnectionState.values()[((Long) value).intValue()]; + return value == null ? null : PlaybackState.values()[(int) value]; } case (byte) 133: { Object value = readValue(buffer); - return value == null ? null : TrackType.values()[((Long) value).intValue()]; + return value == null ? null : CastConnectionState.values()[(int) value]; + } + case (byte) 134: { + Object value = readValue(buffer); + return value == null ? null : TrackType.values()[(int) value]; } - case (byte) 134: - return NpawConfig.fromList((ArrayList) readValue(buffer)); case (byte) 135: - return AppConfig.fromList((ArrayList) readValue(buffer)); + return NpawConfig.fromList((ArrayList) readValue(buffer)); case (byte) 136: - return User.fromList((ArrayList) readValue(buffer)); + return AppConfig.fromList((ArrayList) readValue(buffer)); case (byte) 137: - return SetUrlArgs.fromList((ArrayList) readValue(buffer)); + return DrmConfiguration.fromList((ArrayList) readValue(buffer)); case (byte) 138: - return MediaItem.fromList((ArrayList) readValue(buffer)); + return CastMedia.fromList((ArrayList) readValue(buffer)); case (byte) 139: - return MediaMetadata.fromList((ArrayList) readValue(buffer)); + return MediaItem.fromList((ArrayList) readValue(buffer)); case (byte) 140: - return PlayerStateSnapshot.fromList((ArrayList) readValue(buffer)); + return MediaMetadata.fromList((ArrayList) readValue(buffer)); case (byte) 141: - return PlayerError.fromList((ArrayList) readValue(buffer)); + return PlayerStateSnapshot.fromList((ArrayList) readValue(buffer)); case (byte) 142: - return VideoSize.fromList((ArrayList) readValue(buffer)); + return PlayerError.fromList((ArrayList) readValue(buffer)); case (byte) 143: - return ChromecastState.fromList((ArrayList) readValue(buffer)); + return VideoSize.fromList((ArrayList) readValue(buffer)); case (byte) 144: - return MediaInfo.fromList((ArrayList) readValue(buffer)); + return ChromecastState.fromList((ArrayList) readValue(buffer)); case (byte) 145: - return PlayerTracksSnapshot.fromList((ArrayList) readValue(buffer)); + return MediaInfo.fromList((ArrayList) readValue(buffer)); case (byte) 146: - return Track.fromList((ArrayList) readValue(buffer)); + return PlayerTracksSnapshot.fromList((ArrayList) readValue(buffer)); case (byte) 147: - return PrimaryPlayerChangedEvent.fromList((ArrayList) readValue(buffer)); + return Track.fromList((ArrayList) readValue(buffer)); case (byte) 148: - return PlayerStateUpdateEvent.fromList((ArrayList) readValue(buffer)); + return PrimaryPlayerChangedEvent.fromList((ArrayList) readValue(buffer)); case (byte) 149: - return PositionDiscontinuityEvent.fromList((ArrayList) readValue(buffer)); + return PlayerStateUpdateEvent.fromList((ArrayList) readValue(buffer)); case (byte) 150: - return PlaybackStateChangedEvent.fromList((ArrayList) readValue(buffer)); + return PositionDiscontinuityEvent.fromList((ArrayList) readValue(buffer)); case (byte) 151: - return PlaybackEndedEvent.fromList((ArrayList) readValue(buffer)); + return PlaybackStateChangedEvent.fromList((ArrayList) readValue(buffer)); case (byte) 152: - return PictureInPictureModeChangedEvent.fromList((ArrayList) readValue(buffer)); + return PlaybackEndedEvent.fromList((ArrayList) readValue(buffer)); case (byte) 153: + return PictureInPictureModeChangedEvent.fromList((ArrayList) readValue(buffer)); + case (byte) 154: return MediaItemTransitionEvent.fromList((ArrayList) readValue(buffer)); default: return super.readValueOfType(type, buffer); @@ -2676,74 +2807,77 @@ protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { } else if (value instanceof RepeatMode) { stream.write(130); writeValue(stream, value == null ? null : ((RepeatMode) value).index); - } else if (value instanceof PlaybackState) { + } else if (value instanceof DrmType) { stream.write(131); + writeValue(stream, value == null ? null : ((DrmType) value).index); + } else if (value instanceof PlaybackState) { + stream.write(132); writeValue(stream, value == null ? null : ((PlaybackState) value).index); } else if (value instanceof CastConnectionState) { - stream.write(132); + stream.write(133); writeValue(stream, value == null ? null : ((CastConnectionState) value).index); } else if (value instanceof TrackType) { - stream.write(133); + stream.write(134); writeValue(stream, value == null ? null : ((TrackType) value).index); } else if (value instanceof NpawConfig) { - stream.write(134); + stream.write(135); writeValue(stream, ((NpawConfig) value).toList()); } else if (value instanceof AppConfig) { - stream.write(135); - writeValue(stream, ((AppConfig) value).toList()); - } else if (value instanceof User) { stream.write(136); - writeValue(stream, ((User) value).toList()); - } else if (value instanceof SetUrlArgs) { + writeValue(stream, ((AppConfig) value).toList()); + } else if (value instanceof DrmConfiguration) { stream.write(137); - writeValue(stream, ((SetUrlArgs) value).toList()); - } else if (value instanceof MediaItem) { + writeValue(stream, ((DrmConfiguration) value).toList()); + } else if (value instanceof CastMedia) { stream.write(138); + writeValue(stream, ((CastMedia) value).toList()); + } else if (value instanceof MediaItem) { + stream.write(139); writeValue(stream, ((MediaItem) value).toList()); } else if (value instanceof MediaMetadata) { - stream.write(139); + stream.write(140); writeValue(stream, ((MediaMetadata) value).toList()); } else if (value instanceof PlayerStateSnapshot) { - stream.write(140); + stream.write(141); writeValue(stream, ((PlayerStateSnapshot) value).toList()); } else if (value instanceof PlayerError) { - stream.write(141); + stream.write(142); writeValue(stream, ((PlayerError) value).toList()); } else if (value instanceof VideoSize) { - stream.write(142); + stream.write(143); writeValue(stream, ((VideoSize) value).toList()); } else if (value instanceof ChromecastState) { - stream.write(143); + stream.write(144); writeValue(stream, ((ChromecastState) value).toList()); } else if (value instanceof MediaInfo) { - stream.write(144); + stream.write(145); writeValue(stream, ((MediaInfo) value).toList()); } else if (value instanceof PlayerTracksSnapshot) { - stream.write(145); + stream.write(146); writeValue(stream, ((PlayerTracksSnapshot) value).toList()); } else if (value instanceof Track) { - stream.write(146); + stream.write(147); writeValue(stream, ((Track) value).toList()); } else if (value instanceof PrimaryPlayerChangedEvent) { - stream.write(147); + stream.write(148); writeValue(stream, ((PrimaryPlayerChangedEvent) value).toList()); } else if (value instanceof PlayerStateUpdateEvent) { - stream.write(148); + stream.write(149); writeValue(stream, ((PlayerStateUpdateEvent) value).toList()); } else if (value instanceof PositionDiscontinuityEvent) { - stream.write(149); + stream.write(150); writeValue(stream, ((PositionDiscontinuityEvent) value).toList()); } else if (value instanceof PlaybackStateChangedEvent) { - stream.write(150); + stream.write(151); writeValue(stream, ((PlaybackStateChangedEvent) value).toList()); } else if (value instanceof PlaybackEndedEvent) { - stream.write(151); + stream.write(152); writeValue(stream, ((PlaybackEndedEvent) value).toList()); } else if (value instanceof PictureInPictureModeChangedEvent) { - stream.write(152); + stream.write(153); writeValue(stream, ((PictureInPictureModeChangedEvent) value).toList()); } else if (value instanceof MediaItemTransitionEvent) { - stream.write(153); + stream.write(154); writeValue(stream, ((MediaItemTransitionEvent) value).toList()); } else { super.writeValue(stream, value); @@ -2944,7 +3078,7 @@ public void error(Throwable error) { (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - Long textureIdArg = (Long) args.get(0); + Number textureIdArg = (Number) args.get(0); Result resultCallback = new Result() { public void success(Boolean result) { @@ -2958,7 +3092,7 @@ public void error(Throwable error) { } }; - api.disposeVideoTexture(textureIdArg, resultCallback); + api.disposeVideoTexture((textureIdArg == null) ? null : textureIdArg.longValue(), resultCallback); }); } else { channel.setMessageHandler(null); @@ -2974,7 +3108,7 @@ public void error(Throwable error) { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String playerIdArg = (String) args.get(0); - Long textureIdArg = (Long) args.get(1); + Number textureIdArg = (Number) args.get(1); Result resultCallback = new Result() { public void success(Long result) { @@ -2988,7 +3122,7 @@ public void error(Throwable error) { } }; - api.switchToVideoTexture(playerIdArg, textureIdArg, resultCallback); + api.switchToVideoTexture(playerIdArg, (textureIdArg == null) ? null : textureIdArg.longValue(), resultCallback); }); } else { channel.setMessageHandler(null); @@ -3064,10 +3198,10 @@ public void error(Throwable error) { (message, reply) -> { ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - Long viewIdArg = (Long) args.get(0); + Number viewIdArg = (Number) args.get(0); Boolean visibleArg = (Boolean) args.get(1); try { - api.setPlayerViewVisibility(viewIdArg, visibleArg); + api.setPlayerViewVisibility((viewIdArg == null) ? null : viewIdArg.longValue(), visibleArg); wrapped.add(0, null); } catch (Throwable exception) { diff --git a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt index 389a5dd4..57923c99 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt @@ -9,6 +9,7 @@ import androidx.core.math.MathUtils.clamp import androidx.media3.common.C import androidx.media3.common.C.TRACK_TYPE_AUDIO import androidx.media3.common.MediaItem +import androidx.media3.common.MediaItem.DrmConfiguration import androidx.media3.common.MediaMetadata import androidx.media3.common.Player import androidx.media3.common.TrackSelectionOverride @@ -32,6 +33,14 @@ import media.bcc.bccm_player.utils.NoOpVoidResult import media.bcc.bccm_player.utils.TrackUtils import java.util.UUID +import android.util.Log +import org.json.JSONArray +import org.json.JSONObject +import media.bcc.bccm_player.players.chromecast.CastMediaItemConverter.Companion.PLAYER_DATA_DRM_LICENSE_SERVER_URL +import media.bcc.bccm_player.players.chromecast.CastMediaItemConverter.Companion.PLAYER_DATA_CAST_URL +import media.bcc.bccm_player.players.chromecast.CastMediaItemConverter.Companion.PLAYER_DATA_CAST_CUSTOM_DATA +import media.bcc.bccm_player.players.chromecast.CastMediaItemConverter.Companion.PLAYER_DATA_DRM_LICENSE_REQUEST_HEADERS + abstract class PlayerController : Player.Listener { abstract val id: String @@ -110,20 +119,28 @@ abstract class PlayerController : Player.Listener { @SuppressLint("UnsafeOptInUsageError") fun replaceCurrentMediaItem(mediaItem: PlaybackPlatformApi.MediaItem, autoplay: Boolean?) { - this.isLive = mediaItem.isLive ?: false - var androidMi = mapMediaItem(mediaItem) - var playbackStartPositionMs: Double? = null - if (!this.isLive && mediaItem.playbackStartPositionMs != null) { - playbackStartPositionMs = mediaItem.playbackStartPositionMs - } + try { + this.isLive = mediaItem.isLive ?: false + var androidMi = mapMediaItem(mediaItem) + var playbackStartPositionMs: Double? = null + if (!this.isLive && mediaItem.playbackStartPositionMs != null) { + playbackStartPositionMs = mediaItem.playbackStartPositionMs + } - player.setMediaItem(androidMi, playbackStartPositionMs?.toLong() ?: 0) - if (playbackStartPositionMs != null) { - player.seekTo(playbackStartPositionMs.toLong()) + player.setMediaItem(androidMi, playbackStartPositionMs?.toLong() ?: 0) + if (playbackStartPositionMs != null) { + player.seekTo(playbackStartPositionMs.toLong()) + } + manualUpdateEvent() + player.playWhenReady = autoplay == true + player.prepare() + } catch (e: Exception) { + Log.e( + "bccm-@PlayerController-replaceCurrentMediaItem", + "Something went wrong: $e" + ); + throw e; } - manualUpdateEvent() - player.playWhenReady = autoplay == true - player.prepare() } fun manualUpdateEvent() { @@ -189,6 +206,24 @@ abstract class PlayerController : Player.Listener { } } + var drmConfiguration: DrmConfiguration? = null + if (mediaItem.drmConfiguration != null && mediaItem.drmConfiguration?.drmType != null && mediaItem.drmConfiguration?.drmType == PlaybackPlatformApi.DrmType.WIDEVINE && mediaItem.drmConfiguration?.licenseServerUrl != null && mediaItem.drmConfiguration?.licenseServerUrl?.isNotEmpty() == true) { + exoExtras.putString(PLAYER_DATA_DRM_LICENSE_SERVER_URL, mediaItem.drmConfiguration?.licenseServerUrl) + if (!mediaItem.drmConfiguration?.licenseRequestHeaders.isNullOrEmpty()) { + exoExtras.putString( + PLAYER_DATA_DRM_LICENSE_REQUEST_HEADERS, + if (mediaItem.drmConfiguration?.licenseRequestHeaders != null) JSONObject( + mediaItem.drmConfiguration?.licenseRequestHeaders as Map + ).toString() else null + ) + } + + drmConfiguration = DrmConfiguration.Builder(C.WIDEVINE_UUID) + .setLicenseUri(mediaItem.drmConfiguration?.licenseServerUrl) + .setLicenseRequestHeaders(mediaItem.drmConfiguration?.licenseRequestHeaders as Map) + .build() + } + metaBuilder .setTitle(mediaItem.metadata?.title) .setArtist(mediaItem.metadata?.artist) @@ -218,7 +253,9 @@ abstract class PlayerController : Player.Listener { .setUri(mediaItem.url) .setMimeType(mimeType) .setMediaId(mediaItem.id ?: UUID.randomUUID().toString()) - .setMediaMetadata(metaBuilder.build()).build() + .setMediaMetadata(metaBuilder.build()) + .setDrmConfiguration(drmConfiguration) + .build() } fun mapMediaItem(mediaItem: MediaItem): PlaybackPlatformApi.MediaItem { @@ -253,12 +290,45 @@ abstract class PlayerController : Player.Listener { } else if (mediaItem.localConfiguration?.mimeType != null) { miBuilder.setMimeType(mediaItem.localConfiguration?.mimeType) } + + if (extraMeta.containsKey(PLAYER_DATA_DRM_LICENSE_SERVER_URL)) { + var drmLicenseRequestHeaders: Map? = null + + if (extraMeta.containsKey(PLAYER_DATA_DRM_LICENSE_REQUEST_HEADERS) && !extraMeta[PLAYER_DATA_DRM_LICENSE_REQUEST_HEADERS].isNullOrEmpty()) { + drmLicenseRequestHeaders = JSONObject(extraMeta[PLAYER_DATA_DRM_LICENSE_REQUEST_HEADERS]!!).toMap() as Map + } + + val drmConfiguration = PlaybackPlatformApi.DrmConfiguration.Builder() + .setDrmType(PlaybackPlatformApi.DrmType.WIDEVINE) + .setFpsCertificateUrl(null) + .setLicenseServerUrl(extraMeta[PLAYER_DATA_DRM_LICENSE_SERVER_URL]!!) + .setLicenseRequestHeaders(drmLicenseRequestHeaders) + .build() + miBuilder.setDrmConfiguration(drmConfiguration) + } + if (extraMeta.containsKey(PLAYER_DATA_CAST_URL)) { + var customData: Map? = null + + if (extraMeta.containsKey(PLAYER_DATA_CAST_CUSTOM_DATA) && !extraMeta[PLAYER_DATA_CAST_CUSTOM_DATA].isNullOrEmpty()) { + customData = JSONObject(extraMeta[PLAYER_DATA_CAST_CUSTOM_DATA]!!).toMap() as Map + } + + val castMedia = PlaybackPlatformApi.CastMedia.Builder() + .setUrl(extraMeta[PLAYER_DATA_CAST_URL]!!) + .setCustomData(customData) + .build() + miBuilder.setCastMedia(castMedia) + } + miBuilder.setId(mediaItem.mediaId) return miBuilder.build() } fun getPlaybackState(): PlaybackPlatformApi.PlaybackState { + if (player.playbackState == Player.STATE_ENDED) { + return PlaybackPlatformApi.PlaybackState.STOPPED + } return if (player.isPlaying || player.playWhenReady && !arrayOf( Player.STATE_ENDED, Player.STATE_IDLE @@ -455,4 +525,18 @@ abstract class PlayerController : Player.Listener { } abstract fun setMixWithOthers(mixWithOthers: Boolean); + + private fun JSONObject.toMap(): Map = keys().asSequence().associateWith { + when (val value = this[it]) + { + is JSONArray -> + { + val map = (0 until value.length()).associate { Pair(it.toString(), value[it]) } + JSONObject(map).toMap().values.toList() + } + is JSONObject -> value.toMap() + JSONObject.NULL -> null + else -> value + } + } } \ No newline at end of file diff --git a/android/src/main/kotlin/media/bcc/bccm_player/players/chromecast/CastMediaItemConverter.kt b/android/src/main/kotlin/media/bcc/bccm_player/players/chromecast/CastMediaItemConverter.kt index acf66ad7..5f105c79 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/players/chromecast/CastMediaItemConverter.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/players/chromecast/CastMediaItemConverter.kt @@ -196,10 +196,12 @@ class CastMediaItemConverter : MediaItemConverter { const val PLAYER_DATA_IS_OFFLINE = "$BCCM_PLAYER_DATA.is_offline" const val PLAYER_DATA_MIME_TYPE = "$BCCM_PLAYER_DATA.mime_type" const val PLAYER_DATA_DURATION = "$BCCM_PLAYER_DATA.durationMs" - const val PLAYER_DATA_LAST_KNOWN_AUDIO_LANGUAGE = - "$BCCM_PLAYER_DATA.last_known_audio_language" - const val PLAYER_DATA_LAST_KNOWN_SUBTITLE_LANGUAGE = - "$BCCM_PLAYER_DATA.last_known_subtitle_language" + const val PLAYER_DATA_LAST_KNOWN_AUDIO_LANGUAGE = "$BCCM_PLAYER_DATA.last_known_audio_language" + const val PLAYER_DATA_LAST_KNOWN_SUBTITLE_LANGUAGE = "$BCCM_PLAYER_DATA.last_known_subtitle_language" + const val PLAYER_DATA_DRM_LICENSE_SERVER_URL = "$BCCM_PLAYER_DATA.drm.license_server.url" + const val PLAYER_DATA_DRM_LICENSE_REQUEST_HEADERS = "$BCCM_PLAYER_DATA.drm.license_server.request_headers" + const val PLAYER_DATA_CAST_URL = "$BCCM_PLAYER_DATA.cast.url" + const val PLAYER_DATA_CAST_CUSTOM_DATA = "$BCCM_PLAYER_DATA.cast.custom_data" // Serialization. private fun getCustomData(mediaItem: MediaItem): JSONObject { diff --git a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt index 27ffa98b..f946bb38 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt @@ -38,7 +38,7 @@ internal class FlutterCastButton( init { val targetColor = color ?: Color.WHITE - val wrappedContext = ContextThemeWrapper(context, R.style.Theme_AppCompat_NoActionBar) + val wrappedContext = ContextThemeWrapper(context, androidx.appcompat.R.style.Theme_AppCompat_NoActionBar) val btn = MediaRouteButton(wrappedContext) val castTheme = diff --git a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt index 96b205d7..4caff9de 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt @@ -155,15 +155,15 @@ class FlutterExoPlayerView( playerView.setShowFastForwardButton(false) playerView.setShowRewindButton(false) playerView.setShowMultiWindowTimeBar(false) - playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE - playerView.findViewById(R.id.exo_time)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_time)?.visibility = View.GONE _v.findViewById(R.id.live_indicator)?.visibility = View.VISIBLE } else { playerView.setShowFastForwardButton(true) playerView.setShowRewindButton(true) playerView.setShowMultiWindowTimeBar(true) - playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE - playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE _v.findViewById(R.id.live_indicator)?.visibility = View.GONE } } diff --git a/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt b/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt index f1b9e371..e4960e9d 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt @@ -170,15 +170,15 @@ class FullscreenPlayerView( playerView.setShowFastForwardButton(false) playerView.setShowRewindButton(false) playerView.setShowMultiWindowTimeBar(false) - playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE - playerView.findViewById(R.id.exo_time)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_time)?.visibility = View.GONE findViewById(R.id.live_indicator)?.visibility = View.VISIBLE } else { playerView.setShowFastForwardButton(true) playerView.setShowRewindButton(true) playerView.setShowMultiWindowTimeBar(true) - playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE - playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE findViewById(R.id.live_indicator)?.visibility = View.GONE } } diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 4f2b532f..fab6c9fa 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -2,5 +2,5 @@ PictureInPicture Dummy Button DUMMY\nCONTENT - + exo-download-notification-channel-name \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 36abcb19..82d329fa 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -26,8 +26,9 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace = "media.bcc.bccm_player_example" compileSdkVersion flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + ndkVersion "27.0.12077973" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/example/android/build.gradle b/example/android/build.gradle index 674e96f4..ade4f8b8 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 5d8ce5d5..09d293d4 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx4608m android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -android.enableNewResourceShrinker=false \ No newline at end of file +# android.enableNewResourceShrinker=false \ No newline at end of file diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 3c472b99..cad0d135 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Feb 10 12:44:18 WIB 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/example/lib/examples/drm_player.dart b/example/lib/examples/drm_player.dart new file mode 100644 index 00000000..84afa10c --- /dev/null +++ b/example/lib/examples/drm_player.dart @@ -0,0 +1,68 @@ +import 'dart:io'; + +import 'package:bccm_player/bccm_player.dart'; +import 'package:flutter/material.dart'; + +class DrmPlayer extends StatefulWidget { + const DrmPlayer({super.key}); + + @override + State createState() => _DrmPlayerState(); +} + +class _DrmPlayerState extends State { + late BccmPlayerController playerController; + + @override + void initState() { + playerController = BccmPlayerController( + MediaItem( + url: TempDrmSource.file, + mimeType: Platform.isAndroid ? 'application/dash+xml' : 'application/vnd.apple.mpegurl', + drmConfiguration: DrmConfiguration( + drmType: DrmType.widevine, + licenseServerUrl: TempDrmSource.licenseUrl, + licenseRequestHeaders: {'X-AxDRM-Message': TempDrmSource.token}, + ), + ), + ); + playerController.addListener(playerListener); + playerController.events.listen(playerEventListener); + playerController.initialize().then((_) => playerController.setMixWithOthers(false)); + super.initState(); + } + + void playerListener() { + final result = playerController.value; + print('@playerListener: ${result.playbackState}'); + } + + void playerEventListener(dynamic event) { + print('@playerEventListener: $event'); + } + + @override + void dispose() { + playerController.removeListener(playerListener); + playerController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Column( + children: [ + BccmPlayerView(playerController), + ], + ); + } +} + +class TempDrmSource { + TempDrmSource._(); + + static const String file = 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p.mpd'; + static const String token = + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4IiwibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImZpcnN0X3BsYXlfZXhwaXJhdGlvbiI6NjAsInBsYXlyZWFkeSI6eyJyZWFsX3RpbWVfZXhwaXJhdGlvbiI6dHJ1ZX0sImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.FAbIiPxX8BHi9RwfzD7Yn-wugU19ghrkBFKsaCPrZmU'; + static const String licenseUrl = 'https://drm-widevine-licensing.axtest.net/AcquireLicense'; +} diff --git a/example/lib/main.dart b/example/lib/main.dart index 095c1324..e72bd955 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:bccm_player/bccm_player.dart'; +import 'package:bccm_player_example/examples/drm_player.dart'; import 'package:bccm_player_example/examples/queue.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -12,7 +13,7 @@ import 'examples/custom_controls.dart'; import 'examples/simple_player.dart'; import 'examples/downloader.dart'; -Future main() async { +Future main() async { await BccmPlayerInterface.instance.setup(); // FocusDebugger.instance.activate(); @@ -37,7 +38,7 @@ class _MyAppState extends State { LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(), }, child: DefaultTabController( - length: 7, + length: 8, child: MaterialApp( home: Scaffold( appBar: AppBar( @@ -55,7 +56,8 @@ class _MyAppState extends State { Tab(text: 'Simple player'), Tab(text: 'Custom controls'), Tab(text: 'Native controls'), - Tab(text: 'Downloader') + Tab(text: 'Downloader'), + Tab(text: 'DRM'), ]), ), // tabs with Playground #1 then a new "ListOfPlayers" tab at #2 and controls to navigate between the tabs @@ -68,6 +70,7 @@ class _MyAppState extends State { CustomControls(), NativeControls(), Downloader(), + DrmPlayer(), ], ), ), diff --git a/example/pubspec.lock b/example/pubspec.lock index c8385c03..38a6087d 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,23 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "76.0.0" - _macros: - dependency: transitive - description: dart - source: sdk - version: "0.3.3" + version: "67.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "6.11.0" + version: "6.4.1" args: dependency: transitive description: @@ -129,10 +124,10 @@ packages: dependency: transitive description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -145,10 +140,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.6" dbus: dependency: transitive description: @@ -214,10 +209,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.0.19" flutter_riverpod: dependency: "direct main" description: @@ -264,10 +259,10 @@ packages: dependency: transitive description: name: freezed - sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e" + sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1 url: "https://pub.dev" source: hosted - version: "2.5.7" + version: "2.5.2" freezed_annotation: dependency: transitive description: @@ -312,10 +307,10 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -364,14 +359,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - macros: - dependency: transitive - description: - name: macros - sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" - url: "https://pub.dev" - source: hosted - version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -645,18 +632,18 @@ packages: dependency: transitive description: name: wakelock_plus - sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484 + sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" url: "https://pub.dev" source: hosted - version: "1.2.8" + version: "1.2.10" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" watcher: dependency: transitive description: @@ -669,18 +656,18 @@ packages: dependency: transitive description: name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "0.5.1" win32: dependency: transitive description: name: win32 - sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e url: "https://pub.dev" source: hosted - version: "5.5.4" + version: "5.10.1" xml: dependency: transitive description: @@ -698,5 +685,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" flutter: ">=3.22.0" diff --git a/ios/Classes/Pigeon/PlaybackPlatformApi.h b/ios/Classes/Pigeon/PlaybackPlatformApi.h index a966e624..6f863872 100644 --- a/ios/Classes/Pigeon/PlaybackPlatformApi.h +++ b/ios/Classes/Pigeon/PlaybackPlatformApi.h @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.3.0), do not edit directly. +// Autogenerated from Pigeon (v21.2.0), do not edit directly. // See also: https://pub.dev/packages/pigeon #import @@ -32,6 +32,17 @@ typedef NS_ENUM(NSUInteger, RepeatMode) { - (instancetype)initWithValue:(RepeatMode)value; @end +typedef NS_ENUM(NSUInteger, DrmType) { + DrmTypeWidevine = 0, + DrmTypeFairplay = 1, +}; + +/// Wrapper for DrmType to allow for nullability. +@interface DrmTypeBox : NSObject +@property(nonatomic, assign) DrmType value; +- (instancetype)initWithValue:(DrmType)value; +@end + typedef NS_ENUM(NSUInteger, PlaybackState) { PlaybackStateStopped = 0, PlaybackStatePaused = 1, @@ -72,8 +83,8 @@ typedef NS_ENUM(NSUInteger, TrackType) { @class NpawConfig; @class AppConfig; -@class User; -@class SetUrlArgs; +@class DrmConfiguration; +@class CastMedia; @class MediaItem; @class MediaMetadata; @class PlayerStateSnapshot; @@ -117,20 +128,28 @@ typedef NS_ENUM(NSUInteger, TrackType) { @property(nonatomic, strong, nullable) NSNumber * sessionId; @end -@interface User : NSObject -+ (instancetype)makeWithId:(nullable NSString *)id; -@property(nonatomic, copy, nullable) NSString * id; +@interface DrmConfiguration : NSObject +/// `init` unavailable to enforce nonnull fields, see the `make` class method. +- (instancetype)init NS_UNAVAILABLE; ++ (instancetype)makeWithDrmType:(DrmType)drmType + contentKeyId:(nullable NSString *)contentKeyId + fpsCertificateUrl:(nullable NSString *)fpsCertificateUrl + licenseServerUrl:(NSString *)licenseServerUrl + licenseRequestHeaders:(nullable NSDictionary *)licenseRequestHeaders; +@property(nonatomic, assign) DrmType drmType; +@property(nonatomic, copy, nullable) NSString * contentKeyId; +@property(nonatomic, copy, nullable) NSString * fpsCertificateUrl; +@property(nonatomic, copy) NSString * licenseServerUrl; +@property(nonatomic, copy, nullable) NSDictionary * licenseRequestHeaders; @end -@interface SetUrlArgs : NSObject +@interface CastMedia : NSObject /// `init` unavailable to enforce nonnull fields, see the `make` class method. - (instancetype)init NS_UNAVAILABLE; -+ (instancetype)makeWithPlayerId:(NSString *)playerId - url:(NSString *)url - isLive:(nullable NSNumber *)isLive; -@property(nonatomic, copy) NSString * playerId; ++ (instancetype)makeWithUrl:(NSString *)url + customData:(nullable NSDictionary *)customData; @property(nonatomic, copy) NSString * url; -@property(nonatomic, strong, nullable) NSNumber * isLive; +@property(nonatomic, copy, nullable) NSDictionary * customData; @end @interface MediaItem : NSObject @@ -142,7 +161,9 @@ typedef NS_ENUM(NSUInteger, TrackType) { isOffline:(nullable NSNumber *)isOffline playbackStartPositionMs:(nullable NSNumber *)playbackStartPositionMs lastKnownAudioLanguage:(nullable NSString *)lastKnownAudioLanguage - lastKnownSubtitleLanguage:(nullable NSString *)lastKnownSubtitleLanguage; + lastKnownSubtitleLanguage:(nullable NSString *)lastKnownSubtitleLanguage + drmConfiguration:(nullable DrmConfiguration *)drmConfiguration + castMedia:(nullable CastMedia *)castMedia; @property(nonatomic, copy, nullable) NSString * id; @property(nonatomic, copy, nullable) NSString * url; @property(nonatomic, copy, nullable) NSString * mimeType; @@ -152,6 +173,8 @@ typedef NS_ENUM(NSUInteger, TrackType) { @property(nonatomic, strong, nullable) NSNumber * playbackStartPositionMs; @property(nonatomic, copy, nullable) NSString * lastKnownAudioLanguage; @property(nonatomic, copy, nullable) NSString * lastKnownSubtitleLanguage; +@property(nonatomic, strong, nullable) DrmConfiguration * drmConfiguration; +@property(nonatomic, strong, nullable) CastMedia * castMedia; @end @interface MediaMetadata : NSObject diff --git a/ios/Classes/Pigeon/PlaybackPlatformApi.m b/ios/Classes/Pigeon/PlaybackPlatformApi.m index 978007a7..a3b9649f 100644 --- a/ios/Classes/Pigeon/PlaybackPlatformApi.m +++ b/ios/Classes/Pigeon/PlaybackPlatformApi.m @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.3.0), do not edit directly. +// Autogenerated from Pigeon (v21.2.0), do not edit directly. // See also: https://pub.dev/packages/pigeon #import "PlaybackPlatformApi.h" @@ -51,6 +51,16 @@ - (instancetype)initWithValue:(RepeatMode)value { } @end +@implementation DrmTypeBox +- (instancetype)initWithValue:(DrmType)value { + self = [super init]; + if (self) { + _value = value; + } + return self; +} +@end + @implementation PlaybackStateBox - (instancetype)initWithValue:(PlaybackState)value { self = [super init]; @@ -93,15 +103,15 @@ + (nullable AppConfig *)nullableFromList:(NSArray *)list; - (NSArray *)toList; @end -@interface User () -+ (User *)fromList:(NSArray *)list; -+ (nullable User *)nullableFromList:(NSArray *)list; +@interface DrmConfiguration () ++ (DrmConfiguration *)fromList:(NSArray *)list; ++ (nullable DrmConfiguration *)nullableFromList:(NSArray *)list; - (NSArray *)toList; @end -@interface SetUrlArgs () -+ (SetUrlArgs *)fromList:(NSArray *)list; -+ (nullable SetUrlArgs *)nullableFromList:(NSArray *)list; +@interface CastMedia () ++ (CastMedia *)fromList:(NSArray *)list; ++ (nullable CastMedia *)nullableFromList:(NSArray *)list; - (NSArray *)toList; @end @@ -271,52 +281,65 @@ + (nullable AppConfig *)nullableFromList:(NSArray *)list { } @end -@implementation User -+ (instancetype)makeWithId:(nullable NSString *)id { - User* pigeonResult = [[User alloc] init]; - pigeonResult.id = id; +@implementation DrmConfiguration ++ (instancetype)makeWithDrmType:(DrmType)drmType + contentKeyId:(nullable NSString *)contentKeyId + fpsCertificateUrl:(nullable NSString *)fpsCertificateUrl + licenseServerUrl:(NSString *)licenseServerUrl + licenseRequestHeaders:(nullable NSDictionary *)licenseRequestHeaders { + DrmConfiguration* pigeonResult = [[DrmConfiguration alloc] init]; + pigeonResult.drmType = drmType; + pigeonResult.contentKeyId = contentKeyId; + pigeonResult.fpsCertificateUrl = fpsCertificateUrl; + pigeonResult.licenseServerUrl = licenseServerUrl; + pigeonResult.licenseRequestHeaders = licenseRequestHeaders; return pigeonResult; } -+ (User *)fromList:(NSArray *)list { - User *pigeonResult = [[User alloc] init]; - pigeonResult.id = GetNullableObjectAtIndex(list, 0); ++ (DrmConfiguration *)fromList:(NSArray *)list { + DrmConfiguration *pigeonResult = [[DrmConfiguration alloc] init]; + DrmTypeBox *boxedDrmType = GetNullableObjectAtIndex(list, 0); + pigeonResult.drmType = boxedDrmType.value; + pigeonResult.contentKeyId = GetNullableObjectAtIndex(list, 1); + pigeonResult.fpsCertificateUrl = GetNullableObjectAtIndex(list, 2); + pigeonResult.licenseServerUrl = GetNullableObjectAtIndex(list, 3); + pigeonResult.licenseRequestHeaders = GetNullableObjectAtIndex(list, 4); return pigeonResult; } -+ (nullable User *)nullableFromList:(NSArray *)list { - return (list) ? [User fromList:list] : nil; ++ (nullable DrmConfiguration *)nullableFromList:(NSArray *)list { + return (list) ? [DrmConfiguration fromList:list] : nil; } - (NSArray *)toList { return @[ - self.id ?: [NSNull null], + [[DrmTypeBox alloc] initWithValue:self.drmType], + self.contentKeyId ?: [NSNull null], + self.fpsCertificateUrl ?: [NSNull null], + self.licenseServerUrl ?: [NSNull null], + self.licenseRequestHeaders ?: [NSNull null], ]; } @end -@implementation SetUrlArgs -+ (instancetype)makeWithPlayerId:(NSString *)playerId - url:(NSString *)url - isLive:(nullable NSNumber *)isLive { - SetUrlArgs* pigeonResult = [[SetUrlArgs alloc] init]; - pigeonResult.playerId = playerId; +@implementation CastMedia ++ (instancetype)makeWithUrl:(NSString *)url + customData:(nullable NSDictionary *)customData { + CastMedia* pigeonResult = [[CastMedia alloc] init]; pigeonResult.url = url; - pigeonResult.isLive = isLive; + pigeonResult.customData = customData; return pigeonResult; } -+ (SetUrlArgs *)fromList:(NSArray *)list { - SetUrlArgs *pigeonResult = [[SetUrlArgs alloc] init]; - pigeonResult.playerId = GetNullableObjectAtIndex(list, 0); - pigeonResult.url = GetNullableObjectAtIndex(list, 1); - pigeonResult.isLive = GetNullableObjectAtIndex(list, 2); ++ (CastMedia *)fromList:(NSArray *)list { + CastMedia *pigeonResult = [[CastMedia alloc] init]; + pigeonResult.url = GetNullableObjectAtIndex(list, 0); + pigeonResult.customData = GetNullableObjectAtIndex(list, 1); return pigeonResult; } -+ (nullable SetUrlArgs *)nullableFromList:(NSArray *)list { - return (list) ? [SetUrlArgs fromList:list] : nil; ++ (nullable CastMedia *)nullableFromList:(NSArray *)list { + return (list) ? [CastMedia fromList:list] : nil; } - (NSArray *)toList { return @[ - self.playerId ?: [NSNull null], self.url ?: [NSNull null], - self.isLive ?: [NSNull null], + self.customData ?: [NSNull null], ]; } @end @@ -330,7 +353,9 @@ + (instancetype)makeWithId:(nullable NSString *)id isOffline:(nullable NSNumber *)isOffline playbackStartPositionMs:(nullable NSNumber *)playbackStartPositionMs lastKnownAudioLanguage:(nullable NSString *)lastKnownAudioLanguage - lastKnownSubtitleLanguage:(nullable NSString *)lastKnownSubtitleLanguage { + lastKnownSubtitleLanguage:(nullable NSString *)lastKnownSubtitleLanguage + drmConfiguration:(nullable DrmConfiguration *)drmConfiguration + castMedia:(nullable CastMedia *)castMedia { MediaItem* pigeonResult = [[MediaItem alloc] init]; pigeonResult.id = id; pigeonResult.url = url; @@ -341,6 +366,8 @@ + (instancetype)makeWithId:(nullable NSString *)id pigeonResult.playbackStartPositionMs = playbackStartPositionMs; pigeonResult.lastKnownAudioLanguage = lastKnownAudioLanguage; pigeonResult.lastKnownSubtitleLanguage = lastKnownSubtitleLanguage; + pigeonResult.drmConfiguration = drmConfiguration; + pigeonResult.castMedia = castMedia; return pigeonResult; } + (MediaItem *)fromList:(NSArray *)list { @@ -354,6 +381,8 @@ + (MediaItem *)fromList:(NSArray *)list { pigeonResult.playbackStartPositionMs = GetNullableObjectAtIndex(list, 6); pigeonResult.lastKnownAudioLanguage = GetNullableObjectAtIndex(list, 7); pigeonResult.lastKnownSubtitleLanguage = GetNullableObjectAtIndex(list, 8); + pigeonResult.drmConfiguration = GetNullableObjectAtIndex(list, 9); + pigeonResult.castMedia = GetNullableObjectAtIndex(list, 10); return pigeonResult; } + (nullable MediaItem *)nullableFromList:(NSArray *)list { @@ -370,6 +399,8 @@ + (nullable MediaItem *)nullableFromList:(NSArray *)list { self.playbackStartPositionMs ?: [NSNull null], self.lastKnownAudioLanguage ?: [NSNull null], self.lastKnownSubtitleLanguage ?: [NSNull null], + self.drmConfiguration ?: [NSNull null], + self.castMedia ?: [NSNull null], ]; } @end @@ -855,55 +886,59 @@ - (nullable id)readValueOfType:(UInt8)type { } case 131: { NSNumber *enumAsNumber = [self readValue]; - return enumAsNumber == nil ? nil : [[PlaybackStateBox alloc] initWithValue:[enumAsNumber integerValue]]; + return enumAsNumber == nil ? nil : [[DrmTypeBox alloc] initWithValue:[enumAsNumber integerValue]]; } case 132: { NSNumber *enumAsNumber = [self readValue]; - return enumAsNumber == nil ? nil : [[CastConnectionStateBox alloc] initWithValue:[enumAsNumber integerValue]]; + return enumAsNumber == nil ? nil : [[PlaybackStateBox alloc] initWithValue:[enumAsNumber integerValue]]; } case 133: { + NSNumber *enumAsNumber = [self readValue]; + return enumAsNumber == nil ? nil : [[CastConnectionStateBox alloc] initWithValue:[enumAsNumber integerValue]]; + } + case 134: { NSNumber *enumAsNumber = [self readValue]; return enumAsNumber == nil ? nil : [[TrackTypeBox alloc] initWithValue:[enumAsNumber integerValue]]; } - case 134: - return [NpawConfig fromList:[self readValue]]; case 135: - return [AppConfig fromList:[self readValue]]; + return [NpawConfig fromList:[self readValue]]; case 136: - return [User fromList:[self readValue]]; + return [AppConfig fromList:[self readValue]]; case 137: - return [SetUrlArgs fromList:[self readValue]]; + return [DrmConfiguration fromList:[self readValue]]; case 138: - return [MediaItem fromList:[self readValue]]; + return [CastMedia fromList:[self readValue]]; case 139: - return [MediaMetadata fromList:[self readValue]]; + return [MediaItem fromList:[self readValue]]; case 140: - return [PlayerStateSnapshot fromList:[self readValue]]; + return [MediaMetadata fromList:[self readValue]]; case 141: - return [PlayerError fromList:[self readValue]]; + return [PlayerStateSnapshot fromList:[self readValue]]; case 142: - return [VideoSize fromList:[self readValue]]; + return [PlayerError fromList:[self readValue]]; case 143: - return [ChromecastState fromList:[self readValue]]; + return [VideoSize fromList:[self readValue]]; case 144: - return [MediaInfo fromList:[self readValue]]; + return [ChromecastState fromList:[self readValue]]; case 145: - return [PlayerTracksSnapshot fromList:[self readValue]]; + return [MediaInfo fromList:[self readValue]]; case 146: - return [Track fromList:[self readValue]]; + return [PlayerTracksSnapshot fromList:[self readValue]]; case 147: - return [PrimaryPlayerChangedEvent fromList:[self readValue]]; + return [Track fromList:[self readValue]]; case 148: - return [PlayerStateUpdateEvent fromList:[self readValue]]; + return [PrimaryPlayerChangedEvent fromList:[self readValue]]; case 149: - return [PositionDiscontinuityEvent fromList:[self readValue]]; + return [PlayerStateUpdateEvent fromList:[self readValue]]; case 150: - return [PlaybackStateChangedEvent fromList:[self readValue]]; + return [PositionDiscontinuityEvent fromList:[self readValue]]; case 151: - return [PlaybackEndedEvent fromList:[self readValue]]; + return [PlaybackStateChangedEvent fromList:[self readValue]]; case 152: - return [PictureInPictureModeChangedEvent fromList:[self readValue]]; + return [PlaybackEndedEvent fromList:[self readValue]]; case 153: + return [PictureInPictureModeChangedEvent fromList:[self readValue]]; + case 154: return [MediaItemTransitionEvent fromList:[self readValue]]; default: return [super readValueOfType:type]; @@ -923,78 +958,82 @@ - (void)writeValue:(id)value { RepeatModeBox *box = (RepeatModeBox *)value; [self writeByte:130]; [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])]; + } else if ([value isKindOfClass:[DrmTypeBox class]]) { + DrmTypeBox *box = (DrmTypeBox *)value; + [self writeByte:131]; + [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])]; } else if ([value isKindOfClass:[PlaybackStateBox class]]) { PlaybackStateBox *box = (PlaybackStateBox *)value; - [self writeByte:131]; + [self writeByte:132]; [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])]; } else if ([value isKindOfClass:[CastConnectionStateBox class]]) { CastConnectionStateBox *box = (CastConnectionStateBox *)value; - [self writeByte:132]; + [self writeByte:133]; [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])]; } else if ([value isKindOfClass:[TrackTypeBox class]]) { TrackTypeBox *box = (TrackTypeBox *)value; - [self writeByte:133]; + [self writeByte:134]; [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])]; } else if ([value isKindOfClass:[NpawConfig class]]) { - [self writeByte:134]; - [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[AppConfig class]]) { [self writeByte:135]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[User class]]) { + } else if ([value isKindOfClass:[AppConfig class]]) { [self writeByte:136]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[SetUrlArgs class]]) { + } else if ([value isKindOfClass:[DrmConfiguration class]]) { [self writeByte:137]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[MediaItem class]]) { + } else if ([value isKindOfClass:[CastMedia class]]) { [self writeByte:138]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[MediaMetadata class]]) { + } else if ([value isKindOfClass:[MediaItem class]]) { [self writeByte:139]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PlayerStateSnapshot class]]) { + } else if ([value isKindOfClass:[MediaMetadata class]]) { [self writeByte:140]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PlayerError class]]) { + } else if ([value isKindOfClass:[PlayerStateSnapshot class]]) { [self writeByte:141]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[VideoSize class]]) { + } else if ([value isKindOfClass:[PlayerError class]]) { [self writeByte:142]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[ChromecastState class]]) { + } else if ([value isKindOfClass:[VideoSize class]]) { [self writeByte:143]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[MediaInfo class]]) { + } else if ([value isKindOfClass:[ChromecastState class]]) { [self writeByte:144]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PlayerTracksSnapshot class]]) { + } else if ([value isKindOfClass:[MediaInfo class]]) { [self writeByte:145]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[Track class]]) { + } else if ([value isKindOfClass:[PlayerTracksSnapshot class]]) { [self writeByte:146]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PrimaryPlayerChangedEvent class]]) { + } else if ([value isKindOfClass:[Track class]]) { [self writeByte:147]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PlayerStateUpdateEvent class]]) { + } else if ([value isKindOfClass:[PrimaryPlayerChangedEvent class]]) { [self writeByte:148]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PositionDiscontinuityEvent class]]) { + } else if ([value isKindOfClass:[PlayerStateUpdateEvent class]]) { [self writeByte:149]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PlaybackStateChangedEvent class]]) { + } else if ([value isKindOfClass:[PositionDiscontinuityEvent class]]) { [self writeByte:150]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PlaybackEndedEvent class]]) { + } else if ([value isKindOfClass:[PlaybackStateChangedEvent class]]) { [self writeByte:151]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PictureInPictureModeChangedEvent class]]) { + } else if ([value isKindOfClass:[PlaybackEndedEvent class]]) { [self writeByte:152]; [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[MediaItemTransitionEvent class]]) { + } else if ([value isKindOfClass:[PictureInPictureModeChangedEvent class]]) { [self writeByte:153]; [self writeValue:[value toList]]; + } else if ([value isKindOfClass:[MediaItemTransitionEvent class]]) { + [self writeByte:154]; + [self writeValue:[value toList]]; } else { [super writeValue:value]; } diff --git a/lib/bccm_player.dart b/lib/bccm_player.dart index 45f2f6d9..f85686cf 100644 --- a/lib/bccm_player.dart +++ b/lib/bccm_player.dart @@ -20,7 +20,10 @@ export 'src/pigeon/playback_platform_pigeon.g.dart' RepeatMode, PlayerError, BufferMode, - PictureInPictureModeChangedEvent; + PictureInPictureModeChangedEvent, + DrmType, + DrmConfiguration, + CastMedia; export 'src/state/player_state_notifier.dart'; export 'src/state/plugin_state_notifier.dart'; export 'src/state/player_controller.dart'; diff --git a/lib/src/pigeon/playback_platform_pigeon.g.dart b/lib/src/pigeon/playback_platform_pigeon.g.dart index 6cf0f6a1..11bad7a2 100644 --- a/lib/src/pigeon/playback_platform_pigeon.g.dart +++ b/lib/src/pigeon/playback_platform_pigeon.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.3.0), do not edit directly. +// Autogenerated from Pigeon (v21.2.0), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -35,6 +35,11 @@ enum RepeatMode { one, } +enum DrmType { + widevine, + fairplay, +} + enum PlaybackState { stopped, paused, @@ -132,54 +137,69 @@ class AppConfig { } } -class User { - User({ - this.id, +class DrmConfiguration { + DrmConfiguration({ + required this.drmType, + this.contentKeyId, + this.fpsCertificateUrl, + required this.licenseServerUrl, + this.licenseRequestHeaders, }); - String? id; + DrmType drmType; + + String? contentKeyId; + + String? fpsCertificateUrl; + + String licenseServerUrl; + + Map? licenseRequestHeaders; Object encode() { return [ - id, + drmType, + contentKeyId, + fpsCertificateUrl, + licenseServerUrl, + licenseRequestHeaders, ]; } - static User decode(Object result) { + static DrmConfiguration decode(Object result) { result as List; - return User( - id: result[0] as String?, + return DrmConfiguration( + drmType: result[0]! as DrmType, + contentKeyId: result[1] as String?, + fpsCertificateUrl: result[2] as String?, + licenseServerUrl: result[3]! as String, + licenseRequestHeaders: (result[4] as Map?)?.cast(), ); } } -class SetUrlArgs { - SetUrlArgs({ - required this.playerId, +class CastMedia { + CastMedia({ required this.url, - this.isLive, + this.customData, }); - String playerId; - String url; - bool? isLive; + Map? customData; Object encode() { return [ - playerId, url, - isLive, + customData, ]; } - static SetUrlArgs decode(Object result) { + static CastMedia decode(Object result) { result as List; - return SetUrlArgs( - playerId: result[0]! as String, - url: result[1]! as String, - isLive: result[2] as bool?, + return CastMedia( + url: result[0]! as String, + customData: (result[1] as Map?)?.cast(), ); } } @@ -195,6 +215,8 @@ class MediaItem { this.playbackStartPositionMs, this.lastKnownAudioLanguage, this.lastKnownSubtitleLanguage, + this.drmConfiguration, + this.castMedia, }); String? id; @@ -215,6 +237,10 @@ class MediaItem { String? lastKnownSubtitleLanguage; + DrmConfiguration? drmConfiguration; + + CastMedia? castMedia; + Object encode() { return [ id, @@ -226,6 +252,8 @@ class MediaItem { playbackStartPositionMs, lastKnownAudioLanguage, lastKnownSubtitleLanguage, + drmConfiguration, + castMedia, ]; } @@ -241,6 +269,8 @@ class MediaItem { playbackStartPositionMs: result[6] as double?, lastKnownAudioLanguage: result[7] as String?, lastKnownSubtitleLanguage: result[8] as String?, + drmConfiguration: result[9] as DrmConfiguration?, + castMedia: result[10] as CastMedia?, ); } } @@ -750,84 +780,84 @@ class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override void writeValue(WriteBuffer buffer, Object? value) { - if (value is int) { - buffer.putUint8(4); - buffer.putInt64(value); - } else if (value is BufferMode) { + if (value is BufferMode) { buffer.putUint8(129); writeValue(buffer, value.index); - } else if (value is RepeatMode) { + } else if (value is RepeatMode) { buffer.putUint8(130); writeValue(buffer, value.index); - } else if (value is PlaybackState) { + } else if (value is DrmType) { buffer.putUint8(131); writeValue(buffer, value.index); - } else if (value is CastConnectionState) { + } else if (value is PlaybackState) { buffer.putUint8(132); writeValue(buffer, value.index); - } else if (value is TrackType) { + } else if (value is CastConnectionState) { buffer.putUint8(133); writeValue(buffer, value.index); - } else if (value is NpawConfig) { + } else if (value is TrackType) { buffer.putUint8(134); - writeValue(buffer, value.encode()); - } else if (value is AppConfig) { + writeValue(buffer, value.index); + } else if (value is NpawConfig) { buffer.putUint8(135); writeValue(buffer, value.encode()); - } else if (value is User) { + } else if (value is AppConfig) { buffer.putUint8(136); writeValue(buffer, value.encode()); - } else if (value is SetUrlArgs) { + } else if (value is DrmConfiguration) { buffer.putUint8(137); writeValue(buffer, value.encode()); - } else if (value is MediaItem) { + } else if (value is CastMedia) { buffer.putUint8(138); writeValue(buffer, value.encode()); - } else if (value is MediaMetadata) { + } else if (value is MediaItem) { buffer.putUint8(139); writeValue(buffer, value.encode()); - } else if (value is PlayerStateSnapshot) { + } else if (value is MediaMetadata) { buffer.putUint8(140); writeValue(buffer, value.encode()); - } else if (value is PlayerError) { + } else if (value is PlayerStateSnapshot) { buffer.putUint8(141); writeValue(buffer, value.encode()); - } else if (value is VideoSize) { + } else if (value is PlayerError) { buffer.putUint8(142); writeValue(buffer, value.encode()); - } else if (value is ChromecastState) { + } else if (value is VideoSize) { buffer.putUint8(143); writeValue(buffer, value.encode()); - } else if (value is MediaInfo) { + } else if (value is ChromecastState) { buffer.putUint8(144); writeValue(buffer, value.encode()); - } else if (value is PlayerTracksSnapshot) { + } else if (value is MediaInfo) { buffer.putUint8(145); writeValue(buffer, value.encode()); - } else if (value is Track) { + } else if (value is PlayerTracksSnapshot) { buffer.putUint8(146); writeValue(buffer, value.encode()); - } else if (value is PrimaryPlayerChangedEvent) { + } else if (value is Track) { buffer.putUint8(147); writeValue(buffer, value.encode()); - } else if (value is PlayerStateUpdateEvent) { + } else if (value is PrimaryPlayerChangedEvent) { buffer.putUint8(148); writeValue(buffer, value.encode()); - } else if (value is PositionDiscontinuityEvent) { + } else if (value is PlayerStateUpdateEvent) { buffer.putUint8(149); writeValue(buffer, value.encode()); - } else if (value is PlaybackStateChangedEvent) { + } else if (value is PositionDiscontinuityEvent) { buffer.putUint8(150); writeValue(buffer, value.encode()); - } else if (value is PlaybackEndedEvent) { + } else if (value is PlaybackStateChangedEvent) { buffer.putUint8(151); writeValue(buffer, value.encode()); - } else if (value is PictureInPictureModeChangedEvent) { + } else if (value is PlaybackEndedEvent) { buffer.putUint8(152); writeValue(buffer, value.encode()); - } else if (value is MediaItemTransitionEvent) { + } else if (value is PictureInPictureModeChangedEvent) { buffer.putUint8(153); writeValue(buffer, value.encode()); + } else if (value is MediaItemTransitionEvent) { + buffer.putUint8(154); + writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); } @@ -844,52 +874,55 @@ class _PigeonCodec extends StandardMessageCodec { return value == null ? null : RepeatMode.values[value]; case 131: final int? value = readValue(buffer) as int?; - return value == null ? null : PlaybackState.values[value]; + return value == null ? null : DrmType.values[value]; case 132: final int? value = readValue(buffer) as int?; - return value == null ? null : CastConnectionState.values[value]; + return value == null ? null : PlaybackState.values[value]; case 133: final int? value = readValue(buffer) as int?; - return value == null ? null : TrackType.values[value]; + return value == null ? null : CastConnectionState.values[value]; case 134: - return NpawConfig.decode(readValue(buffer)!); + final int? value = readValue(buffer) as int?; + return value == null ? null : TrackType.values[value]; case 135: - return AppConfig.decode(readValue(buffer)!); + return NpawConfig.decode(readValue(buffer)!); case 136: - return User.decode(readValue(buffer)!); + return AppConfig.decode(readValue(buffer)!); case 137: - return SetUrlArgs.decode(readValue(buffer)!); + return DrmConfiguration.decode(readValue(buffer)!); case 138: - return MediaItem.decode(readValue(buffer)!); + return CastMedia.decode(readValue(buffer)!); case 139: - return MediaMetadata.decode(readValue(buffer)!); + return MediaItem.decode(readValue(buffer)!); case 140: - return PlayerStateSnapshot.decode(readValue(buffer)!); + return MediaMetadata.decode(readValue(buffer)!); case 141: - return PlayerError.decode(readValue(buffer)!); + return PlayerStateSnapshot.decode(readValue(buffer)!); case 142: - return VideoSize.decode(readValue(buffer)!); + return PlayerError.decode(readValue(buffer)!); case 143: - return ChromecastState.decode(readValue(buffer)!); + return VideoSize.decode(readValue(buffer)!); case 144: - return MediaInfo.decode(readValue(buffer)!); + return ChromecastState.decode(readValue(buffer)!); case 145: - return PlayerTracksSnapshot.decode(readValue(buffer)!); + return MediaInfo.decode(readValue(buffer)!); case 146: - return Track.decode(readValue(buffer)!); + return PlayerTracksSnapshot.decode(readValue(buffer)!); case 147: - return PrimaryPlayerChangedEvent.decode(readValue(buffer)!); + return Track.decode(readValue(buffer)!); case 148: - return PlayerStateUpdateEvent.decode(readValue(buffer)!); + return PrimaryPlayerChangedEvent.decode(readValue(buffer)!); case 149: - return PositionDiscontinuityEvent.decode(readValue(buffer)!); + return PlayerStateUpdateEvent.decode(readValue(buffer)!); case 150: - return PlaybackStateChangedEvent.decode(readValue(buffer)!); + return PositionDiscontinuityEvent.decode(readValue(buffer)!); case 151: - return PlaybackEndedEvent.decode(readValue(buffer)!); + return PlaybackStateChangedEvent.decode(readValue(buffer)!); case 152: - return PictureInPictureModeChangedEvent.decode(readValue(buffer)!); + return PlaybackEndedEvent.decode(readValue(buffer)!); case 153: + return PictureInPictureModeChangedEvent.decode(readValue(buffer)!); + case 154: return MediaItemTransitionEvent.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); diff --git a/lib/src/playback_platform_interface.dart b/lib/src/playback_platform_interface.dart index c689df30..6aa36f79 100644 --- a/lib/src/playback_platform_interface.dart +++ b/lib/src/playback_platform_interface.dart @@ -41,7 +41,15 @@ abstract class BccmPlayerInterface extends PlatformInterface { } Future replaceCurrentMediaItem(String playerId, MediaItem mediaItem, {bool? playbackPositionFromPrimary, bool? autoplay = true}) { - throw UnimplementedError('setUrl() has not been implemented.'); + throw UnimplementedError('replaceCurrentMediaItem() has not been implemented.'); + } + + Future replaceCurrentOfflineAsset(String playerId, String downloadKey, {bool? playbackPositionFromPrimary, bool? autoplay = true}) { + throw UnimplementedError('replaceCurrentOfflineAsset() has not been implemented.'); + } + + Future queueMediaItem(String playerId, MediaItem mediaItem) async { + throw UnimplementedError('addMediaItem() has not been implemented.'); } Future getChromecastState() async { diff --git a/lib/src/state/player_state_notifier.freezed.dart b/lib/src/state/player_state_notifier.freezed.dart index e42ef4f4..74455b5e 100644 --- a/lib/src/state/player_state_notifier.freezed.dart +++ b/lib/src/state/player_state_notifier.freezed.dart @@ -30,9 +30,7 @@ mixin _$PlayerState { double? get volume => throw _privateConstructorUsedError; PlayerError? get error => throw _privateConstructorUsedError; - /// Create a copy of PlayerState - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $PlayerStateCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -69,8 +67,6 @@ class _$PlayerStateCopyWithImpl<$Res, $Val extends PlayerState> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of PlayerState - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -177,8 +173,6 @@ class __$$PlayerStateImplCopyWithImpl<$Res> _$PlayerStateImpl _value, $Res Function(_$PlayerStateImpl) _then) : super(_value, _then); - /// Create a copy of PlayerState - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -378,9 +372,7 @@ class _$PlayerStateImpl extends _PlayerState with DiagnosticableTreeMixin { volume, error); - /// Create a copy of PlayerState - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$PlayerStateImplCopyWith<_$PlayerStateImpl> get copyWith => @@ -430,11 +422,8 @@ abstract class _PlayerState extends PlayerState { double? get volume; @override PlayerError? get error; - - /// Create a copy of PlayerState - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$PlayerStateImplCopyWith<_$PlayerStateImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/src/state/plugin_state_notifier.freezed.dart b/lib/src/state/plugin_state_notifier.freezed.dart index edbae9b8..ed149fad 100644 --- a/lib/src/state/plugin_state_notifier.freezed.dart +++ b/lib/src/state/plugin_state_notifier.freezed.dart @@ -20,9 +20,7 @@ mixin _$PlayerPluginState { Map get players => throw _privateConstructorUsedError; - /// Create a copy of PlayerPluginState - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $PlayerPluginStateCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -47,8 +45,6 @@ class _$PlayerPluginStateCopyWithImpl<$Res, $Val extends PlayerPluginState> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of PlayerPluginState - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -88,8 +84,6 @@ class __$$PlayerPluginStateImplCopyWithImpl<$Res> $Res Function(_$PlayerPluginStateImpl) _then) : super(_value, _then); - /// Create a copy of PlayerPluginState - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -146,9 +140,7 @@ class _$PlayerPluginStateImpl implements _PlayerPluginState { int get hashCode => Object.hash(runtimeType, primaryPlayerId, const DeepCollectionEquality().hash(_players)); - /// Create a copy of PlayerPluginState - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$PlayerPluginStateImplCopyWith<_$PlayerPluginStateImpl> get copyWith => @@ -166,11 +158,8 @@ abstract class _PlayerPluginState implements PlayerPluginState { String? get primaryPlayerId; @override Map get players; - - /// Create a copy of PlayerPluginState - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$PlayerPluginStateImplCopyWith<_$PlayerPluginStateImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/pigeons/playback_platform_pigeon.dart b/pigeons/playback_platform_pigeon.dart index 6cbe962a..386263d3 100644 --- a/pigeons/playback_platform_pigeon.dart +++ b/pigeons/playback_platform_pigeon.dart @@ -138,6 +138,11 @@ enum RepeatMode { one, } +enum DrmType { + widevine, + fairplay, +} + class NpawConfig { late String? appName; late String? appReleaseVersion; @@ -163,6 +168,19 @@ class SetUrlArgs { bool? isLive; } +class DrmConfiguration { + late DrmType drmType; + String? contentKeyId; + String? fpsCertificateUrl; + late String licenseServerUrl; + Map? licenseRequestHeaders; +} + +class CastMedia { + late String url; + Map? customData; +} + class MediaItem { String? id; String? url; @@ -173,6 +191,8 @@ class MediaItem { double? playbackStartPositionMs; String? lastKnownAudioLanguage; String? lastKnownSubtitleLanguage; + DrmConfiguration? drmConfiguration; + CastMedia? castMedia; } class MediaMetadata { diff --git a/pubspec.yaml b/pubspec.yaml index ae8fc0b1..0fc245d3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,20 +20,21 @@ dependencies: sdk: flutter freezed: ^2.3.2 freezed_annotation: ^2.2.0 - js: ^0.7.1 + js: ^0.6.3 meta: ^1.9.1 plugin_platform_interface: ^2.0.2 riverpod: ^2.2.0 state_notifier: ^1.0.0 universal_io: ^2.0.4 uuid: ^4.5.0 - wakelock_plus: ^1.1.1 + wakelock_plus: ^1.2.10 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - pigeon: ^22.3.0 + # pigeon: ^22.2.0 + pigeon: ^21.2.0 build_runner: ^2.3.3 mockito: ^5.4.2 diff --git a/test/utils/mocks.mocks.dart b/test/utils/mocks.mocks.dart index 1ac8f0dd..7d78ca9c 100644 --- a/test/utils/mocks.mocks.dart +++ b/test/utils/mocks.mocks.dart @@ -250,6 +250,46 @@ class MockBccmPlayerInterface extends _i1.Mock returnValueForMissingStub: _i3.Future.value(), ) as _i3.Future); + @override + _i3.Future replaceCurrentOfflineAsset( + String? playerId, + String? downloadKey, { + bool? playbackPositionFromPrimary, + bool? autoplay = true, + }) => + (super.noSuchMethod( + Invocation.method( + #replaceCurrentOfflineAsset, + [ + playerId, + downloadKey, + ], + { + #playbackPositionFromPrimary: playbackPositionFromPrimary, + #autoplay: autoplay, + }, + ), + returnValue: _i3.Future.value(), + returnValueForMissingStub: _i3.Future.value(), + ) as _i3.Future); + + @override + _i3.Future queueMediaItem( + String? playerId, + _i2.MediaItem? mediaItem, + ) => + (super.noSuchMethod( + Invocation.method( + #queueMediaItem, + [ + playerId, + mediaItem, + ], + ), + returnValue: _i3.Future.value(), + returnValueForMissingStub: _i3.Future.value(), + ) as _i3.Future); + @override _i3.Future<_i7.ChromecastState?> getChromecastState() => (super.noSuchMethod( Invocation.method( From 91ed28a411bd0900159a0df9f78ced1fe3704cd5 Mon Sep 17 00:00:00 2001 From: Kautsar Albana Date: Mon, 26 May 2025 16:48:10 +0700 Subject: [PATCH 2/6] Merge from parent repository --- android/build.gradle | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../bcc/bccm_player/players/PlayerListener.kt | 19 -- .../bccm_player/views/FlutterCastButton.kt | 2 +- .../bccm_player/views/FlutterExoPlayerView.kt | 8 +- .../bccm_player/views/FullscreenPlayerView.kt | 8 +- android/src/main/res/layout/player_view.xml | 1 + android/src/main/res/values/strings.xml | 2 +- example/.gitignore | 3 +- example/.metadata | 33 +++ example/.vscode/launch.json | 25 -- example/README.md | 2 +- example/analysis_options.yaml | 3 +- example/android/.gitignore | 2 +- example/android/app/build.gradle | 66 ++--- .../android/app/src/main/AndroidManifest.xml | 6 +- example/android/build.gradle | 17 +- example/android/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 30 ++- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 5 +- example/ios/Podfile.lock | 65 ----- example/ios/Runner.xcodeproj/project.pbxproj | 212 +++++++++------- .../xcshareddata/xcschemes/Runner.xcscheme | 18 +- .../contents.xcworkspacedata | 3 - example/ios/Runner/AppDelegate.swift | 2 +- example/ios/Runner/Info.plist | 2 +- example/ios/RunnerTests/RunnerTests.swift | 12 + example/pubspec.lock | 197 +++++++-------- example/pubspec.yaml | 35 +-- example/test/widget_test.dart | 30 +++ example/web/favicon.png | Bin 917 -> 0 bytes example/web/icons/Icon-192.png | Bin 5292 -> 0 bytes example/web/icons/Icon-512.png | Bin 8252 -> 0 bytes example/web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes example/web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes example/web/index.html | 58 ----- example/web/manifest.json | 35 --- .../Players/AVQueuePlayerController.swift | 13 + ios/Classes/Views/BccmPlayerView.swift | 73 +++++- lib/src/theme/mini_player_theme_data.dart | 6 + .../controls/default/play_pause_button.dart | 7 +- lib/src/widgets/mini_player/mini_player.dart | 231 +++++++++++------- pigeons/README.md | 3 + pubspec.yaml | 12 +- 46 files changed, 641 insertions(+), 618 deletions(-) create mode 100644 example/.metadata delete mode 100644 example/.vscode/launch.json delete mode 100644 example/ios/Podfile.lock create mode 100644 example/ios/RunnerTests/RunnerTests.swift create mode 100644 example/test/widget_test.dart delete mode 100644 example/web/favicon.png delete mode 100644 example/web/icons/Icon-192.png delete mode 100644 example/web/icons/Icon-512.png delete mode 100644 example/web/icons/Icon-maskable-192.png delete mode 100644 example/web/icons/Icon-maskable-512.png delete mode 100644 example/web/index.html delete mode 100644 example/web/manifest.json diff --git a/android/build.gradle b/android/build.gradle index 39620b23..57b0906b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,6 +32,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' android { + namespace "media.bcc.bccm_player" compileSdkVersion 33 compileOptions { @@ -67,7 +68,7 @@ dependencies { implementation "androidx.media3:media3-test-utils:$media3_version" implementation "androidx.media3:media3-session:$media3_version" implementation "androidx.media3:media3-ui:$media3_version" - implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.nicepeopleatwork:media3-adapter:6.8.0' implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0" implementation 'androidx.core:core-ktx:1.12.0' diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 21f97edb..9355b415 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerListener.kt b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerListener.kt index aeac9b5c..7f9bf459 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerListener.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerListener.kt @@ -84,28 +84,9 @@ class PlayerListener(private val playerController: PlayerController, val plugin: } else { event.setMediaItem(null) } - Log.d( - "bccm", - "onMediaItemTransition" + plugin.playbackPigeon.toString() + "event:" + event.build() - .toString() - ); plugin.playbackPigeon?.onMediaItemTransition(event.build(), NoOpVoidResult()) } - override fun onMediaMetadataChanged(mediaMetadata: MediaMetadata) { - onMediaItemTransition( - playerController.player.currentMediaItem, - Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED - ) - } - - override fun onTimelineChanged(timeline: Timeline, reason: Int) { - onMediaItemTransition( - playerController.player.currentMediaItem, - Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED - ) - } - override fun onPositionDiscontinuity( oldPosition: Player.PositionInfo, newPosition: Player.PositionInfo, reason: Int ) { diff --git a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt index 27ffa98b..f946bb38 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterCastButton.kt @@ -38,7 +38,7 @@ internal class FlutterCastButton( init { val targetColor = color ?: Color.WHITE - val wrappedContext = ContextThemeWrapper(context, R.style.Theme_AppCompat_NoActionBar) + val wrappedContext = ContextThemeWrapper(context, androidx.appcompat.R.style.Theme_AppCompat_NoActionBar) val btn = MediaRouteButton(wrappedContext) val castTheme = diff --git a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt index 96b205d7..c80741e5 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/views/FlutterExoPlayerView.kt @@ -155,15 +155,15 @@ class FlutterExoPlayerView( playerView.setShowFastForwardButton(false) playerView.setShowRewindButton(false) playerView.setShowMultiWindowTimeBar(false) - playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE - playerView.findViewById(R.id.exo_time)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_progress_placeholder)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_time)?.visibility = View.GONE _v.findViewById(R.id.live_indicator)?.visibility = View.VISIBLE } else { playerView.setShowFastForwardButton(true) playerView.setShowRewindButton(true) playerView.setShowMultiWindowTimeBar(true) - playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE - playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_progress_placeholder)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE _v.findViewById(R.id.live_indicator)?.visibility = View.GONE } } diff --git a/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt b/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt index f1b9e371..e4960e9d 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/views/FullscreenPlayerView.kt @@ -170,15 +170,15 @@ class FullscreenPlayerView( playerView.setShowFastForwardButton(false) playerView.setShowRewindButton(false) playerView.setShowMultiWindowTimeBar(false) - playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE - playerView.findViewById(R.id.exo_time)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_progress)?.visibility = View.GONE + // playerView.findViewById(R.id.exo_time)?.visibility = View.GONE findViewById(R.id.live_indicator)?.visibility = View.VISIBLE } else { playerView.setShowFastForwardButton(true) playerView.setShowRewindButton(true) playerView.setShowMultiWindowTimeBar(true) - playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE - playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_progress)?.visibility = View.VISIBLE + // playerView.findViewById(R.id.exo_time)?.visibility = View.VISIBLE findViewById(R.id.live_indicator)?.visibility = View.GONE } } diff --git a/android/src/main/res/layout/player_view.xml b/android/src/main/res/layout/player_view.xml index aed28a5e..ed2dfdac 100644 --- a/android/src/main/res/layout/player_view.xml +++ b/android/src/main/res/layout/player_view.xml @@ -42,6 +42,7 @@ tools:visibility="gone"> + + the Android process has started. This theme is visible to the user + while the Flutter UI initializes. After that, this theme continues + to determine the Window background behind the Flutter UI. --> diff --git a/example/android/build.gradle b/example/android/build.gradle index 674e96f4..d2ffbffa 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.0' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -18,12 +5,12 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 5d8ce5d5..25971708 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,5 +1,3 @@ -org.gradle.jvmargs=-Xmx4608m +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -kotlin.code.style=official -android.enableNewResourceShrinker=false \ No newline at end of file diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 3c472b99..7bb2df6b 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 44e62bcf..bd473bbe 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.2.1" apply false + id "org.jetbrains.kotlin.android" version "1.9.0" apply false +} + +include ":app" diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 1dc6cf76..7c569640 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 13.0 + 12.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index f17bddc9..d97f17e2 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '15.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -32,6 +32,9 @@ target 'Runner' do use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end end post_install do |installer| diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock deleted file mode 100644 index 7c2960df..00000000 --- a/example/ios/Podfile.lock +++ /dev/null @@ -1,65 +0,0 @@ -PODS: - - bccm_player (0.0.1): - - Flutter - - google-cast-sdk (= 4.8.3) - - Protobuf (~> 3.13) - - YouboraAVPlayerAdapter (= 6.6.8) - - YouboraLib (= 6.6.22) - - connectivity_plus (0.0.1): - - Flutter - - FlutterMacOS - - Flutter (1.0.0) - - google-cast-sdk (4.8.3): - - Protobuf (~> 3.13) - - package_info_plus (0.4.5): - - Flutter - - Protobuf (3.28.2) - - wakelock_plus (0.0.1): - - Flutter - - YouboraAVPlayerAdapter (6.6.8): - - YouboraAVPlayerAdapter/Default (= 6.6.8) - - YouboraLib (~> 6.5) - - YouboraAVPlayerAdapter/Default (6.6.8): - - YouboraLib (~> 6.5) - - YouboraLib (6.6.22) - -DEPENDENCIES: - - bccm_player (from `.symlinks/plugins/bccm_player/ios`) - - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`) - - Flutter (from `Flutter`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - -SPEC REPOS: - trunk: - - google-cast-sdk - - Protobuf - - YouboraAVPlayerAdapter - - YouboraLib - -EXTERNAL SOURCES: - bccm_player: - :path: ".symlinks/plugins/bccm_player/ios" - connectivity_plus: - :path: ".symlinks/plugins/connectivity_plus/darwin" - Flutter: - :path: Flutter - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" - wakelock_plus: - :path: ".symlinks/plugins/wakelock_plus/ios" - -SPEC CHECKSUMS: - bccm_player: 508fbd6f79e90a6d834da4d2fde56058d9060742 - connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - google-cast-sdk: 1fb6724e94cc5ff23b359176e0cf6360586bb97a - package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c - Protobuf: 28c89b24435762f60244e691544ed80f50d82701 - wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1 - YouboraAVPlayerAdapter: bc898a61e09c667202a77491b677a42dfa0adc04 - YouboraLib: fc65b030ac93499f8beb3f5daa10deb3879fb2d2 - -PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb - -COCOAPODS: 1.15.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 616dd126..be0c0acd 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,14 +8,24 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - E0EA73AD39E36C2CF67EE3D2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92DC6938909E66F6E88C0E48 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 9705A1C41CF9048500538489 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -32,12 +42,12 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 355760C778515FD885481D47 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 92DC6938909E66F6E88C0E48 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -45,8 +55,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A90674F5250E2602007380B1 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - D5C7D7CB7CA0A9714AE1A380 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,19 +62,18 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E0EA73AD39E36C2CF67EE3D2 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5C70E04A97865AA6B605144F /* Frameworks */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( - 92DC6938909E66F6E88C0E48 /* Pods_Runner.framework */, + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - name = Frameworks; + path = RunnerTests; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -86,8 +93,7 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 9CB683FB681E88D9C3F4678A /* Pods */, - 5C70E04A97865AA6B605144F /* Frameworks */, + 331C8082294A63A400263BE5 /* RunnerTests */, ); sourceTree = ""; }; @@ -95,6 +101,7 @@ isa = PBXGroup; children = ( 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, ); name = Products; sourceTree = ""; @@ -114,32 +121,36 @@ path = Runner; sourceTree = ""; }; - 9CB683FB681E88D9C3F4678A /* Pods */ = { - isa = PBXGroup; - children = ( - 355760C778515FD885481D47 /* Pods-Runner.debug.xcconfig */, - D5C7D7CB7CA0A9714AE1A380 /* Pods-Runner.release.xcconfig */, - A90674F5250E2602007380B1 /* Pods-Runner.profile.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 97C146ED1CF9000F007C117D /* Runner */ = { isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 199AA125BF0D927EBA6B62B7 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 0C6B0618631F42184600ED26 /* [CP] Embed Pods Frameworks */, - B2575C0105BD79B1B1CC0A41 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -156,9 +167,14 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; LastSwiftMigration = 1100; @@ -179,11 +195,19 @@ projectRoot = ""; targets = ( 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EC1CF9000F007C117D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -198,45 +222,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0C6B0618631F42184600ED26 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 199AA125BF0D927EBA6B62B7 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -268,26 +253,17 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - B2575C0105BD79B1B1CC0A41 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ 97C146EA1CF9000F007C117D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -299,6 +275,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 97C146FA1CF9000F007C117D /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -323,6 +307,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -352,6 +337,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -376,10 +362,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = KJ6LCYQ3A8; + DEVELOPMENT_TEAM = 5U2ZR9WCZS; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -392,10 +377,58 @@ }; name = Profile; }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = media.bcc.bccmPlayerExample.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = media.bcc.bccmPlayerExample.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = media.bcc.bccmPlayerExample.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -425,6 +458,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -451,6 +485,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -480,6 +515,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -506,10 +542,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = KJ6LCYQ3A8; + DEVELOPMENT_TEAM = 5U2ZR9WCZS; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -530,10 +565,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = KJ6LCYQ3A8; + DEVELOPMENT_TEAM = 5U2ZR9WCZS; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -549,6 +583,16 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 9f6ef422..8e3ca5df 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -37,6 +37,17 @@ + + + + - - - - - - diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift index b6363034..62666446 100644 --- a/example/ios/Runner/AppDelegate.swift +++ b/example/ios/Runner/AppDelegate.swift @@ -1,5 +1,5 @@ -import UIKit import Flutter +import UIKit @main @objc class AppDelegate: FlutterAppDelegate { diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 202af80d..013caf23 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -15,7 +15,7 @@ network. CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Bccm Player + Bccm Player Example CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/example/ios/RunnerTests/RunnerTests.swift b/example/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 00000000..86a7c3b1 --- /dev/null +++ b/example/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/example/pubspec.lock b/example/pubspec.lock index c8385c03..277a7dde 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,31 +5,26 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" + sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f url: "https://pub.dev" source: hosted - version: "76.0.0" - _macros: - dependency: transitive - description: dart - source: sdk - version: "0.3.3" + version: "82.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" + sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0" url: "https://pub.dev" source: hosted - version: "6.11.0" + version: "7.4.5" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.7.0" async: dependency: transitive description: @@ -57,18 +52,18 @@ packages: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" characters: dependency: transitive description: @@ -105,10 +100,10 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0" + sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.4" connectivity_plus_platform_interface: dependency: transitive description: @@ -121,18 +116,18 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -145,18 +140,18 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "3.0.1" dbus: dependency: transitive description: name: dbus - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" fake_async: dependency: transitive description: @@ -177,18 +172,18 @@ packages: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -198,34 +193,34 @@ packages: dependency: "direct main" description: name: flutter_hooks - sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70 + sha256: b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d url: "https://pub.dev" source: hosted - version: "0.20.5" + version: "0.21.2" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" + sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.0.28" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod - sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" flutter_state_notifier: dependency: transitive description: @@ -238,10 +233,10 @@ packages: dependency: transitive description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1 url: "https://pub.dev" source: hosted - version: "2.0.10+1" + version: "2.1.0" flutter_test: dependency: "direct dev" description: flutter @@ -264,50 +259,50 @@ packages: dependency: transitive description: name: freezed - sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e" + sha256: "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c" url: "https://pub.dev" source: hosted - version: "2.5.7" + version: "3.0.6" freezed_annotation: dependency: transitive description: name: freezed_annotation - sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 + sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "3.0.0" glob: dependency: transitive description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" hooks_riverpod: dependency: "direct main" description: name: hooks_riverpod - sha256: "97266a91c994951a06ef0ff3a1c7fb261e52ec7f74e87f0614ea0b7411b859b2" + sha256: "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.6.1" http: dependency: transitive description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.4.0" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.2" js: dependency: transitive description: @@ -352,26 +347,18 @@ packages: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.1.1" logging: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - macros: - dependency: transitive - description: - name: macros - sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "0.1.3-main.0" + version: "1.3.0" matcher: dependency: transitive description: @@ -416,26 +403,26 @@ packages: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.0" package_info_plus: dependency: transitive description: name: package_info_plus - sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 + sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.3.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.2.0" path: dependency: transitive description: @@ -448,10 +435,10 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" petitparser: dependency: transitive description: @@ -472,34 +459,34 @@ packages: dependency: transitive description: name: provider - sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84" url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.5" pub_semver: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" riverpod: dependency: "direct main" description: name: riverpod - sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" sky_engine: dependency: transitive description: flutter @@ -509,10 +496,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "2.0.0" source_span: dependency: transitive description: @@ -581,10 +568,10 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" universal_io: dependency: transitive description: @@ -597,34 +584,34 @@ packages: dependency: transitive description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" vector_graphics: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.18" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.13" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.17" vector_math: dependency: transitive description: @@ -645,42 +632,42 @@ packages: dependency: transitive description: name: wakelock_plus - sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484 + sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678 url: "https://pub.dev" source: hosted - version: "1.2.8" + version: "1.3.2" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.3" watcher: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web: dependency: transitive description: name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" win32: dependency: transitive description: name: win32 - sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e url: "https://pub.dev" source: hosted - version: "5.5.4" + version: "5.10.1" xml: dependency: transitive description: @@ -693,10 +680,10 @@ packages: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.2 <4.0.0" + flutter: ">=3.27.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3a00f55f..5acc144f 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,12 +1,25 @@ name: bccm_player_example -description: Demonstrates how to use the bccm_player plugin. - +description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: "none" # Remove this line if you wish to publish to pub.dev +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. +version: 1.0.0+1 environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ^3.6.2 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -18,20 +31,14 @@ dependencies: flutter: sdk: flutter - bccm_player: - # When depending on this package from a real application you should use: - # bccm_player: ^x.y.z - # See https://dart.dev/tools/pub/dependencies#version-constraints - # The example app is bundled with the plugin so we use a path dependency on - # the parent directory to use the current plugin's version. - path: ../ - # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. + bccm_player: + path: ../ cupertino_icons: ^1.0.2 riverpod: ^2.3.6 flutter_riverpod: ^2.3.6 - flutter_hooks: ^0.20.5 + flutter_hooks: ^0.21.2 hooks_riverpod: ^2.3.6 focus_debugger: ^0.0.1 connectivity_plus: ^6.0.0 @@ -47,7 +54,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^4.0.0 + flutter_lints: ^5.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart new file mode 100644 index 00000000..47afb98d --- /dev/null +++ b/example/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:bccm_player_example/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/example/web/favicon.png b/example/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/example/web/icons/Icon-192.png b/example/web/icons/Icon-192.png deleted file mode 100644 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 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 diff --git a/example/web/icons/Icon-512.png b/example/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 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 diff --git a/example/web/icons/Icon-maskable-192.png b/example/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! diff --git a/example/web/icons/Icon-maskable-512.png b/example/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20998 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 MPgg&ebxsLQ025IeI{*Lx diff --git a/example/web/index.html b/example/web/index.html deleted file mode 100644 index e39c4986..00000000 --- a/example/web/index.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - bccm_player_example - - - - - - - - - - diff --git a/example/web/manifest.json b/example/web/manifest.json deleted file mode 100644 index 71552a52..00000000 --- a/example/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "bccm_player_example", - "short_name": "bccm_player_example", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "Demonstrates how to use the bccm_player plugin.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -} diff --git a/ios/Classes/Players/AVQueuePlayerController.swift b/ios/Classes/Players/AVQueuePlayerController.swift index 6ecc5e0d..e1db67e7 100644 --- a/ios/Classes/Players/AVQueuePlayerController.swift +++ b/ios/Classes/Players/AVQueuePlayerController.swift @@ -360,9 +360,22 @@ public class AVQueuePlayerController: NSObject, PlayerController, AVPlayerViewCo } func updatePipController(_ playerView: AVPlayerViewController?) { + let wasPip = pipController != nil pipController = playerView + + // Notify Flutter about PiP mode change let event = PictureInPictureModeChangedEvent.make(withPlayerId: id, isInPipMode: playerView != nil) playbackListener.onPicture(inPictureModeChanged: event, completion: { _ in }) + + // Add special handling when exiting PiP mode + if wasPip && playerView == nil { + print("Exiting PiP mode - forcing state resync") + // Force a full state resync when exiting PiP + DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in + guard let self = self else { return } + self.onManualPlayerStateUpdate() + } + } } func releasePlayerView(_ playerView: AVPlayerViewController) { diff --git a/ios/Classes/Views/BccmPlayerView.swift b/ios/Classes/Views/BccmPlayerView.swift index c8be4e10..6abf8517 100644 --- a/ios/Classes/Views/BccmPlayerView.swift +++ b/ios/Classes/Views/BccmPlayerView.swift @@ -92,12 +92,21 @@ class AVPlayerBccmPlayerView: NSObject, FlutterPlatformView { _playerController.stop(reset: true) } } - + @objc func willBecomeActive(_ notification: Notification) { - // code to execute print("willBecomeActive") - createNativeView() - perform(#selector(pipFix), with: nil, afterDelay: 1) + + // Check if we're returning from PiP + if _playerController.pipController != nil { + print("willBecomeActive - returning from PiP") + // Ensure we're on the main thread and add a slight delay to allow UI to settle + DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in + guard let self = self else { return } + self.performImprovedPipFix() + } + } else { + createNativeView() + } } func view() -> UIView { @@ -159,6 +168,62 @@ class AVPlayerBccmPlayerView: NSObject, FlutterPlatformView { createNativeView() _playerController.player.playImmediately(atRate: rate) } + + // New improved method for handling PiP transitions + func performImprovedPipFix() { + print("Performing improved PiP fix") + + // Save current state before resetting + let playbackPosition = _playerController.player.currentTime() + let rate = _playerController.player.rate + let isPlaying = _playerController.isPlaying() + let volume = _playerController.player.volume + + // Reset the player view + reset() + + // Small delay to ensure proper view hierarchy setup + DispatchQueue.main.asyncAfter(deadline: .now() + 1.00) { [weak self] in + guard let self = self else { return } + + // Recreate the view + self.createNativeView() + + // Restore volume first to prevent any audio glitches + self._playerController.player.volume = volume + + // Restore player state + if !playbackPosition.isIndefinite { + self._playerController.player.seek(to: playbackPosition) { [weak self] finished in + guard let self = self, finished else { return } + + // Restore playback if it was playing + if isPlaying && rate > 0 { + self._playerController.player.playImmediately(atRate: rate) + } + + // Force layout update + self.playerViewController?.view.setNeedsLayout() + self.playerViewController?.view.layoutIfNeeded() + + // Force state update to Flutter + self._playerController.onManualPlayerStateUpdate() + } + } else { + // If we don't have a valid position, just restore playback + if isPlaying && rate > 0 { + self._playerController.player.playImmediately(atRate: rate) + } + + // Force layout update + self.playerViewController?.view.setNeedsLayout() + self.playerViewController?.view.layoutIfNeeded() + + // Force state update to Flutter + self._playerController.onManualPlayerStateUpdate() + } + } + } @objc func reset() { if let playerViewController = playerViewController { diff --git a/lib/src/theme/mini_player_theme_data.dart b/lib/src/theme/mini_player_theme_data.dart index ca66a5ce..a7c7b876 100644 --- a/lib/src/theme/mini_player_theme_data.dart +++ b/lib/src/theme/mini_player_theme_data.dart @@ -5,6 +5,7 @@ class BccmMiniPlayerThemeData { final Color? backgroundColor; final Color? thumbnailBorderColor; final Color? topBorderColor; + final Color? progressColor; final TextStyle? titleStyle; final TextStyle? secondaryTitleStyle; @@ -13,6 +14,7 @@ class BccmMiniPlayerThemeData { this.backgroundColor, this.thumbnailBorderColor, this.topBorderColor, + this.progressColor, this.titleStyle, this.secondaryTitleStyle, }); @@ -24,6 +26,7 @@ class BccmMiniPlayerThemeData { backgroundColor: theme.colorScheme.surface, thumbnailBorderColor: Colors.white.withOpacity(0.01), topBorderColor: theme.colorScheme.onSurface.withOpacity(0.1), + progressColor: theme.colorScheme.onSurface, titleStyle: theme.textTheme.labelMedium!.copyWith(color: theme.colorScheme.onSurface), secondaryTitleStyle: theme.textTheme.labelSmall?.copyWith(color: theme.colorScheme.primary), ); @@ -35,6 +38,7 @@ class BccmMiniPlayerThemeData { backgroundColor: backgroundColor ?? defaults.backgroundColor, thumbnailBorderColor: thumbnailBorderColor ?? defaults.thumbnailBorderColor, topBorderColor: topBorderColor ?? defaults.topBorderColor, + progressColor: progressColor ?? defaults.progressColor, titleStyle: titleStyle ?? defaults.titleStyle, secondaryTitleStyle: secondaryTitleStyle ?? defaults.secondaryTitleStyle, ); @@ -45,6 +49,7 @@ class BccmMiniPlayerThemeData { Color? backgroundColor, Color? thumbnailBorderColor, Color? topBorderColor, + Color? progressColor, TextStyle? titleStyle, TextStyle? secondaryTitleStyle, }) { @@ -53,6 +58,7 @@ class BccmMiniPlayerThemeData { backgroundColor: backgroundColor ?? this.backgroundColor, thumbnailBorderColor: thumbnailBorderColor ?? this.thumbnailBorderColor, topBorderColor: topBorderColor ?? this.topBorderColor, + progressColor: progressColor ?? this.progressColor, titleStyle: titleStyle ?? this.titleStyle, secondaryTitleStyle: secondaryTitleStyle ?? this.secondaryTitleStyle, ); diff --git a/lib/src/widgets/controls/default/play_pause_button.dart b/lib/src/widgets/controls/default/play_pause_button.dart index 6cf427c4..52c18f10 100644 --- a/lib/src/widgets/controls/default/play_pause_button.dart +++ b/lib/src/widgets/controls/default/play_pause_button.dart @@ -6,10 +6,11 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_svg/svg.dart'; class PlayPauseButton extends HookWidget { - const PlayPauseButton({super.key, required this.player, this.onPressed}); + const PlayPauseButton({super.key, required this.player, this.onPressed, this.iconSize = 68}); final BccmPlayerController player; final void Function(bool newState)? onPressed; + final double? iconSize; @override Widget build(BuildContext context) { @@ -18,7 +19,7 @@ class PlayPauseButton extends HookWidget { if (state != PlaybackState.playing) { return IconButton( autofocus: true, - constraints: const BoxConstraints.tightFor(width: 68, height: 68), + constraints: BoxConstraints.tightFor(width: iconSize, height: iconSize), icon: Padding( padding: const EdgeInsets.only(left: 4), child: SvgPicture.string( @@ -36,7 +37,7 @@ class PlayPauseButton extends HookWidget { ); } else { return IconButton( - constraints: const BoxConstraints.tightFor(width: 68, height: 68), + constraints: BoxConstraints.tightFor(width: iconSize, height: iconSize), icon: player.value.isBuffering == true ? LoadingIndicator( width: 42, diff --git a/lib/src/widgets/mini_player/mini_player.dart b/lib/src/widgets/mini_player/mini_player.dart index 16eedd7c..9d457d3f 100644 --- a/lib/src/widgets/mini_player/mini_player.dart +++ b/lib/src/widgets/mini_player/mini_player.dart @@ -1,8 +1,10 @@ +import 'package:bccm_player/bccm_player.dart'; +import 'package:bccm_player/controls.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_svg/svg.dart'; -import '../../theme/player_theme.dart'; import '../../utils/svg_icons.dart'; import '../../utils/transparent_image.dart'; import 'loading_indicator.dart'; @@ -21,6 +23,7 @@ class MiniPlayer extends HookWidget { final VoidCallback? onCloseTap; final bool? hideCloseButton; final bool showBorder; + final BccmPlayerController? playerController; final Key? titleKey; final Widget? loadingIndicator; @@ -44,112 +47,152 @@ class MiniPlayer extends HookWidget { this.loadingIndicator, this.playSemanticLabel, this.pauseSemanticLabel, + this.playerController, }) : assert(artworkUri != null || artwork != null, "Artwork must be set"); @override Widget build(BuildContext context) { final theme = BccmPlayerTheme.safeOf(context).miniPlayer!; + final controller = playerController ?? BccmPlayerInterface.instance.primaryController; - return Container( - height: kMiniPlayerHeight, - width: MediaQuery.sizeOf(context).width, - decoration: BoxDecoration( - color: theme.backgroundColor, - border: showBorder ? Border(top: BorderSide(color: theme.topBorderColor ?? Colors.transparent, width: 1)) : null, - ), - padding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 12, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - margin: const EdgeInsets.only(right: 16), - width: 64, - height: 36, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - border: Border.all(color: theme.thumbnailBorderColor ?? Colors.transparent, width: 1), - ), - child: artworkUri == null - ? null - : ClipRRect( - borderRadius: BorderRadius.circular(4), - child: FadeInImage( - fadeInDuration: const Duration(milliseconds: 200), - placeholder: MemoryImage(kTransparentImage), - fit: BoxFit.cover, - image: artwork ?? ResizeImage.resizeIfNeeded(null, 64, NetworkImage(artworkUri!)), - width: 64, - height: 36, - )), + return Stack( + alignment: Alignment.topLeft, + children: [ + Container( + height: kMiniPlayerHeight, + width: MediaQuery.sizeOf(context).width, + decoration: BoxDecoration( + color: theme.backgroundColor, + border: showBorder ? Border(top: BorderSide(color: theme.topBorderColor ?? Colors.transparent, width: 1)) : null, + ), + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 12, ), - Expanded( - child: Column( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (secondaryTitle != null) - Padding( - padding: const EdgeInsets.only(bottom: 4.0), - child: Text( - secondaryTitle!, - semanticsLabel: secondaryTitle!, + child: Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + if (!(artworkUri == null || artworkUri == '')) + Container( + margin: const EdgeInsets.only(right: 16), + width: 36, + height: 36, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + border: Border.all(color: theme.thumbnailBorderColor ?? Colors.transparent, width: 1), + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(4), + child: FadeInImage( + fadeInDuration: const Duration(milliseconds: 200), + placeholder: MemoryImage(kTransparentImage), + fit: BoxFit.contain, + image: artwork ?? ResizeImage.resizeIfNeeded(null, 64, NetworkImage(artworkUri!)), + width: 36, + height: 36, + )), + ), + Expanded( + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (secondaryTitle != null) + Padding( + padding: const EdgeInsets.only(bottom: 4.0), + child: Text( + secondaryTitle!, + semanticsLabel: secondaryTitle!, + overflow: TextOverflow.ellipsis, + style: theme.secondaryTitleStyle, + ), + ), + Text( + title, + semanticsLabel: title, + key: titleKey, overflow: TextOverflow.ellipsis, - style: theme.secondaryTitleStyle, + style: theme.titleStyle, ), + ], + ), + ), + if (loading == true) + Container( + margin: const EdgeInsets.only(left: 16), + height: 36, + width: 36, + child: loadingIndicator ?? const LoadingIndicator(height: 24), + ) + else + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => isPlaying ? onPauseTap?.call() : onPlayTap?.call(), + child: Container( + margin: const EdgeInsets.only(left: 16), + padding: const EdgeInsets.symmetric(horizontal: 8), + height: 36, + width: 36, + child: isPlaying + ? SvgPicture.string( + SvgIcons.pause, + semanticsLabel: pauseSemanticLabel, + colorFilter: ColorFilter.mode(theme.iconColor ?? Colors.transparent, BlendMode.srcIn), + ) + : SvgPicture.string( + SvgIcons.play, + semanticsLabel: playSemanticLabel, + colorFilter: ColorFilter.mode(theme.iconColor ?? Colors.transparent, BlendMode.srcIn), + ), ), - Text( - title, - semanticsLabel: title, - key: titleKey, - overflow: TextOverflow.ellipsis, - style: theme.titleStyle, ), - ], - ), + if (hideCloseButton != true) + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => onCloseTap?.call(), + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 8), + height: 36, + width: 48, + child: SvgPicture.string( + SvgIcons.close, + colorFilter: ColorFilter.mode(theme.iconColor ?? Colors.transparent, BlendMode.srcIn), + ), + ), + ), + ], ), - if (loading == true) - Container(margin: const EdgeInsets.only(left: 16), height: 36, child: loadingIndicator ?? const LoadingIndicator(height: 24)) - else - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () => isPlaying ? onPauseTap?.call() : onPlayTap?.call(), - child: Container( - margin: const EdgeInsets.only(left: 16), - height: 36, - child: isPlaying - ? SvgPicture.string( - SvgIcons.pause, - semanticsLabel: pauseSemanticLabel, - colorFilter: ColorFilter.mode(theme.iconColor ?? Colors.transparent, BlendMode.srcIn), - ) - : SvgPicture.string( - SvgIcons.play, - semanticsLabel: playSemanticLabel, - colorFilter: ColorFilter.mode(theme.iconColor ?? Colors.transparent, BlendMode.srcIn), - ), - ), - ), - if (hideCloseButton != true) - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () => onCloseTap?.call(), - child: Container( - margin: const EdgeInsets.only(left: 7), - height: 36, - child: SvgPicture.string( - SvgIcons.close, - colorFilter: ColorFilter.mode(theme.iconColor ?? Colors.transparent, BlendMode.srcIn), + ), + AnimatedOpacity( + duration: const Duration(milliseconds: 200), + curve: Curves.easeOutExpo, + opacity: controller.value.playbackPositionMs != null ? 1 : 0, + child: SizedBox( + width: double.infinity, + height: 2, + child: LayoutBuilder(builder: (context, constraints) { + return Align( + alignment: Alignment.bottomLeft, + child: SmoothVideoProgress( + controller: controller, + builder: (context, position, duration, child) { + if (duration.inMilliseconds == 0) { + return const SizedBox.shrink(); + } + return Container( + decoration: BoxDecoration(color: theme.progressColor), + width: constraints.maxWidth * clampDouble(position.inMilliseconds / duration.inMilliseconds, 0, 1), + ); + }, ), - ), - ), - ], - ), + ); + }), + ), + ), + ], ); } } diff --git a/pigeons/README.md b/pigeons/README.md index ebaa9527..1053de17 100644 --- a/pigeons/README.md +++ b/pigeons/README.md @@ -11,4 +11,7 @@ dart run pigeon --input pigeons/playback_platform_pigeon.dart # When you change chromecast_pigeon.dart, run: dart run pigeon --input pigeons/chromecast_pigeon.dart +# When you change downloader_pigeon.dart, run: +dart run pigeon --input pigeons/downloader_pigeon.dart + ``` diff --git a/pubspec.yaml b/pubspec.yaml index ae8fc0b1..914170b8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,14 +12,16 @@ dependencies: collection: ^1.17.1 flutter: sdk: flutter - flutter_hooks: ^0.20.5 + flutter_hooks: ^0.21.2 flutter_plugin_android_lifecycle: ^2.0.9 flutter_state_notifier: ^1.0.0 flutter_svg: ^2.0.2 flutter_web_plugins: sdk: flutter - freezed: ^2.3.2 - freezed_annotation: ^2.2.0 + freezed: ^3.0.6 + freezed_annotation: ^3.0.0 + # freezed: ^2.3.2 + # freezed_annotation: ^2.2.0 js: ^0.7.1 meta: ^1.9.1 plugin_platform_interface: ^2.0.2 @@ -32,8 +34,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^4.0.0 - pigeon: ^22.3.0 + flutter_lints: ^5.0.0 + pigeon: ^25.3.2 build_runner: ^2.3.3 mockito: ^5.4.2 From 0d5b51bc2f9f8eff53ba4622a3e6c05abeac153f Mon Sep 17 00:00:00 2001 From: Kautsar Albana Date: Fri, 6 Jun 2025 18:27:07 +0700 Subject: [PATCH 3/6] Init preloader --- .../bccm_player/players/PlayerController.kt | 2 + example/analysis_options.yaml | 3 + example/lib/app.dart | 91 ++++++++++++++++ example/lib/examples/list_of_players.dart | 37 ++++--- example/lib/examples/preload_players.dart | 102 ++++++++++++++++++ example/lib/main.dart | 77 +------------ example/pubspec.lock | 16 +++ example/pubspec.yaml | 2 + 8 files changed, 241 insertions(+), 89 deletions(-) create mode 100644 example/lib/app.dart create mode 100644 example/lib/examples/preload_players.dart diff --git a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt index 57923c99..edab2f7b 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt @@ -164,6 +164,7 @@ abstract class PlayerController : Player.Listener { return extraMeta } + // map for android @SuppressLint("UnsafeOptInUsageError") private fun mapMediaItem(mediaItem: PlaybackPlatformApi.MediaItem): MediaItem { val metaBuilder = MediaMetadata.Builder() @@ -258,6 +259,7 @@ abstract class PlayerController : Player.Listener { .build() } + // map for dart fun mapMediaItem(mediaItem: MediaItem): PlaybackPlatformApi.MediaItem { val metaBuilder = PlaybackPlatformApi.MediaMetadata.Builder() if (mediaItem.mediaMetadata.artworkUri != null) { diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index 61b6c4de..04e69e71 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -7,6 +7,9 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + errors: + prefer_const_constructors: ignore include: package:flutter_lints/flutter.yaml linter: diff --git a/example/lib/app.dart b/example/lib/app.dart new file mode 100644 index 00000000..93c7c837 --- /dev/null +++ b/example/lib/app.dart @@ -0,0 +1,91 @@ +import 'package:bccm_player/bccm_player.dart'; +import 'package:bccm_player_example/examples/drm_player.dart'; +import 'package:bccm_player_example/examples/preload_players.dart'; +import 'package:bccm_player_example/examples/queue.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import 'examples/custom_controls.dart'; +import 'examples/downloader.dart'; +import 'examples/list_of_players.dart'; +import 'examples/native_controls.dart'; +import 'examples/playground.dart'; +import 'examples/simple_player.dart'; + +class MyApp extends StatefulWidget { + const MyApp({super.key}); + + @override + State createState() => _MyAppState(); +} + +class _MyAppState extends State { + @override + Widget build(BuildContext context) { + return MediaQuery( + data: MediaQuery.of(context).copyWith(navigationMode: NavigationMode.directional), + child: Shortcuts( + shortcuts: { + LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(), + }, + child: Scaffold( + appBar: AppBar( + backgroundColor: Colors.primaries.first, + title: const Text('Plugin example app', style: TextStyle(color: Colors.white)), + actions: const [ + Padding( + padding: EdgeInsets.only(right: 16), + child: CastButton(color: Colors.black), + ), + ], + ), + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox(width: double.infinity), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => QueueExample())), + child: Text('Queu'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => Playground())), + child: Text('Playground'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => ListOfPlayers())), + child: Text('List of Players'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => SimplePlayer())), + child: Text('Simple Players'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => CustomControls())), + child: Text('Custom Controls'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => NativeControls())), + child: Text('Native Controls'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => Downloader())), + child: Text('Downloader'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => DrmPlayer())), + child: Text('DRM Player'), + ), + TextButton( + onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => PreloadPlayerPage())), + child: Text('Preload Player'), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/example/lib/examples/list_of_players.dart b/example/lib/examples/list_of_players.dart index 7f739114..7b2d4104 100644 --- a/example/lib/examples/list_of_players.dart +++ b/example/lib/examples/list_of_players.dart @@ -1,6 +1,7 @@ import 'package:bccm_player/bccm_player.dart'; import 'package:bccm_player_example/example_videos.dart'; import 'package:flutter/material.dart'; +import 'package:screen_protector/screen_protector.dart'; class ListOfPlayers extends StatefulWidget { const ListOfPlayers({super.key}); @@ -14,6 +15,8 @@ class _ListOfPlayersState extends State { @override void initState() { + ScreenProtector.preventScreenshotOn(); + ScreenProtector.protectDataLeakageWithBlur(); controllers = [ BccmPlayerController.empty(), ...exampleVideos.map( @@ -29,6 +32,8 @@ class _ListOfPlayersState extends State { @override void dispose() { + ScreenProtector.preventScreenshotOff(); + ScreenProtector.protectDataLeakageWithBlurOff(); for (var element in controllers) { if (!element.isPrimary) element.dispose(); } @@ -37,21 +42,23 @@ class _ListOfPlayersState extends State { @override Widget build(BuildContext context) { - return ListView( - children: [ - ...controllers.map( - (controller) => Column( - children: [ - BccmPlayerView(controller), - ElevatedButton( - onPressed: () { - controller.setPrimary(); - }, - child: const Text('Make primary')), - ], - ), - ) - ], + return Scaffold( + body: ListView( + children: [ + ...controllers.map( + (controller) => Column( + children: [ + BccmPlayerView(controller), + ElevatedButton( + onPressed: () { + controller.setPrimary(); + }, + child: const Text('Make primary')), + ], + ), + ) + ], + ), ); } } diff --git a/example/lib/examples/preload_players.dart b/example/lib/examples/preload_players.dart new file mode 100644 index 00000000..9d4143bc --- /dev/null +++ b/example/lib/examples/preload_players.dart @@ -0,0 +1,102 @@ +import 'dart:async'; + +import 'package:bccm_player/bccm_player.dart'; +import 'package:bccm_player_example/example_videos.dart'; +import 'package:flutter/material.dart'; +import 'package:preload_page_view/preload_page_view.dart'; + +class PreloadPlayerPage extends StatefulWidget { + const PreloadPlayerPage({super.key}); + + @override + State createState() => _PreloadPlayerPageState(); +} + +class _PreloadPlayerPageState extends State { + int initialIndex = 0; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text("Preload Players"), + ), + body: PreloadPageView.builder( + itemCount: exampleVideos.length, + preloadPagesCount: exampleVideos.length, + scrollDirection: Axis.vertical, + itemBuilder: (BuildContext context, int index) { + final MediaItem mediaItem = exampleVideos[index]; + return _PortraitPlayer( + mediaItem: mediaItem, + isPrimary: initialIndex == index, + currentIndex: initialIndex, + ); + }, + controller: PreloadPageController(), + onPageChanged: (int position) { + setState(() => initialIndex = position); + print('page changed. current: $position'); + }, + ), + ); + } +} + +class _PortraitPlayer extends StatefulWidget { + final MediaItem mediaItem; + final bool isPrimary; + final int currentIndex; + const _PortraitPlayer({ + required this.mediaItem, + required this.isPrimary, + required this.currentIndex, + }); + + @override + State<_PortraitPlayer> createState() => __PortraitPlayerState(); +} + +class __PortraitPlayerState extends State<_PortraitPlayer> { + late BccmPlayerController playerController; + late BccmPlayerViewController viewController; + + FutureOr setupPlayer() async { + playerController = BccmPlayerController(widget.mediaItem); + viewController = BccmPlayerViewController( + playerController: playerController, + config: BccmPlayerViewConfig(useSurfaceView: false, videoFit: BoxFit.contain), + ); + + playerController.initialize().then((_) { + playerController.setMixWithOthers(true); + playerController.play(); + }); + } + + @override + void initState() { + setupPlayer(); + super.initState(); + } + + @override + void dispose() { + playerController.stop(reset: false); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + if (!widget.isPrimary) return Text('Is not primary = ${widget.isPrimary} - ${widget.currentIndex}'); + return Column( + children: [ + AspectRatio( + aspectRatio: 16 / 9, + child: BccmPlayerView(playerController, config: viewController.config), + ), + Text('${widget.currentIndex}'), + ], + ); + } +} diff --git a/example/lib/main.dart b/example/lib/main.dart index e72bd955..8de2b12d 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,82 +1,11 @@ import 'dart:async'; import 'package:bccm_player/bccm_player.dart'; -import 'package:bccm_player_example/examples/drm_player.dart'; -import 'package:bccm_player_example/examples/queue.dart'; +import 'package:bccm_player_example/app.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'examples/list_of_players.dart'; -import 'examples/playground.dart'; -import 'examples/native_controls.dart'; -import 'examples/custom_controls.dart'; -import 'examples/simple_player.dart'; -import 'examples/downloader.dart'; - -Future main() async { +FutureOr main() async { await BccmPlayerInterface.instance.setup(); - // FocusDebugger.instance.activate(); - - runApp(const MyApp()); -} - -class MyApp extends StatefulWidget { - const MyApp({super.key}); - - @override - State createState() => _MyAppState(); -} - -class _MyAppState extends State { - @override - Widget build(BuildContext context) { - return MediaQuery( - data: MediaQuery.of(context).copyWith(navigationMode: NavigationMode.directional), - child: Shortcuts( - shortcuts: { - LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(), - }, - child: DefaultTabController( - length: 8, - child: MaterialApp( - home: Scaffold( - appBar: AppBar( - title: const Text('Plugin example app'), - actions: const [ - Padding( - padding: EdgeInsets.only(right: 16), - child: CastButton(color: Colors.white), - ), - ], - bottom: const TabBar(tabs: [ - Tab(text: 'Queue'), - Tab(text: 'Playground'), - Tab(text: 'List Of Players'), - Tab(text: 'Simple player'), - Tab(text: 'Custom controls'), - Tab(text: 'Native controls'), - Tab(text: 'Downloader'), - Tab(text: 'DRM'), - ]), - ), - // tabs with Playground #1 then a new "ListOfPlayers" tab at #2 and controls to navigate between the tabs - body: const TabBarView( - children: [ - QueueExample(), - Playground(), - ListOfPlayers(), - SimplePlayer(), - CustomControls(), - NativeControls(), - Downloader(), - DrmPlayer(), - ], - ), - ), - ), - ), - ), - ); - } + runApp(const MaterialApp(home: MyApp())); } diff --git a/example/pubspec.lock b/example/pubspec.lock index 38a6087d..ccd571e9 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -455,6 +455,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + preload_page_view: + dependency: "direct main" + description: + name: preload_page_view + sha256: "488a10c158c5c2e9ba9d77e5dbc09b1e49e37a20df2301e5ba02992eac802b7a" + url: "https://pub.dev" + source: hosted + version: "0.2.0" provider: dependency: transitive description: @@ -487,6 +495,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.5.1" + screen_protector: + dependency: "direct main" + description: + name: screen_protector + sha256: "305fd157f6f0b210afe216e790022bfe469c3b1d1f2e0d3dcc5906cc9c49c3e9" + url: "https://pub.dev" + source: hosted + version: "1.4.2+1" sky_engine: dependency: transitive description: flutter diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3a00f55f..5f5e4515 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -35,6 +35,8 @@ dependencies: hooks_riverpod: ^2.3.6 focus_debugger: ^0.0.1 connectivity_plus: ^6.0.0 + preload_page_view: ^0.2.0 + screen_protector: ^1.4.2+1 flutter_web_plugins: sdk: flutter From c339622dbc8bafdadab8c1d9a14dbd8ea7413dcc Mon Sep 17 00:00:00 2001 From: Kautsar Albana Date: Thu, 3 Jul 2025 17:32:16 +0700 Subject: [PATCH 4/6] update api pubs --- example/pubspec.lock | 74 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 277a7dde..fb8d7edd 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" bccm_player: dependency: "direct main" description: @@ -44,10 +44,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -68,10 +68,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -84,18 +84,18 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" connectivity_plus: dependency: "direct main" description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -323,18 +323,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -363,10 +363,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -379,10 +379,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" nested: dependency: transitive description: @@ -427,10 +427,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -504,10 +504,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -520,10 +520,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" state_notifier: dependency: transitive description: @@ -536,34 +536,34 @@ packages: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" typed_data: dependency: transitive description: @@ -624,10 +624,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" wakelock_plus: dependency: transitive description: @@ -685,5 +685,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.2 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" From 28b53940f03afdb4c3ed23c7f37423ca56f991fe Mon Sep 17 00:00:00 2001 From: Kautsar Albana Date: Thu, 3 Jul 2025 17:47:23 +0700 Subject: [PATCH 5/6] update drm_player --- .gitignore | 150 ++++- example/.flutter-plugins | 7 + example/.gitignore | 151 ++++- example/lib/examples/drm_player.dart | 31 +- example/pubspec.lock | 20 +- pubspec.lock | 807 +++++++++++++++++++++++++++ 6 files changed, 1117 insertions(+), 49 deletions(-) create mode 100644 example/.flutter-plugins create mode 100644 pubspec.lock diff --git a/.gitignore b/.gitignore index 5c134814..feb91f29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ +# Do not remove or rename entries in this file, only add new ones +# See https://github.com/flutter/flutter/issues/128635 for more context. + # Miscellaneous *.class +*.lock *.log *.pyc *.swp @@ -8,7 +12,11 @@ .buildlog/ .history .svn/ -migrate_working_dir/ + +# As packages are no longer pinned, we use a lockfile for testing locally. +# When unpinning packages, Using lockfiles ensures that failures in PRs are +# actually due to those PRs, not due to a package being updated. +!/pubspec.lock # IntelliJ related *.iml @@ -16,20 +24,142 @@ migrate_working_dir/ *.iws .idea/ -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ +# Visual Studio Code related +.classpath +.project +.settings/ +.vscode/* +.ccls-cache + +# This file, on the master branch, should never exist or be checked-in. +# +# On a *final* release branch, that is, what will ship to stable or beta, the +# file can be force added (git add --force) and checked-in in order to effectively +# "pin" the engine artifact version so the flutter tool does not need to use git +# to determine the engine artifacts. +# +# See https://github.com/flutter/flutter/blob/main/docs/tool/Engine-artifacts.md. +/bin/internal/engine.version + +# Flutter repo-specific +/bin/cache/ +/bin/internal/bootstrap.bat +/bin/internal/bootstrap.sh +/bin/internal/engine.realm +/bin/mingit/ +/dev/benchmarks/mega_gallery/ +/dev/bots/.recipe_deps +/dev/bots/android_tools/ +/dev/devicelab/ABresults*.json +/dev/docs/doc/ +/dev/docs/api_docs.zip +/dev/docs/flutter.docs.zip +/dev/docs/lib/ +/dev/docs/pubspec.yaml +/dev/integration_tests/**/xcuserdata +/dev/integration_tests/**/Pods +/packages/flutter/coverage/ +version +analysis_benchmark.json + +# packages file containing multi-root paths +.packages.generated # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock **/doc/api/ .dart_tool/ +.flutter-plugins-dependencies +**/generated_plugin_registrant.dart .packages +.pub-preload-cache/ +.pub-cache/ +.pub/ build/ +flutter_*.png +linked_*.ds +unlinked.ds +unlinked_spec.ds + +# Android related +**/android/**/gradle-wrapper.jar +.gradle/ +**/android/captures/ +**/android/gradlew +**/android/gradlew.bat +**/android/**/GeneratedPluginRegistrant.java +**/android/key.properties +*.jks +local.properties +**/.cxx/ + +# iOS/XCode related +**/ios/**/*.mode1v3 +**/ios/**/*.mode2v3 +**/ios/**/*.moved-aside +**/ios/**/*.pbxuser +**/ios/**/*.perspectivev3 +**/ios/**/*sync/ +**/ios/**/.sconsign.dblite +**/ios/**/.tags* +**/ios/**/.vagrant/ +**/ios/**/DerivedData/ +**/ios/**/Icon? +**/ios/**/Pods/ +**/ios/**/.symlinks/ +**/ios/**/profile +**/ios/**/xcuserdata +**/ios/.generated/ +**/ios/Flutter/.last_build_id +**/ios/Flutter/App.framework +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Flutter.podspec +**/ios/Flutter/Generated.xcconfig +**/ios/Flutter/ephemeral +**/ios/Flutter/app.flx +**/ios/Flutter/app.zip +**/ios/Flutter/flutter_assets/ +**/ios/Flutter/flutter_export_environment.sh +**/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* + +# macOS +**/Flutter/ephemeral/ +**/Pods/ +**/macos/Flutter/GeneratedPluginRegistrant.swift +**/macos/Flutter/ephemeral +**/xcuserdata/ + +# Windows +**/windows/flutter/ephemeral/ +**/windows/flutter/generated_plugin_registrant.cc +**/windows/flutter/generated_plugin_registrant.h +**/windows/flutter/generated_plugins.cmake + +# Linux +**/linux/flutter/ephemeral/ +**/linux/flutter/generated_plugin_registrant.cc +**/linux/flutter/generated_plugin_registrant.h +**/linux/flutter/generated_plugins.cmake + +# Coverage +coverage/ + +# Symbols +app.*.symbols -**/dgph +# Exceptions to above rules. +!**/ios/**/default.mode1v3 +!**/ios/**/default.mode2v3 +!**/ios/**/default.pbxuser +!**/ios/**/default.perspectivev3 +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +!/dev/ci/**/Gemfile.lock +!.vscode/settings.json -# Mkdocs (has own branch) -site \ No newline at end of file +# Monorepo +.cipd +.gclient +.gclient_entries +.python-version +.gclient_previous_custom_vars +.gclient_previous_sync_commits \ No newline at end of file diff --git a/example/.flutter-plugins b/example/.flutter-plugins new file mode 100644 index 00000000..11f3beb6 --- /dev/null +++ b/example/.flutter-plugins @@ -0,0 +1,7 @@ +# This is a generated file; do not edit or check into version control. +bccm_player=/Users/kautsaralbana/Downloads/works/bccm-player/ +connectivity_plus=/Users/kautsaralbana/.puro/shared/pub_cache/hosted/pub.dev/connectivity_plus-6.1.4/ +flutter_plugin_android_lifecycle=/Users/kautsaralbana/.puro/shared/pub_cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.28/ +package_info_plus=/Users/kautsaralbana/.puro/shared/pub_cache/hosted/pub.dev/package_info_plus-8.3.0/ +screen_protector=/Users/kautsaralbana/.puro/shared/pub_cache/hosted/pub.dev/screen_protector-1.4.2+1/ +wakelock_plus=/Users/kautsaralbana/.puro/shared/pub_cache/hosted/pub.dev/wakelock_plus-1.3.2/ diff --git a/example/.gitignore b/example/.gitignore index 24476c5d..feb91f29 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,5 +1,9 @@ +# Do not remove or rename entries in this file, only add new ones +# See https://github.com/flutter/flutter/issues/128635 for more context. + # Miscellaneous *.class +*.lock *.log *.pyc *.swp @@ -8,7 +12,11 @@ .buildlog/ .history .svn/ -migrate_working_dir/ + +# As packages are no longer pinned, we use a lockfile for testing locally. +# When unpinning packages, Using lockfiles ensures that failures in PRs are +# actually due to those PRs, not due to a package being updated. +!/pubspec.lock # IntelliJ related *.iml @@ -16,29 +24,142 @@ migrate_working_dir/ *.iws .idea/ -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ +# Visual Studio Code related +.classpath +.project +.settings/ +.vscode/* +.ccls-cache + +# This file, on the master branch, should never exist or be checked-in. +# +# On a *final* release branch, that is, what will ship to stable or beta, the +# file can be force added (git add --force) and checked-in in order to effectively +# "pin" the engine artifact version so the flutter tool does not need to use git +# to determine the engine artifacts. +# +# See https://github.com/flutter/flutter/blob/main/docs/tool/Engine-artifacts.md. +/bin/internal/engine.version + +# Flutter repo-specific +/bin/cache/ +/bin/internal/bootstrap.bat +/bin/internal/bootstrap.sh +/bin/internal/engine.realm +/bin/mingit/ +/dev/benchmarks/mega_gallery/ +/dev/bots/.recipe_deps +/dev/bots/android_tools/ +/dev/devicelab/ABresults*.json +/dev/docs/doc/ +/dev/docs/api_docs.zip +/dev/docs/flutter.docs.zip +/dev/docs/lib/ +/dev/docs/pubspec.yaml +/dev/integration_tests/**/xcuserdata +/dev/integration_tests/**/Pods +/packages/flutter/coverage/ +version +analysis_benchmark.json + +# packages file containing multi-root paths +.packages.generated # Flutter/Dart/Pub related **/doc/api/ -**/ios/Flutter/.last_build_id .dart_tool/ -.flutter-plugins .flutter-plugins-dependencies +**/generated_plugin_registrant.dart .packages +.pub-preload-cache/ .pub-cache/ .pub/ -/build/ +build/ +flutter_*.png +linked_*.ds +unlinked.ds +unlinked_spec.ds + +# Android related +**/android/**/gradle-wrapper.jar +.gradle/ +**/android/captures/ +**/android/gradlew +**/android/gradlew.bat +**/android/**/GeneratedPluginRegistrant.java +**/android/key.properties +*.jks +local.properties +**/.cxx/ + +# iOS/XCode related +**/ios/**/*.mode1v3 +**/ios/**/*.mode2v3 +**/ios/**/*.moved-aside +**/ios/**/*.pbxuser +**/ios/**/*.perspectivev3 +**/ios/**/*sync/ +**/ios/**/.sconsign.dblite +**/ios/**/.tags* +**/ios/**/.vagrant/ +**/ios/**/DerivedData/ +**/ios/**/Icon? +**/ios/**/Pods/ +**/ios/**/.symlinks/ +**/ios/**/profile +**/ios/**/xcuserdata +**/ios/.generated/ +**/ios/Flutter/.last_build_id +**/ios/Flutter/App.framework +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Flutter.podspec +**/ios/Flutter/Generated.xcconfig +**/ios/Flutter/ephemeral +**/ios/Flutter/app.flx +**/ios/Flutter/app.zip +**/ios/Flutter/flutter_assets/ +**/ios/Flutter/flutter_export_environment.sh +**/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* + +# macOS +**/Flutter/ephemeral/ +**/Pods/ +**/macos/Flutter/GeneratedPluginRegistrant.swift +**/macos/Flutter/ephemeral +**/xcuserdata/ + +# Windows +**/windows/flutter/ephemeral/ +**/windows/flutter/generated_plugin_registrant.cc +**/windows/flutter/generated_plugin_registrant.h +**/windows/flutter/generated_plugins.cmake + +# Linux +**/linux/flutter/ephemeral/ +**/linux/flutter/generated_plugin_registrant.cc +**/linux/flutter/generated_plugin_registrant.h +**/linux/flutter/generated_plugins.cmake + +# Coverage +coverage/ -# Symbolication related +# Symbols app.*.symbols -# Obfuscation related -app.*.map.json +# Exceptions to above rules. +!**/ios/**/default.mode1v3 +!**/ios/**/default.mode2v3 +!**/ios/**/default.pbxuser +!**/ios/**/default.perspectivev3 +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +!/dev/ci/**/Gemfile.lock +!.vscode/settings.json -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release +# Monorepo +.cipd +.gclient +.gclient_entries +.python-version +.gclient_previous_custom_vars +.gclient_previous_sync_commits \ No newline at end of file diff --git a/example/lib/examples/drm_player.dart b/example/lib/examples/drm_player.dart index 84afa10c..948f6b63 100644 --- a/example/lib/examples/drm_player.dart +++ b/example/lib/examples/drm_player.dart @@ -15,17 +15,15 @@ class _DrmPlayerState extends State { @override void initState() { - playerController = BccmPlayerController( - MediaItem( - url: TempDrmSource.file, - mimeType: Platform.isAndroid ? 'application/dash+xml' : 'application/vnd.apple.mpegurl', - drmConfiguration: DrmConfiguration( - drmType: DrmType.widevine, - licenseServerUrl: TempDrmSource.licenseUrl, - licenseRequestHeaders: {'X-AxDRM-Message': TempDrmSource.token}, - ), + playerController = BccmPlayerController(MediaItem( + url: TempDrmSource.file, + mimeType: Platform.isAndroid ? 'application/dash+xml' : 'application/vnd.apple.mpegurl', + drmConfiguration: DrmConfiguration( + drmType: DrmType.widevine, + licenseServerUrl: TempDrmSource.licenseUrl, + licenseRequestHeaders: {'X-AxDRM-Message': TempDrmSource.token}, ), - ); + )); playerController.addListener(playerListener); playerController.events.listen(playerEventListener); playerController.initialize().then((_) => playerController.setMixWithOthers(false)); @@ -50,10 +48,15 @@ class _DrmPlayerState extends State { @override Widget build(BuildContext context) { - return Column( - children: [ - BccmPlayerView(playerController), - ], + return Scaffold( + body: Column( + children: [ + BccmPlayerView( + playerController, + config: BccmPlayerViewConfig(useSurfaceView: true), + ), + ], + ), ); } } diff --git a/example/pubspec.lock b/example/pubspec.lock index af7067ea..67c363f3 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.12.0" bccm_player: dependency: "direct main" description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.2" ffi: dependency: transitive description: @@ -307,10 +307,10 @@ packages: dependency: transitive description: name: js - sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -323,10 +323,10 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.9" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: @@ -640,10 +640,10 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "14.3.1" wakelock_plus: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 00000000..5d7c5f9a --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,807 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" + url: "https://pub.dev" + source: hosted + version: "76.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.3" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" + url: "https://pub.dev" + source: hosted + version: "6.11.0" + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + url: "https://pub.dev" + source: hosted + version: "2.12.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + build: + dependency: transitive + description: + name: build + sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + build_config: + dependency: transitive + description: + name: build_config + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" + url: "https://pub.dev" + source: hosted + version: "4.0.4" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62 + url: "https://pub.dev" + source: hosted + version: "2.5.4" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792" + url: "https://pub.dev" + source: hosted + version: "9.1.2" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27" + url: "https://pub.dev" + source: hosted + version: "8.10.1" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + url: "https://pub.dev" + source: hosted + version: "4.10.1" + collection: + dependency: "direct main" + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + crypto: + dependency: transitive + description: + name: crypto + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" + source: hosted + version: "3.0.6" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" + url: "https://pub.dev" + source: hosted + version: "2.3.8" + dbus: + dependency: transitive + description: + name: dbus + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" + url: "https://pub.dev" + source: hosted + version: "0.7.11" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + url: "https://pub.dev" + source: hosted + version: "1.3.2" + ffi: + dependency: transitive + description: + name: ffi + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_hooks: + dependency: "direct main" + description: + name: flutter_hooks + sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70 + url: "https://pub.dev" + source: hosted + version: "0.20.5" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + flutter_plugin_android_lifecycle: + dependency: "direct main" + description: + name: flutter_plugin_android_lifecycle + sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e + url: "https://pub.dev" + source: hosted + version: "2.0.28" + flutter_state_notifier: + dependency: "direct main" + description: + name: flutter_state_notifier + sha256: bd8d4eabd4b74f11733409305369c112fa2f7989290f73ee75ae2cbfcf04b8a3 + url: "https://pub.dev" + source: hosted + version: "1.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + freezed: + dependency: "direct main" + description: + name: freezed + sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e" + url: "https://pub.dev" + source: hosted + version: "2.5.7" + freezed_annotation: + dependency: "direct main" + description: + name: freezed_annotation + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 + url: "https://pub.dev" + source: hosted + version: "2.4.4" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de + url: "https://pub.dev" + source: hosted + version: "2.1.3" + graphs: + dependency: transitive + description: + name: graphs + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + http: + dependency: transitive + description: + name: http + sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" + url: "https://pub.dev" + source: hosted + version: "1.4.0" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 + url: "https://pub.dev" + source: hosted + version: "3.2.2" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + io: + dependency: transitive + description: + name: io + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + url: "https://pub.dev" + source: hosted + version: "1.0.5" + js: + dependency: "direct main" + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + url: "https://pub.dev" + source: hosted + version: "10.0.8" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + lints: + dependency: transitive + description: + name: lints + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" + url: "https://pub.dev" + source: hosted + version: "0.1.3-main.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: "direct main" + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + mime: + dependency: transitive + description: + name: mime + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + mockito: + dependency: "direct dev" + description: + name: mockito + sha256: f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6 + url: "https://pub.dev" + source: hosted + version: "5.4.5" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc + url: "https://pub.dev" + source: hosted + version: "2.2.0" + package_info_plus: + dependency: transitive + description: + name: package_info_plus + sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191" + url: "https://pub.dev" + source: hosted + version: "8.3.0" + package_info_plus_platform_interface: + dependency: transitive + description: + name: package_info_plus_platform_interface + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" + url: "https://pub.dev" + source: hosted + version: "6.1.0" + pigeon: + dependency: "direct dev" + description: + name: pigeon + sha256: f938cbea2249d68843f96953da7c787a99960578066492ac5962da1da8cabf67 + url: "https://pub.dev" + source: hosted + version: "21.2.0" + plugin_platform_interface: + dependency: "direct main" + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + provider: + dependency: transitive + description: + name: provider + sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + riverpod: + dependency: "direct main" + description: + name: riverpod + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" + url: "https://pub.dev" + source: hosted + version: "2.6.1" + shelf: + dependency: transitive + description: + name: shelf + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 + url: "https://pub.dev" + source: hosted + version: "1.4.2" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + state_notifier: + dependency: "direct main" + description: + name: state_notifier + sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb + url: "https://pub.dev" + source: hosted + version: "1.0.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 + url: "https://pub.dev" + source: hosted + version: "2.1.1" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" + timing: + dependency: transitive + description: + name: timing + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + universal_io: + dependency: "direct main" + description: + name: universal_io + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + uuid: + dependency: "direct main" + description: + name: uuid + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + url: "https://pub.dev" + source: hosted + version: "4.5.1" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6 + url: "https://pub.dev" + source: hosted + version: "1.1.19" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" + url: "https://pub.dev" + source: hosted + version: "1.1.13" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331" + url: "https://pub.dev" + source: hosted + version: "1.1.17" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + url: "https://pub.dev" + source: hosted + version: "14.3.1" + wakelock_plus: + dependency: "direct main" + description: + name: wakelock_plus + sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678 + url: "https://pub.dev" + source: hosted + version: "1.3.2" + wakelock_plus_platform_interface: + dependency: transitive + description: + name: wakelock_plus_platform_interface + sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207 + url: "https://pub.dev" + source: hosted + version: "1.2.3" + watcher: + dependency: transitive + description: + name: watcher + sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 + url: "https://pub.dev" + source: hosted + version: "3.0.3" + win32: + dependency: transitive + description: + name: win32 + sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba" + url: "https://pub.dev" + source: hosted + version: "5.13.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://pub.dev" + source: hosted + version: "3.1.3" +sdks: + dart: ">=3.7.0 <4.0.0" + flutter: ">=3.27.0" From 276064ad7fef2d054ba6d0c4887c9261461d1e0e Mon Sep 17 00:00:00 2001 From: Kautsar Albana Date: Thu, 3 Jul 2025 18:09:51 +0700 Subject: [PATCH 6/6] update for pull request --- .../kotlin/media/bcc/bccm_player/players/PlayerController.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt index edab2f7b..39779a3f 100644 --- a/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt +++ b/android/src/main/kotlin/media/bcc/bccm_player/players/PlayerController.kt @@ -328,9 +328,6 @@ abstract class PlayerController : Player.Listener { } fun getPlaybackState(): PlaybackPlatformApi.PlaybackState { - if (player.playbackState == Player.STATE_ENDED) { - return PlaybackPlatformApi.PlaybackState.STOPPED - } return if (player.isPlaying || player.playWhenReady && !arrayOf( Player.STATE_ENDED, Player.STATE_IDLE