mirror of
https://github.com/lizongying/my-tv.git
synced 2026-11-02 17:46:35 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa4d52681f | ||
|
|
8137515605 | ||
|
|
6c16408b90 | ||
|
|
44ab3a6669 | ||
|
|
917b245bbe | ||
|
|
dd4550cf4f | ||
|
|
4bdc625718 | ||
|
|
cda19995b2 | ||
|
|
1eb2f257b5 | ||
|
|
9feb0dc4bc | ||
|
|
46311036d6 | ||
|
|
1aade3a48d | ||
|
|
2528cf33db | ||
|
|
4364f66ec5 | ||
|
|
49cd7b3af2 |
@@ -1,83 +0,0 @@
|
|||||||
name: Bug 反馈
|
|
||||||
description: 反馈一个 Bug
|
|
||||||
labels: [ "bug" ]
|
|
||||||
title: "[BUG] "
|
|
||||||
body:
|
|
||||||
- type: checkboxes
|
|
||||||
id: checklist
|
|
||||||
attributes:
|
|
||||||
label: 检查清单
|
|
||||||
description: 确保我们的错误报告表单适合您。
|
|
||||||
options:
|
|
||||||
- label: 之前没有人提交过类似或相同的 bug report。
|
|
||||||
required: true
|
|
||||||
- label: 我正在使用本软件的最新版本。
|
|
||||||
required: true
|
|
||||||
- type: dropdown
|
|
||||||
id: version
|
|
||||||
attributes:
|
|
||||||
label: my-ty 版本
|
|
||||||
description: 请选择正在使用的版本
|
|
||||||
options:
|
|
||||||
- 最新稳定版
|
|
||||||
- 最新 CI 版
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: bug
|
|
||||||
attributes:
|
|
||||||
label: Bug 描述
|
|
||||||
description: 请描述 bug 详情
|
|
||||||
placeholder: |
|
|
||||||
e.g. Crashed when generating snapshot.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: expected
|
|
||||||
attributes:
|
|
||||||
label: 预期行为
|
|
||||||
description: 你预期会发生什么?
|
|
||||||
placeholder: |
|
|
||||||
e.g. A New snapshot!
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: actual
|
|
||||||
attributes:
|
|
||||||
label: 实际行为
|
|
||||||
description: 反而发生了什么?
|
|
||||||
placeholder: |
|
|
||||||
e.g. Crashed.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: steps
|
|
||||||
attributes:
|
|
||||||
label: 复现步骤
|
|
||||||
description: 如何复现这个 bug。
|
|
||||||
placeholder: |
|
|
||||||
1. Open the app
|
|
||||||
2. Crashed
|
|
||||||
|
|
||||||
What an app.
|
|
||||||
- type: input
|
|
||||||
id: ui
|
|
||||||
attributes:
|
|
||||||
label: UI / OS
|
|
||||||
description: 你的电视系统 UI 或 OS 或 品牌
|
|
||||||
placeholder: TCL / XIAOMI / PHONE / etc.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: input
|
|
||||||
id: android
|
|
||||||
attributes:
|
|
||||||
label: Android 版本
|
|
||||||
description: 你的 Android 版本
|
|
||||||
placeholder: "12"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: additional
|
|
||||||
attributes:
|
|
||||||
label: 额外信息
|
|
||||||
description: 任何你觉得值得说的。
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
name: 功能(新频道)请求
|
|
||||||
description: 提出一个建议
|
|
||||||
labels: [ "enhancement" ]
|
|
||||||
title: "[FR] "
|
|
||||||
body:
|
|
||||||
- type: checkboxes
|
|
||||||
id: checklist
|
|
||||||
attributes:
|
|
||||||
label: 检查清单
|
|
||||||
description: 确保我们的错误报告表单适合您。
|
|
||||||
options:
|
|
||||||
- label: 之前没有人提交过类似或相同的功能请求。
|
|
||||||
required: true
|
|
||||||
- label: 这个建议不会背离 LibChecker 的初衷。
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: propose
|
|
||||||
attributes:
|
|
||||||
label: 改进目的
|
|
||||||
description: 改进有什么用
|
|
||||||
placeholder: |
|
|
||||||
Show your idea here.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: solution
|
|
||||||
attributes:
|
|
||||||
label: 解决方案
|
|
||||||
description: 你会怎么完成这个改进?
|
|
||||||
placeholder: |
|
|
||||||
How to do it on your opinion? Or left this blank
|
|
||||||
- type: textarea
|
|
||||||
id: addition
|
|
||||||
attributes:
|
|
||||||
label: 额外信息
|
|
||||||
description: 任何你觉得值得说的。
|
|
||||||
@@ -14,16 +14,6 @@
|
|||||||
|
|
||||||
## 更新日志
|
## 更新日志
|
||||||
|
|
||||||
### v1.5.8(通用版)
|
|
||||||
|
|
||||||
* 修复央视6画质差的问题
|
|
||||||
* 增加兵团卫视
|
|
||||||
* 播放失败重试
|
|
||||||
|
|
||||||
### v1.5.6(通用版)
|
|
||||||
|
|
||||||
* 解决部分设备系统时间不对导致播放失败的问题
|
|
||||||
|
|
||||||
### v1.5.2(通用版)
|
### v1.5.2(通用版)
|
||||||
|
|
||||||
* 修复APP恢复后频道号、频道列表不自动消失的问题
|
* 修复APP恢复后频道号、频道列表不自动消失的问题
|
||||||
@@ -119,7 +109,6 @@ adb install my-tv.apk
|
|||||||
* 获取系统时间
|
* 获取系统时间
|
||||||
* 选中的图标比例能否相差更大
|
* 选中的图标比例能否相差更大
|
||||||
* 自动重连
|
* 自动重连
|
||||||
* 节目增加预告
|
|
||||||
|
|
||||||
## 赞赏
|
## 赞赏
|
||||||
|
|
||||||
|
|||||||
+1
-5
@@ -101,7 +101,7 @@ dependencies {
|
|||||||
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
|
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
|
||||||
|
|
||||||
// 21:2.9.0 17:2.6.4
|
// 21:2.9.0 17:2.6.4
|
||||||
def retrofit2_version = "2.9.0"
|
def retrofit2_version = "2.6.4"
|
||||||
|
|
||||||
implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
|
implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
|
||||||
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
|
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
|
||||||
@@ -113,8 +113,4 @@ dependencies {
|
|||||||
implementation 'com.github.bumptech.glide:glide:4.11.0'
|
implementation 'com.github.bumptech.glide:glide:4.11.0'
|
||||||
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
|
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
|
||||||
|
|
||||||
implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
|
|
||||||
implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
|
|
||||||
implementation 'com.google.android.exoplayer:exoplayer-hls:2.13.3'
|
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,6 @@
|
|||||||
android:name="android.software.leanback"
|
android:name="android.software.leanback"
|
||||||
android:required="true" />
|
android:required="true" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:largeHeap="true"
|
android:largeHeap="true"
|
||||||
@@ -30,13 +29,5 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<receiver
|
|
||||||
android:name=".BootReceiver"
|
|
||||||
android:exported="true">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
|
||||||
</intent-filter>
|
|
||||||
</receiver>
|
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,19 +0,0 @@
|
|||||||
package com.lizongying.mytv
|
|
||||||
|
|
||||||
import android.content.BroadcastReceiver
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
|
||||||
|
|
||||||
class BootReceiver : BroadcastReceiver() {
|
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
|
||||||
val sp = context.getSharedPreferences("MainActivity", Context.MODE_PRIVATE)
|
|
||||||
if (sp.getBoolean(MainActivity.BOOT_STARTUP, true)) {
|
|
||||||
context.startActivity(
|
|
||||||
Intent(context, MainActivity::class.java)
|
|
||||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
package com.lizongying.mytv
|
||||||
|
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.view.ContextThemeWrapper
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.view.animation.ScaleAnimation
|
||||||
|
import android.widget.ImageView
|
||||||
|
import androidx.leanback.widget.ImageCardView
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.bumptech.glide.Glide
|
||||||
|
import com.lizongying.mytv.models.TVListViewModel
|
||||||
|
import com.lizongying.mytv.models.TVViewModel
|
||||||
|
|
||||||
|
|
||||||
|
class CardAdapter(private val owner: LifecycleOwner, private var tvListViewModel: TVListViewModel) :
|
||||||
|
RecyclerView.Adapter<CardAdapter.ViewHolder>() {
|
||||||
|
|
||||||
|
private var listener: ItemListener? = null
|
||||||
|
|
||||||
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
|
val cardView = object :
|
||||||
|
ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
|
||||||
|
startScaleAnimation(cardView, 1.0f, 0.9f)
|
||||||
|
cardView.isFocusable = true
|
||||||
|
cardView.isFocusableInTouchMode = true
|
||||||
|
|
||||||
|
return ViewHolder(cardView)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float) {
|
||||||
|
val scaleAnimation = ScaleAnimation(
|
||||||
|
fromScale, toScale,
|
||||||
|
fromScale, toScale,
|
||||||
|
ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
|
||||||
|
ScaleAnimation.RELATIVE_TO_SELF, 0.5f
|
||||||
|
)
|
||||||
|
scaleAnimation.duration = 200
|
||||||
|
scaleAnimation.fillAfter = true
|
||||||
|
|
||||||
|
view.startAnimation(scaleAnimation)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
|
||||||
|
val item = tvListViewModel.getTVViewModel(position)
|
||||||
|
|
||||||
|
val tvViewModel = item as TVViewModel
|
||||||
|
val cardView = viewHolder.view as ImageCardView
|
||||||
|
|
||||||
|
cardView.setOnFocusChangeListener { _, hasFocus ->
|
||||||
|
listener?.onItemFocusChange(item, hasFocus)
|
||||||
|
if (hasFocus) {
|
||||||
|
startScaleAnimation(cardView, 0.9f, 1.0f)
|
||||||
|
} else {
|
||||||
|
startScaleAnimation(cardView, 1.0f, 0.9f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cardView.setOnClickListener { _ ->
|
||||||
|
listener?.onItemClicked(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
cardView.titleText = tvViewModel.title.value
|
||||||
|
cardView.tag = tvViewModel.videoUrl.value
|
||||||
|
|
||||||
|
when (tvViewModel.title.value) {
|
||||||
|
"CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(R.drawable.cctv8k)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
|
||||||
|
"天津卫视" -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(R.drawable.tianjin)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
|
||||||
|
"新疆卫视" -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(R.drawable.xinjiang)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
|
||||||
|
else -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(tvViewModel.logo.value)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
}
|
||||||
|
|
||||||
|
cardView.mainImageView.setBackgroundColor(Color.WHITE)
|
||||||
|
cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
|
||||||
|
|
||||||
|
tvViewModel.program.observe(owner) { _ ->
|
||||||
|
val program = tvViewModel.getProgramOne()
|
||||||
|
if (program != null) {
|
||||||
|
cardView.contentText = program.name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getItemCount() = tvListViewModel.size()
|
||||||
|
|
||||||
|
class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
|
||||||
|
val view = itemView
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ItemListener {
|
||||||
|
fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
|
||||||
|
fun onItemClicked(tvViewModel: TVViewModel)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setItemListener(listener: ItemListener) {
|
||||||
|
this.listener = listener
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "CardAdapter"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,157 +0,0 @@
|
|||||||
package com.lizongying.mytv
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
import java.io.File
|
|
||||||
|
|
||||||
/**
|
|
||||||
*@author LeGend
|
|
||||||
*@date 2024/2/4 22:42
|
|
||||||
*/
|
|
||||||
object ChannelUtils {
|
|
||||||
/**
|
|
||||||
* 获取服务器channel版本
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return 服务器channel版本
|
|
||||||
*/
|
|
||||||
suspend fun getServerVersion(context: Context): Int {
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
|
|
||||||
.readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
|
|
||||||
client.newCall(okhttp3.Request.Builder().url(getServerVersionUrl(context)).build()).execute()
|
|
||||||
.use { response ->
|
|
||||||
if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
|
|
||||||
val body = response.body()
|
|
||||||
body?.string()?.toInt() ?: 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取服务器channel
|
|
||||||
*
|
|
||||||
* @param url String 服务器地址
|
|
||||||
*
|
|
||||||
* @return Array<TV> 服务器channel
|
|
||||||
*
|
|
||||||
* @throws java.io.IOException 网络请求失败
|
|
||||||
*/
|
|
||||||
suspend fun getServerChannel(url: String): List<TV> {
|
|
||||||
val result = withContext(Dispatchers.IO) {
|
|
||||||
val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
|
|
||||||
.readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
|
|
||||||
val request = okhttp3.Request.Builder().url(url).build()
|
|
||||||
client.newCall(request).execute().use { response ->
|
|
||||||
if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
|
|
||||||
val body = response.body()
|
|
||||||
body?.string() ?: ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return withContext(Dispatchers.Default) {
|
|
||||||
val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
|
|
||||||
com.google.gson.Gson().fromJson(result, type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取服务器地址
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return 服务器地址
|
|
||||||
*/
|
|
||||||
fun getServerUrl(context: Context): String {
|
|
||||||
return context.resources.getString(R.string.server_url)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取serverVersion的URL
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return serverVersionURL 服务器版本地址
|
|
||||||
*/
|
|
||||||
suspend fun getServerVersionUrl(context: Context): String {
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
context.resources.getString(R.string.server_version_url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取本地channel版本
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return 本地channel
|
|
||||||
*/
|
|
||||||
suspend fun getLocalVersion(context: Context): Int {
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
val file = File(getAppDirectory(context), "channels")
|
|
||||||
//检查本地是否已经有保存的channels.json,若无保存的Channel.json则从读取assert中文件
|
|
||||||
val savedVersion =
|
|
||||||
context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).getInt("version", Integer.MIN_VALUE)
|
|
||||||
if (!file.exists() || savedVersion == Integer.MIN_VALUE) {
|
|
||||||
context.resources.getInteger(R.integer.local_channel_version)
|
|
||||||
} else {
|
|
||||||
savedVersion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取本地可读取的目录
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return 可读取的目录
|
|
||||||
*/
|
|
||||||
private fun getAppDirectory(context: Context): File {
|
|
||||||
return context.filesDir
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取本地channel
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return Array<TV> 本地channel
|
|
||||||
*/
|
|
||||||
suspend fun getLocalChannel(context: Context): List<TV> {
|
|
||||||
val str = withContext(Dispatchers.IO) {
|
|
||||||
if (File(getAppDirectory(context), "channels").exists()) {
|
|
||||||
File(getAppDirectory(context), "channels").readText()
|
|
||||||
} else {
|
|
||||||
context.resources.openRawResource(R.raw.channels).bufferedReader().use { it.readText() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return withContext(Dispatchers.Default) {
|
|
||||||
val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
|
|
||||||
com.google.gson.Gson().fromJson(str, type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 更新channels.json
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*
|
|
||||||
* @return 无
|
|
||||||
*
|
|
||||||
* @throws java.io.IOException 写入失败
|
|
||||||
*/
|
|
||||||
suspend fun updateLocalChannel(context: Context, version: Int, channels: List<TV>) {
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
val file = File(getAppDirectory(context), "channels")
|
|
||||||
if (!file.exists()) {
|
|
||||||
file.createNewFile()
|
|
||||||
}
|
|
||||||
file.writeText(com.google.gson.Gson().toJson(channels))
|
|
||||||
context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).edit().putInt(
|
|
||||||
"version", version
|
|
||||||
).apply()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -43,10 +43,6 @@ class InfoFragment : Fragment() {
|
|||||||
.load(R.drawable.xinjiang)
|
.load(R.drawable.xinjiang)
|
||||||
.into(binding.infoLogo)
|
.into(binding.infoLogo)
|
||||||
|
|
||||||
"兵团卫视" -> Glide.with(this)
|
|
||||||
.load(R.drawable.bingtuan)
|
|
||||||
.into(binding.infoLogo)
|
|
||||||
|
|
||||||
else -> Glide.with(this)
|
else -> Glide.with(this)
|
||||||
.load(tvViewModel.logo.value)
|
.load(tvViewModel.logo.value)
|
||||||
.into(binding.infoLogo)
|
.into(binding.infoLogo)
|
||||||
|
|||||||
@@ -18,12 +18,7 @@ import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
|||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import com.lizongying.mytv.models.TVViewModel
|
import com.lizongying.mytv.models.TVViewModel
|
||||||
import kotlinx.coroutines.CoroutineStart
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.async
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
|
|
||||||
|
|
||||||
@@ -46,20 +41,9 @@ class MainActivity : FragmentActivity() {
|
|||||||
lateinit var sharedPref: SharedPreferences
|
lateinit var sharedPref: SharedPreferences
|
||||||
private var channelReversal = false
|
private var channelReversal = false
|
||||||
private var channelNum = true
|
private var channelNum = true
|
||||||
private var bootStartup = true
|
|
||||||
|
|
||||||
private var versionName = ""
|
private var versionName = ""
|
||||||
|
|
||||||
init {
|
|
||||||
lifecycleScope.launch(Dispatchers.IO) {
|
|
||||||
val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
|
|
||||||
|
|
||||||
utilsJob.start()
|
|
||||||
|
|
||||||
utilsJob.await()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
Log.i(TAG, "onCreate")
|
Log.i(TAG, "onCreate")
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@@ -83,10 +67,9 @@ class MainActivity : FragmentActivity() {
|
|||||||
sharedPref = getPreferences(Context.MODE_PRIVATE)
|
sharedPref = getPreferences(Context.MODE_PRIVATE)
|
||||||
channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
|
channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
|
||||||
channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
|
channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
|
||||||
bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
|
|
||||||
|
|
||||||
versionName = getPackageInfo().versionName
|
versionName = getPackageInfo().versionName
|
||||||
settingFragment = SettingFragment(versionName, channelReversal, channelNum, bootStartup)
|
settingFragment = SettingFragment(versionName, channelReversal, channelNum)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun showInfoFragment(tvViewModel: TVViewModel) {
|
fun showInfoFragment(tvViewModel: TVViewModel) {
|
||||||
@@ -139,6 +122,7 @@ class MainActivity : FragmentActivity() {
|
|||||||
val transaction = supportFragmentManager.beginTransaction()
|
val transaction = supportFragmentManager.beginTransaction()
|
||||||
|
|
||||||
if (mainFragment.isHidden) {
|
if (mainFragment.isHidden) {
|
||||||
|
mainFragment.setPosition()
|
||||||
transaction.show(mainFragment)
|
transaction.show(mainFragment)
|
||||||
keepRunnable()
|
keepRunnable()
|
||||||
} else {
|
} else {
|
||||||
@@ -239,14 +223,6 @@ class MainActivity : FragmentActivity() {
|
|||||||
this.channelNum = channelNum
|
this.channelNum = channelNum
|
||||||
}
|
}
|
||||||
|
|
||||||
fun saveBootStartup(bootStartup: Boolean) {
|
|
||||||
with(sharedPref.edit()) {
|
|
||||||
putBoolean(BOOT_STARTUP, bootStartup)
|
|
||||||
apply()
|
|
||||||
}
|
|
||||||
this.bootStartup = bootStartup
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun showSetting() {
|
private fun showSetting() {
|
||||||
if (!mainFragment.isHidden) {
|
if (!mainFragment.isHidden) {
|
||||||
return
|
return
|
||||||
@@ -535,6 +511,5 @@ class MainActivity : FragmentActivity() {
|
|||||||
private const val TAG = "MainActivity"
|
private const val TAG = "MainActivity"
|
||||||
private const val CHANNEL_REVERSAL = "channel_reversal"
|
private const val CHANNEL_REVERSAL = "channel_reversal"
|
||||||
private const val CHANNEL_NUM = "channel_num"
|
private const val CHANNEL_NUM = "channel_num"
|
||||||
const val BOOT_STARTUP = "boot_startup"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,30 +5,31 @@ import android.os.Bundle
|
|||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.leanback.app.BrowseSupportFragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.leanback.widget.ArrayObjectAdapter
|
|
||||||
import androidx.leanback.widget.HeaderItem
|
|
||||||
import androidx.leanback.widget.ListRow
|
|
||||||
import androidx.leanback.widget.ListRowPresenter
|
|
||||||
import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
|
|
||||||
import androidx.leanback.widget.OnItemViewClickedListener
|
|
||||||
import androidx.leanback.widget.OnItemViewSelectedListener
|
|
||||||
import androidx.leanback.widget.Presenter
|
|
||||||
import androidx.leanback.widget.Row
|
|
||||||
import androidx.leanback.widget.RowPresenter
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.lizongying.mytv.Utils.dpToPx
|
||||||
import com.lizongying.mytv.Utils.getDateTimestamp
|
import com.lizongying.mytv.Utils.getDateTimestamp
|
||||||
|
import com.lizongying.mytv.databinding.RowBinding
|
||||||
|
import com.lizongying.mytv.databinding.ShowBinding
|
||||||
import com.lizongying.mytv.models.TVListViewModel
|
import com.lizongying.mytv.models.TVListViewModel
|
||||||
import com.lizongying.mytv.models.TVViewModel
|
import com.lizongying.mytv.models.TVViewModel
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class MainFragment : BrowseSupportFragment() {
|
class MainFragment : Fragment(), CardAdapter.ItemListener {
|
||||||
|
|
||||||
private var itemPosition = 0
|
private var itemPosition = 0
|
||||||
|
|
||||||
private var rowsAdapter: ArrayObjectAdapter? = null
|
private var rowList: MutableList<View> = mutableListOf()
|
||||||
|
|
||||||
|
private var _binding: ShowBinding? = null
|
||||||
|
private val binding get() = _binding!!
|
||||||
|
|
||||||
private var request = Request()
|
private var request = Request()
|
||||||
|
|
||||||
@@ -43,15 +44,12 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
|
|
||||||
private var ready = 0
|
private var ready = 0
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreateView(
|
||||||
Log.i(TAG, "onCreate")
|
inflater: LayoutInflater, container: ViewGroup?,
|
||||||
super.onCreate(savedInstanceState)
|
savedInstanceState: Bundle?
|
||||||
headersState = HEADERS_DISABLED
|
): View {
|
||||||
}
|
_binding = ShowBinding.inflate(inflater, container, false)
|
||||||
|
return binding.root
|
||||||
override fun onStart() {
|
|
||||||
Log.i(TAG, "onStart")
|
|
||||||
super.onStart()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
||||||
@@ -60,171 +58,140 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
activity?.let { request.initYSP(it) }
|
activity?.let { request.initYSP(it) }
|
||||||
sharedPref = (activity as? MainActivity)?.sharedPref!!
|
sharedPref = (activity as? MainActivity)?.sharedPref!!
|
||||||
|
|
||||||
loadRows()
|
view?.post {
|
||||||
|
val content = binding.content
|
||||||
|
|
||||||
setupEventListeners()
|
var idx: Long = 0
|
||||||
|
for ((k, v) in TVList.list) {
|
||||||
|
val itemBinding: RowBinding =
|
||||||
|
RowBinding.inflate(layoutInflater, content, false)
|
||||||
|
|
||||||
mUpdateProgramRunnable = UpdateProgramRunnable()
|
val tvListViewModelCurrent = TVListViewModel()
|
||||||
handler.post(mUpdateProgramRunnable)
|
for ((idx2, v1) in v.withIndex()) {
|
||||||
|
val tvViewModel = TVViewModel(v1)
|
||||||
tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
|
tvViewModel.setRowPosition(idx.toInt())
|
||||||
tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
|
tvViewModel.setItemPosition(idx2)
|
||||||
if (tvViewModel.errInfo.value != null
|
tvListViewModelCurrent.addTVViewModel(tvViewModel)
|
||||||
&& tvViewModel.id.value == itemPosition
|
tvListViewModel.addTVViewModel(tvViewModel)
|
||||||
) {
|
|
||||||
Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
}
|
||||||
}
|
tvListViewModel.maxNum.add(v.size)
|
||||||
tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
|
|
||||||
|
|
||||||
// not first time && channel not change
|
val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
|
||||||
if (tvViewModel.ready.value != null
|
rowList.add(itemBinding.rowItems)
|
||||||
&& tvViewModel.id.value == itemPosition
|
|
||||||
&& check(tvViewModel)
|
adapter.setItemListener(this)
|
||||||
) {
|
|
||||||
Log.i(TAG, "ready ${tvViewModel.title.value}")
|
itemBinding.rowHeader.text = k
|
||||||
(activity as? MainActivity)?.play(tvViewModel)
|
itemBinding.rowItems.adapter = adapter
|
||||||
}
|
itemBinding.rowItems.layoutManager =
|
||||||
|
LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
|
||||||
|
|
||||||
|
val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
|
||||||
|
layoutParams.topMargin = dpToPx(11F)
|
||||||
|
itemBinding.row.layoutParams = layoutParams
|
||||||
|
content.addView(itemBinding.row)
|
||||||
|
|
||||||
|
idx++
|
||||||
}
|
}
|
||||||
tvViewModel.change.observe(viewLifecycleOwner) { _ ->
|
|
||||||
if (tvViewModel.change.value != null) {
|
mUpdateProgramRunnable = UpdateProgramRunnable()
|
||||||
val title = tvViewModel.title.value
|
handler.post(mUpdateProgramRunnable)
|
||||||
if (tvViewModel.pid.value != "") {
|
|
||||||
Log.i(TAG, "request $title")
|
itemPosition = sharedPref.getInt(POSITION, 0)
|
||||||
lifecycleScope.launch(Dispatchers.IO) {
|
if (itemPosition >= tvListViewModel.size()) {
|
||||||
tvViewModel.let { request.fetchData(it) }
|
itemPosition = 0
|
||||||
}
|
}
|
||||||
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
tvListViewModel.setItemPosition(itemPosition)
|
||||||
setSelectedPosition(
|
setPosition()
|
||||||
tvViewModel.getRowPosition(), true,
|
tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
|
||||||
SelectItemViewHolderTask(tvViewModel.getItemPosition())
|
tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
|
||||||
)
|
if (tvViewModel.errInfo.value != null
|
||||||
} else {
|
&& tvViewModel.id.value == itemPosition
|
||||||
if (check(tvViewModel)) {
|
) {
|
||||||
(activity as? MainActivity)?.play(tvViewModel)
|
Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
|
||||||
|
|
||||||
|
// not first time && channel not change
|
||||||
|
if (tvViewModel.ready.value != null
|
||||||
|
&& tvViewModel.id.value == itemPosition
|
||||||
|
&& check(tvViewModel)
|
||||||
|
) {
|
||||||
|
Log.i(TAG, "ready ${tvViewModel.title.value}")
|
||||||
|
(activity as? MainActivity)?.play(tvViewModel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tvViewModel.change.observe(viewLifecycleOwner) { _ ->
|
||||||
|
if (tvViewModel.change.value != null) {
|
||||||
|
val title = tvViewModel.title.value
|
||||||
|
Log.i(TAG, "switch $title")
|
||||||
|
if (tvViewModel.pid.value != "") {
|
||||||
|
Log.i(TAG, "request $title")
|
||||||
|
lifecycleScope.launch(Dispatchers.IO) {
|
||||||
|
tvViewModel.let { request.fetchData(it) }
|
||||||
|
}
|
||||||
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
||||||
setSelectedPosition(
|
setPosition(
|
||||||
tvViewModel.getRowPosition(), true,
|
tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
|
||||||
SelectItemViewHolderTask(tvViewModel.getItemPosition())
|
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
if (check(tvViewModel)) {
|
||||||
|
(activity as? MainActivity)?.play(tvViewModel)
|
||||||
|
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
||||||
|
setPosition(
|
||||||
|
tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fragmentReady()
|
fragmentReady()
|
||||||
}
|
|
||||||
|
|
||||||
fun toLastPosition() {
|
|
||||||
setSelectedPosition(
|
|
||||||
selectedPosition, false,
|
|
||||||
SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun toFirstPosition() {
|
|
||||||
setSelectedPosition(
|
|
||||||
selectedPosition, false,
|
|
||||||
SelectItemViewHolderTask(0)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun startHeadersTransition(withHeaders: Boolean) {
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun loadRows() {
|
|
||||||
rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
|
|
||||||
|
|
||||||
val cardPresenter = CardPresenter(viewLifecycleOwner)
|
|
||||||
|
|
||||||
var idx: Long = 0
|
|
||||||
for ((k, v) in TVList.list) {
|
|
||||||
val listRowAdapter = ArrayObjectAdapter(cardPresenter)
|
|
||||||
for ((idx2, v1) in v.withIndex()) {
|
|
||||||
val tvViewModel = TVViewModel(v1)
|
|
||||||
tvViewModel.setRowPosition(idx.toInt())
|
|
||||||
tvViewModel.setItemPosition(idx2)
|
|
||||||
tvListViewModel.addTVViewModel(tvViewModel)
|
|
||||||
listRowAdapter.add(tvViewModel)
|
|
||||||
}
|
|
||||||
tvListViewModel.maxNum.add(v.size)
|
|
||||||
val header = HeaderItem(idx, k)
|
|
||||||
rowsAdapter!!.add(ListRow(header, listRowAdapter))
|
|
||||||
idx++
|
|
||||||
}
|
|
||||||
|
|
||||||
adapter = rowsAdapter
|
|
||||||
|
|
||||||
itemPosition = sharedPref.getInt(POSITION, 0)
|
|
||||||
if (itemPosition >= tvListViewModel.size()) {
|
|
||||||
itemPosition = 0
|
|
||||||
}
|
|
||||||
tvListViewModel.setItemPosition(itemPosition)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun prevSource() {
|
|
||||||
view?.post {
|
|
||||||
val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
|
|
||||||
if (tvViewModel != null) {
|
|
||||||
if (tvViewModel.videoUrl.value!!.size > 1) {
|
|
||||||
val videoIndex = tvViewModel.videoIndex.value?.minus(1)
|
|
||||||
if (videoIndex == -1) {
|
|
||||||
tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
|
|
||||||
}
|
|
||||||
tvViewModel.changed()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun nextSource() {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
view?.post {
|
super.onViewCreated(view, savedInstanceState)
|
||||||
val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
|
}
|
||||||
if (tvViewModel != null) {
|
|
||||||
if (tvViewModel.videoUrl.value!!.size > 1) {
|
override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
|
||||||
val videoIndex = tvViewModel.videoIndex.value?.plus(1)
|
if (hasFocus) {
|
||||||
if (videoIndex == tvViewModel.videoUrl.value!!.size) {
|
tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
|
||||||
tvViewModel.setVideoIndex(0)
|
(activity as MainActivity).keepRunnable()
|
||||||
}
|
|
||||||
tvViewModel.changed()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupEventListeners() {
|
override fun onItemClicked(tvViewModel: TVViewModel) {
|
||||||
onItemViewClickedListener = ItemViewClickedListener()
|
if (this.isHidden) {
|
||||||
onItemViewSelectedListener = ItemViewSelectedListener()
|
(activity as? MainActivity)?.switchMainFragment()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemPosition != tvViewModel.id.value!!) {
|
||||||
|
itemPosition = tvViewModel.id.value!!
|
||||||
|
tvListViewModel.setItemPosition(itemPosition)
|
||||||
|
tvListViewModel.getTVViewModel(itemPosition)?.changed()
|
||||||
|
}
|
||||||
|
(activity as? MainActivity)?.switchMainFragment()
|
||||||
}
|
}
|
||||||
|
|
||||||
private inner class ItemViewClickedListener : OnItemViewClickedListener {
|
fun setPosition() {
|
||||||
override fun onItemClicked(
|
val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
|
||||||
itemViewHolder: Presenter.ViewHolder,
|
rowList[tvViewModel!!.getRowPosition()].post {
|
||||||
item: Any,
|
((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
|
||||||
rowViewHolder: RowPresenter.ViewHolder,
|
tvViewModel.getItemPosition()
|
||||||
row: Row
|
)?.requestFocus()
|
||||||
) {
|
|
||||||
if (item is TVViewModel) {
|
|
||||||
if (itemPosition != item.id.value!!) {
|
|
||||||
itemPosition = item.id.value!!
|
|
||||||
tvListViewModel.setItemPosition(itemPosition)
|
|
||||||
tvListViewModel.getTVViewModel(itemPosition)?.changed()
|
|
||||||
}
|
|
||||||
(activity as? MainActivity)?.switchMainFragment()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
|
fun setPosition(rowPosition: Int, itemPosition: Int) {
|
||||||
override fun onItemSelected(
|
rowList[rowPosition].post {
|
||||||
itemViewHolder: Presenter.ViewHolder?, item: Any?,
|
((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
|
||||||
rowViewHolder: RowPresenter.ViewHolder, row: Row
|
itemPosition
|
||||||
) {
|
)?.requestFocus()
|
||||||
if (item is TVViewModel) {
|
|
||||||
tvListViewModel.setItemPositionCurrent(item.id.value!!)
|
|
||||||
(activity as MainActivity).keepRunnable()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,6 +302,12 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
handler.removeCallbacks(mUpdateProgramRunnable)
|
handler.removeCallbacks(mUpdateProgramRunnable)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onDestroyView() {
|
||||||
|
Log.i(TAG, "onDestroyView")
|
||||||
|
super.onDestroyView()
|
||||||
|
_binding = null
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "MainFragment"
|
private const val TAG = "MainFragment"
|
||||||
private const val POSITION = "position"
|
private const val POSITION = "position"
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ package com.lizongying.mytv
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.SurfaceHolder
|
|
||||||
import android.view.SurfaceView
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.ViewTreeObserver
|
import android.view.ViewTreeObserver
|
||||||
@@ -17,39 +15,24 @@ import androidx.media3.common.VideoSize
|
|||||||
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 com.google.android.exoplayer2.SimpleExoPlayer
|
|
||||||
import com.lizongying.mytv.databinding.PlayerBinding
|
import com.lizongying.mytv.databinding.PlayerBinding
|
||||||
import com.lizongying.mytv.models.TVViewModel
|
import com.lizongying.mytv.models.TVViewModel
|
||||||
|
|
||||||
|
|
||||||
class PlayerFragment : Fragment(), SurfaceHolder.Callback {
|
class PlayerFragment : Fragment() {
|
||||||
|
|
||||||
private var _binding: PlayerBinding? = null
|
private var _binding: PlayerBinding? = null
|
||||||
private var playerView: PlayerView? = null
|
private var playerView: PlayerView? = null
|
||||||
private var tvViewModel: TVViewModel? = null
|
private var tvViewModel: TVViewModel? = null
|
||||||
private val aspectRatio = 16f / 9f
|
private val aspectRatio = 16f / 9f
|
||||||
|
|
||||||
|
|
||||||
private lateinit var surfaceView: SurfaceView
|
|
||||||
private lateinit var surfaceHolder: SurfaceHolder
|
|
||||||
private var exoPlayer: SimpleExoPlayer? = null
|
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
inflater: LayoutInflater, container: ViewGroup?,
|
inflater: LayoutInflater, container: ViewGroup?,
|
||||||
savedInstanceState: Bundle?
|
savedInstanceState: Bundle?
|
||||||
): View {
|
): View {
|
||||||
_binding = PlayerBinding.inflate(inflater, container, false)
|
_binding = PlayerBinding.inflate(inflater, container, false)
|
||||||
|
playerView = _binding!!.playerView
|
||||||
if (Utils.isTmallDevice()) {
|
(activity as MainActivity).playerFragment = this
|
||||||
_binding!!.playerView.visibility = View.GONE
|
|
||||||
surfaceView = _binding!!.surfaceView
|
|
||||||
surfaceHolder = surfaceView.holder
|
|
||||||
surfaceHolder.addCallback(this)
|
|
||||||
} else {
|
|
||||||
_binding!!.surfaceView.visibility = View.GONE
|
|
||||||
playerView = _binding!!.playerView
|
|
||||||
}
|
|
||||||
|
|
||||||
playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
|
playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
|
||||||
ViewTreeObserver.OnGlobalLayoutListener {
|
ViewTreeObserver.OnGlobalLayoutListener {
|
||||||
override fun onGlobalLayout() {
|
override fun onGlobalLayout() {
|
||||||
@@ -95,10 +78,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
|
setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
|
||||||
prepare()
|
prepare()
|
||||||
}
|
}
|
||||||
exoPlayer?.run {
|
|
||||||
setMediaItem(com.google.android.exoplayer2.MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
|
|
||||||
prepare()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onStart() {
|
override fun onStart() {
|
||||||
@@ -107,10 +86,8 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
if (playerView != null && playerView!!.player?.isPlaying == false) {
|
if (playerView != null && playerView!!.player?.isPlaying == false) {
|
||||||
Log.i(TAG, "replay")
|
Log.i(TAG, "replay")
|
||||||
playerView!!.player?.prepare()
|
playerView!!.player?.prepare()
|
||||||
}
|
} else {
|
||||||
if (exoPlayer?.isPlaying == false) {
|
Log.i(TAG, "playing")
|
||||||
Log.i(TAG, "replay")
|
|
||||||
exoPlayer?.prepare()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,9 +101,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
if (playerView != null && playerView!!.player?.isPlaying == true) {
|
if (playerView != null && playerView!!.player?.isPlaying == true) {
|
||||||
playerView!!.player?.stop()
|
playerView!!.player?.stop()
|
||||||
}
|
}
|
||||||
if (exoPlayer?.isPlaying == true) {
|
|
||||||
exoPlayer?.stop()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
@@ -134,7 +108,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
if (playerView != null) {
|
if (playerView != null) {
|
||||||
playerView!!.player?.release()
|
playerView!!.player?.release()
|
||||||
}
|
}
|
||||||
exoPlayer?.release()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
override fun onDestroyView() {
|
||||||
@@ -145,16 +118,4 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "PlaybackVideoFragment"
|
private const val TAG = "PlaybackVideoFragment"
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun surfaceCreated(holder: SurfaceHolder) {
|
|
||||||
exoPlayer = SimpleExoPlayer.Builder(requireContext()).build()
|
|
||||||
exoPlayer?.setVideoSurfaceHolder(surfaceHolder)
|
|
||||||
exoPlayer?.playWhenReady = true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun surfaceDestroyed(holder: SurfaceHolder) {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -43,6 +43,54 @@ class Request {
|
|||||||
private val input =
|
private val input =
|
||||||
"""{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
|
"""{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
|
||||||
|
|
||||||
|
private var mapping = mapOf(
|
||||||
|
"CCTV4K" to "CCTV4K 超高清",
|
||||||
|
"CCTV1" to "CCTV1 综合",
|
||||||
|
"CCTV2" to "CCTV2 财经",
|
||||||
|
"CCTV4" to "CCTV4 中文国际",
|
||||||
|
"CCTV5" to "CCTV5 体育",
|
||||||
|
"CCTV5+" to "CCTV5+ 体育赛事",
|
||||||
|
"CCTV7" to "CCTV7 国防军事",
|
||||||
|
"CCTV9" to "CCTV9 记录",
|
||||||
|
"CCTV10" to "CCTV10 科教",
|
||||||
|
"CCTV11" to "CCTV11 戏曲",
|
||||||
|
"CCTV12" to "CCTV12 社会与法",
|
||||||
|
"CCTV13" to "CCTV13 新闻",
|
||||||
|
"CCTV14" to "CCTV14 少儿",
|
||||||
|
"CCTV15" to "CCTV15 音乐",
|
||||||
|
"CCTV16-HD" to "CCTV16 奥林匹克",
|
||||||
|
"CCTV17" to "CCTV17 农业农村",
|
||||||
|
"CGTN" to "CGTN",
|
||||||
|
"CGTN法语频道" to "CGTN 法语频道",
|
||||||
|
"CGTN俄语频道" to "CGTN 俄语频道",
|
||||||
|
"CGTN阿拉伯语频道" to "CGTN 阿拉伯语频道",
|
||||||
|
"CGTN西班牙语频道" to "CGTN 西班牙语频道",
|
||||||
|
"CGTN外语纪录频道" to "CGTN 纪录频道",
|
||||||
|
"东方卫视" to "东方卫视",
|
||||||
|
"湖南卫视" to "湖南卫视",
|
||||||
|
"湖北卫视" to "湖北卫视",
|
||||||
|
"辽宁卫视" to "辽宁卫视",
|
||||||
|
"江苏卫视" to "江苏卫视",
|
||||||
|
"江西卫视" to "江西卫视",
|
||||||
|
"山东卫视" to "山东卫视",
|
||||||
|
"广东卫视" to "广东卫视",
|
||||||
|
"广西卫视" to "广西卫视",
|
||||||
|
"重庆卫视" to "重庆卫视",
|
||||||
|
"河南卫视" to "河南卫视",
|
||||||
|
"河北卫视" to "河北卫视",
|
||||||
|
"贵州卫视" to "贵州卫视",
|
||||||
|
"北京卫视" to "北京卫视",
|
||||||
|
"黑龙江卫视" to "黑龙江卫视",
|
||||||
|
"浙江卫视" to "浙江卫视",
|
||||||
|
"安徽卫视" to "安徽卫视",
|
||||||
|
"深圳卫视" to "深圳卫视",
|
||||||
|
"四川卫视" to "四川卫视",
|
||||||
|
"福建东南卫视" to "东南卫视",
|
||||||
|
"海南卫视" to "海南卫视",
|
||||||
|
"天津卫视" to "天津卫视",
|
||||||
|
"新疆卫视" to "新疆卫视",
|
||||||
|
)
|
||||||
|
|
||||||
init {
|
init {
|
||||||
handler.post(tokenRunnable)
|
handler.post(tokenRunnable)
|
||||||
}
|
}
|
||||||
@@ -180,7 +228,7 @@ class Request {
|
|||||||
yspTokenService.getInfo()
|
yspTokenService.getInfo()
|
||||||
.enqueue(object : Callback<Info> {
|
.enqueue(object : Callback<Info> {
|
||||||
override fun onResponse(call: Call<Info>, response: Response<Info>) {
|
override fun onResponse(call: Call<Info>, response: Response<Info>) {
|
||||||
if (response.isSuccessful && response.body()?.data?.token != null) {
|
if (response.isSuccessful) {
|
||||||
token = response.body()?.data?.token!!
|
token = response.body()?.data?.token!!
|
||||||
Log.i(TAG, "info success $token")
|
Log.i(TAG, "info success $token")
|
||||||
val cookie =
|
val cookie =
|
||||||
@@ -243,7 +291,7 @@ class Request {
|
|||||||
yspTokenService.getInfo()
|
yspTokenService.getInfo()
|
||||||
.enqueue(object : Callback<Info> {
|
.enqueue(object : Callback<Info> {
|
||||||
override fun onResponse(call: Call<Info>, response: Response<Info>) {
|
override fun onResponse(call: Call<Info>, response: Response<Info>) {
|
||||||
if (response.isSuccessful && response.body()?.data?.token != null) {
|
if (response.isSuccessful) {
|
||||||
token = response.body()?.data?.token!!
|
token = response.body()?.data?.token!!
|
||||||
Log.i(TAG, "info success $token")
|
Log.i(TAG, "info success $token")
|
||||||
} else {
|
} else {
|
||||||
@@ -316,6 +364,7 @@ class Request {
|
|||||||
|
|
||||||
for ((_, v) in TVList.list) {
|
for ((_, v) in TVList.list) {
|
||||||
for (v2 in v) {
|
for (v2 in v) {
|
||||||
|
Log.i(TAG, "$v2")
|
||||||
if (v2.title == item.channelName || v2.alias == item.channelName) {
|
if (v2.title == item.channelName || v2.alias == item.channelName) {
|
||||||
v2.pid = item.pid
|
v2.pid = item.pid
|
||||||
v2.sid = item.streamId
|
v2.sid = item.streamId
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import com.lizongying.mytv.databinding.DialogBinding
|
|||||||
class SettingFragment(private val versionName: String,
|
class SettingFragment(private val versionName: String,
|
||||||
private val channelReversal: Boolean,
|
private val channelReversal: Boolean,
|
||||||
private val channelNum: Boolean,
|
private val channelNum: Boolean,
|
||||||
private val bootStartup: Boolean,
|
|
||||||
) :
|
) :
|
||||||
DialogFragment() {
|
DialogFragment() {
|
||||||
|
|
||||||
@@ -44,12 +43,6 @@ class SettingFragment(private val versionName: String,
|
|||||||
(activity as MainActivity).saveChannelNum(isChecked)
|
(activity as MainActivity).saveChannelNum(isChecked)
|
||||||
}
|
}
|
||||||
|
|
||||||
val switchBootStartup = _binding?.switchBootStartup
|
|
||||||
switchBootStartup?.isChecked = bootStartup
|
|
||||||
switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
|
|
||||||
(activity as MainActivity).saveBootStartup(isChecked)
|
|
||||||
}
|
|
||||||
|
|
||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
package com.lizongying.mytv
|
package com.lizongying.mytv
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.util.Log
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import java.io.IOException
|
|
||||||
|
|
||||||
object TVList {
|
object TVList {
|
||||||
var list = mapOf(
|
var list = mapOf(
|
||||||
"央视频道" to listOf(
|
"央视频道" to listOf(
|
||||||
@@ -91,8 +84,8 @@ object TVList {
|
|||||||
0,
|
0,
|
||||||
"央视频道",
|
"央视频道",
|
||||||
"https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
|
"https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
|
||||||
"600108442",
|
"600001802",
|
||||||
"2013693901",
|
"2022574301",
|
||||||
"600001802",
|
"600001802",
|
||||||
true,
|
true,
|
||||||
mustToken = true
|
mustToken = true
|
||||||
@@ -950,63 +943,4 @@ object TVList {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
/**
|
|
||||||
* 初始化
|
|
||||||
*
|
|
||||||
* @param context Context
|
|
||||||
*/
|
|
||||||
fun init(context: Context) {
|
|
||||||
CoroutineScope(Dispatchers.Default).launch {
|
|
||||||
//获取本地版本号
|
|
||||||
val localVersion = ChannelUtils.getLocalVersion(context)
|
|
||||||
//获取服务器版本号
|
|
||||||
val serverVersion = try {
|
|
||||||
ChannelUtils.getServerVersion(context)
|
|
||||||
} catch (e: IOException) {
|
|
||||||
Log.e("TVList", "无法从服务器获取版本信息", e)
|
|
||||||
Integer.MIN_VALUE
|
|
||||||
}
|
|
||||||
//频道列表
|
|
||||||
val channelTVMap: MutableMap<String, MutableList<TV>> = mutableMapOf()
|
|
||||||
//是否从服务器更新
|
|
||||||
var updateFromServer = false
|
|
||||||
//获取频道列表
|
|
||||||
val tvList: List<TV> = if (localVersion < serverVersion) {
|
|
||||||
//获取服务器地址
|
|
||||||
val url = ChannelUtils.getServerUrl(context)
|
|
||||||
//是否从服务器更新
|
|
||||||
updateFromServer = true
|
|
||||||
Log.i("TVList", "从服务器获取频道信息")
|
|
||||||
try {
|
|
||||||
ChannelUtils.getServerChannel(url)
|
|
||||||
} catch (e: IOException) {
|
|
||||||
Log.e("TVList", "无法从服务器获取频道信息", e)
|
|
||||||
updateFromServer = false
|
|
||||||
ChannelUtils.getLocalChannel(context)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Log.i("TVList", "从本地获取频道信息")
|
|
||||||
//获取本地频道
|
|
||||||
ChannelUtils.getLocalChannel(context)
|
|
||||||
}
|
|
||||||
//按频道分类
|
|
||||||
for (tv in tvList) {
|
|
||||||
val key = tv.channel
|
|
||||||
if (channelTVMap.containsKey(key)) {
|
|
||||||
val list = channelTVMap[key]!!
|
|
||||||
list.add(tv)
|
|
||||||
channelTVMap[key] = list
|
|
||||||
} else {
|
|
||||||
channelTVMap[key] = mutableListOf(tv)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//保存频道列表
|
|
||||||
list = channelTVMap
|
|
||||||
//保存版本号
|
|
||||||
if (updateFromServer) {
|
|
||||||
ChannelUtils.updateLocalChannel(context, serverVersion, tvList)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package com.lizongying.mytv
|
|
||||||
|
|
||||||
class UpdateManager {
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,64 +1,20 @@
|
|||||||
package com.lizongying.mytv
|
package com.lizongying.mytv
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import android.content.res.Resources
|
import android.content.res.Resources
|
||||||
import android.os.Build
|
|
||||||
import android.util.TypedValue
|
import android.util.TypedValue
|
||||||
import com.google.gson.Gson
|
import java.io.File
|
||||||
import com.lizongying.mytv.api.TimeResponse
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
import java.io.IOException
|
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Date
|
import java.util.*
|
||||||
import java.util.Locale
|
import java.io.IOException
|
||||||
|
|
||||||
object Utils {
|
object Utils {
|
||||||
private var between: Long = 0
|
|
||||||
|
|
||||||
fun getDateFormat(format: String): String {
|
fun getDateFormat(format: String): String {
|
||||||
return SimpleDateFormat(
|
return SimpleDateFormat(format, Locale.CHINA).format(Date())
|
||||||
format,
|
|
||||||
Locale.CHINA
|
|
||||||
).format(Date(System.currentTimeMillis() - between))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getDateTimestamp(): Long {
|
fun getDateTimestamp(): Long {
|
||||||
return (System.currentTimeMillis() - between) / 1000
|
return Date().time / 1000
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun init() {
|
|
||||||
var currentTimeMillis: Long = 0
|
|
||||||
try {
|
|
||||||
currentTimeMillis = getTimestampFromServer()
|
|
||||||
} catch (e: Exception) {
|
|
||||||
println("Failed to retrieve timestamp from server: ${e.message}")
|
|
||||||
}
|
|
||||||
between = System.currentTimeMillis() - currentTimeMillis
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 从服务器获取时间戳
|
|
||||||
* @return Long 时间戳
|
|
||||||
*/
|
|
||||||
private suspend fun getTimestampFromServer(): Long {
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
val client = okhttp3.OkHttpClient.Builder()
|
|
||||||
.connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
|
|
||||||
.readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
|
|
||||||
val request = okhttp3.Request.Builder()
|
|
||||||
.url("https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp")
|
|
||||||
.build()
|
|
||||||
try {
|
|
||||||
client.newCall(request).execute().use { response ->
|
|
||||||
if (!response.isSuccessful) throw IOException("Unexpected code $response")
|
|
||||||
val string = response.body()?.string()
|
|
||||||
Gson().fromJson(string, TimeResponse::class.java).data.t.toLong()
|
|
||||||
}
|
|
||||||
} catch (e: IOException) {
|
|
||||||
// Handle network errors
|
|
||||||
throw IOException("Error during network request", e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun dpToPx(dp: Float): Int {
|
fun dpToPx(dp: Float): Int {
|
||||||
@@ -73,5 +29,48 @@ object Utils {
|
|||||||
).toInt()
|
).toInt()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isTmallDevice() = Build.MANUFACTURER.equals("Tmall", ignoreCase = true)
|
/**
|
||||||
|
* 获取可读写的目录
|
||||||
|
*
|
||||||
|
* @param context 应用环境信息
|
||||||
|
*
|
||||||
|
* @return 可读写的目录
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
fun getAppDirectory(context: Context): File {
|
||||||
|
return context.filesDir
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新channels.json
|
||||||
|
*
|
||||||
|
* @param context 应用环境信息
|
||||||
|
*
|
||||||
|
* @return 无
|
||||||
|
*
|
||||||
|
* @throws IOException 网络请求失败
|
||||||
|
*/
|
||||||
|
fun updateChannel(context: Context) {
|
||||||
|
val client = okhttp3.OkHttpClient()
|
||||||
|
val request = okhttp3.Request.Builder().url(getServerUrl(context)).build()
|
||||||
|
client.newCall(request).execute().use { response ->
|
||||||
|
if (!response.isSuccessful) throw IOException("Unexpected code $response")
|
||||||
|
val body = response.body()
|
||||||
|
//覆盖channels.json
|
||||||
|
val file = File(getAppDirectory(context), "channels.json")
|
||||||
|
if (!file.exists()) {
|
||||||
|
file.createNewFile()
|
||||||
|
}
|
||||||
|
file.writeText(body!!.string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从res/values/server.xml获取服务器地址
|
||||||
|
* @param context 应用环境信息
|
||||||
|
* @return 服务器地址
|
||||||
|
*/
|
||||||
|
private fun getServerUrl(context: Context): String {
|
||||||
|
return context.resources.getString(R.string.server_url)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -9,11 +9,3 @@ data class Info(
|
|||||||
data class InfoData(
|
data class InfoData(
|
||||||
val token: String,
|
val token: String,
|
||||||
)
|
)
|
||||||
|
|
||||||
data class TimeResponse(
|
|
||||||
val data: Time
|
|
||||||
) {
|
|
||||||
data class Time(
|
|
||||||
val t: String
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
@@ -40,12 +40,6 @@
|
|||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<Switch
|
|
||||||
android:id="@+id/switch_boot_startup"
|
|
||||||
android:text="@string/title_boot_startup"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="300dp"
|
android:layout_width="300dp"
|
||||||
|
|||||||
@@ -7,14 +7,6 @@
|
|||||||
android:background="@color/black"
|
android:background="@color/black"
|
||||||
android:keepScreenOn="true">
|
android:keepScreenOn="true">
|
||||||
|
|
||||||
<SurfaceView
|
|
||||||
android:id="@+id/surface_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
app:resize_mode="fill"
|
|
||||||
app:use_controller="false" />
|
|
||||||
|
|
||||||
<androidx.media3.ui.PlayerView
|
<androidx.media3.ui.PlayerView
|
||||||
android:id="@+id/player_view"
|
android:id="@+id/player_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/row"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/row_header"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="start"
|
||||||
|
android:layout_marginTop="0dp"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:gravity="start"
|
||||||
|
android:textColor="#FFEEEEEE"
|
||||||
|
android:textSize="22sp" />
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/row_items"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
</androidx.recyclerview.widget.RecyclerView>
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/show_fragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
<ScrollView
|
||||||
|
android:id="@+id/scroll_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/content"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</FrameLayout>
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<integer name="local_channel_version">1</integer>
|
<string name="server_url">http://localhost:8080</string>
|
||||||
<string name="server_version_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/version.txt</string>
|
</resources>
|
||||||
<string name="server_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/channels.json</string>
|
|
||||||
</resources>
|
|
||||||
@@ -2,5 +2,4 @@
|
|||||||
<string name="app_name">我的电视</string>
|
<string name="app_name">我的电视</string>
|
||||||
<string name="title_channel_reversal">换台反转</string>
|
<string name="title_channel_reversal">换台反转</string>
|
||||||
<string name="title_channel_num">数字选台</string>
|
<string name="title_channel_num">数字选台</string>
|
||||||
<string name="title_boot_startup">开机自启</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,10 +1,25 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
|
<style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
|
||||||
<item name="lbImageCardViewType">Title|Content</item>
|
<item name="cardType">infoUnder</item>
|
||||||
|
<item name="infoVisibility">always</item>
|
||||||
|
<!-- In order to keep backward compatibility we have to create an icon on right. -->
|
||||||
|
<item name="lbImageCardViewType">Title|Content|IconOnRight</item>
|
||||||
|
<!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
|
||||||
|
<item name="infoAreaBackground">@null</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
|
||||||
|
<item name="android:layout_width">143dp</item>
|
||||||
|
<item name="android:layout_height">50dp</item>
|
||||||
|
<item name="android:adjustViewBounds">true</item>
|
||||||
|
<item name="android:contentDescription">@null</item>
|
||||||
|
<item name="android:scaleType">centerCrop</item>
|
||||||
|
<item name="layout_viewType">main</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="CustomImageCardTheme" parent="Theme.Leanback">
|
<style name="CustomImageCardTheme" parent="Theme.Leanback">
|
||||||
<item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
|
<item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
|
||||||
|
<item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 73 KiB |
Reference in New Issue
Block a user