fix gson crash

.github/workflows/build.yml

@@ -37,6 +37,13 @@ jobs:
           # override default build-tools version (29.0.3) -- optional
           BUILD_TOOLS_VERSION: "34.0.0"
 
+      - name: Get History
+        id: get_history
+        run: |
+          chmod +x history.sh
+          output=$(./history.sh)
+          echo "$output" > history.md
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -47,6 +54,7 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: false
           prerelease: false
+          body_path: history.md
 
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
@@ -56,4 +64,19 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ steps.sign_app.outputs.signedReleaseFile }}
           asset_name: my-tv-${{ github.ref_name }}.apk
-          asset_content_type: application/vnd.android.package-archive
+          asset_content_type: application/vnd.android.package-archive
+
+      - name: Gitee Create Release
+        run: |
+          latest_commit=$(git rev-parse HEAD)
+          history=$(cat history.md)
+          curl -v POST https://gitee.com/api/v5/repos/${{ github.repository }}/releases \
+          -H "Content-Type: application/json" \
+          -d '{
+            "access_token": "${{ secrets.GITEE_ACCESS_TOKEN}}",
+            "tag_name": "${{ github.ref_name }}",
+            "name": "Release ${{ github.ref_name }}",
+            "body": "'"$history"'",
+            "prerelease": false,
+            "target_commitish": "'"$latest_commit"'"
+          }'

HISTORY.md

@@ -1,5 +1,65 @@
 ## 更新日志
 
+### v2.0.7
+
+* 修复部分设备闪退的问题
+* 修复设置页可能显示不全的问题
+
+### v2.0.5
+
+* 设置页增加恢复默认按钮，目前只用于同步系统时间
+
+### v2.0.4
+
+* 修复不能播放的问题
+* 包含国际频道
+
+### v2.0.3
+
+* 修复不能播放的问题
+* 不包含国际频道
+
+### v2.0.0
+
+* 解决卡顿问题
+* 解决网格样式时，点击空白处不退出的问题
+* 解决频道列表样式切换可能不生效的问题
+
+### v1.9.8（通用）
+
+* 优化在线升级
+* 优化可能状态错误的问题
+
+### v1.9.6（通用）
+
+* 优化在线升级
+* 优化可能状态错误的问题
+
+### v1.9.4（通用）
+
+* 修复默认时间不显示问题
+* 设置页居中
+* 频道号和时间对齐
+
+### v1.9.2（通用）
+
+* 修复一个重试的错误
+
+### v1.9.0（通用）
+
+* 减少视频播放失败情况
+* 全面屏手机居中显示
+
+### v1.8.8（通用）
+
+* 样式优化
+
+### v1.8.6（通用）
+
+* 增加错误显示
+* 节目预告优化
+* 频道列表页单击切换频道
+
 ### v1.8.4（通用）
 
 * 解決部分情況下打開後黑屏问题
@@ -11,6 +71,8 @@
 
 * 修复无法播放问题
 
+### 以下已不可用
+
 ### v1.8.0（通用）
 
 * 修复返回键无法退出问题
@@ -146,8 +208,6 @@
 
 * 修复播放失败的问题
 
-### 以下已不可用
-
 ### v1.5.3（安卓5及以上专用）
 
 * 修复部分情况下APP切换后无法继续播放的问题

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all
 
-all: info
+all: info gen-version
 
 branch := $(shell git rev-parse --abbrev-ref HEAD)
 commit := $(shell git rev-parse --short HEAD)
@@ -9,3 +9,11 @@ info:
 	@echo 'SHELL='$(SHELL)
 	@echo 'branch='$(branch)
 	@echo 'commit='$(commit)
+
+gen-version:
+	git describe --tags --always
+	git describe --tags --always | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print ($$1*16777216)+($$2*65536)+($$3*256)+$$4}'
+
+#make gen v=v2.0.0
+gen:
+	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "v$(v)" "\"}"}' > version.json

README.md

@@ -4,17 +4,16 @@
 
 ## 使用
 
-下载安装:
+1. 下载
-[github](https://github.com/lizongying/my-tv/releases/)
+    * [github](https://github.com/lizongying/my-tv/releases/)
-[gitee](https://gitee.com/lizongying/my-tv/releases/)
+    * [gitee](https://gitee.com/lizongying/my-tv/releases/)
-
+2. 安裝
-小米电视可以使用小米电视助手进行安装
+    * U盘安装
-
+    * 小米电视可以使用小米电视助手进行安装
-如电视可以启用ADB，也可以通过ADB进行安装：
+    * 如电视可以启用ADB，也可以通过ADB进行安装
-
+       ```shell
-```shell
+       adb install my-tv.apk
-adb install my-tv.apk
+       ```
-```
 
 ![image](./screenshots/img_3.png)
 ![image](./screenshots/img_2.png)
@@ -27,19 +26,16 @@ adb install my-tv.apk
 ## TODO
 
 * 音量不同
-* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
+* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视、翡翠
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 海外
-* 1.5.0 无法安装，1.5.1 可以安装
-* 节目增加预告
-* epg更新后菜单更新
 * 隐藏频道
 * 亮度调节
 * 音量调节
-* 错误页
+* 軟解
-* 频道列表页只点击一次即可
+* 网格空白处退出
 
 ## 版权说明
 

app/build.gradle

@@ -77,10 +77,9 @@ static def VersionCode() {
         def replace = [v: "", ".": " ", "-": " "]
         def arr = (process.text.trim().replace(replace) + " 0").split(" ")
         def versionCode = arr[0].toInteger() * 16777216 + arr[1].toInteger() * 65536 + arr[2].toInteger() * 256 + arr[3].toInteger()
-        println("VersionCode $versionCode")
         return versionCode
     } catch (ignored) {
-        return 0
+        return 1
     }
 }
 
@@ -88,13 +87,19 @@ static def VersionName() {
     try {
         def process = "git describe --tags --always".execute()
         process.waitFor()
-        return process.text.trim() - "v"
+        def versionName = process.text.trim() - "v"
+        if (versionName.isEmpty()) {
+            versionName = "1.0.0"
+        }
+        return versionName
     } catch (ignored) {
         return "1.0.0"
     }
 }
 
 dependencies {
+
+//    minSdk17
     def media3_version = "1.2.1"
 
     implementation "androidx.media3:media3-ui:$media3_version"
@@ -109,6 +114,8 @@ dependencies {
     def retrofit2_version = "2.6.4"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
+    // Gson 2.10.1 and older: API level 19
+    implementation("com.google.code.gson:gson:2.10.1")
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
     implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
     implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"

app/src/main/AndroidManifest.xml

@@ -12,9 +12,10 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
-        android:name=".MyTvApplication"
+        android:name=".MyTVApplication"
         android:allowBackup="true"
         android:banner="@drawable/banner"
         android:icon="@drawable/logo"
@@ -36,6 +37,9 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.windowLayoutInDisplayCutoutMode"
+                android:value="shortEdges" />
         </activity>
 
         <receiver
@@ -58,5 +62,16 @@
             android:name=".InitializerProvider"
             android:authorities="${applicationId}.InitializerProvider"
             android:exported="false" />
+
+        <meta-data android:name="android.max_aspect" android:value="2.5" />
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 </manifest>

app/src/main/java/com/lizongying/mytv/CardAdapter.kt

@@ -1,8 +1,11 @@
 package com.lizongying.mytv
 
+import android.util.Log
 import android.view.KeyEvent
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import android.view.ViewGroup
 import android.view.animation.ScaleAnimation
 import androidx.core.view.marginTop
@@ -12,6 +15,7 @@ import com.bumptech.glide.Glide
 import com.lizongying.mytv.databinding.CardBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
+import kotlin.math.abs
 
 
 class CardAdapter(
@@ -30,7 +34,7 @@ class CardAdapter(
         val inflater = LayoutInflater.from(parent.context)
         val binding = CardBinding.inflate(inflater, parent, false)
 
-        val application = mainFragment.requireActivity().applicationContext as MyTvApplication
+        val application = mainFragment.requireActivity().applicationContext as MyTVApplication
 
         binding.card.layoutParams.width = application.px2Px(binding.card.layoutParams.width)
         binding.card.layoutParams.height = application.px2Px(binding.card.layoutParams.height)
@@ -45,6 +49,7 @@ class CardAdapter(
         binding.desc.layoutParams = layoutParams
 
         val cardView = binding.root
+        cardView.isClickable = true
         cardView.isFocusable = true
         cardView.isFocusableInTouchMode = true
         return ViewHolder(cardView, binding)
@@ -55,14 +60,14 @@ class CardAdapter(
         recyclerView.invalidate()
     }
 
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float, duration: Long) {
+    private fun startScaleAnimation(view: View) {
         val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
+            0.9f, 1.0f,
-            fromScale, toScale,
+            0.9f, 1.0f,
             ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
             ScaleAnimation.RELATIVE_TO_SELF, 0.5f
         )
-        scaleAnimation.duration = duration
+        scaleAnimation.duration = 200
         scaleAnimation.fillAfter = false
         view.startAnimation(scaleAnimation)
     }
@@ -80,7 +85,7 @@ class CardAdapter(
                 focused = cardView
 
                 if (focusable) {
-                    startScaleAnimation(cardView, 0.9f, 1.0f, 200)
+                    startScaleAnimation(cardView)
                     viewHolder.focus(true)
                 }
             } else {
@@ -94,6 +99,34 @@ class CardAdapter(
             listener?.onItemClicked(item)
         }
 
+        var downX = 0f
+        var downY = 0f
+        val touchSlop = ViewConfiguration.get(cardView.context).scaledTouchSlop
+
+        cardView.setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    downX = event.x
+                    downY = event.y
+                    true
+                }
+
+                MotionEvent.ACTION_UP -> {
+                    val upX = event.x
+                    val upY = event.y
+                    val deltaX = abs(upX - downX)
+                    val deltaY = abs(upY - downY)
+                    if (deltaX < touchSlop && deltaY < touchSlop) {
+                        // 如果位移量小于阈值，则执行点击操作
+                        cardView.performClick()
+                    }
+                    true
+                }
+
+                else -> false
+            }
+        }
+
         cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
             if (event?.action == KeyEvent.ACTION_DOWN) {
                 return@setOnKeyListener listener?.onKey(keyCode) ?: false
@@ -132,6 +165,33 @@ class CardAdapter(
         }
     }
 
+    fun updateEPG() {
+        for (i in 0 until recyclerView.childCount) {
+            val childView = recyclerView.getChildAt(i)
+
+            val viewHolder = recyclerView.getChildViewHolder(childView) as ViewHolder
+
+            if (viewHolder.view.tag != null && viewHolder.view.tag is TVViewModel) {
+                val tvViewModel = viewHolder.view.tag as TVViewModel
+
+                val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+
+                if (!epg.isNullOrEmpty()) {
+                    val title = epg.last().title
+                    if (viewHolder.binding.desc.text != title) {
+                        viewHolder.binding.desc.text = title
+                        Log.i(TAG, "updateEPG $title")
+                    }
+                } else {
+                    if (viewHolder.binding.desc.text != "") {
+                        viewHolder.binding.desc.text = ""
+                        Log.i(TAG, "updateEPG")
+                    }
+                }
+            }
+        }
+    }
+
     fun toPosition(position: Int) {
         recyclerView.post {
             recyclerView.scrollToPosition(position)

app/src/main/java/com/lizongying/mytv/ChannelFragment.kt

@@ -6,7 +6,7 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginRight
+import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.databinding.ChannelBinding
@@ -28,40 +28,23 @@ class ChannelFragment : Fragment() {
         _binding = ChannelBinding.inflate(inflater, container, false)
         _binding!!.root.visibility = View.GONE
 
-        val application = requireActivity().applicationContext as MyTvApplication
+        val application = requireActivity().applicationContext as MyTVApplication
-
-        val width = application.getWidth()
-        val height = application.getHeight()
-
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height > ratio) {
-            val x =
-                ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.channel.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.rightMargin += x
-            binding.channel.layoutParams = originalLayoutParams
-        }
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.channel.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.topMargin += y
-            binding.channel.layoutParams = originalLayoutParams
-        }
 
         binding.channel.layoutParams.width = application.px2Px(binding.channel.layoutParams.width)
         binding.channel.layoutParams.height = application.px2Px(binding.channel.layoutParams.height)
+
         val layoutParams = binding.channel.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.channel.marginTop)
-        layoutParams.rightMargin = application.px2Px(binding.channel.marginRight)
+        layoutParams.marginEnd = application.px2Px(binding.channel.marginEnd)
         binding.channel.layoutParams = layoutParams
-        binding.content.textSize = application.px2PxFont(binding.content.textSize)
 
-        (activity as MainActivity).fragmentReady("ChannelFragment")
+        binding.content.textSize = application.px2PxFont(binding.content.textSize)
+        binding.time.textSize = application.px2PxFont(binding.time.textSize)
+
+        binding.main.layoutParams.width = application.shouldWidthPx()
+        binding.main.layoutParams.height = application.shouldHeightPx()
+
+        (activity as MainActivity).fragmentReady(TAG)
         return binding.root
     }
 

app/src/main/java/com/lizongying/mytv/ConfirmationFragment.kt

@@ -7,24 +7,33 @@ import androidx.fragment.app.DialogFragment
 
 class ConfirmationFragment(
     private val listener: ConfirmationListener,
-    private val message: String
+    private val message: String,
+    private val update: Boolean
 ) : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = AlertDialog.Builder(it)
-            builder.setTitle("确定更新吗？")
+            builder.setTitle(message)
-                .setMessage(message)
+            if (update) {
-                .setPositiveButton(
+                builder.setMessage("确定更新吗？")
-                    "确定"
+                    .setPositiveButton(
-                ) { _, _ ->
+                        "确定"
-                    listener.onConfirm()
+                    ) { _, _ ->
-                }
+                        listener.onConfirm()
-                .setNegativeButton(
+                    }
-                    "取消"
+                    .setNegativeButton(
-                ) { _, _ ->
+                        "取消"
-                    listener.onCancel()
+                    ) { _, _ ->
-                }
+                        listener.onCancel()
+                    }
+            } else {
+                builder.setMessage("")
+                    .setNegativeButton(
+                        "好的"
+                    ) { _, _ ->
+                    }
+            }
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }

app/src/main/java/com/lizongying/mytv/ErrorFragment.kt

@@ -0,0 +1,49 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.marginStart
+import androidx.core.view.marginTop
+import androidx.fragment.app.Fragment
+import com.lizongying.mytv.databinding.ErrorBinding
+
+class ErrorFragment : Fragment() {
+    private var _binding: ErrorBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ErrorBinding.inflate(inflater, container, false)
+
+        val application = requireActivity().applicationContext as MyTVApplication
+
+        binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
+        binding.logo.layoutParams.height = application.px2Px(binding.logo.layoutParams.height)
+
+        val layoutParams = binding.msg.layoutParams as ViewGroup.MarginLayoutParams
+        layoutParams.topMargin = application.px2Px(binding.msg.marginTop)
+        binding.msg.layoutParams = layoutParams
+
+        binding.msg.textSize = application.px2PxFont(binding.msg.textSize)
+
+        (activity as MainActivity).fragmentReady(TAG)
+        return binding.root
+    }
+
+    fun show(msg: String) {
+        binding.msg.text = msg
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val TAG = "ErrorFragment"
+    }
+}

app/src/main/java/com/lizongying/mytv/InfoFragment.kt

@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.marginBottom
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.core.view.setPadding
 import androidx.fragment.app.Fragment
@@ -29,46 +29,44 @@ class InfoFragment : Fragment() {
     ): View {
         _binding = InfoBinding.inflate(inflater, container, false)
 
-        val application = requireActivity().applicationContext as MyTvApplication
+        val application = requireActivity().applicationContext as MyTVApplication
-        val width = application.getWidth()
-        val height = application.getHeight()
-
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams = binding.info.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.bottomMargin += y
-            binding.info.layoutParams = originalLayoutParams
-        }
 
         binding.info.layoutParams.width = application.px2Px(binding.info.layoutParams.width)
         binding.info.layoutParams.height = application.px2Px(binding.info.layoutParams.height)
+
         val layoutParams = binding.info.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.bottomMargin = application.px2Px(binding.info.marginBottom)
         binding.info.layoutParams = layoutParams
+
         binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
         binding.logo.setPadding(application.px2Px(binding.logo.paddingTop))
         binding.main.layoutParams.width = application.px2Px(binding.main.layoutParams.width)
         binding.main.setPadding(application.px2Px(binding.main.paddingTop))
+
         val layoutParamsMain = binding.main.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsMain.leftMargin = application.px2Px(binding.main.marginLeft)
+        layoutParamsMain.marginStart = application.px2Px(binding.main.marginStart)
         binding.main.layoutParams = layoutParamsMain
 
         val layoutParamsDesc = binding.desc.layoutParams as ViewGroup.MarginLayoutParams
         layoutParamsDesc.topMargin = application.px2Px(binding.desc.marginTop)
         binding.desc.layoutParams = layoutParamsDesc
+
         binding.title.textSize = application.px2PxFont(binding.title.textSize)
         binding.desc.textSize = application.px2PxFont(binding.desc.textSize)
 
+        binding.container.layoutParams.width = application.shouldWidthPx()
+        binding.container.layoutParams.height = application.shouldHeightPx()
+
         _binding!!.root.visibility = View.GONE
 
-        (activity as MainActivity).fragmentReady("InfoFragment")
+        (activity as MainActivity).fragmentReady(TAG)
         return binding.root
     }
 
     fun show(tvViewModel: TVViewModel) {
+        if (_binding == null) {
+            return
+        }
         binding.title.text = tvViewModel.getTV().title
 
         Glide.with(this)

app/src/main/java/com/lizongying/mytv/ItemDecoration.kt

@@ -7,10 +7,10 @@ import androidx.recyclerview.widget.RecyclerView
 
 class ItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
 
-    private var application: MyTvApplication
+    private var application: MyTVApplication
 
     init {
-        application = context.applicationContext as MyTvApplication
+        application = context.applicationContext as MyTVApplication
     }
 
     override fun getItemOffsets(

app/src/main/java/com/lizongying/mytv/LoadingFragment.kt

@@ -0,0 +1,37 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.lizongying.mytv.databinding.LoadingBinding
+
+class LoadingFragment : Fragment() {
+    private var _binding: LoadingBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = LoadingBinding.inflate(inflater, container, false)
+
+        val application = requireActivity().applicationContext as MyTVApplication
+
+        binding.bar.layoutParams.width = application.px2Px(binding.bar.layoutParams.width)
+        binding.bar.layoutParams.height = application.px2Px(binding.bar.layoutParams.height)
+
+        (activity as MainActivity).fragmentReady(TAG)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val TAG = "LoadingFragment"
+    }
+}

app/src/main/java/com/lizongying/mytv/MainActivity.kt

@@ -1,8 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -11,22 +8,31 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.View
+import android.view.View.SYSTEM_UI_FLAG_FULLSCREEN
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+import android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
+import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 
 
-class MainActivity : FragmentActivity(), Request.RequestListener {
+class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPreferenceChangeListener {
 
     private var ready = 0
     private val playerFragment = PlayerFragment()
+    private val errorFragment = ErrorFragment()
+
+    private val loadingFragment = LoadingFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
@@ -39,13 +45,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private val handler = Handler()
     private val delayHideMain: Long = 10000
-    private val delayHideSetting: Long = 10000
+    private val delayHideSetting: Long = 15000
 
     init {
         Utils.setRequestListener(this)
     }
 
-    private fun syncTime() {
+    fun syncTime() {
         lifecycleScope.launch(Dispatchers.IO) {
             val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
             utilsJob.start()
@@ -53,47 +59,84 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val lp = window.attributes
+            lp.layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            window.setAttributes(lp)
+        }
+
+
+        window.decorView.apply {
+            systemUiVisibility =
+                SYSTEM_UI_FLAG_FULLSCREEN or
+                        SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+                        SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+                        SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+                        View.SYSTEM_UI_FLAG_IMMERSIVE
+        }
+
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        window.decorView.systemUiVisibility =
+            SYSTEM_UI_FLAG_FULLSCREEN or
+                    SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+                    SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+//            window.statusBarColor = Color.TRANSPARENT
+//            window.navigationBarColor = Color.TRANSPARENT
+//        }
+
         setContentView(R.layout.activity_main)
 
         Request.setRequestListener(this)
 
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
-
         if (savedInstanceState == null) {
-            supportFragmentManager.beginTransaction()
+            val transaction = supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
+                .add(R.id.main_browse_fragment, errorFragment)
+//                .add(R.id.main_browse_fragment, loadingFragment)
                 .add(R.id.main_browse_fragment, timeFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
                 .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(mainFragment)
-                .commit()
+                .hide(errorFragment)
+
+            if (!SP.time) {
+                transaction.hide(timeFragment)
+            } else {
+                transaction.show(timeFragment)
+            }
+
+            transaction.commitNow()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val connectivityManager =
+//            val connectivityManager =
-                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+//                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            connectivityManager.registerDefaultNetworkCallback(object :
+//            connectivityManager.registerDefaultNetworkCallback(object :
-                ConnectivityManager.NetworkCallback() {
+//                ConnectivityManager.NetworkCallback() {
-                override fun onAvailable(network: Network) {
+//                override fun onAvailable(network: Network) {
-                    super.onAvailable(network)
+//                    super.onAvailable(network)
-                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+//                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-                    if (this@MainActivity.isNetworkConnected) {
+//                    if (this@MainActivity.isNetworkConnected) {
-                        Log.i(TAG, "net isNetworkConnected")
+//                        Log.i(TAG, "net isNetworkConnected")
-                        ready++
+//                        ready++
-                    }
+//                    }
-                }
+//                }
-            })
+//            })
-        } else {
+//        } else {
-            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+//            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-            ready++
+//            ready++
-        }
+//        }
+
+        SP.setOnSharedPreferenceChangeListener(this)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -103,6 +146,52 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
+    fun showErrorFragment(msg: String) {
+        errorFragment.show(msg)
+        if (errorFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .show(errorFragment)
+            .commit()
+    }
+
+    fun hideErrorFragment() {
+        errorFragment.show("")
+        if (!errorFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .hide(errorFragment)
+            .commit()
+    }
+
+    fun showLoadingFragment() {
+        showFragment(loadingFragment)
+    }
+
+    fun hideLoadingFragment() {
+        hideFragment(loadingFragment)
+    }
+
+    fun showPlayerFragment() {
+        if (playerFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .show(playerFragment)
+            .commit()
+    }
+
+    fun hidePlayerFragment() {
+        if (!playerFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .hide(playerFragment)
+            .commit()
+    }
+
     private fun showChannel(channel: String) {
         if (!mainFragment.isHidden) {
             return
@@ -155,7 +244,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun settingDelayHide() {
         handler.removeCallbacks(hideSetting)
         handler.postDelayed(hideSetting, delayHideSetting)
-        showTime()
     }
 
     fun settingNeverHide() {
@@ -185,18 +273,35 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         Log.i(TAG, "ready $tag $ready ")
         if (ready == 7) {
             mainFragment.fragmentReady()
-            showTime()
         }
     }
 
     private fun showTime() {
-        Log.i(TAG, "showTime ${SP.time}")
         if (SP.time) {
-            timeFragment.show()
+            showFragment(timeFragment)
         } else {
-            timeFragment.hide()
+            hideFragment(timeFragment)
         }
-        mainFragment.changeStyle()
+    }
+
+    private fun showFragment(fragment: Fragment) {
+        if (!fragment.isHidden) {
+            return
+        }
+
+        supportFragmentManager.beginTransaction()
+            .show(fragment)
+            .commitNow()
+    }
+
+    private fun hideFragment(fragment: Fragment) {
+        if (fragment.isHidden) {
+            return
+        }
+
+        supportFragmentManager.beginTransaction()
+            .hide(fragment)
+            .commitNow()
     }
 
     override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -257,20 +362,17 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             return
         }
 
-        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
+        if (settingFragment.isVisible) {
-        if (!settingFragment.isVisible) {
+            return
-            settingFragment.show(supportFragmentManager, "setting")
-            settingDelayHide()
-        } else {
-            handler.removeCallbacks(hideSetting)
-            settingFragment.dismiss()
         }
+
+        settingFragment.show(supportFragmentManager, TAG)
+        settingDelayHide()
     }
 
     private val hideSetting = Runnable {
         if (settingFragment.isVisible) {
             settingFragment.dismiss()
-            showTime()
         }
     }
 
@@ -335,6 +437,11 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
+    private fun active() {
+        if (settingFragment.isVisible) {
+            settingDelayHide()
+        }
+    }
 
     fun onKey(keyCode: Int): Boolean {
         Log.i(TAG, "keyCode $keyCode")
@@ -405,7 +512,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_UNKNOWN -> {
-                showSetting()
+//                showSetting()
                 return true
             }
 
@@ -425,6 +532,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_ENTER -> {
+                active()
                 switchMainFragment()
             }
 
@@ -433,6 +541,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_UP -> {
+                active()
                 channelUp()
             }
 
@@ -441,6 +550,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_DOWN -> {
+                active()
                 channelDown()
             }
 
@@ -449,6 +559,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
+                active()
                 if (mainFragment.isHidden && !settingFragment.isVisible) {
                     switchMainFragment()
                     return true
@@ -456,6 +567,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                active()
                 if (mainFragment.isHidden && !settingFragment.isVisible) {
                     showSetting()
                     return true
@@ -484,6 +596,12 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     override fun onResume() {
         Log.i(TAG, "onResume")
         super.onResume()
+    }
+
+    override fun onResumeFragments() {
+        super.onResumeFragments()
+        mainFragment.changeMenu()
+
         if (!mainFragment.isHidden) {
             handler.postDelayed(hideMain, delayHideMain)
         }
@@ -507,4 +625,12 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private companion object {
         const val TAG = "MainActivity"
     }
+
+    override fun onSharedPreferenceChanged(key: String) {
+        Log.i(TAG, "$key changed")
+        when (key) {
+            SP.KEY_GRID -> mainFragment.changeMenu()
+            SP.KEY_TIME -> showTime()
+        }
+    }
 }

app/src/main/java/com/lizongying/mytv/MainFragment.kt

@@ -1,15 +1,16 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
 import android.os.Bundle
 import android.util.Log
+import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.marginBottom
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -20,8 +21,10 @@ import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.databinding.MenuBinding
 import com.lizongying.mytv.databinding.RowBinding
 import com.lizongying.mytv.models.ProgramType
+import com.lizongying.mytv.models.TVList
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
+import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -39,53 +42,39 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var lastVideoUrl = ""
 
-    private lateinit var application: MyTvApplication
+    private lateinit var application: MyTVApplication
+
+    private lateinit var gestureDetector: GestureDetector
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        val context = requireContext()
         _binding = MenuBinding.inflate(inflater, container, false)
 
-        application = requireActivity().applicationContext as MyTvApplication
+        application = requireActivity().applicationContext as MyTVApplication
 
-        val width = application.getWidth()
+        binding.menu.layoutParams.width = application.shouldWidthPx()
-        val height = application.getHeight()
+        binding.menu.layoutParams.height = application.shouldHeightPx()
 
-        val ratio = 16f / 9f
+        binding.container.setOnClickListener {
-
-        if (width.toFloat() / height > ratio) {
-            val x =
-                ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.leftMargin += x
-            originalLayoutParams.rightMargin += x
-            binding.scroll.layoutParams = originalLayoutParams
-
-            Log.i(
-                TAG,
-                "binding.scroll ${Resources.getSystem().displayMetrics.widthPixels} ${height * ratio}"
-            )
-        }
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.topMargin += y
-            originalLayoutParams.bottomMargin += y
-            binding.scroll.layoutParams = originalLayoutParams
-        }
-
-        binding.menu.setOnClickListener {
             hideSelf()
         }
 
+        gestureDetector = GestureDetector(context, GestureListener())
+
         return binding.root
     }
 
+    private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
+        override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+            Log.i(TAG, "onSingleTapConfirmed")
+            hideSelf()
+            return true
+        }
+    }
+
     private fun hideSelf() {
         requireActivity().supportFragmentManager.beginTransaction()
             .hide(this)
@@ -160,11 +149,26 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     hideSelf()
                 }
 
+                itemBinding.items.addOnItemTouchListener(object : RecyclerView.OnItemTouchListener {
+                    override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
+                        gestureDetector.onTouchEvent(e)
+                        return false
+                    }
+
+                    override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {
+                        TODO("Not yet implemented")
+                    }
+
+                    override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+                        TODO("Not yet implemented")
+                    }
+                })
+
                 val layoutParamsHeader =
                     itemBinding.header.layoutParams as ViewGroup.MarginLayoutParams
                 layoutParamsHeader.topMargin = application.px2Px(itemBinding.header.marginTop)
                 layoutParamsHeader.bottomMargin = application.px2Px(itemBinding.header.marginBottom)
-                layoutParamsHeader.leftMargin = application.px2Px(itemBinding.header.marginLeft)
+                layoutParamsHeader.marginStart = application.px2Px(itemBinding.header.marginStart)
                 itemBinding.header.layoutParams = layoutParamsHeader
                 itemBinding.header.textSize = application.px2PxFont(itemBinding.header.textSize)
 
@@ -183,8 +187,15 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     if (tvViewModel.errInfo.value != null
                         && tvViewModel.getTV().id == itemPosition
                     ) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                        if (tvViewModel.errInfo.value == "") {
-                            .show()
+                            (activity as? MainActivity)?.showPlayerFragment()
+                            (activity as? MainActivity)?.hideErrorFragment()
+                            (activity as? MainActivity)?.hideLoadingFragment()
+                        } else {
+                            (activity as? MainActivity)?.hidePlayerFragment()
+                            (activity as? MainActivity)?.hideLoadingFragment()
+                            (activity as? MainActivity)?.showErrorFragment(tvViewModel.errInfo.value.toString())
+                        }
                     }
                 }
                 tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
@@ -224,11 +235,11 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     }
                 }
             }
-            (activity as MainActivity).fragmentReady("MainFragment")
+            (activity as MainActivity).fragmentReady(TAG)
         }
     }
 
-    fun changeStyle() {
+    fun changeMenu() {
         if (SP.grid) {
             for (i in rowList) {
                 if (i is RecyclerView) {
@@ -266,14 +277,12 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     override fun onItemHasFocus(tvViewModel: TVViewModel) {
-        tvListViewModel.setItemPositionCurrent(tvViewModel.getTV().id)
-
         val row = tvViewModel.getRowPosition()
 
         for (i in rowList) {
             if (i.tag as Int != row) {
                 ((i as RecyclerView).adapter as CardAdapter).focusable = false
-                ((i as RecyclerView).adapter as CardAdapter).clear()
+                (i.adapter as CardAdapter).clear()
             } else {
                 ((i as RecyclerView).adapter as CardAdapter).focusable = true
             }
@@ -283,7 +292,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     override fun onItemClicked(tvViewModel: TVViewModel) {
-        Log.i(TAG, "onItemClicked")
         if (this.isHidden) {
             (activity as? MainActivity)?.switchMainFragment()
             return
@@ -293,6 +301,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
             itemPosition = tvViewModel.getTV().id
             tvListViewModel.setItemPosition(itemPosition)
             tvListViewModel.getTVViewModel(itemPosition)?.changed("menu")
+            Log.i(TAG, "onItemClicked ${tvViewModel.getTV().id}")
         }
         (activity as? MainActivity)?.switchMainFragment()
     }
@@ -410,8 +419,9 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
             Log.i(TAG, "toPosition $rowPosition $itemPosition")
             for (i in rowList) {
                 if (i.tag as Int == rowPosition) {
-                    ((i as RecyclerView).adapter as CardAdapter).focusable = true
+                    ((i as RecyclerView).adapter as CardAdapter).updateEPG()
-                    ((i as RecyclerView).adapter as CardAdapter).toPosition(itemPosition!!)
+                    (i.adapter as CardAdapter).focusable = true
+                    (i.adapter as CardAdapter).toPosition(itemPosition!!)
                     break
                 }
             }
@@ -429,13 +439,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         super.onResume()
     }
 
-    override fun onStop() {
-        Log.i(TAG, "onStop")
-        super.onStop()
-        SP.itemPosition = itemPosition
-        Log.i(TAG, "$POSITION $itemPosition saved")
-    }
-
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()

app/src/main/java/com/lizongying/mytv/MyTVApplication.kt

@@ -8,12 +8,16 @@ import android.view.WindowManager
 import androidx.multidex.MultiDex
 
 
-class MyTvApplication : Application() {
+class MyTVApplication : Application() {
     private lateinit var displayMetrics: DisplayMetrics
     private lateinit var realDisplayMetrics: DisplayMetrics
 
+    private lateinit var windowManager: WindowManager
+
     private var width = 0
     private var height = 0
+    private var shouldWidth = 0
+    private var shouldHeight = 0
     private var deviation = 0
     private var ratio = 1.0
     private var density = 2.0f
@@ -24,7 +28,7 @@ class MyTvApplication : Application() {
 
         displayMetrics = DisplayMetrics()
         realDisplayMetrics = DisplayMetrics()
-        val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+        windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
         windowManager.defaultDisplay.getMetrics(displayMetrics)
         windowManager.defaultDisplay.getRealMetrics(realDisplayMetrics)
 
@@ -44,6 +48,16 @@ class MyTvApplication : Application() {
             height * 2 / 1080.0 / density
         }
 
+        if ((width.toDouble() / height) < (16.0 / 9.0)) {
+            ratio = width * 2 / 1920.0 / density
+            shouldWidth = width
+            shouldHeight = (width * 9.0 / 16.0).toInt()
+        } else {
+            ratio = height * 2 / 1080.0 / density
+            shouldHeight = height
+            shouldWidth = (height * 16.0 / 9.0).toInt()
+        }
+
         deviation = width - Resources.getSystem().displayMetrics.widthPixels
         scale = Resources.getSystem().displayMetrics.scaledDensity
     }
@@ -56,18 +70,26 @@ class MyTvApplication : Application() {
         return realDisplayMetrics
     }
 
+    fun shouldWidthPx(): Int {
+        return shouldWidth
+    }
+
+    fun shouldHeightPx(): Int {
+        return shouldHeight
+    }
+
     fun getWidth(): Int {
         return width
     }
 
-    fun getDeviation(): Int {
-        return deviation
-    }
-
     fun getHeight(): Int {
         return height
     }
 
+    fun getDeviation(): Int {
+        return deviation
+    }
+
     fun getRatio(): Double {
         return ratio
     }

app/src/main/java/com/lizongying/mytv/OnSharedPreferenceChangeListener.kt

@@ -0,0 +1,6 @@
+package com.lizongying.mytv
+
+
+interface OnSharedPreferenceChangeListener {
+    fun onSharedPreferenceChanged(key: String)
+}

app/src/main/java/com/lizongying/mytv/PlayerFragment.kt

@@ -15,6 +15,7 @@ import androidx.media3.common.PlaybackException
 import androidx.media3.common.Player
 import androidx.media3.common.VideoSize
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 import com.google.android.exoplayer2.SimpleExoPlayer
@@ -52,10 +53,16 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
 
         playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
+            @OptIn(UnstableApi::class)
             override fun onGlobalLayout() {
                 playerView!!.viewTreeObserver.removeOnGlobalLayoutListener(this)
+
+//                val renderersFactory = context?.let { DefaultRenderersFactory(it) }
+//                renderersFactory?.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
+
                 playerView!!.player = activity?.let {
                     ExoPlayer.Builder(it)
+//                        .setRenderersFactory(renderersFactory!!)
                         .build()
                 }
                 playerView!!.player?.playWhenReady = true
@@ -78,14 +85,22 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
 
                     override fun onPlayerError(error: PlaybackException) {
                         super.onPlayerError(error)
-
                         Log.e(TAG, "PlaybackException $error")
+                        val err = "播放错误"
+                        tvViewModel?.setErrInfo(err)
                         tvViewModel?.changed("retry")
                     }
+
+                    override fun onIsPlayingChanged(isPlaying: Boolean) {
+                        super.onIsPlayingChanged(isPlaying)
+                        if (isPlaying) {
+                            tvViewModel?.setErrInfo("")
+                        }
+                    }
                 })
             }
         })
-        (activity as MainActivity).fragmentReady("PlayerFragment")
+        (activity as MainActivity).fragmentReady(TAG)
         return _binding!!.root
     }
 
@@ -146,7 +161,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     companion object {
-        private const val TAG = "PlaybackVideoFragment"
+        private const val TAG = "PlayerFragment"
     }
 
     override fun surfaceCreated(holder: SurfaceHolder) {

app/src/main/java/com/lizongying/mytv/SP.kt

@@ -13,12 +13,12 @@ object SP {
     // If use channel num to select channel or not
     private const val KEY_CHANNEL_NUM = "channel_num"
 
-    private const val KEY_TIME = "time"
+    const val KEY_TIME = "time"
 
     // If start app on device boot or not
     private const val KEY_BOOT_STARTUP = "boot_startup"
 
-    private const val KEY_GRID = "grid"
+    const val KEY_GRID = "grid"
 
     // Position in list of the selected channel item
     private const val KEY_POSITION = "position"
@@ -28,6 +28,8 @@ object SP {
 
     private lateinit var sp: SharedPreferences
 
+    private var listener: OnSharedPreferenceChangeListener? = null
+
     /**
      * The method must be invoked as early as possible(At least before using the keys)
      */
@@ -35,6 +37,10 @@ object SP {
         sp = context.getSharedPreferences(SP_FILE_NAME, Context.MODE_PRIVATE)
     }
 
+    fun setOnSharedPreferenceChangeListener(listener: OnSharedPreferenceChangeListener) {
+        this.listener = listener
+    }
+
     var channelReversal: Boolean
         get() = sp.getBoolean(KEY_CHANNEL_REVERSAL, false)
         set(value) = sp.edit().putBoolean(KEY_CHANNEL_REVERSAL, value).apply()
@@ -45,7 +51,12 @@ object SP {
 
     var time: Boolean
         get() = sp.getBoolean(KEY_TIME, true)
-        set(value) = sp.edit().putBoolean(KEY_TIME, value).apply()
+        set(value) {
+            if (value != this.time) {
+                sp.edit().putBoolean(KEY_TIME, value).apply()
+                listener?.onSharedPreferenceChanged(KEY_TIME)
+            }
+        }
 
     var bootStartup: Boolean
         get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
@@ -53,7 +64,12 @@ object SP {
 
     var grid: Boolean
         get() = sp.getBoolean(KEY_GRID, false)
-        set(value) = sp.edit().putBoolean(KEY_GRID, value).apply()
+        set(value) {
+            if (value != this.grid) {
+                sp.edit().putBoolean(KEY_GRID, value).apply()
+                listener?.onSharedPreferenceChanged(KEY_GRID)
+            }
+        }
 
     var itemPosition: Int
         get() = sp.getInt(KEY_POSITION, 0)

app/src/main/java/com/lizongying/mytv/SettingFragment.kt

@@ -1,13 +1,20 @@
 package com.lizongying.mytv
 
+import android.Manifest
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.DialogFragment
+import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.databinding.SettingBinding
 
 
@@ -23,6 +30,11 @@ class SettingFragment : DialogFragment() {
         dialog?.window?.apply {
             addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
             decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                attributes.layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+                setAttributes(attributes)
+            }
         }
     }
 
@@ -81,15 +93,19 @@ class SettingFragment : DialogFragment() {
             }
         }
 
-        updateManager = UpdateManager(context, this, context.appVersionCode)
+        binding.checkVersion.setOnClickListener {
-        binding.checkVersion.setOnClickListener(
+            (activity as MainActivity).settingDelayHide()
-            OnClickListenerCheckVersion(
+            requestInstallPermissions()
-                activity as MainActivity,
+        }
-                updateManager
-            )
-        )
 
-        val application = requireActivity().applicationContext as MyTvApplication
+        binding.clear.setOnClickListener {
+            (requireActivity() as MainActivity).syncTime()
+            SP.guid = ""
+            YSP.getGuid()
+        }
+
+        val application = requireActivity().applicationContext as MyTVApplication
+        val textSize = application.px2PxFont(binding.switchChannelReversal.textSize)
 
         binding.content.layoutParams.width =
             application.px2Px(binding.content.layoutParams.width)
@@ -100,51 +116,41 @@ class SettingFragment : DialogFragment() {
             application.px2Px(binding.content.paddingBottom)
         )
         binding.name.textSize = application.px2PxFont(binding.name.textSize)
-        binding.version.textSize = application.px2PxFont(binding.version.textSize)
+        binding.version.textSize = textSize
-        val layoutParamsDesc = binding.version.layoutParams as ViewGroup.MarginLayoutParams
+        val layoutParamsVersion = binding.version.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsDesc.topMargin = application.px2Px(binding.version.marginTop)
+        layoutParamsVersion.topMargin = application.px2Px(binding.version.marginTop)
-        binding.version.layoutParams = layoutParamsDesc
+        binding.version.layoutParams = layoutParamsVersion
 
-        binding.checkVersion.textSize = application.px2PxFont(binding.checkVersion.textSize)
+        binding.checkVersion.textSize = textSize
         val layoutParamsCheckVersion =
             binding.checkVersion.layoutParams as ViewGroup.MarginLayoutParams
         layoutParamsCheckVersion.marginEnd = application.px2Px(binding.checkVersion.marginEnd)
         binding.checkVersion.layoutParams = layoutParamsCheckVersion
 
-        binding.versionName.textSize = application.px2PxFont(binding.versionName.textSize)
+        binding.versionName.textSize = textSize
 
-        binding.exit.textSize = application.px2PxFont(binding.exit.textSize)
+        binding.clear.textSize = textSize
+        binding.exit.textSize = textSize
 
-        binding.switchChannelReversal.textSize =
+        val layoutParamsChannelSwitch =
-            application.px2PxFont(binding.switchChannelReversal.textSize)
-        val layoutParamsChannelReversal =
             binding.switchChannelReversal.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsChannelReversal.topMargin =
+        layoutParamsChannelSwitch.topMargin =
             application.px2Px(binding.switchChannelReversal.marginTop)
-        binding.switchChannelReversal.layoutParams = layoutParamsChannelReversal
 
-        binding.switchChannelNum.textSize = application.px2PxFont(binding.switchChannelNum.textSize)
+        binding.switchChannelReversal.textSize = textSize
-        val layoutParamsChannelNum =
+        binding.switchChannelReversal.layoutParams = layoutParamsChannelSwitch
-            binding.switchChannelNum.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsChannelNum.topMargin = application.px2Px(binding.switchChannelNum.marginTop)
-        binding.switchChannelNum.layoutParams = layoutParamsChannelNum
 
-        binding.switchTime.textSize = application.px2PxFont(binding.switchTime.textSize)
+        binding.switchChannelNum.textSize = textSize
-        val layoutParamsTime = binding.switchTime.layoutParams as ViewGroup.MarginLayoutParams
+        binding.switchChannelNum.layoutParams = layoutParamsChannelSwitch
-        layoutParamsTime.topMargin = application.px2Px(binding.switchTime.marginTop)
-        binding.switchTime.layoutParams = layoutParamsTime
 
-        binding.switchBootStartup.textSize =
+        binding.switchTime.textSize = textSize
-            application.px2PxFont(binding.switchBootStartup.textSize)
+        binding.switchTime.layoutParams = layoutParamsChannelSwitch
-        val layoutParamsBootStartup =
-            binding.switchBootStartup.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsBootStartup.topMargin = application.px2Px(binding.switchBootStartup.marginTop)
-        binding.switchBootStartup.layoutParams = layoutParamsBootStartup
 
-        binding.switchGrid.textSize = application.px2PxFont(binding.switchGrid.textSize)
+        binding.switchBootStartup.textSize = textSize
-        val layoutParamsGrid = binding.switchGrid.layoutParams as ViewGroup.MarginLayoutParams
+        binding.switchBootStartup.layoutParams = layoutParamsChannelSwitch
-        layoutParamsGrid.topMargin = application.px2Px(binding.switchGrid.marginTop)
+
-        binding.switchGrid.layoutParams = layoutParamsGrid
+        binding.switchGrid.textSize = textSize
+        binding.switchGrid.layoutParams = layoutParamsChannelSwitch
 
         binding.appreciate.layoutParams.width =
             application.px2Px(binding.appreciate.layoutParams.width)
@@ -153,23 +159,67 @@ class SettingFragment : DialogFragment() {
             requireActivity().finishAffinity()
         }
 
+        updateManager = UpdateManager(context, context.appVersionCode)
+
         return binding.root
     }
 
-    fun setVersionName(versionName: String) {
+    private fun requestInstallPermissions() {
-        if (_binding != null) {
+        val context = requireContext()
-            binding.versionName.text = versionName
+        val permissionsList: MutableList<String> = ArrayList()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !context.packageManager.canRequestPackageInstalls()) {
+            permissionsList.add(Manifest.permission.REQUEST_INSTALL_PACKAGES)
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+            ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            permissionsList.add(Manifest.permission.READ_EXTERNAL_STORAGE)
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+            ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            permissionsList.add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+        }
+
+        if (permissionsList.isNotEmpty()) {
+            ActivityCompat.requestPermissions(
+                requireActivity(),
+                permissionsList.toTypedArray<String>(),
+                PERMISSIONS_REQUEST_CODE
+            )
+        } else {
+            updateManager.checkAndUpdate()
         }
     }
 
-    internal class OnClickListenerCheckVersion(
+    override fun onRequestPermissionsResult(
-        private val mainActivity: MainActivity,
+        requestCode: Int,
-        private val updateManager: UpdateManager
+        permissions: Array<out String>,
-    ) :
+        grantResults: IntArray
-        View.OnClickListener {
+    ) {
-        override fun onClick(view: View?) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-            mainActivity.settingDelayHide()
+        if (requestCode == PERMISSIONS_REQUEST_CODE) {
-            updateManager.checkAndUpdate()
+            var allPermissionsGranted = true
+            for (result in grantResults) {
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    allPermissionsGranted = false
+                    break
+                }
+            }
+            if (allPermissionsGranted) {
+                updateManager.checkAndUpdate()
+            } else {
+                Toast.makeText(context, "权限授权失败", Toast.LENGTH_LONG).show()
+            }
         }
     }
 
@@ -180,6 +230,7 @@ class SettingFragment : DialogFragment() {
 
     companion object {
         const val TAG = "SettingFragment"
+        const val PERMISSIONS_REQUEST_CODE = 1
     }
 }
 

app/src/main/java/com/lizongying/mytv/TimeFragment.kt

@@ -1,12 +1,11 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginRight
+import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.Utils.getDateFormat
@@ -25,54 +24,43 @@ class TimeFragment : Fragment() {
     ): View {
         _binding = TimeBinding.inflate(inflater, container, false)
 
-        val application = requireActivity().applicationContext as MyTvApplication
+        val application = requireActivity().applicationContext as MyTVApplication
-
-        val width = application.getWidth()
-        val height = application.getHeight()
-
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height > ratio) {
-            val x =
-                ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
-            val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.rightMargin += x
-            binding.time.layoutParams = originalLayoutParams
-        }
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.topMargin += y
-            binding.time.layoutParams = originalLayoutParams
-        }
 
         binding.time.layoutParams.width = application.px2Px(binding.time.layoutParams.width)
         binding.time.layoutParams.height = application.px2Px(binding.time.layoutParams.height)
+
         val layoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.time.marginTop)
-        layoutParams.rightMargin = application.px2Px(binding.time.marginRight)
+        layoutParams.marginEnd = application.px2Px(binding.time.marginEnd)
         binding.time.layoutParams = layoutParams
-        binding.content.textSize = application.px2PxFont(binding.content.textSize)
 
-        (activity as MainActivity).fragmentReady("TimeFragment")
+        binding.content.textSize = application.px2PxFont(binding.content.textSize)
+        binding.channel.textSize = application.px2PxFont(binding.channel.textSize)
+
+        binding.main.layoutParams.width = application.shouldWidthPx()
+        binding.main.layoutParams.height = application.shouldHeightPx()
+
+        if (SP.time) {
+            handler.removeCallbacks(showRunnable)
+            handler.postDelayed(showRunnable, 0)
+        } else {
+            handler.removeCallbacks(showRunnable)
+        }
+
+        (activity as MainActivity).fragmentReady(TAG)
         return binding.root
     }
 
-    override fun onResume() {
+    override fun onHiddenChanged(hidden: Boolean) {
-        super.onResume()
+        super.onHiddenChanged(hidden)
-        if (view?.visibility == View.VISIBLE) {
+        if (!hidden) {
             handler.removeCallbacks(showRunnable)
             handler.postDelayed(showRunnable, 0)
+        } else {
+            handler.removeCallbacks(showRunnable)
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        handler.removeCallbacks(showRunnable)
-    }
-
     private val showRunnable: Runnable = Runnable {
         run {
             if (_binding == null) {
@@ -83,17 +71,6 @@ class TimeFragment : Fragment() {
         }
     }
 
-    fun show() {
-        view?.visibility = View.VISIBLE
-        handler.removeCallbacks(showRunnable)
-        handler.postDelayed(showRunnable, 0)
-    }
-
-    fun hide() {
-        view?.visibility = View.GONE
-        handler.removeCallbacks(showRunnable)
-    }
-
     override fun onDestroyView() {
         handler.removeCallbacks(showRunnable)
         super.onDestroyView()

app/src/main/java/com/lizongying/mytv/UpdateManager.kt

@@ -1,6 +1,5 @@
 package com.lizongying.mytv
 
-import android.app.Activity
 import android.app.DownloadManager
 import android.app.DownloadManager.Request
 import android.content.BroadcastReceiver
@@ -14,11 +13,10 @@ import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import androidx.core.app.ActivityCompat
+import androidx.fragment.app.FragmentActivity
-import androidx.core.content.PermissionChecker
+import com.lizongying.mytv.api.ApiClient
-import androidx.core.content.PermissionChecker.checkSelfPermission
+import com.lizongying.mytv.requests.ReleaseRequest
-import com.lizongying.mytv.api.ReleaseV2
+import com.lizongying.mytv.requests.ReleaseResponse
-import com.lizongying.mytv.requests.MyRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -27,81 +25,61 @@ import java.io.File
 
 class UpdateManager(
     private var context: Context,
-    private var settingFragment: SettingFragment,
     private var versionCode: Long
 ) :
     ConfirmationFragment.ConfirmationListener {
 
-    private var myRequest = MyRequest()
+    private var releaseRequest = ReleaseRequest()
-    private var release: ReleaseV2? = null
+    private var release: ReleaseResponse? = null
 
     private var downloadReceiver: DownloadReceiver? = null
 
     fun checkAndUpdate() {
-        if (!haveStoragePermission()) {
-            return
-        }
         CoroutineScope(Dispatchers.Main).launch {
             var text = "版本获取失败"
+            var update = false
             try {
-                release = myRequest.getRelease()
+                release = releaseRequest.getRelease()
-                Log.i(TAG, "versionCode $versionCode ${release?.c}")
+                Log.i(TAG, "versionCode $versionCode ${release?.version_code}")
-                if (release?.c != null) {
+                if (release?.version_code != null) {
-                    text = if (release?.c!! > versionCode) {
+                    if (release?.version_code!! > versionCode) {
-                        "最新版本：${release?.n}\n${release?.d ?: ""}"
+                        text = "最新版本：${release?.version_name}"
+                        update = true
                     } else {
-                        "已是最新版本，不需要更新"
+                        text = "已是最新版本，不需要更新"
                     }
                 }
             } catch (e: Exception) {
                 Log.e(TAG, "Error occurred: ${e.message}", e)
             }
-            updateUI(text)
+            updateUI(text, update)
         }
     }
 
-    private fun updateUI(text: String) {
+    private fun updateUI(text: String, update: Boolean) {
-        val dialog = ConfirmationFragment(this@UpdateManager, text)
+        val dialog = ConfirmationFragment(this@UpdateManager, text, update)
-        settingFragment.fragmentManager?.let { dialog.show(it, TAG) }
+        dialog.show((context as FragmentActivity).supportFragmentManager, TAG)
     }
 
-    private fun haveStoragePermission(): Boolean {
+    private fun startDownload(release: ReleaseResponse) {
-        if (Build.VERSION.SDK_INT >= 23) {
+        val apkName = "my-tv"
-            if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+        val apkFileName = "$apkName-${release.version_name}.apk"
-                === PermissionChecker.PERMISSION_GRANTED
-            ) {
-                Log.e("Permission error", "You have permission")
-                return true
-            } else {
-                Log.e("Permission error", "You have asked for permission")
-                ActivityCompat.requestPermissions(
-                    context as Activity, arrayOf(
-                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ), 1
-                )
-                return false
-            }
-        } else { //you don't need to worry about these stuff below api level 23
-            Log.e("Permission error", "You already have the permission")
-            return true
-        }
-    }
-
-
-    private fun startDownload(release: ReleaseV2) {
-        val apkFileName = "my-tv-${release.n}.apk"
-        Log.i(TAG, "apkFileName $apkFileName")
         val downloadManager =
             context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request = Request(Uri.parse(release.u))
+        val request =
-        Log.i(TAG, "url ${Uri.parse(release.u)}")
+            Request(Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk"))
+        Log.i(
+            TAG,
+            "url ${Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk")}"
+        )
         context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
+        Log.i(TAG, "save dir ${Environment.DIRECTORY_DOWNLOADS}")
         request.setDestinationInExternalFilesDir(
             context,
             Environment.DIRECTORY_DOWNLOADS,
             apkFileName
         )
-        request.setTitle("${settingFragment.resources.getString(R.string.app_name)} ${release.n}")
+        request.setTitle("${context.resources.getString(R.string.app_name)} ${release.version_name}")
         request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
         request.setAllowedOverRoaming(false)
         request.setMimeType("application/vnd.android.package-archive")
@@ -179,27 +157,73 @@ class UpdateManager(
         override fun onReceive(context: Context, intent: Intent) {
             val reference = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
             Log.i(TAG, "reference $reference")
-            val progress = intent.getIntExtra("progress", 0)
-            Log.i(TAG, "progress $progress")
 
-            // 检查是否是我们发起的下载
             if (reference == downloadReference) {
-                // 下载完成，触发安装
+                val downloadManager =
-                installNewVersion()
+                    context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+                val query = DownloadManager.Query().setFilterById(downloadReference)
+                val cursor = downloadManager.query(query)
+                if (cursor != null && cursor.moveToFirst()) {
+                    val statusIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
+                    if (statusIndex < 0) {
+                        Log.i(TAG, "Download failure")
+                        return
+                    }
+                    val status = cursor.getInt(statusIndex)
+
+                    val progressIndex =
+                        cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
+                    if (progressIndex < 0) {
+                        Log.i(TAG, "Download failure")
+                        return
+                    }
+                    val progress = cursor.getInt(progressIndex)
+
+                    val totalSizeIndex =
+                        cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
+                    val totalSize = cursor.getInt(totalSizeIndex)
+
+                    cursor.close()
+
+                    when (status) {
+                        DownloadManager.STATUS_SUCCESSFUL -> {
+                            installNewVersion()
+                        }
+
+                        DownloadManager.STATUS_FAILED -> {
+                            // Handle download failure
+                            Log.i(TAG, "Download failure")
+                        }
+
+                        else -> {
+                            // Update UI with download progress
+                            val percentage = progress * 100 / totalSize
+                            Log.i(TAG, "Download progress: $percentage%")
+                        }
+                    }
+                }
             }
         }
 
         private fun installNewVersion() {
-            val installIntent = Intent(Intent.ACTION_VIEW)
+            val apkFile = File(
-            val apkUri = Uri.fromFile(
+                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
-                File(
+                apkFileName
-                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
-                    apkFileName
-                )
             )
-            installIntent.setDataAndType(apkUri, "application/vnd.android.package-archive")
+            Log.i(TAG, "apkFile $apkFile")
-            installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
-            context.startActivity(installIntent)
+            if (apkFile.exists()) {
+                val apkUri = Uri.parse("file://$apkFile")
+                Log.i(TAG, "apkUri $apkUri")
+                val installIntent = Intent(Intent.ACTION_VIEW).apply {
+                    setDataAndType(apkUri, "application/vnd.android.package-archive")
+                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+
+                context.startActivity(installIntent)
+            } else {
+                Log.e(TAG, "APK file does not exist!")
+            }
         }
     }
 

app/src/main/java/com/lizongying/mytv/Utils.kt

@@ -5,8 +5,11 @@ import android.os.Build
 import android.util.TypedValue
 import com.google.gson.Gson
 import com.lizongying.mytv.api.TimeResponse
+import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.Interceptor
+import okhttp3.Response
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -33,19 +36,34 @@ object Utils {
     }
 
     suspend fun init() {
-        var currentTimeMillis: Long = 0
         try {
-            currentTimeMillis = getTimestampFromServer()
+            val currentTimeMillis = getTimestampFromServer()
+            if (currentTimeMillis > 0) {
+                between = System.currentTimeMillis() - currentTimeMillis
+            }
         } catch (e: Exception) {
             println("Failed to retrieve timestamp from server: ${e.message}")
         }
-        between = System.currentTimeMillis() - currentTimeMillis
 
         withContext(Dispatchers.Main) {
             listener?.onRequestFinished(null)
         }
     }
 
+    class RetryInterceptor(private val maxRetry: Int) : Interceptor {
+        @Throws(IOException::class)
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val request = chain.request()
+            var response = chain.proceed(request)
+            var tryCount = 0
+            while (!response.isSuccessful && tryCount < maxRetry) {
+                tryCount++
+                response = chain.proceed(request)
+            }
+            return response
+        }
+    }
+
     /**
      * 从服务器获取时间戳
      * @return Long 时间戳
@@ -53,8 +71,8 @@ object Utils {
     private suspend fun getTimestampFromServer(): Long {
         return withContext(Dispatchers.IO) {
             val client = okhttp3.OkHttpClient.Builder()
-                .connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .addInterceptor(RetryInterceptor(3))
-                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
+                .build()
             val request = okhttp3.Request.Builder()
                 .url("https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp")
                 .build()
@@ -65,7 +83,6 @@ object Utils {
                     Gson().fromJson(string, TimeResponse::class.java).data.t.toLong()
                 }
             } catch (e: IOException) {
-                // Handle network errors
                 throw IOException("Error during network request", e)
             }
         }

app/src/main/java/com/lizongying/mytv/api/ApiClient.kt

@@ -4,6 +4,7 @@ package com.lizongying.mytv.api
 import android.os.Build
 import android.util.Log
 import com.lizongying.mytv.jce.JceConverterFactory
+import com.lizongying.mytv.requests.ReleaseService
 import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
 import okhttp3.TlsVersion
@@ -23,6 +24,7 @@ class ApiClient {
     private val protoUrl = "https://capi.yangshipin.cn/"
     private val traceUrl = "https://btrace.yangshipin.cn/"
     private val trace2Url = "https://aatc-api.yangshipin.cn/"
+    private val tokenUrl = "https://h5access.yangshipin.cn/"
     private val trace3Url = "https://dtrace.ysp.cctv.cn/"
     private val jceUrl = "https://jacc.ysp.cctv.cn/"
     private val fUrl = "https://m.fengshows.com/"
@@ -47,7 +49,7 @@ class ApiClient {
 
     val releaseService: ReleaseService by lazy {
         Retrofit.Builder()
-            .baseUrl(myUrl)
+            .baseUrl(HOST)
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(ReleaseService::class.java)
@@ -77,6 +79,14 @@ class ApiClient {
             .build().create(YSPBtraceService::class.java)
     }
 
+    val yspToken2Service: YSPApiService by lazy {
+        Retrofit.Builder()
+            .baseUrl(tokenUrl)
+            .client(okHttpClient)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build().create(YSPApiService::class.java)
+    }
+
     val yspBtraceService3: YSPBtraceService by lazy {
         Retrofit.Builder()
             .baseUrl(trace3Url)
@@ -156,7 +166,7 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
+//            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
 
             val builder = OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
@@ -170,4 +180,9 @@ class ApiClient {
             throw RuntimeException(e)
         }
     }
+
+    companion object {
+        const val HOST = "https://gitee.com/lizongying/my-tv/raw/"
+        const val DOWNLOAD_HOST = "https://gitee.com/lizongying/my-tv/releases/download/"
+    }
 }

app/src/main/java/com/lizongying/mytv/api/Encryptor.kt

@@ -1,4 +1,4 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.api
 
 import android.content.Context
 

app/src/main/java/com/lizongying/mytv/api/KvcollectRequest.kt

@@ -1,17 +1,17 @@
 package com.lizongying.mytv.api
 
 data class KvcollectRequest(
-    val BossId: Int = 2727,
+    val BossId: Int = 99150,
-    val Pwd: Int = 1424084450,
+    val Pwd: Int = 1999332929,
     val cdn: String = "waibao",
     val cmd: Int = 263,
     val defn: String = "fhd",
-    val downspeed: Double = 10.0,
+    val downspeed: Int = 10,
     val durl: String = "", //
     val errcode: String = "",
     val fact1: String = "ysp_pc_live_b",
     val firstreport: Int = 0,
-    val fplayerver: String = "100",
+    val fplayerver: String = "180",
     val ftime: String = "", //
     val geturltime: Int = 0,
     val guid: String = "", //
@@ -39,17 +39,17 @@ data class KvcollectRequest(
 
 
 data class KvcollectRequest2(
-    val BossId: Int = 2727,
+    val BossId: Int = 99150,
-    val Pwd: Int = 1424084450,
+    val Pwd: Int = 1999332929,
     val cdn: String = "waibao",
     val cmd: Int = 263,
     val defn: String = "fhd",
-    val downspeed: String = "10",
+    val downspeed: Int = 10,
     val durl: String = "", //
     val errcode: String = "",
     val fact1: String = "ysp_pc_live_b",
     val firstreport: Int = 0,
-    val fplayerver: String = "100",
+    val fplayerver: String = "180",
     val ftime: String = "", //
     val geturltime: Int = 0,
     val guid: String = "", //
@@ -68,9 +68,9 @@ data class KvcollectRequest2(
     val sRef: String = "",
     val sUrl: String = "", //
     val sdtfrom: String = "ysp_pc_01",
-    val seq: Int = 9, //
+    val seq: Int = 0, //
     var signature: String = "",
     val url: String = "", //
     val viewid: String = "", //
-    val _dc: Double = 0.0,
+    val _dc: String = "",
 )

app/src/main/java/com/lizongying/mytv/api/ReleaseService.kt

@@ -1,12 +0,0 @@
-package com.lizongying.mytv.api
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface ReleaseService {
-    @GET("my-tv/v2/release/{name}")
-    fun getRelease(
-        @Path("name") date: String = "2",
-    ): Call<ReleaseV2>
-}

app/src/main/java/com/lizongying/mytv/api/Token2.kt

@@ -0,0 +1,11 @@
+package com.lizongying.mytv.api
+
+data class Token2(
+    val ret: Int?,
+    val msg: String?,
+    val data: Data,
+) {
+    data class Data(
+        val token: String,
+    )
+}

app/src/main/java/com/lizongying/mytv/api/YSP.kt

@@ -1,10 +1,10 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
-import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel
+import java.security.MessageDigest
 import kotlin.math.floor
 import kotlin.random.Random
 
@@ -53,6 +53,13 @@ object YSP {
 
     private var appid = "ysp_pc"
     var token = ""
+    var token2 = ""
+
+    var yspsdkinput = ""
+    var openapi_signature = ""
+
+    var nseqId = 1
+    var nrequest_id = ""
 
     private var encryptor = Encryptor()
 
@@ -76,10 +83,43 @@ object YSP {
 
         cKey =
             encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
+        randStr = getRand()
         signature = getSignature()
         return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
     }
 
+    fun getTokenData(tvModel: TVViewModel) {
+        livepid = tvModel.getTV().pid
+        cnlid = tvModel.getTV().sid
+        defn = "fhd"
+
+        randStr = getRand()
+
+        if (tvModel.retryTimes > 0) {
+            guid = newGuid()
+        }
+
+        cKey =
+            encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
+
+        yspsdkinput =
+            md("adjust=$adjust&app_version=$appVersion&appVer=$appVer&channel=$channel&cKey=$cKey&cmd=$cmd&cnlid=$cnlid&defn=$defn&devid=$devid&dtype=$dtype&encryptVer=$encryptVer&guid=$guid&livepid=$livepid&otype=$otype&platform=$platform&sphttps=$sphttps&stream=$stream")
+
+        nseqId++
+
+        nrequest_id = "999999" + getRand() + getTimeStr()
+
+        openapi_signature =
+            md("yspappid:519748109;host:www.yangshipin.cn;protocol:https:;token:$token2;input:$yspsdkinput-$guid-$nseqId-$nrequest_id;")
+    }
+
+    fun md(str: String): String {
+        val md = MessageDigest.getInstance("MD5")
+        md.update(str.toByteArray())
+        val digest = md.digest()
+        return digest.let { it -> it.joinToString("") { "%02x".format(it) } }
+    }
+
     fun getAuthData(tvModel: TVViewModel): String {
         livepid = tvModel.getTV().pid
 
@@ -93,7 +133,7 @@ object YSP {
         return """pid=$livepid&guid=$guid&appid=$appid&rand_str=$randStr&signature=$signature"""
     }
 
-    private fun getTimeStr(): String {
+    fun getTimeStr(): String {
         return getDateTimestamp().toString()
     }
 
@@ -107,6 +147,7 @@ object YSP {
         var guid = SP.guid
         if (guid.length < 18) {
             guid = generateGuid()
+            this.guid = guid
             SP.guid = guid
         }
         return guid

app/src/main/java/com/lizongying/mytv/api/YSPApiService.kt

@@ -2,9 +2,11 @@ package com.lizongying.mytv.api
 
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Headers
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 
 interface YSPApiService {
@@ -18,6 +20,11 @@ interface YSPApiService {
     fun getLiveInfo(
         @Header("cookie") cookie: String,
         @Header("Yspplayertoken") token: String,
+        @Header("Yspsdkinput") Yspsdkinput: String,
+        @Header("yspsdksign") yspsdksign: String,
+        @Header("Seqid") Seqid: String,
+        @Header("Request-Id") RequestId: String,
+        @Header("Yspappid") Yspappid: String="519748109",
         @Body request: LiveInfoRequest,
     ): Call<LiveInfo>
 
@@ -32,4 +39,20 @@ interface YSPApiService {
         @Header("cookie") cookie: String,
         @Body request: AuthRequest,
     ): Call<Auth>
+
+    @GET("web/open/token")
+    @Headers(
+        "content-type: application/json",
+        "referer: https://www.yangshipin.cn/",
+        "user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    )
+    fun getToken(
+        @Header("cookie") cookie: String,
+        @Query("yspappid") yspappid: String = "519748109",
+        @Query("guid") guid: String = "",
+        @Query("vappid") vappid: String = "59306155",
+        @Query("vsecret") vsecret: String = "b42702bf7309a179d102f3d51b1add2fda0bc7ada64cb801",
+        @Query("raw") raw: String = "1",
+        @Query("ts") ts: String = "",
+    ): Call<Token2>
 }

app/src/main/java/com/lizongying/mytv/api/YSPBtraceService.kt

@@ -87,8 +87,8 @@ interface YSPBtraceService {
         "referer: https://www.yangshipin.cn/",
     )
     fun kvcollect3(
-        @Field("BossId") BossId: String = "9141",
+        @Field("BossId") BossId: String = "9150",
-        @Field("Pwd") Pwd: String = "1137850982",
+        @Field("Pwd") Pwd: String = "1999332929",
         @Field("prog") prog: String = "", //
         @Field("playno") playno: String = "", //
         @Field("guid") guid: String = "", //
@@ -102,7 +102,7 @@ interface YSPBtraceService {
         @Field("firstreport") firstreport: String = "-",
         @Field("sUrl") sUrl: String = "", //
         @Field("sRef") sRef: String = "-",
-        @Field("fplayerver") fplayerver: String = "100",
+        @Field("fplayerver") fplayerver: String = "180",
         @Field("livepid") livepid: String = "",
         @Field("viewid") viewid: String = "",
         @Field("seq") seq: String = "",
@@ -118,8 +118,8 @@ interface YSPBtraceService {
         @Field("_dc") _dc: String = "",
         @Field("live_type") live_type: String = "-",
         @Field("ftime") ftime: String = "",
-        @Field("url") url: String = "",
+//        @Field("url") url: String = "",
-        @Field("rand_str") rand_str: String = "", //
+//        @Field("rand_str") rand_str: String = "", //
-        @Field("signature") signature: String = "",
+//        @Field("signature") signature: String = "",
     ): Call<Void>
 }

app/src/main/java/com/lizongying/mytv/models/TV.kt

@@ -1,4 +1,4 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.models
 
 import com.lizongying.mytv.models.ProgramType
 import java.io.Serializable
@@ -28,6 +28,8 @@ data class TV(
                 ", pid='" + pid + '\'' +
                 ", sid='" + sid + '\'' +
                 ", programType='" + programType + '\'' +
+                ", needToken='" + needToken + '\'' +
+                ", mustToken='" + mustToken + '\'' +
                 '}'
     }
 }

app/src/main/java/com/lizongying/mytv/models/TVList.kt

@@ -1,6 +1,6 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.models
 
-import com.lizongying.mytv.models.ProgramType
+import com.lizongying.mytv.R
 
 object TVList {
     val list: Map<String, List<TV>> by lazy {
@@ -900,6 +900,7 @@ object TVList {
             v.forEach { v1 ->
                 if (!v1.mustToken) {
                     v1.id = id
+                    v1.needToken = false
                     id++
                     group.add(v1)
                 }

app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt

@@ -3,6 +3,7 @@ package com.lizongying.mytv.models
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.lizongying.mytv.SP
 
 class TVListViewModel : ViewModel() {
 
@@ -16,10 +17,6 @@ class TVListViewModel : ViewModel() {
     val itemPosition: LiveData<Int>
         get() = _itemPosition
 
-    private val _itemPositionCurrent = MutableLiveData<Int>()
-    val itemPositionCurrent: LiveData<Int>
-        get() = _itemPositionCurrent
-
     fun addTVViewModel(tvViewModel: TVViewModel) {
         if (_tvListViewModel.value == null) {
             _tvListViewModel.value = mutableListOf(tvViewModel)
@@ -32,23 +29,16 @@ class TVListViewModel : ViewModel() {
         return _tvListViewModel.value?.get(id)
     }
 
-    fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
-    }
-
     fun setItemPosition(position: Int) {
         _itemPosition.value = position
-        _itemPositionCurrent.value = position
+        SP.itemPosition = position
-    }
-
-    fun setItemPositionCurrent(position: Int) {
-        _itemPositionCurrent.value = position
     }
 
     fun size(): Int {
         if (_tvListViewModel.value == null) {
             return 0
         }
+
         return _tvListViewModel.value!!.size
     }
 }

app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt

@@ -1,10 +1,8 @@
 package com.lizongying.mytv.models
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.lizongying.mytv.TV
 import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
 import com.tencent.videolite.android.datamodel.cctvjce.TVProgram
@@ -18,6 +16,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var retryTimes = 0
     var retryMaxTimes = 8
+    var authYSPRetryTimes = 0
+    var authYSPRetryMaxTimes = 3
     var tokenYSPRetryTimes = 0
     var tokenYSPRetryMaxTimes = 0
     var tokenFHRetryTimes = 0
@@ -56,25 +56,20 @@ class TVViewModel(private var tv: TV) : ViewModel() {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
                 tv.videoUrl = tv.videoUrl.subList(0, tv.videoUrl.lastIndex) + listOf(url)
             } else {
-                tv.videoUrl = tv.videoUrl + listOf(url)
+                tv.videoUrl += listOf(url)
             }
         } else {
-            tv.videoUrl = tv.videoUrl + listOf(url)
+            tv.videoUrl += listOf(url)
         }
         _videoUrl.value = tv.videoUrl
         _videoIndex.value = tv.videoUrl.lastIndex
     }
 
-    fun firstSource() {
-        if (_videoUrl.value!!.isNotEmpty()) {
-            setVideoIndex(0)
-            allReady()
-        } else {
-            Log.e(TAG, "no first")
-        }
-    }
-
     fun changed(from: String) {
+        retryTimes = 0
+        authYSPRetryTimes = 0
+        tokenYSPRetryTimes = 0
+        tokenFHRetryTimes = 0
         _change.value = from
     }
 
@@ -82,10 +77,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _ready.value = true
     }
 
-    fun setVideoIndex(videoIndex: Int) {
-        _videoIndex.value = videoIndex
-    }
-
     init {
         _videoUrl.value = tv.videoUrl
         _videoIndex.value = tv.videoUrl.lastIndex

app/src/main/java/com/lizongying/mytv/requests/ReleaseRequest.kt

@@ -10,20 +10,23 @@ import retrofit2.Response
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class MyRequest {
+class ReleaseRequest {
     private var releaseService = ApiClient().releaseService
 
-    suspend fun getRelease(): ReleaseV2? {
+    suspend fun getRelease(): ReleaseResponse? {
         return withContext(Dispatchers.IO) {
             fetchRelease()
         }
     }
 
-    private suspend fun fetchRelease(): ReleaseV2? {
+    private suspend fun fetchRelease(): ReleaseResponse? {
         return suspendCoroutine { continuation ->
             releaseService.getRelease()
-                .enqueue(object : Callback<ReleaseV2> {
+                .enqueue(object : Callback<ReleaseResponse> {
-                    override fun onResponse(call: Call<ReleaseV2>, response: Response<ReleaseV2>) {
+                    override fun onResponse(
+                        call: Call<ReleaseResponse>,
+                        response: Response<ReleaseResponse>
+                    ) {
                         if (response.isSuccessful) {
                             continuation.resume(response.body())
                         } else {
@@ -31,7 +34,7 @@ class MyRequest {
                         }
                     }
 
-                    override fun onFailure(call: Call<ReleaseV2>, t: Throwable) {
+                    override fun onFailure(call: Call<ReleaseResponse>, t: Throwable) {
                         continuation.resume(null)
                     }
                 })
@@ -39,6 +42,6 @@ class MyRequest {
     }
 
     companion object {
-        private const val TAG = "MyRequest"
+        private const val TAG = "ReleaseRequest"
     }
 }

app/src/main/java/com/lizongying/mytv/requests/ReleaseResponse.kt

@@ -0,0 +1,7 @@
+package com.lizongying.mytv.requests
+
+
+data class ReleaseResponse(
+    val version_code: Int?,
+    val version_name: String?,
+)

app/src/main/java/com/lizongying/mytv/requests/ReleaseService.kt

@@ -0,0 +1,10 @@
+package com.lizongying.mytv.requests
+
+import retrofit2.Call
+import retrofit2.http.GET
+
+interface ReleaseService {
+    @GET("JELLY_BEAN_MR1/version.json")
+    fun getRelease(
+    ): Call<ReleaseResponse>
+}

app/src/main/java/com/lizongying/mytv/requests/Request.kt

@@ -1,11 +1,10 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.requests
 
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import com.google.gson.Gson
+import com.lizongying.mytv.Utils
-import java.net.URLDecoder
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.api.Auth
@@ -19,12 +18,14 @@ import com.lizongying.mytv.api.KvcollectRequest
 import com.lizongying.mytv.api.KvcollectRequest2
 import com.lizongying.mytv.api.LiveInfo
 import com.lizongying.mytv.api.LiveInfoRequest
+import com.lizongying.mytv.api.Token2
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.api.YSPApiService
 import com.lizongying.mytv.api.YSPBtraceService
 import com.lizongying.mytv.api.YSPJceService
 import com.lizongying.mytv.api.YSPProtoService
 import com.lizongying.mytv.api.YSPTokenService
+import com.lizongying.mytv.models.TVList
 import com.lizongying.mytv.models.TVViewModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.oms.common.proto.pageModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.epgProgramModel
@@ -42,6 +43,7 @@ import kotlin.random.Random
 object Request {
     private const val TAG = "Request"
     private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
+    private var yspToken2Service: YSPApiService = ApiClient().yspToken2Service
     private var yspApiService: YSPApiService = ApiClient().yspApiService
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspBtraceService2: YSPBtraceService = ApiClient().yspBtraceService2
@@ -56,6 +58,7 @@ object Request {
 
     private var needAuth = true
     private var needToken = false
+    private var needToken2 = true
 
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var btraceRunnable: BtraceRunnable
@@ -74,6 +77,7 @@ object Request {
     }
 
     private var call: Call<LiveInfo>? = null
+    private var callToken: Call<Token2>? = null
     private var callAuth: Call<Auth>? = null
     private var callInfo: Call<Info>? = null
     private var callFAuth: Call<FAuth>? = null
@@ -84,11 +88,117 @@ object Request {
     private fun cancelCall() {
         call?.cancel()
         callAuth?.cancel()
+        callToken?.cancel()
         callInfo?.cancel()
         callFAuth?.cancel()
         callPage?.cancel()
     }
 
+
+    private fun fetchToken(tvModel: TVViewModel, cookie: String) {
+        cancelCall()
+
+        val title = tvModel.getTV().title
+
+        callToken = yspToken2Service.getToken("guid=${YSP.getGuid()}; $cookie",  "519748109", YSP.getGuid(),  "59306155", "b42702bf7309a179d102f3d51b1add2fda0bc7ada64cb801" ,"1", YSP.getTimeStr())
+        callToken?.enqueue(object : Callback<Token2> {
+            override fun onResponse(call: Call<Token2>, response: Response<Token2>) {
+                if (response.isSuccessful) {
+                    val liveInfo = response.body()
+
+                    if (liveInfo?.data?.token != null) {
+                        Log.i(TAG, "token ${liveInfo.data.token}")
+                        YSP.token2 = liveInfo.data.token
+
+                        YSP.getTokenData(tvModel)
+
+                        fetchAuth(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "$title token error")
+                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                            tvModel.retryTimes++
+                            if (tvModel.getTV().needToken) {
+                                if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                                    tvModel.tokenYSPRetryTimes++
+                                    tvModel.needGetToken = true
+                                    fetchToken(tvModel)
+                                } else {
+                                    if (!tvModel.getTV().mustToken) {
+                                        fetchToken(tvModel, cookie)
+                                    } else {
+                                        val err = "错误"
+                                        Log.e(TAG, "$title $err")
+                                        tvModel.setErrInfo(err)
+                                    }
+                                }
+                            } else {
+                                fetchToken(tvModel, cookie)
+                            }
+                        } else {
+                            val err = "认证结果错误"
+                            Log.e(TAG, "$title $err")
+                            tvModel.setErrInfo(err)
+                        }
+                    }
+                } else {
+                    Log.e(TAG, "$title token status error")
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                        tvModel.retryTimes++
+                        if (tvModel.getTV().needToken) {
+                            if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                                tvModel.tokenYSPRetryTimes++
+                                tvModel.needGetToken = true
+                                fetchToken(tvModel)
+                            } else {
+                                if (!tvModel.getTV().mustToken) {
+                                    fetchToken(tvModel, cookie)
+                                } else {
+                                    val err = "错误"
+                                    Log.e(TAG, "$title $err")
+                                    tvModel.setErrInfo(err)
+                                }
+                            }
+                        } else {
+                            fetchToken(tvModel, cookie)
+                        }
+                    } else {
+                        val err = "认证状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<Token2>, t: Throwable) {
+                Log.e(TAG, "$title token request error $t")
+                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                    tvModel.retryTimes++
+                    if (tvModel.getTV().needToken) {
+                        if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
+                            tvModel.needGetToken = true
+                            fetchToken(tvModel)
+                        } else {
+                            if (!tvModel.getTV().mustToken) {
+                                fetchToken(tvModel, cookie)
+                            } else {
+                                val err = "错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
+                            }
+                        }
+                    } else {
+                        fetchToken(tvModel, cookie)
+                    }
+                } else {
+                    val err = "认证请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
+                }
+            }
+        })
+    }
+
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
@@ -103,11 +213,11 @@ object Request {
                     val liveInfo = response.body()
 
                     if (liveInfo?.data?.token != null) {
-                        Log.i(TAG, "token ${liveInfo.data.token}")
+                        Log.i(TAG, "auth ${liveInfo.data.token}")
                         YSP.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
                     } else {
-                        Log.e(TAG, "$title token error")
+                        Log.e(TAG, "$title auth error")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             if (tvModel.getTV().needToken) {
@@ -118,11 +228,19 @@ object Request {
                                 } else {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
+                                    } else {
+                                        val err = "错误"
+                                        Log.e(TAG, "$title $err")
+                                        tvModel.setErrInfo(err)
                                     }
                                 }
                             } else {
                                 fetchAuth(tvModel, cookie)
                             }
+                        } else {
+                            val err = "认证结果错误"
+                            Log.e(TAG, "$title $err")
+                            tvModel.setErrInfo(err)
                         }
                     }
                 } else {
@@ -137,11 +255,19 @@ object Request {
                             } else {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
+                                } else {
+                                    val err = "错误"
+                                    Log.e(TAG, "$title $err")
+                                    tvModel.setErrInfo(err)
                                 }
                             }
                         } else {
                             fetchAuth(tvModel, cookie)
                         }
+                    } else {
+                        val err = "认证状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -158,11 +284,19 @@ object Request {
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
+                            } else {
+                                val err = "错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
                             }
                         }
                     } else {
                         fetchAuth(tvModel, cookie)
                     }
+                } else {
+                    val err = "认证请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -171,7 +305,7 @@ object Request {
     private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
-        if (::btraceRunnable.isInitialized) {
+        if (Request::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
 
@@ -182,8 +316,13 @@ object Request {
         val request = LiveInfoRequest(data)
         call = request.let {
             yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; $cookie",
+                "guid=${YSP.getGuid()}; gr_user_id=261eecf2-0ce4-4316-a6a1-7171e3de7389; $cookie; newLogin=1; nseqId=${YSP.nseqId}; nrequest-id=${YSP.nrequest_id}",
                 YSP.token,
+                YSP.yspsdkinput,
+                YSP.openapi_signature,
+                "${YSP.nseqId}",
+                YSP.nrequest_id,
+                "519748109",
                 it
             )
         }
@@ -223,24 +362,42 @@ object Request {
                                     if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                         tvModel.tokenYSPRetryTimes++
                                         tvModel.needGetToken = true
-                                        fetchVideo(tvModel)
+                                        if (needAuth) {
-//                                        fetchAuth(tvModel)
+                                            fetchAuth(tvModel)
+                                        } else {
+                                            fetchVideo(tvModel)
+                                        }
                                     } else {
                                         if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
+                                            if (needAuth) {
-//                                            fetchAuth(tvModel, cookie)
+                                                fetchAuth(tvModel, cookie)
+                                            } else {
+                                                fetchVideo(tvModel, cookie)
+                                            }
+                                        } else {
+                                            val err = "错误"
+                                            Log.e(TAG, "$title $err")
+                                            tvModel.setErrInfo(err)
                                         }
                                     }
                                 } else {
-                                    fetchVideo(tvModel, cookie)
+                                    if (needAuth) {
-//                                    fetchAuth(tvModel, cookie)
+                                        fetchAuth(tvModel, cookie)
+                                    } else {
+                                        fetchVideo(tvModel, cookie)
+                                    }
                                 }
+                            } else {
+                                val err = "结果错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
                             }
                         }
                     } else {
                         if (liveInfo?.data?.errinfo != null && liveInfo.data.errinfo == "应版权方要求，暂停提供直播信号，请点击观看其他精彩节目") {
-                            Log.e(TAG, "$title error ${liveInfo.data.errinfo}")
+                            val err = "版权错误"
-                            tvModel.setErrInfo(liveInfo.data.errinfo)
+                            Log.e(TAG, "$title $err")
+                            tvModel.setErrInfo(err)
                         } else {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
@@ -249,18 +406,35 @@ object Request {
                                     if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                         tvModel.tokenYSPRetryTimes++
                                         tvModel.needGetToken = true
-                                        fetchVideo(tvModel)
+                                        if (needAuth) {
-//                                        fetchAuth(tvModel)
+                                            fetchAuth(tvModel)
+                                        } else {
+                                            fetchVideo(tvModel)
+                                        }
                                     } else {
                                         if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
+                                            if (needAuth) {
-//                                            fetchAuth(tvModel, cookie)
+                                                fetchAuth(tvModel, cookie)
+                                            } else {
+                                                fetchVideo(tvModel, cookie)
+                                            }
+                                        } else {
+                                            val err = "错误"
+                                            Log.e(TAG, "$title $err")
+                                            tvModel.setErrInfo(err)
                                         }
                                     }
                                 } else {
-                                    fetchVideo(tvModel, cookie)
+                                    if (needAuth) {
-//                                    fetchAuth(tvModel, cookie)
+                                        fetchAuth(tvModel, cookie)
+                                    } else {
+                                        fetchVideo(tvModel, cookie)
+                                    }
                                 }
+                            } else {
+                                val err = "其他错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
                             }
                         }
                     }
@@ -272,18 +446,35 @@ object Request {
                             if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                 tvModel.tokenYSPRetryTimes++
                                 tvModel.needGetToken = true
-                                fetchVideo(tvModel)
+                                if (needAuth) {
-//                                fetchAuth(tvModel)
+                                    fetchAuth(tvModel, cookie)
+                                } else {
+                                    fetchVideo(tvModel, cookie)
+                                }
                             } else {
                                 if (!tvModel.getTV().mustToken) {
-                                    fetchVideo(tvModel, cookie)
+                                    if (needAuth) {
-//                                    fetchAuth(tvModel, cookie)
+                                        fetchAuth(tvModel, cookie)
+                                    } else {
+                                        fetchVideo(tvModel, cookie)
+                                    }
+                                } else {
+                                    val err = "错误"
+                                    Log.e(TAG, "$title $err")
+                                    tvModel.setErrInfo(err)
                                 }
                             }
                         } else {
-                            fetchVideo(tvModel, cookie)
+                            if (needAuth) {
-//                            fetchAuth(tvModel, cookie)
+                                fetchAuth(tvModel, cookie)
+                            } else {
+                                fetchVideo(tvModel, cookie)
+                            }
                         }
+                    } else {
+                        val err = "状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -300,16 +491,82 @@ object Request {
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
+                            } else {
+//                                TODO
                             }
                         }
                     } else {
                         fetchVideo(tvModel, cookie)
                     }
+                } else {
+                    val err = "请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
                 }
             }
         })
     }
 
+    private fun fetchToken(tvModel: TVViewModel) {
+        cancelCall()
+        if (tvModel.needGetToken) {
+            callInfo = yspTokenService.getInfo("")
+            callInfo?.enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful && response.body()?.data?.token != null) {
+                        token = response.body()?.data?.token!!
+                        Log.i(TAG, "info success $token")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
+                        fetchAuth(tvModel, cookie)
+                    } else if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "info status error")
+                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
+                            fetchToken(tvModel)
+                        } else {
+                            if (!tvModel.getTV().mustToken) {
+                                val cookie =
+                                    "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109"
+                                fetchToken(tvModel, cookie)
+                            } else {
+//                                TODO
+                            }
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
+                        fetchAuth(tvModel)
+                    } else {
+                        if (!tvModel.getTV().mustToken) {
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109"
+                            fetchToken(tvModel, cookie)
+                        } else {
+//                                TODO
+                        }
+                    }
+                }
+            })
+        } else {
+            val cookie =
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
+            fetchToken(tvModel, cookie)
+        }
+    }
+
     private fun fetchAuth(tvModel: TVViewModel) {
         cancelCall()
         if (tvModel.needGetToken) {
@@ -340,6 +597,8 @@ object Request {
                                 val cookie =
                                     "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                                 fetchAuth(tvModel, cookie)
+                            } else {
+//                                TODO
                             }
                         }
                     }
@@ -355,13 +614,15 @@ object Request {
                             val cookie =
                                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                             fetchAuth(tvModel, cookie)
+                        } else {
+//                                TODO
                         }
                     }
                 }
             })
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; yspopenid=$openid; vusession=$token"
             fetchAuth(tvModel, cookie)
         }
     }
@@ -397,6 +658,8 @@ object Request {
                                 val cookie =
                                     "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                                 fetchVideo(tvModel, cookie)
+                            } else {
+//                                TODO
                             }
                         }
                     }
@@ -412,6 +675,8 @@ object Request {
                             val cookie =
                                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                             fetchVideo(tvModel, cookie)
+                        } else {
+//                                TODO
                         }
                     }
                 }
@@ -447,6 +712,10 @@ object Request {
                     if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                         tvModel.tokenFHRetryTimes++
                         fetchFAuth(tvModel)
+                    } else {
+                        val err = "状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -456,6 +725,10 @@ object Request {
                 if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                     tvModel.tokenFHRetryTimes++
                     fetchFAuth(tvModel)
+                } else {
+                    val err = "请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -471,19 +744,42 @@ object Request {
             if (token == "") {
                 tvModel.needGetToken = true
             }
-            if (needAuth) {
+            if (needToken2) {
-                fetchAuth(tvModel)
+                if (needAuth) {
+                    fetchToken(tvModel)
+                } else {
+                    fetchAuth(tvModel)
+                }
             } else {
-                fetchVideo(tvModel)
+                if (needAuth) {
+                    fetchAuth(tvModel)
+                } else {
+                    fetchVideo(tvModel)
+                }
             }
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; updateProtocol=1; deviceModel=120"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124"
-            if (needAuth) {
+
-                fetchAuth(tvModel, cookie)
+            if (needToken2) {
+                if (needAuth) {
+                    fetchToken(tvModel, cookie)
+                } else {
+                    fetchAuth(tvModel, cookie)
+                }
             } else {
-                fetchVideo(tvModel, cookie)
+                if (needAuth) {
+                    fetchAuth(tvModel, cookie)
+                } else {
+                    fetchVideo(tvModel, cookie)
+                }
             }
+//
+//            if (needAuth) {
+//                fetchAuth(tvModel, cookie)
+//            } else {
+//                fetchVideo(tvModel, cookie)
+//            }
         }
     }
 
@@ -602,7 +898,7 @@ object Request {
             seq = tvModel.seq,
             durl = url,
             url = url,
-            _dc = randomNumber,
+//            _dc = "",
         )
 
         val e =
@@ -634,7 +930,7 @@ object Request {
         val guid = YSP.getGuid()
         val pid = tvModel.getTV().pid
         val sid = tvModel.getTV().sid
-        val randomNumber = Random.nextDouble()
+//        val randomNumber = Random.nextDouble()
         val url = tvModel.getTV().videoUrl.first()
 
         val r = KvcollectRequest2(
@@ -649,12 +945,12 @@ object Request {
             seq = tvModel.seq,
             durl = url,
             url = url,
-            _dc = randomNumber,
+            _dc = "",
         )
 
-        val e =
+//        val e =
-            "BossId=${r.BossId}&Pwd=${r.Pwd}&_dc=${r._dc}&cdn=${r.cdn}&cmd=${r.cmd}&defn=${r.defn}&downspeed=${r.downspeed}&durl=${r.durl}&errcode=${r.errcode}&fact1=${r.fact1}&firstreport=${r.firstreport}&fplayerver=${r.fplayerver}&ftime=${r.ftime}&geturltime=${r.geturltime}&guid=${r.guid}&hc_openid=${r.hc_openid}&hh_ua=${r.hh_ua}&live_type=${r.live_type}&livepid=${r.livepid}&login_type=${r.login_type}&open_id=${r.open_id}&openid=${r.openid}&platform=${r.platform}&playno=${r.playno}&prd=${r.prd}&prog=${r.prog}&rand_str=${r.rand_str}&sRef=${r.sRef}&sUrl=${r.sUrl}&sdtfrom=${r.sdtfrom}&seq=${r.seq}&url=${r.url}&viewid=${r.viewid}"
+//            "BossId=${r.BossId}&Pwd=${r.Pwd}&_dc=${r._dc}&cdn=${r.cdn}&cmd=${r.cmd}&defn=${r.defn}&downspeed=${r.downspeed}&durl=${r.durl}&errcode=${r.errcode}&fact1=${r.fact1}&firstreport=${r.firstreport}&fplayerver=${r.fplayerver}&ftime=${r.ftime}&geturltime=${r.geturltime}&guid=${r.guid}&hc_openid=${r.hc_openid}&hh_ua=${r.hh_ua}&live_type=${r.live_type}&livepid=${r.livepid}&login_type=${r.login_type}&open_id=${r.open_id}&openid=${r.openid}&platform=${r.platform}&playno=${r.playno}&prd=${r.prd}&prog=${r.prog}&rand_str=${r.rand_str}&sRef=${r.sRef}&sUrl=${r.sUrl}&sdtfrom=${r.sdtfrom}&seq=${r.seq}&url=${r.url}&viewid=${r.viewid}"
-        r.signature = YSP.getAuthSignature(e)
+//        r.signature = YSP.getAuthSignature(e)
 
         callBtracePage = yspBtraceService3.kvcollect3(
             guid = r.guid,
@@ -663,18 +959,18 @@ object Request {
             livepid = r.livepid,
             sUrl = r.sUrl,
             playno = r.playno,
-            rand_str = r.rand_str,
+//            rand_str = r.rand_str,
             ftime = r.ftime,
             seq = "${r.seq}",
             durl = r.durl,
-            url = r.url,
+//            url = r.url,
             _dc = "${r._dc}",
-            signature = r.signature
+//            signature = r.signature
         )
         callBtracePage?.enqueue(object : Callback<Void> {
             override fun onResponse(call: Call<Void>, response: Response<Void>) {
                 if (response.isSuccessful) {
-                    Log.d(TAG, "$title kvcollect success")
+                    Log.i(TAG, "$title kvcollect success")
                 } else {
                     Log.e(TAG, "$title kvcollect status error")
                 }
@@ -817,6 +1113,6 @@ object Request {
     }
 
     fun setRequestListener(listener: RequestListener) {
-        this.listener = listener
+        Request.listener = listener
     }
 }

app/src/main/res/drawable/sad_cloud.xml

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="50"
+    android:viewportHeight="50"
+    android:width="62.5dp"
+    android:height="62.5dp">
+    <group
+        android:scaleX="0.1"
+        android:scaleY="-0.1"
+        android:translateY="50">
+        <path
+            android:pathData="M205 377c-27 -27 -40 -33 -65 -29 -30 4 -70 -19 -70 -40 0 -5 -16 -24 -35 -42 -38 -36 -44 -66 -23 -111 22 -49 51 -55 248 -55l182 0 29 29c46 46 37 106 -20 136 -20 10 -31 25 -35 49 -4 22 -20 46 -42 65 -29 26 -43 31 -85 31 -44 0 -55 -4 -84 -33zm138 2c29 -13 57 -58 57 -93 0 -17 5 -26 15 -26 24 0 65 -46 65 -71 0 -13 -10 -33 -22 -46 -21 -22 -26 -23 -205 -23 -182 0 -184 0 -208 25 -33 32 -32 70 3 105 16 15 36 40 45 54 18 27 54 35 74 15 8 -8 16 -2 29 19 9 17 27 35 38 41 28 13 80 13 109 0z"
+            android:fillColor="#FFEEEEEE" />
+        <path
+            android:pathData="M174 269c-10 -17 13 -36 27 -22 12 12 4 33 -11 33 -5 0 -12 -5 -16 -11z"
+            android:fillColor="#FFEEEEEE" />
+        <path
+            android:pathData="M294 269c-10 -17 13 -36 27 -22 12 12 4 33 -11 33 -5 0 -12 -5 -16 -11z"
+            android:fillColor="#FFEEEEEE" />
+        <path
+            android:pathData="M194 196c-32 -14 -50 -33 -41 -42 3 -3 20 4 38 15 43 26 75 26 118 0 34 -20 49 -20 36 1 -10 16 -69 40 -97 40 -13 -1 -37 -7 -54 -14z"
+            android:fillColor="#FFEEEEEE" />
+    </group>
+</vector>

app/src/main/res/layout/channel.xml

@@ -1,18 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/channel"
+    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="90dp"
+    android:layout_width="match_parent"
-    android:layout_height="60dp"
+    android:layout_height="match_parent"
-    android:layout_gravity="end|top"
+    android:gravity="center"
-    android:layout_marginTop="20dp"
+    >
-    android:layout_marginEnd="170dp">
+    <FrameLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
 
-    <TextView
+        <RelativeLayout
-        android:id="@+id/content"
+            android:id="@+id/channel"
-        android:layout_width="wrap_content"
+            android:layout_width="90dp"
-        android:layout_height="wrap_content"
+            android:layout_height="60dp"
-        android:layout_gravity="end"
+            android:layout_gravity="end|top"
-        android:textColor="#FFEEEEEE"
+            android:layout_marginTop="15dp"
-        android:textStyle="bold"
+            android:layout_marginEnd="170dp"
-        android:textSize="40sp" />
+            android:gravity="end|bottom" >
-</FrameLayout>
+
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="40sp"
+                tools:text="99"
+                android:layout_alignBaseline="@+id/time"/>
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="32sp"
+                tools:text="12:34" />
+        </RelativeLayout>
+    </FrameLayout>
+</LinearLayout>

app/src/main/res/layout/error.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/error"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black" >
+
+    <LinearLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ImageView
+            android:id="@+id/logo"
+            android:src="@drawable/sad_cloud"
+            android:layout_width="50dp"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:id="@+id/msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textColor="#FFEEEEEE"
+            android:text="Message"
+            android:textSize="20sp" />
+    </LinearLayout>
+</FrameLayout>

app/src/main/res/layout/info.xml

@@ -1,46 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/info"
+    android:layout_width="match_parent"
-    android:layout_width="400dp"
+    android:layout_height="match_parent"
-    android:layout_height="80dp"
+    android:gravity="center"
-    android:layout_gravity="center_horizontal|bottom"
+    >
-    android:layout_marginBottom="20dp">
+    <FrameLayout
-
+        android:id="@+id/container"
-    <ImageView
+        android:layout_width="match_parent"
-        android:id="@+id/logo"
-        android:layout_width="100dp"
         android:layout_height="match_parent"
-        android:background="@drawable/rounded_white_left"
+        >
-        android:padding="10dp" />
 
-    <LinearLayout
+        <LinearLayout
-        android:id="@+id/main"
+            android:id="@+id/info"
-        android:layout_width="300dp"
+            android:layout_width="400dp"
-        android:layout_height="match_parent"
+            android:layout_height="80dp"
-        android:layout_marginStart="100dp"
+            android:layout_gravity="center_horizontal|bottom"
-        android:background="@drawable/rounded_dark_right"
+            android:layout_marginBottom="20dp"
-        android:gravity="start|center_vertical"
+            android:orientation="horizontal">
-        android:orientation="vertical"
-        android:padding="7dp">
 
-        <TextView
+            <ImageView
-            android:id="@+id/title"
+                android:id="@+id/logo"
-            android:layout_width="wrap_content"
+                android:layout_width="100dp"
-            android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-            android:layout_gravity="start"
+                android:background="@drawable/rounded_white_left"
-            android:gravity="start"
+                android:padding="10dp" />
-            android:textColor="#FFEEEEEE"
-            android:textSize="20sp" />
 
-        <TextView
+            <LinearLayout
-            android:id="@+id/desc"
+                android:id="@+id/main"
-            android:layout_width="wrap_content"
+                android:layout_width="300dp"
-            android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-            android:layout_gravity="start"
+                android:layout_marginStart="0dp"
-            android:layout_marginTop="8dp"
+                android:background="@drawable/rounded_dark_right"
-            android:gravity="start"
+                android:gravity="start|center_vertical"
-            android:singleLine="true"
+                android:orientation="vertical"
-            android:textColor="#B3EEEEEE"
+                android:padding="7dp">
-            android:textSize="14sp" />
+
-    </LinearLayout>
+                <TextView
-</FrameLayout>
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:gravity="start"
+                    android:textColor="#FFEEEEEE"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:id="@+id/desc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_marginTop="8dp"
+                    android:gravity="start"
+                    android:singleLine="true"
+                    android:textColor="#B3EEEEEE"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>

app/src/main/res/layout/loading.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loading"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    >
+
+    <LinearLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center" >
+
+        <ProgressBar
+            android:id="@+id/bar"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminateTint="@color/white"/>
+    </LinearLayout>
+</FrameLayout>

app/src/main/res/layout/menu.xml

@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/menu"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/transparent"
     android:clickable="true"
     android:focusable="false"
-    >
+    android:gravity="center"
-    <ScrollView
+>
-        android:id="@+id/scroll"
+
+    <FrameLayout
+        android:id="@+id/menu"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
-        <LinearLayout
+>
-            android:id="@+id/content"
+
-            android:layout_width="match_parent"
+            <ScrollView
-            android:layout_height="wrap_content"
+                android:id="@+id/scroll"
-            android:orientation="vertical">
+                android:layout_width="wrap_content"
-        </LinearLayout>
+                android:layout_height="wrap_content"
-    </ScrollView>
+             >
-</FrameLayout>
+                <LinearLayout
+                    android:id="@+id/content"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                </LinearLayout>
+            </ScrollView>
+
+    </FrameLayout>
+</LinearLayout>

app/src/main/res/layout/setting.xml

@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setting"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
-    <LinearLayout
+    <ScrollView
+        android:id="@+id/container"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        >
         <LinearLayout
             android:id="@+id/content"
             android:layout_width="300dp"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:paddingTop="20dp"
-            android:paddingLeft="7dp"
+            android:paddingBottom="20dp"
-            android:paddingRight="7dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:background="@drawable/rounded_dark_left"
             >
             <TextView
@@ -40,7 +44,6 @@
                     android:id="@+id/check_version"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="10dp"
                     android:textSize="14sp"
                     android:text="@string/check_version"
                     />
@@ -56,6 +59,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
+            <Button
+                android:id="@+id/clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:text="@string/clear"
+                />
             <Button
                 android:id="@+id/exit"
                 android:layout_width="wrap_content"
@@ -99,11 +109,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>
-        <ImageView
+    </ScrollView>
-            android:id="@+id/appreciate"
+    <ImageView
-            android:layout_width="300dp"
+        android:id="@+id/appreciate"
-            android:layout_height="wrap_content"
+        android:layout_width="300dp"
-            android:src="@drawable/appreciate"
+        android:layout_height="wrap_content"
-            android:background="@drawable/rounded_white_right" />
+        android:src="@drawable/appreciate"
-    </LinearLayout>
+        android:background="@drawable/rounded_white_right" />
-</FrameLayout>
+</LinearLayout>

app/src/main/res/layout/time.xml

@@ -1,18 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/time"
+    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="100dp"
+    android:layout_width="match_parent"
-    android:layout_height="40dp"
+    android:layout_height="match_parent"
-    android:layout_gravity="end|top"
+    android:gravity="center"
-    android:layout_marginTop="25dp"
+    >
-    android:layout_marginEnd="50dp">
+    <FrameLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
 
-    <TextView
+        <RelativeLayout
-        android:id="@+id/content"
+            android:id="@+id/time"
-        android:layout_width="wrap_content"
+            android:layout_width="120dp"
-        android:layout_height="wrap_content"
+            android:layout_height="60dp"
-        android:layout_gravity="end"
+            android:layout_gravity="end|top"
-        android:textColor="#FFEEEEEE"
+            android:layout_marginTop="15dp"
-        android:textStyle="bold"
+            android:layout_marginEnd="50dp"
-        android:textSize="32sp" />
+            android:gravity="end|bottom" >
-</FrameLayout>
+
+            <TextView
+                android:id="@+id/channel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="40sp"
+                tools:text="99"
+                android:layout_alignBaseline="@+id/content"/>
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="32sp"
+                tools:text="12:34" />
+        </RelativeLayout>
+
+    </FrameLayout>
+</LinearLayout>

app/src/main/res/values/colors.xml

@@ -2,5 +2,6 @@
     <color name="black">#000</color>
     <color name="white">#FFF</color>
     <color name="focus">#0096a6</color>
-    <color name="blur">#FF263238</color>
+    <color name="blur">#223239</color>
+    <color name="ic_launcher_background">#223239</color>
 </resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#223239</color>
-</resources>

app/src/main/res/values/strings.xml

@@ -6,5 +6,6 @@
     <string name="title_boot_startup">开机自启</string>
     <string name="title_grid">频道列表采用网格样式</string>
     <string name="title_time">显示时间</string>
-    <string name="exit">退出</string>
+    <string name="clear">恢复默认</string>
+    <string name="exit">退出应用</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,25 +1,3 @@
 <resources>
 
-    <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <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">150dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:adjustViewBounds">true</item>
-        <item name="android:contentDescription">@null</item>
-        <item name="android:scaleType">centerInside</item>
-        <item name="layout_viewType">main</item>
-    </style>
-
-    <style name="CustomImageCardTheme" parent="Theme.Leanback">
-        <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
-        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
-    </style>
 </resources>

app/src/main/res/values/themes.xml

@@ -1,8 +1,6 @@
 <resources>
 
     <style name="Theme.MyTV" parent="@style/Theme.Leanback">
-        <item name="browsePaddingStart">11dp</item>
+        <item name="android:fitsSystemWindows">false</item>
-        <item name="browsePaddingEnd">11dp</item>
-        <item name="browseRowsMarginTop">54dp</item>
     </style>
 </resources>

app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,3 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="." />
+</paths>

history.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+in_changelog=false
+
+while IFS= read -r line; do
+    if [[ "$line" == "## "* ]]; then
+        continue
+    fi
+
+    if [[ $in_changelog == false ]] && [[ "$line" == "### "* ]]; then
+        in_changelog=true
+        continue
+    fi
+
+    if [[ $in_changelog == true ]] && [[ "$line" == "### "* ]]; then
+        break
+    fi
+
+    echo "$line"
+done < HISTORY.md

version.json

@@ -0,0 +1 @@
+{"version_code": 33556224, "version_name": "v2.0.7"}