0.9.0_rename

This commit is contained in:
Mateusz Gruszczyński committed 2026-11-17 17:29:00 +01:00
1 parent e55ce0ee29
commit 271ad2a492
30 files changed
+120 -112

No files matched your search

+7 -3
View File
@@ -1,6 +1,6 @@
# simply-tv # simply-tv
Android TV app for [simply-dvb](../simply-dvb) (works with tvheadend too). It makes the DVB Android TV app for [simply-dvb](../simple-dvbt) (works with tvheadend too). It makes the DVB
server a **source of the TV's own live-TV app** (Android TV Input Framework): channels with server a **source of the TV's own live-TV app** (Android TV Input Framework): channels with
logos and the programme guide appear in the TV's channel list and guide, and playback runs in logos and the programme guide appear in the TV's channel list and guide, and playback runs in
the TV's player with hardware decoding (HEVC, AC-3/E-AC-3, MPEG-2…). the TV's player with hardware decoding (HEVC, AC-3/E-AC-3, MPEG-2…).
@@ -56,6 +56,10 @@ simply-tv keeps a list of servers (*Servers* on the start screen, also opened by
* **TV app source on/off** – whether its channels are loaded into the TV's own live-TV app. Several servers can feed the TV app at once; the server name is shown as the channel's network. Switching a server off removes its channels (and recordings) from the TV app on the next sync. * **TV app source on/off** – whether its channels are loaded into the TV's own live-TV app. Several servers can feed the TV app at once; the server name is shown as the channel's network. Switching a server off removes its channels (and recordings) from the TV app on the next sync.
* **Load channels into the TV app** syncs all enabled servers right away. * **Load channels into the TV app** syncs all enabled servers right away.
## Moving from 0.8 and older (`io.simplydvb.tv`)
From 0.9 the app id is `io.simplytv`, so Android installs it as a new app next to the old one. After installing: add the server again (QR pairing), switch autostart on again if you used it, set up the channels in the TV app (the input is new), then uninstall the old one: `adb uninstall io.simplydvb.tv`.
## Start screen ## Start screen
The player comes first: *Watch TV* has the focus, so OK opens it on the last channel. Under the title the screen shows that channel and what is on it right now, with a progress bar – read from the server (`/api/epg/events/grid`), refreshed when the programme ends. Below: Programme guide, Recordings, TV app (the TV's built-in live-TV app with the simply-tv channels), Servers and Settings; then the active server's state with a Sync button; at the bottom the remote's keys in the player. The player comes first: *Watch TV* has the focus, so OK opens it on the last channel. Under the title the screen shows that channel and what is on it right now, with a progress bar – read from the server (`/api/epg/events/grid`), refreshed when the programme ends. Below: Programme guide, Recordings, TV app (the TV's built-in live-TV app with the simply-tv channels), Servers and Settings; then the active server's state with a Sync button; at the bottom the remote's keys in the player.
@@ -78,7 +82,7 @@ The tuner card (top right, optional) shows the adapter, frequency, lock, three s
**Smooth video:** *Tunnelled video playback* (*Settings*, on by default) lets the TV's own video pipeline decode and sync the picture – the same path the built-in tuner uses. If a channel shows no picture with it, switch it off. The tuner card's white line shows what the TV does with the stream: resolution, frames shown per second, dropped frames (red), buffer and decoder; the last line shows simply-dvb's driver timing (time of a signal statistics read and the longest pause in the stream). **Smooth video:** *Tunnelled video playback* (*Settings*, on by default) lets the TV's own video pipeline decode and sync the picture – the same path the built-in tuner uses. If a channel shows no picture with it, switch it off. The tuner card's white line shows what the TV does with the stream: resolution, frames shown per second, dropped frames (red), buffer and decoder; the last line shows simply-dvb's driver timing (time of a signal statistics read and the longest pause in the stream).
**Start with the TV:** *Start the player with the TV* (*Settings*) opens the own player on the last channel when the TV boots and when it wakes up from standby. Android only lets an app open a screen from the background with the *Display over other apps* permission – the app opens that settings screen; if the TV has none, grant it once from a computer: `adb shell appops set io.simplydvb.tv SYSTEM_ALERT_WINDOW allow`. The home screen also has a second tile, *simply-tv Live*, that goes straight into the player. The TV button on the remote always opens the TV's own TV app – simply-tv channels play there too (via the TV input). **Start with the TV:** *Start the player with the TV* (*Settings*) opens the own player on the last channel when the TV boots and when it wakes up from standby. Android only lets an app open a screen from the background with the *Display over other apps* permission – the app opens that settings screen; if the TV has none, grant it once from a computer: `adb shell appops set io.simplytv SYSTEM_ALERT_WINDOW allow`. The home screen also has a second tile, *simply-tv Live*, that goes straight into the player. The TV button on the remote always opens the TV's own TV app – simply-tv channels play there too (via the TV input).
## First start ## First start
@@ -96,7 +100,7 @@ Manually:
## Layout ## Layout
``` ```
app/src/main/java/io/simplydvb/tv/ app/src/main/java/io/simplytv/
htsp/ HTSMSG codec and HTSP client (hello, SHA-1 auth, request/response, async) htsp/ HTSMSG codec and HTSP client (hello, SHA-1 auth, request/response, async)
tif/ TvInputService (playback + recording sessions), EPG/channel sync, WorkManager job tif/ TvInputService (playback + recording sessions), EPG/channel sync, WorkManager job
player/ ExoPlayer setup for DVB MPEG-TS player/ ExoPlayer setup for DVB MPEG-TS
+5 -1
View File
@@ -55,6 +55,10 @@ simply-tv trzyma listę serwerów (*Serwery* na ekranie startowym, otwiera się
* **Źródło aplikacji TV wł./wył.** – czy kanały tego serwera trafiają do wbudowanej aplikacji TV telewizora. Kilka serwerów może zasilać ją jednocześnie; nazwa serwera widnieje jako sieć kanału. Wyłączenie serwera usuwa jego kanały (i nagrania) z aplikacji TV przy następnej synchronizacji. * **Źródło aplikacji TV wł./wył.** – czy kanały tego serwera trafiają do wbudowanej aplikacji TV telewizora. Kilka serwerów może zasilać ją jednocześnie; nazwa serwera widnieje jako sieć kanału. Wyłączenie serwera usuwa jego kanały (i nagrania) z aplikacji TV przy następnej synchronizacji.
* **Wczytaj kanały do aplikacji TV** od razu synchronizuje wszystkie włączone serwery. * **Wczytaj kanały do aplikacji TV** od razu synchronizuje wszystkie włączone serwery.
## Przejście z wersji 0.8 i starszych (`io.simplydvb.tv`)
Od 0.9 identyfikator aplikacji to `io.simplytv`, więc Android instaluje ją jako nową aplikację obok starej. Po instalacji: dodaj serwer ponownie (parowanie kodem QR), w razie potrzeby włącz ponownie autostart, skonfiguruj kanały w aplikacji TV (wejście jest nowe), a potem odinstaluj starą: `adb uninstall io.simplydvb.tv`.
## Ekran startowy ## Ekran startowy
Najpierw odtwarzacz: *Oglądaj telewizję* ma fokus, więc OK otwiera go na ostatnim kanale. Pod tytułem widać ten kanał i to, co na nim teraz leci, z paskiem postępu – dane z serwera (`/api/epg/events/grid`), odświeżane po zakończeniu audycji. Niżej: Program TV, Nagrania, Aplikacja TV (wbudowana aplikacja telewizora z kanałami simply-tv), Serwery i Ustawienia; dalej stan aktywnego serwera z przyciskiem Synchronizuj, a na dole klawisze pilota w odtwarzaczu. Najpierw odtwarzacz: *Oglądaj telewizję* ma fokus, więc OK otwiera go na ostatnim kanale. Pod tytułem widać ten kanał i to, co na nim teraz leci, z paskiem postępu – dane z serwera (`/api/epg/events/grid`), odświeżane po zakończeniu audycji. Niżej: Program TV, Nagrania, Aplikacja TV (wbudowana aplikacja telewizora z kanałami simply-tv), Serwery i Ustawienia; dalej stan aktywnego serwera z przyciskiem Synchronizuj, a na dole klawisze pilota w odtwarzaczu.
@@ -77,7 +81,7 @@ Karta tunera (prawy górny róg, opcjonalna) pokazuje adapter, częstotliwość,
**Płynny obraz:** *Tunelowanie wideo* (*Ustawienia*, domyślnie włączone) przekazuje dekodowanie i synchronizację obrazu do toru wideo telewizora – tego samego, którego używa wbudowany tuner. Jeśli na jakimś kanale nie ma wtedy obrazu, wyłącz je. Biała linia na karcie tunera pokazuje, co telewizor robi ze strumieniem: rozdzielczość, wyświetlane klatki na sekundę, gubione klatki (na czerwono), bufor i dekoder; ostatnia linia to czasy sterownika w simply-dvb (odczyt statystyk sygnału i najdłuższa przerwa w strumieniu). **Płynny obraz:** *Tunelowanie wideo* (*Ustawienia*, domyślnie włączone) przekazuje dekodowanie i synchronizację obrazu do toru wideo telewizora – tego samego, którego używa wbudowany tuner. Jeśli na jakimś kanale nie ma wtedy obrazu, wyłącz je. Biała linia na karcie tunera pokazuje, co telewizor robi ze strumieniem: rozdzielczość, wyświetlane klatki na sekundę, gubione klatki (na czerwono), bufor i dekoder; ostatnia linia to czasy sterownika w simply-dvb (odczyt statystyk sygnału i najdłuższa przerwa w strumieniu).
**Start razem z telewizorem:** *Uruchamiaj odtwarzacz z telewizorem* (*Ustawienia*) otwiera własny odtwarzacz na ostatnim kanale po starcie telewizora i po wybudzeniu ze stanu czuwania. Android pozwala otworzyć ekran z tła tylko z uprawnieniem *Wyświetlanie nad innymi aplikacjami* – aplikacja otwiera ten ekran ustawień; jeśli telewizor go nie ma, nadaj je raz z komputera: `adb shell appops set io.simplydvb.tv SYSTEM_ALERT_WINDOW allow`. Na ekranie głównym jest też drugi kafelek, *simply-tv Na żywo*, który od razu otwiera odtwarzacz. Przycisk TV na pilocie zawsze otwiera wbudowaną aplikację TV telewizora – kanały simply-tv też w niej działają (przez wejście TV). **Start razem z telewizorem:** *Uruchamiaj odtwarzacz z telewizorem* (*Ustawienia*) otwiera własny odtwarzacz na ostatnim kanale po starcie telewizora i po wybudzeniu ze stanu czuwania. Android pozwala otworzyć ekran z tła tylko z uprawnieniem *Wyświetlanie nad innymi aplikacjami* – aplikacja otwiera ten ekran ustawień; jeśli telewizor go nie ma, nadaj je raz z komputera: `adb shell appops set io.simplytv SYSTEM_ALERT_WINDOW allow`. Na ekranie głównym jest też drugi kafelek, *simply-tv Na żywo*, który od razu otwiera odtwarzacz. Przycisk TV na pilocie zawsze otwiera wbudowaną aplikację TV telewizora – kanały simply-tv też w niej działają (przez wejście TV).
## Pierwsze uruchomienie ## Pierwsze uruchomienie
+4 -4
View File
@@ -13,15 +13,15 @@ val signing = Properties().apply {
} }
android { android {
namespace = "io.simplydvb.tv" namespace = "io.simplytv"
compileSdk = 34 compileSdk = 34
defaultConfig { defaultConfig {
applicationId = "io.simplydvb.tv" applicationId = "io.simplytv"
minSdk = 26 minSdk = 26
targetSdk = 34 targetSdk = 34
versionCode = 9 versionCode = 10
versionName = "0.8.0" versionName = "0.9.0"
} }
signingConfigs { signingConfigs {
@@ -1,4 +1,4 @@
package io.simplydvb.tv package io.simplytv
import android.app.Notification import android.app.Notification
import android.app.NotificationChannel import android.app.NotificationChannel
@@ -16,7 +16,7 @@ import android.os.IBinder
import android.os.Looper import android.os.Looper
import android.provider.Settings import android.provider.Settings
import android.util.Log import android.util.Log
import io.simplydvb.tv.ui.LiveActivity import io.simplytv.ui.LiveActivity
/** /**
* Optional autostart of the own player: when the TV starts and when it wakes up from * Optional autostart of the own player: when the TV starts and when it wakes up from
@@ -1,9 +1,9 @@
package io.simplydvb.tv package io.simplytv
import android.content.Context import android.content.Context
import io.simplydvb.tv.htsp.HtsMsg import io.simplytv.htsp.HtsMsg
import io.simplydvb.tv.tif.HDvr import io.simplytv.tif.HDvr
import io.simplydvb.tv.tif.HEvent import io.simplytv.tif.HEvent
/** Recording requests on the server (shared by the guide and the player). */ /** Recording requests on the server (shared by the guide and the player). */
object Dvr { object Dvr {
@@ -1,4 +1,4 @@
package io.simplydvb.tv package io.simplytv
import android.content.Context import android.content.Context
@@ -1,9 +1,9 @@
package io.simplydvb.tv package io.simplytv
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import io.simplydvb.tv.htsp.HtsMsg import io.simplytv.htsp.HtsMsg
import io.simplydvb.tv.htsp.HtspClient import io.simplytv.htsp.HtspClient
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import java.util.UUID import java.util.UUID
@@ -1,4 +1,4 @@
package io.simplydvb.tv.htsp package io.simplytv.htsp
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
@@ -1,4 +1,4 @@
package io.simplydvb.tv.htsp package io.simplytv.htsp
import android.util.Log import android.util.Log
import java.io.BufferedInputStream import java.io.BufferedInputStream
@@ -1,4 +1,4 @@
package io.simplydvb.tv.player package io.simplytv.player
import android.content.Context import android.content.Context
import androidx.annotation.OptIn import androidx.annotation.OptIn
@@ -1,4 +1,4 @@
package io.simplydvb.tv.tif package io.simplytv.tif
import android.content.ComponentName import android.content.ComponentName
import android.content.ContentProviderOperation import android.content.ContentProviderOperation
@@ -8,8 +8,8 @@ import android.content.Context
import android.media.tv.TvContract import android.media.tv.TvContract
import android.net.Uri import android.net.Uri
import android.util.Log import android.util.Log
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.htsp.HtsMsg import io.simplytv.htsp.HtsMsg
import java.net.HttpURLConnection import java.net.HttpURLConnection
import java.net.URL import java.net.URL
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch
@@ -57,7 +57,7 @@ object EpgSync {
ctx: Context, ctx: Context,
epgDays: Int = 7, epgDays: Int = 7,
withEpg: Boolean = true, withEpg: Boolean = true,
server: io.simplydvb.tv.ServerConfig = io.simplydvb.tv.ServerConfig.load(ctx), server: io.simplytv.ServerConfig = io.simplytv.ServerConfig.load(ctx),
): Snapshot = Server.session(ctx, server) { client -> ): Snapshot = Server.session(ctx, server) { client ->
val channels = ArrayList<HChannel>() val channels = ArrayList<HChannel>()
val events = ArrayList<HEvent>() val events = ArrayList<HEvent>()
@@ -117,11 +117,11 @@ object EpgSync {
fun key(serverId: String, id: Long) = "$serverId:$id" fun key(serverId: String, id: Long) = "$serverId:$id"
/** Splits a key back into (server, id); old single-server rows have no server part. */ /** Splits a key back into (server, id); old single-server rows have no server part. */
fun parseKey(ctx: Context, key: String?): Pair<io.simplydvb.tv.ServerConfig, Long>? { fun parseKey(ctx: Context, key: String?): Pair<io.simplytv.ServerConfig, Long>? {
if (key.isNullOrEmpty()) return null if (key.isNullOrEmpty()) return null
val i = key.lastIndexOf(':') val i = key.lastIndexOf(':')
val id = key.substring(i + 1).toLongOrNull() ?: return null val id = key.substring(i + 1).toLongOrNull() ?: return null
val server = if (i > 0) io.simplydvb.tv.ServerConfig.byId(ctx, key.substring(0, i)) else io.simplydvb.tv.ServerConfig.load(ctx) val server = if (i > 0) io.simplytv.ServerConfig.byId(ctx, key.substring(0, i)) else io.simplytv.ServerConfig.load(ctx)
return (server ?: return null) to id return (server ?: return null) to id
} }
@@ -132,7 +132,7 @@ object EpgSync {
* Returns the number of channels in the TV. * Returns the number of channels in the TV.
*/ */
fun run(ctx: Context): Int { fun run(ctx: Context): Int {
val servers = io.simplydvb.tv.ServerConfig.all(ctx) val servers = io.simplytv.ServerConfig.all(ctx)
val enabled = servers.filter { it.tvInput && it.configured } val enabled = servers.filter { it.tvInput && it.configured }
val keepServers = enabled.map { it.id }.toMutableSet() val keepServers = enabled.map { it.id }.toMutableSet()
val errors = ArrayList<String>() val errors = ArrayList<String>()
@@ -189,7 +189,7 @@ object EpgSync {
return out return out
} }
private fun writeChannels(ctx: Context, srv: io.simplydvb.tv.ServerConfig, channels: List<HChannel>): Map<Long, Long> { private fun writeChannels(ctx: Context, srv: io.simplytv.ServerConfig, channels: List<HChannel>): Map<Long, Long> {
val cr = ctx.contentResolver val cr = ctx.contentResolver
val input = inputId(ctx) val input = inputId(ctx)
val existing = channelRows(ctx).filterKeys { it.startsWith(srv.id + ":") } val existing = channelRows(ctx).filterKeys { it.startsWith(srv.id + ":") }
@@ -274,7 +274,7 @@ object EpgSync {
return TvContract.Programs.Genres.encode(g) return TvContract.Programs.Genres.encode(g)
} }
private fun writePrograms(ctx: Context, srv: io.simplydvb.tv.ServerConfig, rows: Map<Long, Long>, events: List<HEvent>) { private fun writePrograms(ctx: Context, srv: io.simplytv.ServerConfig, rows: Map<Long, Long>, events: List<HEvent>) {
val cr = ctx.contentResolver val cr = ctx.contentResolver
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
val ops = ArrayList<ContentProviderOperation>() val ops = ArrayList<ContentProviderOperation>()
@@ -329,7 +329,7 @@ object EpgSync {
} }
} }
private fun writeRecordings(ctx: Context, srv: io.simplydvb.tv.ServerConfig, rows: Map<Long, Long>, dvr: List<HDvr>) { private fun writeRecordings(ctx: Context, srv: io.simplytv.ServerConfig, rows: Map<Long, Long>, dvr: List<HDvr>) {
val cr = ctx.contentResolver val cr = ctx.contentResolver
val input = inputId(ctx) val input = inputId(ctx)
val existing = HashMap<Long, Long>() val existing = HashMap<Long, Long>()
@@ -1,4 +1,4 @@
package io.simplydvb.tv.tif package io.simplytv.tif
import android.content.Context import android.content.Context
import android.media.PlaybackParams import android.media.PlaybackParams
@@ -25,11 +25,11 @@ import androidx.media3.common.Tracks
import androidx.media3.common.text.CueGroup import androidx.media3.common.text.CueGroup
import androidx.media3.common.util.UnstableApi import androidx.media3.common.util.UnstableApi
import androidx.media3.ui.SubtitleView import androidx.media3.ui.SubtitleView
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import io.simplydvb.tv.htsp.HtsMsg import io.simplytv.htsp.HtsMsg
import io.simplydvb.tv.player.Players import io.simplytv.player.Players
import java.util.concurrent.Executors import java.util.concurrent.Executors
/** /**
@@ -1,4 +1,4 @@
package io.simplydvb.tv.tif package io.simplytv.tif
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
@@ -11,7 +11,7 @@ import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager import androidx.work.WorkManager
import androidx.work.Worker import androidx.work.Worker
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
/** Background sync of channels, programme guide and recordings (hourly + on demand). */ /** Background sync of channels, programme guide and recordings (hourly + on demand). */
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.content.Context import android.content.Context
import android.graphics.Canvas import android.graphics.Canvas
@@ -14,9 +14,9 @@ import android.util.AttributeSet
import android.util.TypedValue import android.util.TypedValue
import android.view.KeyEvent import android.view.KeyEvent
import android.view.View import android.view.View
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.tif.HChannel import io.simplytv.tif.HChannel
import io.simplydvb.tv.tif.HEvent import io.simplytv.tif.HEvent
import java.text.DateFormat import java.text.DateFormat
import java.util.Date import java.util.Date
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@@ -9,15 +9,15 @@ import android.os.Looper
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import io.simplydvb.tv.htsp.HtsMsg import io.simplytv.htsp.HtsMsg
import io.simplydvb.tv.tif.EpgSync import io.simplytv.tif.EpgSync
import io.simplydvb.tv.tif.HChannel import io.simplytv.tif.HChannel
import io.simplydvb.tv.tif.HDvr import io.simplytv.tif.HDvr
import io.simplydvb.tv.tif.HEvent import io.simplytv.tif.HEvent
import io.simplydvb.tv.tif.SyncWorker import io.simplytv.tif.SyncWorker
import java.text.DateFormat import java.text.DateFormat
import java.util.Date import java.util.Date
import kotlin.concurrent.thread import kotlin.concurrent.thread
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@@ -30,17 +30,17 @@ import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.analytics.AnalyticsListener import androidx.media3.exoplayer.analytics.AnalyticsListener
import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.PlayerView import androidx.media3.ui.PlayerView
import io.simplydvb.tv.Dvr import io.simplytv.Dvr
import io.simplydvb.tv.Prefs import io.simplytv.Prefs
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import io.simplydvb.tv.player.ByteMeter import io.simplytv.player.ByteMeter
import io.simplydvb.tv.player.Players import io.simplytv.player.Players
import io.simplydvb.tv.tif.EpgSync import io.simplytv.tif.EpgSync
import io.simplydvb.tv.tif.HChannel import io.simplytv.tif.HChannel
import io.simplydvb.tv.tif.HDvr import io.simplytv.tif.HDvr
import io.simplydvb.tv.tif.HEvent import io.simplytv.tif.HEvent
import org.json.JSONObject import org.json.JSONObject
import java.text.DateFormat import java.text.DateFormat
import java.util.Date import java.util.Date
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
@@ -7,7 +7,7 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.LruCache import android.util.LruCache
import android.widget.ImageView import android.widget.ImageView
import io.simplydvb.tv.Server import io.simplytv.Server
import java.util.concurrent.Executors import java.util.concurrent.Executors
/** Channel logos from the server, loaded in the background and kept in memory. */ /** Channel logos from the server, loaded in the background and kept in memory. */
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
@@ -13,12 +13,12 @@ import android.view.View
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import io.simplydvb.tv.AutoStart import io.simplytv.AutoStart
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import io.simplydvb.tv.tif.EpgSync import io.simplytv.tif.EpgSync
import io.simplydvb.tv.tif.SyncWorker import io.simplytv.tif.SyncWorker
import java.security.MessageDigest import java.security.MessageDigest
import java.text.DateFormat import java.text.DateFormat
import java.util.Date import java.util.Date
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.os.Bundle import android.os.Bundle
@@ -14,9 +14,9 @@ import androidx.media3.common.Player
import androidx.media3.common.util.UnstableApi import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.PlayerView import androidx.media3.ui.PlayerView
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.player.Players import io.simplytv.player.Players
import kotlin.concurrent.thread import kotlin.concurrent.thread
/** Plays a recording from the server (seeking with the remote's arrows). */ /** Plays a recording from the server (seeking with the remote's arrows). */
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@@ -11,12 +11,12 @@ import android.view.View
import android.widget.ListView import android.widget.ListView
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.Server import io.simplytv.Server
import io.simplydvb.tv.htsp.HtsMsg import io.simplytv.htsp.HtsMsg
import io.simplydvb.tv.tif.EpgSync import io.simplytv.tif.EpgSync
import io.simplydvb.tv.tif.HDvr import io.simplytv.tif.HDvr
import io.simplydvb.tv.tif.SyncWorker import io.simplytv.tif.SyncWorker
import java.text.DateFormat import java.text.DateFormat
import java.util.Date import java.util.Date
import kotlin.concurrent.thread import kotlin.concurrent.thread
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.widget.BaseAdapter import android.widget.BaseAdapter
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import io.simplydvb.tv.R import io.simplytv.R
/** One list row: icon (optional), two lines of text and a badge on the right. */ /** One list row: icon (optional), two lines of text and a badge on the right. */
data class Row( data class Row(
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@@ -9,10 +9,10 @@ import android.os.Looper
import android.widget.Button import android.widget.Button
import android.widget.ListView import android.widget.ListView
import android.widget.TextView import android.widget.TextView
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import io.simplydvb.tv.tif.EpgSync import io.simplytv.tif.EpgSync
import io.simplydvb.tv.tif.SyncWorker import io.simplytv.tif.SyncWorker
import kotlin.concurrent.thread import kotlin.concurrent.thread
/** /**
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@@ -10,10 +10,10 @@ import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import io.simplydvb.tv.AutoStart import io.simplytv.AutoStart
import io.simplydvb.tv.Prefs import io.simplytv.Prefs
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
/** /**
* Settings: OSD, player, start-up and servers. Rows on the right; the left column explains * Settings: OSD, player, start-up and servers. Rows on the right; the left column explains
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.app.Activity import android.app.Activity
import android.os.Bundle import android.os.Bundle
@@ -18,11 +18,11 @@ import java.net.URL
import android.widget.Button import android.widget.Button
import android.widget.EditText import android.widget.EditText
import android.widget.TextView import android.widget.TextView
import io.simplydvb.tv.R import io.simplytv.R
import io.simplydvb.tv.ServerConfig import io.simplytv.ServerConfig
import io.simplydvb.tv.htsp.HtspClient import io.simplytv.htsp.HtspClient
import io.simplydvb.tv.tif.EpgSync import io.simplytv.tif.EpgSync
import io.simplydvb.tv.tif.SyncWorker import io.simplytv.tif.SyncWorker
import kotlin.concurrent.thread import kotlin.concurrent.thread
/** /**
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui package io.simplytv.ui
import android.content.Context import android.content.Context
import android.graphics.Canvas import android.graphics.Canvas
+1 -1
View File
@@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg"> android:background="@color/bg">
<io.simplydvb.tv.ui.EpgGridView <io.simplytv.ui.EpgGridView
android:id="@+id/grid" android:id="@+id/grid"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
+4 -4
View File
@@ -121,7 +121,7 @@
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:text="@string/t_signal_snr" android:textColor="@color/muted" android:textSize="9sp" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:text="@string/t_signal_snr" android:textColor="@color/muted" android:textSize="9sp" />
<TextView android:id="@+id/t_signal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/green" android:textSize="14sp" android:fontFamily="monospace" /> <TextView android:id="@+id/t_signal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/green" android:textSize="14sp" android:fontFamily="monospace" />
</LinearLayout> </LinearLayout>
<io.simplydvb.tv.ui.SparkView android:id="@+id/t_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" /> <io.simplytv.ui.SparkView android:id="@+id/t_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:gravity="center_vertical" android:orientation="horizontal"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:gravity="center_vertical" android:orientation="horizontal">
<LinearLayout android:layout_width="96dp" android:layout_height="wrap_content" android:orientation="vertical"> <LinearLayout android:layout_width="96dp" android:layout_height="wrap_content" android:orientation="vertical">
@@ -129,7 +129,7 @@
<TextView android:id="@+id/t_cpu" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/accent" android:textSize="14sp" android:fontFamily="monospace" /> <TextView android:id="@+id/t_cpu" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/accent" android:textSize="14sp" android:fontFamily="monospace" />
<TextView android:id="@+id/t_cpu_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/muted" android:textSize="9sp" android:fontFamily="monospace" /> <TextView android:id="@+id/t_cpu_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/muted" android:textSize="9sp" android:fontFamily="monospace" />
</LinearLayout> </LinearLayout>
<io.simplydvb.tv.ui.SparkView android:id="@+id/t_cpu_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" /> <io.simplytv.ui.SparkView android:id="@+id/t_cpu_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:gravity="center_vertical" android:orientation="horizontal"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:gravity="center_vertical" android:orientation="horizontal">
<LinearLayout android:layout_width="96dp" android:layout_height="wrap_content" android:orientation="vertical"> <LinearLayout android:layout_width="96dp" android:layout_height="wrap_content" android:orientation="vertical">
@@ -137,7 +137,7 @@
<TextView android:id="@+id/t_rate" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/blue" android:textSize="14sp" android:fontFamily="monospace" /> <TextView android:id="@+id/t_rate" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/blue" android:textSize="14sp" android:fontFamily="monospace" />
<TextView android:id="@+id/t_rate_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/muted" android:textSize="9sp" android:fontFamily="monospace" /> <TextView android:id="@+id/t_rate_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/muted" android:textSize="9sp" android:fontFamily="monospace" />
</LinearLayout> </LinearLayout>
<io.simplydvb.tv.ui.SparkView android:id="@+id/t_rate_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" /> <io.simplytv.ui.SparkView android:id="@+id/t_rate_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
</LinearLayout> </LinearLayout>
<TextView android:id="@+id/t_video" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" android:singleLine="true" android:ellipsize="end" android:textColor="@color/text" android:textSize="9sp" android:fontFamily="monospace" /> <TextView android:id="@+id/t_video" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" android:singleLine="true" android:ellipsize="end" android:textColor="@color/text" android:textSize="9sp" android:fontFamily="monospace" />
@@ -160,7 +160,7 @@
</LinearLayout> </LinearLayout>
<!-- programme grid (GUIDE, right arrow) --> <!-- programme grid (GUIDE, right arrow) -->
<io.simplydvb.tv.ui.EpgGridView <io.simplytv.ui.EpgGridView
android:id="@+id/epg_grid" android:id="@+id/epg_grid"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<tv-input xmlns:android="http://schemas.android.com/apk/res/android" <tv-input xmlns:android="http://schemas.android.com/apk/res/android"
android:canRecord="true" android:canRecord="true"
android:setupActivity="io.simplydvb.tv.ui.ServersActivity" android:setupActivity="io.simplytv.ui.ServersActivity"
android:tunerCount="2" /> android:tunerCount="2" />
@@ -1,4 +1,4 @@
package io.simplydvb.tv.htsp package io.simplytv.htsp
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
+1 -1
View File
@@ -15,7 +15,7 @@ APK="${2:-$(ls -t dist/simply-tv-*.apk 2>/dev/null | head -1)}"
[ -f "$APK" ] || { echo "no APK – run scripts/build-apk.sh first" >&2; exit 1; } [ -f "$APK" ] || { echo "no APK – run scripts/build-apk.sh first" >&2; exit 1; }
case "$TV" in *:*) ;; *) TV="$TV:5555" ;; esac case "$TV" in *:*) ;; *) TV="$TV:5555" ;; esac
STEPS="adb connect $TV && sleep 2 && adb -s $TV install -r '$APK' && adb -s $TV shell am start -n io.simplydvb.tv/.ui.MainActivity" STEPS="adb connect $TV && sleep 2 && adb -s $TV install -r '$APK' && adb -s $TV shell am start -n io.simplytv/.ui.MainActivity"
echo ">> connecting to $TV (confirm on the TV if asked) and installing $APK" echo ">> connecting to $TV (confirm on the TV if asked) and installing $APK"
if command -v adb >/dev/null 2>&1; then if command -v adb >/dev/null 2>&1; then
bash -c "$STEPS" bash -c "$STEPS"