@24i/smartapps-bigscreen-rnv-build-engine 0.17.27-alpha.2782 → 0.17.27-alpha.2786

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

@@ -129,4 +129,6 @@ dependencies {
     }
 
     implementation project(':common')
+
+    implementation "com.google.android.gms:play-services-ads-identifier:18.2.0"
 }

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

@@ -8,15 +8,14 @@ import android.webkit.JavascriptInterface
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.TextTrack
 import com.twentyfouri.player.base.TrackKind
-import com.twentyfouri.tvbridge.webview.parser.SourceParser.stringToJson
 import com.twentyfouri.tvbridge.webview.parser.PlaybackInfoParser.parse
-import com.twentyfouri.tvbridge.webview.parser.SourceParser
+import com.twentyfouri.tvbridge.webview.parser.SourceParser.stringToJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.audioFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.textFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
 import com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Arrays
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.math.roundToInt
@@ -375,6 +374,18 @@ class BridgeFromJavaScript(
         return ""
     }
 
+    /***
+     * Bridget JS 2 Android to get advertising id
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetAdId() = viewModel.adId
+
+    /***
+     * Bridget JS 2 Android to get limit ad tracking info
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetLimitAdTracking() = viewModel.limitAdTracking
+
     companion object {
         const val LOG_TAG = "JavaScriptBridge"
         val DISABLED_AUDIO_TRACK = JsonObject().apply {

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

@@ -11,6 +11,10 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import android.view.ViewTreeObserver
+import android.webkit.WebView
+import com.twentyfouri.tvbridge.R
+import com.twentyfouri.tvbridge.webview.client.BridgeWebView
 import android.view.View.MeasureSpec
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
@@ -78,6 +82,15 @@ class WebViewActivity : AppCompatActivity(), Mainview {
 
         loadUrl(config.baseUrl)
 
+        val mainWebView = findViewById<WebView>(R.id.webview)
+
+        window.decorView.viewTreeObserver.addOnGlobalFocusChangeListener { oldFocus: View?, newFocus: View? ->
+            if (newFocus is WebView) {
+                Log.d("FocusDebug", "WebView získal focus, vracím zpět na hlavní view")
+                mainWebView.requestFocus()
+            }
+        }
+
         initialized = true
     }
 
@@ -230,6 +243,7 @@ class WebViewActivity : AppCompatActivity(), Mainview {
 
     override fun loadUrl(url: String?) {
         if (url.isNullOrEmpty()) return
+
         binding.webview.visibility = View.VISIBLE
         binding.webview.loadUrl(url)
         if (url.startsWith("http")) {
@@ -242,4 +256,4 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             setCookiePolicy(CookiePolicy.ACCEPT_ALL)
         }
     }
-}
+}

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

@@ -6,12 +6,15 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Build
+import android.provider.Settings
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
@@ -23,7 +26,6 @@ import com.twentyfouri.tvbridge.bridge.BridgeToJavaScript
 import com.twentyfouri.tvbridge.common.*
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
-import com.twentyfouri.tvbridge.global.utils.PlayerFactoryTheoPlayerCustomized
 import com.twentyfouri.tvbridge.global.utils.PlayerFactoryVersion
 import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
 import com.twentyfouri.tvbridge.webview.client.BridgeWebView
@@ -627,6 +629,30 @@ class WebViewModel @Inject constructor(
         }
     }
 
+    val adId get() = try {
+        // Let's try Google first
+        AdvertisingIdClient.getAdvertisingIdInfo(context).id
+    } catch (e: GooglePlayServicesNotAvailableException) {
+        // Probably Amazon
+        try {
+            Settings.Secure.getString(context.contentResolver, "advertising_id")
+        } catch (snfe: Settings.SettingNotFoundException) {
+            null
+        }
+    }
+
+    val limitAdTracking get() = try {
+        // Let's try Google first
+        AdvertisingIdClient.getAdvertisingIdInfo(context).isLimitAdTrackingEnabled
+    } catch (e: GooglePlayServicesNotAvailableException) {
+        // Probably Amazon
+        try {
+            Settings.Secure.getInt(context.contentResolver, "limit_ad_tracking") != 0
+        } catch (snfe: Settings.SettingNotFoundException) {
+            null
+        }
+    }
+
     private inner class InnerIapCallback : IapCallback {
         override fun checkNewPurchasesFinished(result: List<IapPurchase>) {
             // not actually used at the moment

package/dist/templates/platforms/tizen/project/config.xml

@@ -13,6 +13,7 @@
     <tizen:privilege name="http://developer.samsung.com/privilege/productinfo"/>
     <tizen:privilege name="http://tizen.org/privilege/internet"/>
     <tizen:privilege name="http://tizen.org/privilege/tv.inputdevice"/>
+    <tizen:privilege name="http://developer.samsung.com/privilege/adinfo"/>
     <tizen:setting screen-orientation="landscape" context-menu="enable" background-support="disable" encryption="disable" install-location="auto" hwkey-event="enable"/>
     <tizen:metadata key="http://samsung.com/tv/metadata/use.voiceguide" value="false"/>
 </widget>

package/package.json

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