@24i/smartapps-bigscreen-rnv-build-engine 0.17.26-alpha.2727 → 0.17.26-alpha.2754

package/dist/src/scripts/buildAllWithSchemes.js

@@ -30,6 +30,11 @@ const fse = __importStar(require("fs-extra"));
 const getSafeSchemeString_1 = require("../utils/getSafeSchemeString");
 const resolvers_1 = require("../resolvers");
 const getArgs_1 = require("./utils/getArgs");
+const convertToArray = (value) => {
+    if (!Array.isArray(value))
+        return [value];
+    return value || [];
+};
 const getProgressMessage = ({ schemes, schemeIndex, platforms, platformIndex, flavours, flavourIndex, }) => {
     let string = '\nProcessing';
     string += ` "${platforms[platformIndex]}" platform`;
@@ -69,12 +74,12 @@ const buildAllWithSchemes = () => {
     if (include || exclude) {
         supportedPlatforms = supportedPlatforms.filter((platform) => {
             if (include)
-                return include.includes(platform);
-            return !exclude.includes(platform);
+                return convertToArray(include).includes(platform);
+            return !convertToArray(exclude).includes(platform);
         });
     }
     supportedPlatforms.forEach((platform, platformIndex, platforms) => {
-        buildSchemes.forEach((scheme, schemeIndex, schemes) => {
+        convertToArray(buildSchemes).forEach((scheme, schemeIndex, schemes) => {
             c.runtime.scheme = scheme;
             const supportedFlavours = (0, resolvers_1.resolveSupportedFlavoursForPlatform)(c, platform);
             supportedFlavours.forEach((flavour, flavourIndex, flavours) => {

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -104,12 +104,12 @@ dependencies {
     implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
     implementation "com.squareup.okhttp3:okhttp:4.9.2"
     if (useTheoPlayer) {
-        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.5"
-        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.5"
+        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.8"
+        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.8"
         implementation "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
     } else {
-        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.5"
-        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.5"
+        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.8"
+        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.8"
         compileOnly "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
     }
 

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/PlayerFactoryExoPlayerCustomized.kt

@@ -8,7 +8,7 @@ import com.google.android.exoplayer2.drm.DrmSessionManager
 import com.google.android.exoplayer2.drm.FrameworkMediaDrm
 import com.google.android.exoplayer2.drm.MediaDrmCallback
 import com.google.android.exoplayer2.upstream.HttpDataSource
-import com.google.android.exoplayer2.util.Util
+import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy
 import com.twentyfouri.player.base.DrmPlayready
 import com.twentyfouri.player.base.DrmWidevine
 import com.twentyfouri.player.base.Source
@@ -29,7 +29,9 @@ class PlayerFactoryExoPlayerCustomized(
 
     private inner class CustomizedSharedComponents(context: Context) : DefaultSharedComponents(context) {
 
-        override val drmProvider: DrmSessionManagerProvider by lazy { CustomizedDrmSessionManagerProvider() }
+        override val drmProvider: DrmSessionManagerProvider by lazy {
+            CustomizedDrmSessionManagerProvider(loadErrorHandlingPolicy)
+        }
 
         override val applicationName: String
             get() = config.playerAppName ?: super.applicationName
@@ -50,7 +52,9 @@ class PlayerFactoryExoPlayerCustomized(
             get() = false
     }
 
-    private class CustomizedDrmSessionManagerProvider : DefaultDrmSessionManagerProvider() {
+    private class CustomizedDrmSessionManagerProvider(
+        loadErrorHandlingPolicy: LoadErrorHandlingPolicy
+    ) : DefaultDrmSessionManagerProvider(loadErrorHandlingPolicy) {
         override fun buildDrmSessionManager(
             dataSourceFactory: AuthorizedDataSourceProvider,
             source: Source,
@@ -85,6 +89,7 @@ class PlayerFactoryExoPlayerCustomized(
             return DefaultDrmSessionManager.Builder()
                     .setUuidAndExoMediaDrmProvider(drmUuid, FrameworkMediaDrm.DEFAULT_PROVIDER)
                     .setMultiSession(false)
+                    .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
                     .build(drmCallback)
         }
 

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/PlayerFactoryExoPlayerNpaw.kt

@@ -36,6 +36,7 @@ import com.google.android.exoplayer2.ui.AdViewProvider
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.SubtitleView
 import com.google.android.exoplayer2.upstream.HttpDataSource
+import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource
 import com.google.android.exoplayer2.video.VideoSize
 import com.npaw.NpawPlugin
@@ -127,7 +128,9 @@ class PlayerFactoryExoPlayerNpaw(
             npawPlugin.destroy()
         }
 
-        override val drmProvider: DrmSessionManagerProvider by lazy { CustomizedDrmSessionManagerProvider() }
+        override val drmProvider: DrmSessionManagerProvider by lazy {
+            CustomizedDrmSessionManagerProvider(loadErrorHandlingPolicy)
+        }
 
         override val applicationName: String
             get() = config.playerAppName ?: super.applicationName
@@ -162,7 +165,9 @@ class PlayerFactoryExoPlayerNpaw(
             get() = false
     }
 
-    private class CustomizedDrmSessionManagerProvider : DefaultDrmSessionManagerProvider() {
+    private class CustomizedDrmSessionManagerProvider(
+        loadErrorHandlingPolicy: LoadErrorHandlingPolicy
+    ) : DefaultDrmSessionManagerProvider(loadErrorHandlingPolicy) {
         override fun buildDrmSessionManager(
             dataSourceFactory: AuthorizedDataSourceProvider,
             source: Source,
@@ -197,6 +202,7 @@ class PlayerFactoryExoPlayerNpaw(
             return DefaultDrmSessionManager.Builder()
                     .setUuidAndExoMediaDrmProvider(drmUuid, FrameworkMediaDrm.DEFAULT_PROVIDER)
                     .setMultiSession(false)
+                    .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
                     .build(drmCallback)
         }
 
@@ -228,6 +234,7 @@ class PlayerFactoryExoPlayerNpaw(
                         "app.name" -> target.appName = jsonAnalytics.getString(key, null)
                         "app.releaseVersion" -> target.appReleaseVersion = jsonAnalytics.getString(key, null)
                         "device.id" -> target.deviceId = jsonAnalytics.getString(key, null)
+                        "username" -> target.username = jsonAnalytics.getString(key, null)
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.26-alpha.2727",
+	"version": "0.17.26-alpha.2754",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {