@24i/smartapps-bigscreen-rnv-build-engine 0.17.6-alpha.9 → 0.17.6

package/dist/templates/platforms/androidtv/project/app/src/main/res/layout/activity_web_view.xml

@@ -1,76 +1,28 @@
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black">
 
-    <data>
-
-        <variable
-            name="viewModel"
-            type="com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel" />
-    </data>
+    <com.twentyfouri.player.base.PlayerView
+        android:id="@+id/player_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
-    <RelativeLayout
+    <View
+        android:id="@+id/black_curtain"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/black"
-        tools:context=".webview.ui.view.WebViewActivity">
-
-        <com.twentyfouri.player.base.PlayerView
-            android:id="@+id/exoplayer_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <View
-            android:id="@+id/black_curtain"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/black" />
-
-        <LinearLayout
-            android:id="@+id/url_setter"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_margin="80dp"
-            android:orientation="vertical"
-            app:visibility="@{viewModel.urlSetterVisibility}">
-
-            <EditText
-                android:id="@+id/url"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nextFocusUp="@+id/url"
-                android:nextFocusLeft="@+id/url"
-                android:nextFocusRight="@+id/url"
-                android:textColor="@android:color/white"/>
-
-            <Button
-                android:id="@+id/button_go"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/button_focus"
-                android:textColor="@android:color/black"
-                android:nextFocusDown="@+id/button_go"
-                android:nextFocusLeft="@+id/button_go"
-                android:nextFocusRight="@+id/button_go"
-                android:onClick="@{() -> viewModel.onClickGo()}"
-                android:text="GO" />
-
-        </LinearLayout>
-
-        <com.twentyfouri.tvbridge.webview.client.BridgeWebView
-            android:id="@+id/webview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:background="@android:color/transparent"
-            android:visibility="gone"/>
-
-    </RelativeLayout>
-
-</layout>
-
+        android:background="@android:color/black" />
 
+    <com.twentyfouri.tvbridge.webview.client.BridgeWebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:background="@android:color/transparent"
+        android:visibility="gone" />
+
+</RelativeLayout>

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

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
 
         versionCode 1
         versionName "1.0"

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

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
 
         versionCode 1
         versionName "1.0"

package/package.json

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

package/renative.engine.json

@@ -8,11 +8,13 @@
     "platforms": {
         "androidtv": {},
         "entone": {},
+        "firetv": {},
         "hbbtv": {},
         "kreatv": {},
         "saphi": {},
         "tizen": {},
         "vidaa": {},
+        "smartcast": {},
         "webos": {},
         "webtv": {},
         "xbox": {}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/jump/JumpAnalytics.kt

@@ -1,211 +0,0 @@
-package com.twentyfouri.tvbridge.jump
-
-import android.util.Log
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.SimpleExoPlayer
-import com.google.gson.JsonObject
-import com.twentyfouri.tvbridge.BuildConfig
-import com.twentyfouri.tvbridge.webview.model.AnalyticsPlaybackInfo
-import jump.JumpKit
-import jump.insights.models.contextinformation.*
-import jump.insights.models.track.events.JKContentType
-import jump.insights.models.track.events.JKTransactionType
-import jump.libs.gson.annotations.SerializedName
-import java.util.*
-
-class JumpAnalytics {
-
-    private var started = false
-    private var hasContent = false
-
-    fun setPlaybackInfo(playbackInfo: AnalyticsPlaybackInfo) {
-        setApplicationId(playbackInfo.id ?: return)
-        setUserInfo(playbackInfo.userInfo)
-        setContentInfo(playbackInfo.contentInfo)
-    }
-
-    private fun setApplicationId(applicationId: String) {
-        if (started) return
-        started = true
-        JumpKit.setDebugMode(BuildConfig.DEBUG)
-        JumpKit.start(applicationId)
-    }
-
-    private fun setUserInfo(params: JsonObject?) {
-        JumpKit.insights.setUserInfo(parseUserInfo(params))
-    }
-
-    private fun setContentInfo(params: JsonObject?) {
-        val contentInfo = parseContentInfo(params)
-        jump.exoplayerextension.JumpKit.insights.setContentInfo(contentInfo)
-        hasContent = true
-    }
-
-    fun setVideoPlayer(player: ExoPlayer?) {
-        @Suppress("DEPRECATION")
-        if (player !is SimpleExoPlayer) {
-            /* NOTICE: passing null also causes insights.setContentInfo(null) */
-            jump.exoplayerextension.JumpKit.insights.setVideoPlayer(null)
-            hasContent = false
-        } else if (started && hasContent) {
-            jump.exoplayerextension.JumpKit.insights.setVideoPlayer(player)
-        } else if (started) {
-            Log.w("JumpAnalytics", "No content data available. Did you call SetPlaybackInfo before SetVideoPath?")
-        }
-    }
-
-    private fun parseUserInfo(params: JsonObject?): JKUserInfo {
-        return try {
-            var userType = parseEnum(params, "userType", JKUserType::class.java)
-            if (userType == null) userType = JKUserType.ANONYMOUS
-            val userId = parseString(params, "userId")
-            val userCountry = parseString(params, "userCountry")
-            val userBirthDate = parseString(params, "userBirthDate")
-            var userSex = parseEnum(params, "userSex", JKUserSex::class.java)
-            if (userSex == null) userSex = JKUserSex.UNDEFINED
-            val userProfileId = parseString(params, "userProfileId")
-            val userOperator = parseString(params, "userOperator")
-            if (userType == JKUserType.ANONYMOUS) JKUserInfo.anonymousInstance() else JKUserInfo(userType, userId, userCountry, userBirthDate, userSex, userProfileId, userOperator)
-        } catch (e: Exception) {
-            Log.w("JumpAnalytics", "Parsing userInfo failed. Falling back to ANONYMOUS", e)
-            JKUserInfo.anonymousInstance()
-        }
-    }
-
-    private fun parseCategory(params: JsonObject?, property: String): JKContextCategory? {
-        val jsonValue = params?.get(property) ?: return null
-        return if (!jsonValue.isJsonObject) null else parseCategory(jsonValue.asJsonObject)
-    }
-
-    private fun parseCategory(params: JsonObject): JKContextCategory {
-        return JKContextCategory(
-                parseString(params, "categoryId"),
-                parseString(params, "categoryName")
-        )
-    }
-
-    private fun parseSubCategory(params: JsonObject?, property: String): JKContextSubcategory? {
-        val jsonValue = params?.get(property) ?: return null
-        return if (!jsonValue.isJsonObject) null else parseSubCategory(jsonValue.asJsonObject)
-    }
-
-    private fun parseSubCategory(params: JsonObject): JKContextSubcategory {
-        return JKContextSubcategory(
-                parseString(params, "subcategoryId"),
-                parseString(params, "categoryId"),
-                parseString(params, "subcategoryName")
-        )
-    }
-
-    private fun parseGenre(params: JsonObject): JKContextGenre {
-        return JKContextGenre(
-                parseString(params, "genreId"),
-                parseString(params, "genreName"),
-                parseCategory(params, "categoryId"),
-                parseSubCategory(params, "subCategoryId")
-        )
-    }
-
-    private fun parseContentInfo(params: JsonObject?): JKContextContent {
-        return JKContextContent(
-                parseString(params, "contentId"),
-                parseString(params, "contentTitle"),
-                parseString(params, "contentSerieTitle"),
-                parseInteger(params, "contentEpisodeNumber"),
-                parseInteger(params, "contentSeasonNumber"),
-                parseString(params, "contentDescription"),
-                parseCategory(params, "contentCategory"),
-                parseSubCategory(params, "contentSubCategory"),
-                parseGenres(params, "contentGenres"),
-                parseString(params, "contentProvider"),
-                parseEnum(params, "contentTransactionType", JKTransactionType::class.java),
-                parseEnum(params, "contentType", JKContentType::class.java),
-                parseString(params, "contentLanguage")
-        )
-    }
-
-    private fun parseGenres(container: JsonObject?, property: String): List<JKContextGenre>? {
-        if (container == null) return null
-        val jsonValue = container[property] ?: return null
-        if (!jsonValue.isJsonArray) return null
-        val list = ArrayList<JKContextGenre>()
-        for (jsonElement in jsonValue.asJsonArray) {
-            if (!jsonElement.isJsonObject) continue
-            list.add(parseGenre(jsonElement.asJsonObject))
-        }
-        return list
-    }
-
-    private fun <T : Enum<T>> parseEnum(container: JsonObject?, property: String, type: Class<T>): T? {
-        if (container == null) return null
-        val jsonValue = container[property] ?: return null
-        if (!jsonValue.isJsonPrimitive) return null
-        val primitive = jsonValue.asJsonPrimitive
-        return when {
-            primitive.isString ->
-                parseEnum(type, jsonValue.asString)
-            primitive.isNumber ->
-                parseEnum(type, jsonValue.asInt)
-            else ->
-                null
-        }
-    }
-
-    private fun <T : Enum<T>> parseEnum(type: Class<T>, value: String): T? {
-        try {
-            for (constant in type.enumConstants ?: return null) {
-                val name = constant.name
-                if (name == value) {
-                    return constant
-                }
-                val annotation = type.getField(name).getAnnotation(SerializedName::class.java)
-                if (annotation != null) {
-                    if (annotation.value == value) {
-                        return constant
-                    }
-                }
-            }
-            return null
-        } catch (e: NoSuchFieldException) {
-            return null
-        }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private fun <T : Enum<T>> parseEnum(type: Class<T>, value: Int): T? {
-        return try {
-            val map = type.getDeclaredField("mapper")[null] as Map<T, Int>
-            for ((key, value1) in map) {
-                if (value1 == value) {
-                    return key
-                }
-            }
-            null
-        } catch (e: ClassCastException) {
-            null
-        } catch (e: IllegalAccessException) {
-            null
-        } catch (e: NoSuchFieldException) {
-            null
-        }
-    }
-
-    private fun parseString(container: JsonObject?, property: String): String? {
-        if (container == null) return null
-        var jsonValue = container[property]
-        if (jsonValue == null && property.endsWith("Id")) {
-            // inconsistencies in SDK cause confusion, try uppercased xxxxID just in case
-            jsonValue = container[property.replace("Id", "ID")]
-        }
-        if (jsonValue == null) return null
-        if (!jsonValue.isJsonPrimitive) return null
-        return if (!jsonValue.asJsonPrimitive.isString) null else jsonValue.asString
-    }
-
-    private fun parseInteger(container: JsonObject?, property: String): Int? {
-        if (container == null) return null
-        val jsonValue = container[property] ?: return null
-        if (!jsonValue.isJsonPrimitive) return null
-        return if (!jsonValue.asJsonPrimitive.isNumber) null else jsonValue.asInt
-    }
-}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/parser/ContentModelParser.kt

@@ -1,16 +0,0 @@
-package com.twentyfouri.tvbridge.webview.parser
-
-import com.google.gson.Gson
-import com.twentyfouri.tvbridge.webview.model.ContentModel
-
-object ContentModelParser {
-    fun stringToJson(json: String?): ContentModel? = when {
-        json.isNullOrEmpty() -> null
-        json.startsWith("http://") || json.startsWith("https://") ->
-            ContentModel().apply {
-                streamUrl = json
-            }
-        else ->
-            Gson().fromJson(json, ContentModel::class.java)
-    }
-}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/parser/DeviceInfoParser.kt

@@ -1,22 +0,0 @@
-package com.twentyfouri.tvbridge.webview.parser
-
-import android.os.Build
-import org.json.JSONException
-import org.json.JSONObject
-
-object DeviceInfoParser {
-    // TODO Auto-generated catch block
-    val deviceInfoParsed: String
-        get() {
-            val deviceInfo = JSONObject()
-            try {
-                deviceInfo.put("deviceBrand", Build.MANUFACTURER)
-                deviceInfo.put("deviceModel", Build.MODEL)
-                deviceInfo.put("osVersion", Build.VERSION.RELEASE)
-            } catch (e: JSONException) {
-                // TODO Auto-generated catch block
-                e.printStackTrace()
-            }
-            return deviceInfo.toString()
-        }
-}