keep screen on

2026-10-28 07:06:29 +08:00 · 2023-12-16 14:26:31 +08:00
20 changed files with 624 additions and 416 deletions
@@ -22,7 +22,7 @@ jobs:
          distribution: 'temurin'

      - name: Run build with Gradle wrapper
-        run: ./gradlew assembleRelease -PIS_SO_BUILD=false
+        run: ./gradlew assembleRelease

      - name: Sign app APK
        id: sign_app
@@ -3,4 +3,4 @@
 /cmake_install.cmake
 /CMakeFiles/
 /Makefile
-/src/main/cpp/native.c
+/src/main/cpp/native-lib.c
@@ -24,7 +24,8 @@ android {

            // For ndk-build, instead use the ndkBuild block.
            cmake {
-                arguments "-DIS_SO_BUILD=${project.hasProperty('IS_SO_BUILD') ? project.IS_SO_BUILD : true}"
+//                arguments "-DIS_SO_BUILD=${project.hasProperty('IS_SO_BUILD') ? project.IS_SO_BUILD : false}"
+                arguments "-DIS_SO_BUILD=${false}"

                abiFilters "armeabi-v7a", "arm64-v8a"
            }
@@ -0,0 +1,327 @@
+#include "stdio.h"
+#include "jni.h"
+#include <openssl/rand.h>
+#include <string.h>
+#include <openssl/evp.h>
+#include <openssl/md5.h>
+#include <android/log.h>
+#include <stdbool.h>
+#include <ctype.h>
+
+#include <stdlib.h>
+
+#define APP_SIGNATURE "f0005d8a185c47e72946053a0af5c0f5620605dd9e301ef0937e477f607ab0d7"
+#define APP_SIGNATURE2 "9e58fc98c3967ae80eb25541241895368a900fa488e015b08614575c18fab95e"
+
+#define TAG    "native"
+#define LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
+#define LOGI(...)  __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
+#define LOGW(...)  __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__)
+#define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
+
+static bool signatureVerified = false;
+
+static const char key[33] = "48e5918a74ae21c972b90cce8af6c8be";
+static const char iv[33] = "9a7e7d23610266b1d9fbf98581384d92";
+static const char appendString[15] = "0f$IVHi9Qno?G";
+
+static void toUpperCase(char *str) {
+    while (*str) {
+        *str = toupper((unsigned char) *str);
+        str++;
+    }
+}
+
+static char *binaryToHex(const unsigned char *data, size_t dataSize) {
+    char *hexString = (char *) malloc(dataSize * 2 + 1);  // 每个字节需要两个十六进制字符，再加上字符串结束符
+    if (hexString == NULL) {
+        // 内存分配失败
+        return NULL;
+    }
+
+    for (size_t i = 0; i < dataSize; ++i) {
+        sprintf(hexString + i * 2, "%02X", data[i]);
+    }
+
+    hexString[dataSize * 2] = '\0';  // 添加字符串结束符
+
+    return hexString;
+}
+
+static unsigned char *hexStringToBinary(const char *hexString1) {
+    size_t inputLength = strlen(hexString1);
+    if (inputLength % 2 != 0) {
+        return NULL;
+    }
+
+    size_t length = inputLength / 2;
+    unsigned char *result1 = (unsigned char *) malloc(length);
+
+    for (size_t i = 0; i < length; i++) {
+        char byteString[3] = {hexString1[2 * i], hexString1[2 * i + 1], '\0'};
+        result1[i] = (unsigned char) strtoul(byteString, NULL, 16);
+    }
+
+    return result1;
+}
+
+static char *aes(const char *plaintext) {
+    EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
+    if (ctx == NULL) {
+        return NULL;
+    }
+
+//    const char k[33] = "48e5918a74ae21c972b90cce8af6c8be";
+    unsigned char *resultKey = hexStringToBinary(key);
+
+//    const char i[33] = "9a7e7d23610266b1d9fbf98581384d92";
+    unsigned char *resultIv = hexStringToBinary(iv);
+
+    if (EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, resultKey, resultIv) != 1) {
+        free(resultKey);
+        free(resultIv);
+        EVP_CIPHER_CTX_free(ctx);
+        return NULL;
+    }
+
+    EVP_CIPHER_CTX_set_padding(ctx, 1);
+
+    size_t dataLength = strlen(plaintext);
+
+    size_t maxEncryptedLength = dataLength + EVP_CIPHER_block_size(EVP_aes_128_cbc());
+    unsigned char *encryptedData = (unsigned char *) malloc(maxEncryptedLength);
+    if (encryptedData == NULL) {
+        free(resultKey);
+        free(resultIv);
+        EVP_CIPHER_CTX_free(ctx);
+        return NULL;
+    }
+
+    int len;
+    if (EVP_EncryptUpdate(ctx, encryptedData, &len, (const unsigned char *) plaintext,
+                          (int) dataLength) !=
+        1) {
+        free(resultKey);
+        free(resultIv);
+        free(encryptedData);
+        EVP_CIPHER_CTX_free(ctx);
+        return NULL;
+    }
+
+    size_t encryptedLength = len;
+
+    if (EVP_EncryptFinal_ex(ctx, encryptedData + len, &len) != 1) {
+        free(resultKey);
+        free(resultIv);
+        free(encryptedData);
+        EVP_CIPHER_CTX_free(ctx);
+        return NULL;
+    }
+
+    // 更新加密数据长度
+    encryptedLength += len;
+
+    // 创建一个 C 字符串以容纳加密后的数据
+    char *encryptedString = binaryToHex(encryptedData, encryptedLength);
+    if (encryptedString == NULL) {
+        // 内存分配失败
+        free(resultKey);
+        free(resultIv);
+        free(encryptedData);
+        EVP_CIPHER_CTX_free(ctx);
+        return NULL;
+    }
+
+    // 释放内存和资源
+    free(resultKey);
+    free(resultIv);
+    free(encryptedData);
+    EVP_CIPHER_CTX_free(ctx);
+
+    return encryptedString;
+}
+
+jbyte *appendStringToEnd(jbyte *data, size_t *dataLength) {
+    // 获取原始数据长度
+    size_t originalLength = *dataLength;
+
+    size_t appendStringLength = strlen(appendString);
+
+    // 分配新的内存空间，包括原始数据和附加字符串
+    data = (jbyte *) realloc(data,
+                             originalLength + appendStringLength + 1);
+
+    if (data == NULL) {
+        // 内存分配失败的处理
+        return NULL;
+    }
+
+    // 将附加字符串复制到新的内存空间的末尾
+    memcpy(data + originalLength, appendString, appendStringLength);
+
+    // 在新数据的末尾添加 null 终止字符
+    data[originalLength + appendStringLength] = '\0';
+
+    // 更新数据长度
+    *dataLength = originalLength + appendStringLength + 1;
+
+    return data;
+}
+
+JNIEXPORT jbyteArray
+
+JNICALL
+Java_com_lizongying_mytv_Encryptor_hash(JNIEnv *env, jobject thiz, jbyteArray data_) {
+    if (signatureVerified == false) {
+        return NULL;
+    }
+
+    jbyte *data = (*env)->GetByteArrayElements(env, data_, NULL);
+
+    // 获取数据长度
+    size_t dataLength = (*env)->GetArrayLength(env, data_);
+
+//    LOGI("appendStringLength %s", data);
+    data = appendStringToEnd(data, &dataLength);
+
+    dataLength = strlen((const char *) data);
+//    LOGI("dataLength %d", dataLength);
+
+    // 分配内存以存储 MD5 值（16 字节）
+    unsigned char md5Digest[EVP_MAX_MD_SIZE];
+    unsigned int md5DigestLength;
+
+    // 创建 MD5 上下文
+    EVP_MD_CTX *md5Context = EVP_MD_CTX_new();
+    if (md5Context == NULL) {
+        // 处理错误
+        (*env)->ReleaseByteArrayElements(env, data_, data, 0);
+        return NULL;
+    }
+
+    // 初始化 MD5 上下文
+    if (EVP_DigestInit_ex(md5Context, EVP_md5(), NULL) != 1) {
+        // 处理错误
+        EVP_MD_CTX_free(md5Context);
+        (*env)->ReleaseByteArrayElements(env, data_, data, 0);
+        return NULL;
+    }
+
+    // 更新 MD5 上下文
+    if (EVP_DigestUpdate(md5Context, data, dataLength) != 1) {
+        // 处理错误
+        EVP_MD_CTX_free(md5Context);
+        (*env)->ReleaseByteArrayElements(env, data_, data, 0);
+        return NULL;
+    }
+
+    // 获取 MD5 值
+    if (EVP_DigestFinal_ex(md5Context, md5Digest, &md5DigestLength) != 1) {
+        // 处理错误
+        EVP_MD_CTX_free(md5Context);
+        (*env)->ReleaseByteArrayElements(env, data_, data, 0);
+        return NULL;
+    }
+
+    jsize md5Length = (jsize) md5DigestLength;
+
+    // 创建 Java 字节数组以容纳 MD5 值
+    jbyteArray md5Array = (*env)->NewByteArray(env, md5Length);
+    if (md5Array == NULL) {
+        // 处理错误
+        EVP_MD_CTX_free(md5Context);
+        (*env)->ReleaseByteArrayElements(env, data_, data, 0);
+        return NULL;
+    }
+
+    // 将 MD5 值复制到 Java 字节数组
+    (*env)->SetByteArrayRegion(env, md5Array, 0, md5Length, (jbyte *) md5Digest);
+
+    // 释放内存和资源
+    EVP_MD_CTX_free(md5Context);
+    (*env)->ReleaseByteArrayElements(env, data_, data, 0);
+    return md5Array;
+}
+
+JNIEXPORT void JNICALL
+Java_com_lizongying_mytv_Encryptor_init(JNIEnv *env, jobject thiz, jobject context) {
+    // 获取 Context 类
+    jclass contextClass = (*env)->GetObjectClass(env, context);
+
+    // 获取 getAppSignature 方法的 ID
+    jmethodID methodId = (*env)->GetMethodID(env, contextClass, "getAppSignature",
+                                             "()Ljava/lang/String;");
+
+    // 调用 Kotlin 函数
+    jstring result = (jstring) (*env)->CallObjectMethod(env, context, methodId);
+
+    // 检查 result 是否为 NULL
+    if (result == NULL) {
+        return;
+    }
+
+    // 在 C 端处理字符串
+    const char *utfChars = (*env)->GetStringUTFChars(env, result, NULL);
+
+    // 比较签名哈希
+    signatureVerified = (strcmp(utfChars, APP_SIGNATURE) == 0);
+
+    if (signatureVerified == 0 ) {
+        signatureVerified = (strcmp(utfChars, APP_SIGNATURE2) == 0);
+    }
+
+    // 释放字符串
+    (*env)->ReleaseStringUTFChars(env, result, utfChars);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_lizongying_mytv_Encryptor_encrypt(JNIEnv *env, jobject thiz, jstring t, jstring e,
+                                           jstring r, jstring n, jstring i) {
+    if (signatureVerified == false) {
+        return NULL;
+    }
+
+    const char *t_str = (*env)->GetStringUTFChars(env, t, NULL);
+    const char *e_str = (*env)->GetStringUTFChars(env, e, NULL);
+    const char *r_str = (*env)->GetStringUTFChars(env, r, NULL);
+    const char *n_str = (*env)->GetStringUTFChars(env, n, NULL);
+    const char *i_str = (*env)->GetStringUTFChars(env, i, NULL);
+
+    char El[256];
+    snprintf(El, sizeof(El),
+             "|%s|%s|%s|%s|%s|%s|https://www.yangshipin.c|mozilla/5.0 (macintosh; ||Mozilla|Netscape|MacIntel|",
+             t_str, e_str, "mg3c3b04ba", r_str, n_str, i_str);
+//    LOGI("EL %s", El);
+
+    unsigned int xl = 0;
+    for (int Ll = 0; Ll < strlen(El); Ll++) {
+        xl = (xl << 5) - xl + (unsigned char) El[Ll];
+        xl &= xl;
+    }
+
+    char plaintext[256];
+    snprintf(plaintext, sizeof(plaintext), "|%d%s", xl, El);
+
+    // Encrypt the plaintext
+    char *encryptedResult = aes(plaintext);
+    toUpperCase(encryptedResult);
+
+    char result[512];
+    snprintf(result, sizeof(result), "--01%s", encryptedResult);
+
+//    LOGI("result %s", result);
+
+    // Free the memory allocated in the encrypt function
+    free(encryptedResult);
+
+    (*env)->ReleaseStringUTFChars(env, t, t_str);
+    (*env)->ReleaseStringUTFChars(env, e, e_str);
+    (*env)->ReleaseStringUTFChars(env, r, r_str);
+    (*env)->ReleaseStringUTFChars(env, n, n_str);
+    (*env)->ReleaseStringUTFChars(env, i, i_str);
+
+    // Create a Java string from the result and return it
+    jstring resultString = (*env)->NewStringUTF(env, result);
+
+    return resultString;
+}
@@ -49,12 +49,12 @@ class CardPresenter(
    }

    override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
-        val tvViewModel = item as TVViewModel
+        val tv = item as TV
        val cardView = viewHolder.view as ImageCardView

-        cardView.titleText = tvViewModel.title.value
+        cardView.titleText = tv.title
        cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
-        cardView.tag = tvViewModel.videoUrl.value
+        cardView.tag = tv.videoUrl

 //            lifecycleScope.launch(Dispatchers.IO) {
 //                val videoThumbnail = tv.videoUrl?.let { getVideoThumbnail(it) }
@@ -83,17 +83,17 @@ class CardPresenter(

    private fun updateCardBackgroundColor(view: ImageCardView) {
        val currentTag = view.tag
-//        lifecycleScope.launch(Dispatchers.IO) {
-//            delay(1000)
-//            if (view.isSelected && view.tag != null && currentTag == view.tag) {
-//                val videoThumbnail = view.tag.toString().let { getVideoThumbnail(it) }
-//                withContext(Dispatchers.Main) {
-//                    if (view.isSelected && currentTag == view.tag) {
-//                        view.mainImageView.setImageBitmap(videoThumbnail)
-//                    }
-//                }
-//            }
-//        }
+        lifecycleScope.launch(Dispatchers.IO) {
+            delay(1000)
+            if (view.isSelected && view.tag != null && currentTag == view.tag) {
+                val videoThumbnail = view.tag.toString().let { getVideoThumbnail(it) }
+                withContext(Dispatchers.Main) {
+                    if (view.isSelected && currentTag == view.tag) {
+                        view.mainImageView.setImageBitmap(videoThumbnail)
+                    }
+                }
+            }
+        }
    }

    private fun getVideoThumbnail(url: String): Bitmap? {
@@ -112,7 +112,7 @@ class CardPresenter(

    companion object {
        private const val TAG = "CardPresenter"
-        private const val CARD_WIDTH = 300
-        private const val CARD_HEIGHT = 169
+        private const val CARD_WIDTH = 313
+        private const val CARD_HEIGHT = 176
    }
 }
@@ -10,8 +10,6 @@ import androidx.leanback.media.PlaybackGlueHost
 import androidx.leanback.media.PlayerAdapter
 import androidx.leanback.media.SurfaceHolderGlueHost
 import androidx.media3.common.MediaItem
-import androidx.media3.common.PlaybackException
-import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
@@ -178,14 +176,6 @@ open class ExoPlayerAdapter(private var mContext: Context?) : PlayerAdapter() {
        return mBufferedProgress
    }

-    private var mPlayerErrorListener: PlayerErrorListener? = null
-
-    private inner class PlayerErrorListener : Player.Listener {
-        override fun onPlayerError(error: PlaybackException) {
-            callback.onError(this@ExoPlayerAdapter, error.errorCode, error.message)
-        }
-    }
-
    /**
     * Sets the media source of the player witha given URI.
     *
@@ -199,13 +189,6 @@ open class ExoPlayerAdapter(private var mContext: Context?) : PlayerAdapter() {
        }
        mMediaSourceUri = uri
        prepareMediaForPlaying()
-
-        mPlayer?.playWhenReady = true
-
-        if (mPlayerErrorListener == null) {
-            mPlayerErrorListener = PlayerErrorListener()
-            mPlayer?.addListener(mPlayerErrorListener!!)
-        }
        return true
    }

@@ -238,7 +221,7 @@ open class ExoPlayerAdapter(private var mContext: Context?) : PlayerAdapter() {
            throw RuntimeException(e)
        }
        mPlayer?.prepare()
-
+        mPlayer?.playWhenReady = true
        callback.onPlayStateChanged(this@ExoPlayerAdapter)
    }

@@ -249,10 +232,6 @@ open class ExoPlayerAdapter(private var mContext: Context?) : PlayerAdapter() {
    override fun isPrepared(): Boolean {
        return mInitialized && (mSurfaceHolderGlueHost == null || mHasDisplay)
    }
-
-    companion object {
-        private const val TAG = "ExoPlayerAdapter"
-    }
 }

 internal class VideoPlayerSurfaceHolderCallback(private val playerAdapter: ExoPlayerAdapter) :
@@ -0,0 +1,9 @@
+package com.lizongying.mytv
+
+import java.io.Serializable
+
+data class Info(
+    var rowPosition: Int = 0,
+    var itemPosition: Int = 0,
+    var item: TV,
+) : Serializable
@@ -18,7 +18,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import com.lizongying.mytv.models.TVViewModel
 import java.security.MessageDigest


@@ -67,9 +66,9 @@ class MainActivity : FragmentActivity() {
            .commit()
    }

-    fun play(tvViewModel: TVViewModel) {
-        Log.i(TAG, "play: ${tvViewModel.getTV()}")
-        playbackFragment.play(tvViewModel)
+    fun play(tv: TV) {
+        Log.i(TAG, "play: $tv")
+        playbackFragment.play(tv)
    }

    fun prev() {
@@ -172,57 +171,30 @@ class MainActivity : FragmentActivity() {
            }

            KeyEvent.KEYCODE_DPAD_CENTER -> {
-                Log.i(TAG, "KEYCODE_DPAD_CENTER")
                switchMainFragment()
            }

            KeyEvent.KEYCODE_DPAD_UP -> {
                if (mainFragment.isHidden) {
                    prev()
-                } else {
-                    if (mainFragment.selectedPosition == 0) {
-                        mainFragment.setSelectedPosition(
-                            mainFragment.tvListViewModel.maxNum.size - 1,
-                            false
-                        )
-                    }
                }
            }

            KeyEvent.KEYCODE_DPAD_DOWN -> {
                if (mainFragment.isHidden) {
                    next()
-                } else {
-                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
-//                        mainFragment.setSelectedPosition(0, false)
-                        hideMainFragment()
-                        return false
-                    }
                }
            }

            KeyEvent.KEYCODE_DPAD_LEFT -> {
                if (mainFragment.isHidden) {
                    prevSource()
-                } else {
-                    if (mainFragment.tvListViewModel.getTVViewModelCurrent()
-                            ?.getItemPosition() == 0
-                    ) {
-//                        mainFragment.toLastPosition()
-                        hideMainFragment()
-                    }
                }
            }

            KeyEvent.KEYCODE_DPAD_RIGHT -> {
                if (mainFragment.isHidden) {
                    nextSource()
-                } else {
-                    if (mainFragment.tvListViewModel.getTVViewModelCurrent()
-                            ?.getItemPosition() == mainFragment.tvListViewModel.maxNum[mainFragment.selectedPosition] - 1
-                    ) {
-                        mainFragment.toFirstPosition()
-                    }
                }
            }
        }
@@ -19,25 +19,32 @@ import androidx.leanback.widget.Row
 import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVListViewModel
-import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

-
 class MainFragment : BrowseSupportFragment() {
+
    var itemPosition: Int = 0

+    private val list2: MutableList<Info> = mutableListOf()
+
    private var request: Request? = null

    private var rowsAdapter: ArrayObjectAdapter? = null

-    var tvListViewModel = TVListViewModel()
+    private var tvListViewModel = TVListViewModel()

    private var sharedPref: SharedPreferences? = null
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        headersState = HEADERS_DISABLED
-    }
+
+//    override fun onCreateView(
+//        inflater: LayoutInflater,
+//        container: ViewGroup?,
+//        savedInstanceState: Bundle?
+//    ): View? {
+//        super.onCreate()
+//        // 使用自定义的布局文件
+//        return inflater.inflate(R.layout.custom_browse_fragment, container, false)
+//    }

    override fun onActivityCreated(savedInstanceState: Bundle?) {
        super.onActivityCreated(savedInstanceState)
@@ -53,109 +60,58 @@ class MainFragment : BrowseSupportFragment() {
 //            request?.fetchPage()
        }

-        tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
-            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-                if (tvViewModel.ready.value != null) {
-                    Log.i(TAG, "ready ${tvViewModel.title.value}")
-                    if (tvViewModel.id.value == itemPosition) {
-                        (activity as? MainActivity)?.play(tvViewModel)
+        tvListViewModel.getListLiveData().value?.forEach { tvViewModel ->
+            tvViewModel.videoUrl.observe(viewLifecycleOwner) { _ ->
+//                Log.i(TAG, "tv ${tvViewModel.getTV()}")
+                if (tvViewModel.updateByYSP()) {
+                    val tv = tvViewModel.getTV()
+                    if (tv.id == itemPosition) {
+                        (activity as? MainActivity)?.play(tv)
 //                        (activity as? MainActivity)?.switchInfoFragment(tv)
                    }
                }
            }
-            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                if (tvViewModel.change.value != null) {
-                    Log.i(TAG, "switch to ${tvViewModel.title.value}")
-                    if (tvViewModel.ysp() != null) {
-                        Log.i(TAG, "${tvViewModel.title.value} to get ysp")
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            tvViewModel.let { request?.fetchData(it) }
-                        }
-                    } else {
-                        (activity as? MainActivity)?.play(tvViewModel)
-//                        (activity as? MainActivity)?.switchInfoFragment(item)
-                    }
-                    setSelectedPosition(
-                        tvViewModel.getRowPosition(), true,
-                        SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                    )
-                    Toast.makeText(
-                        activity,
-                        tvViewModel.title.value,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
        }
    }

-    fun toLastPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
-        )
-    }
-
-    fun toFirstPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(0)
-        )
-    }
-
-    override fun startHeadersTransition(withHeaders: Boolean) {
-//        check(mCanShowHeaders) { "Cannot start headers transition" }
-//        if (isInHeadersTransition || mShowingHeaders == withHeaders) {
-//            return
-//        }
-//        startHeadersTransitionInternal(withHeaders)
-    }
-
    private fun setupUIElements() {
        brandColor = ContextCompat.getColor(context!!, R.color.fastlane_background)
-//        var headers = headersSupportFragment
-//        headers.setMenuVisibility(false)
-//        Log.i(TAG, "headers $headers")
-
-//        setHeadersState(HEADERS_DISABLED);
-//
-//        setHeaderPresenterSelector(object : PresenterSelector() {
-//            override fun getPresenter(o: Any): Presenter {
-//                return IconHeaderItemPresenter()
-//            }
-//        })
-//        showHeaders(true)
    }

-//    private fun updateRows(tv: TV) {
-//// 获取适配器中的数据
-//        val dataList = rowsAdapter?.replace(tv.id, tv)
-////
-////// 修改数据
-////// 这里假设 dataList 是一个可变的列表
-////        dataList[position] = updatedData
-////
-////// 刷新适配器
-////        rowsAdapter.notifyItemChanged(position)
-////        rowsAdapter.notifyItemRangeChanged()
-//    }
+    private fun updateRows(tv: TV) {
+// 获取适配器中的数据
+        val dataList = rowsAdapter?.replace(tv.id, tv)
+//
+//// 修改数据
+//// 这里假设 dataList 是一个可变的列表
+//        dataList[position] = updatedData
+//
+//// 刷新适配器
+//        rowsAdapter.notifyItemChanged(position)
+//        rowsAdapter.notifyItemRangeChanged()
+    }

    private fun loadRows() {
+        val list = TVList.list
+
        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())

        val cardPresenter = CardPresenter(lifecycleScope)

        var idx: Long = 0
-        for ((k, v) in TVList.list) {
+        for ((k, v) in list) {
            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
-            for ((idx2, v1) in v.withIndex()) {
-                val tvViewModel = TVViewModel(v1)
-                tvViewModel.setRowPosition(idx.toInt())
-                tvViewModel.setItemPosition(idx2)
-                tvListViewModel.addTVViewModel(tvViewModel)
-                listRowAdapter.add(tvViewModel)
+            var idx2 = 0
+            for ((_, v1) in v) {
+                list2.add(
+                    Info(
+                        idx.toInt(), idx2, v1
+                    )
+                )
+                listRowAdapter.add(v1)
+                idx2++
+                tvListViewModel.addTV(v1)
            }
-            tvListViewModel.maxNum.add(v.size)
            val header = HeaderItem(idx, k)
            rowsAdapter!!.add(ListRow(header, listRowAdapter))
            idx++
@@ -169,9 +125,24 @@ class MainFragment : BrowseSupportFragment() {
            savePosition(0)
        }

-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        tvViewModel?.changed()
+        val tv = list2[itemPosition].item

+        val tvModel = tvListViewModel.getTVModel(itemPosition)
+        if (tvModel?.ysp() != null) {
+            Log.i(TAG, "ysp ${tvModel.getTV()}")
+            lifecycleScope.launch(Dispatchers.IO) {
+                tvModel.let { request?.fetchData(it) }
+            }
+        } else {
+            (activity as? MainActivity)?.play(tv)
+//            (activity as? MainActivity)?.switchInfoFragment(tv)
+        }
+
+        Toast.makeText(
+            activity,
+            tv.title,
+            Toast.LENGTH_SHORT
+        ).show()
        (activity as? MainActivity)?.switchMainFragment()
    }

@@ -182,7 +153,6 @@ class MainFragment : BrowseSupportFragment() {
    }

    fun savePosition(position: Int) {
-        tvListViewModel.setItemPosition(position)
        with(sharedPref!!.edit()) {
            putInt("position", position)
            apply()
@@ -193,63 +163,95 @@ class MainFragment : BrowseSupportFragment() {
        view?.post {
            itemPosition--
            if (itemPosition == -1) {
-                itemPosition = tvListViewModel.size() - 1
+                itemPosition = list2.size - 1
            }
            savePosition(itemPosition)

-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
+            val l = list2[itemPosition]
+
+            val tvModel = tvListViewModel.getTVModel(itemPosition)
+            if (tvModel?.ysp() != null) {
+                lifecycleScope.launch(Dispatchers.IO) {
+                    tvModel.let { request?.fetchData(it) }
+                }
+            } else {
+                l.item.let { (activity as? MainActivity)?.play(it) }
+            }
+
+            setSelectedPosition(
+                l.rowPosition, false,
+                SelectItemViewHolderTask(l.itemPosition)
+            )
+            Toast.makeText(
+                activity,
+                l.item.title,
+                Toast.LENGTH_SHORT
+            ).show()
        }
    }

    fun next() {
        view?.post {
            itemPosition++
-            if (itemPosition == tvListViewModel.size()) {
+            if (itemPosition == list2.size) {
                itemPosition = 0
            }
            savePosition(itemPosition)

-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
+            val l = list2[itemPosition]
+
+            val tvModel = tvListViewModel.getTVModel(itemPosition)
+            if (tvModel?.ysp() != null) {
+                lifecycleScope.launch(Dispatchers.IO) {
+                    tvModel.let { request?.fetchData(it) }
+                }
+            } else {
+                l.item.let { (activity as? MainActivity)?.play(it) }
+            }
+
+            setSelectedPosition(
+                l.rowPosition, false,
+                SelectItemViewHolderTask(l.itemPosition)
+            )
+            Toast.makeText(
+                activity,
+                l.item.title,
+                Toast.LENGTH_SHORT
+            ).show()
        }
    }

    fun prevSource() {
        view?.post {
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            if (tvViewModel != null) {
-                if (tvViewModel.videoUrl.value!!.size > 1) {
-                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
-                    if (videoIndex == -1) {
-                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
-                    }
-                    tvViewModel.changed()
+            val tv = list2[itemPosition].item
+            if (tv.videoUrl.size > 1) {
+                tv.videoIndex--
+                if (tv.videoIndex == -1) {
+                    tv.videoIndex = tv.videoUrl.size - 1
                }
+
+                (activity as? MainActivity)?.play(tv)
+//                (activity as? MainActivity)?.switchInfoFragment(tv)
            }
        }
    }

    fun nextSource() {
        view?.post {
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            if (tvViewModel != null) {
-                tvViewModel.changed()
-//                if (tvViewModel.videoUrl.value!!.size > 1) {
-//                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-//                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-//                        tvViewModel.setVideoIndex(0)
-//                    }
-//                tvViewModel.changed()
-//                }
+            val tv = list2[itemPosition].item
+
+            if (tv.videoUrl.size > 1) {
+                tv.videoIndex++
+                if (tv.videoIndex == tv.videoUrl.size) {
+                    tv.videoIndex = 0
+                }
+
+                (activity as? MainActivity)?.play(tv)
+//                (activity as? MainActivity)?.switchInfoFragment(tv)
            }
        }
    }

-    fun tvViewModel(): TVViewModel? {
-        return tvListViewModel.getTVViewModel(itemPosition)
-    }
-
    private fun setupEventListeners() {
        onItemViewClickedListener = ItemViewClickedListener()
        onItemViewSelectedListener = ItemViewSelectedListener()
@@ -262,12 +264,19 @@ class MainFragment : BrowseSupportFragment() {
            rowViewHolder: RowPresenter.ViewHolder,
            row: Row
        ) {
-            if (item is TVViewModel) {
-                itemPosition = item.id.value!!
+            if (item is TV) {
+                itemPosition = item.id
                savePosition(itemPosition)

-                val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-                tvViewModel?.changed()
+                val tvModel = tvListViewModel.getTVModel(itemPosition)
+                if (tvModel?.ysp() != null) {
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        tvModel.let { request?.fetchData(it) }
+                    }
+                } else {
+                    (activity as? MainActivity)?.play(item)
+//                    (activity as? MainActivity)?.switchInfoFragment(item)
+                }

                (activity as? MainActivity)?.switchMainFragment()
            }
@@ -281,18 +290,13 @@ class MainFragment : BrowseSupportFragment() {
        ) {
            if (itemViewHolder == null) {
                view?.post {
-                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-                    if (tvViewModel != null) {
-                        setSelectedPosition(
-                            tvViewModel.getRowPosition(), false,
-                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                        )
-                    }
+                    val it = list2[itemPosition]
+                    setSelectedPosition(
+                        it.rowPosition, false,
+                        SelectItemViewHolderTask(it.itemPosition)
+                    )
                }
            }
-            if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.id.value!!)
-            }
        }
    }

@@ -1,7 +1,6 @@
 package com.lizongying.mytv

 import android.content.Context
-import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import androidx.leanback.media.MediaPlayerAdapter
@@ -18,7 +17,6 @@ class PlaybackControlGlue(
        if (event!!.action == KeyEvent.ACTION_DOWN) {
            when (keyCode) {
                KeyEvent.KEYCODE_DPAD_CENTER -> {
-                    Log.i(TAG, "KEYCODE_DPAD_CENTER")
                    (context as? MainActivity)?.switchMainFragment()
                }

@@ -52,6 +50,6 @@ class PlaybackControlGlue(
    }

    companion object {
-        private const val TAG = "PlaybackControlGlue"
+        private const val TAG = "CustomPlaybackControlGlue"
    }
 }
@@ -5,10 +5,9 @@ import android.os.Bundle
 import android.util.Log
 import androidx.leanback.app.VideoSupportFragment
 import androidx.leanback.app.VideoSupportFragmentGlueHost
-import androidx.leanback.media.PlaybackTransportControlGlue
 import androidx.leanback.media.PlayerAdapter
+import androidx.leanback.media.PlaybackTransportControlGlue
 import androidx.leanback.widget.PlaybackControlsRow
-import com.lizongying.mytv.models.TVViewModel
 import java.io.IOException

 class PlaybackFragment : VideoSupportFragment() {
@@ -30,10 +29,12 @@ class PlaybackFragment : VideoSupportFragment() {
    override fun showControlsOverlay(runAnimation: Boolean) {
    }

-    fun play(tvModel: TVViewModel) {
-        val videoUrl = tvModel.videoIndex.value?.let { tvModel.videoUrl.value?.get(it) }
-        if (videoUrl == null || videoUrl == "") {
-            Log.e(TAG, "${tvModel.title.value} videoUrl is empty")
+    fun play(tv: TV) {
+        val videoUrl = tv.videoUrl[tv.videoIndex]
+
+        if (videoUrl == "") {
+            Log.e(TAG, "tv $tv")
+            Log.e(TAG, "videoUrl is empty")
            return
        }

@@ -44,31 +45,21 @@ class PlaybackFragment : VideoSupportFragment() {

        lastVideoUrl = videoUrl

+        playerAdapter?.reset()
+
        val glueHost = VideoSupportFragmentGlueHost(this@PlaybackFragment)
        mTransportControlGlue = PlaybackControlGlue(activity, playerAdapter)
        mTransportControlGlue.host = glueHost
        mTransportControlGlue.playWhenPrepared()

-        playerAdapter?.callback = PlayerCallback(tvModel)
        try {
            playerAdapter?.setDataSource(Uri.parse(videoUrl))
        } catch (e: IOException) {
-            Log.e(TAG, "error $e")
            return
        }
        hideControlsOverlay(false)
    }

-    private inner class PlayerCallback(private var tvModel: TVViewModel) :
-        PlayerAdapter.Callback() {
-        override fun onError(adapter: PlayerAdapter?, errorCode: Int, errorMessage: String?) {
-            Log.e(TAG, "on error: $errorMessage")
-            if (tvModel.ysp() != null && tvModel.videoIndex.value!! > 0 && errorMessage == "Source error") {
-                tvModel.changed()
-            }
-        }
-    }
-
    companion object {
        private const val TAG = "PlaybackVideoFragment"
    }
@@ -37,17 +37,17 @@ class Request(var context: Context) {
        "CCTV10" to "CCTV10 科教",
        "CCTV11" to "CCTV11 戏曲",
        "CCTV12" to "CCTV12 社会与法",
-        "CCTV13" to "CCTV13 新闻",
+//        "CCTV13" to "CCTV13",
        "CCTV14" to "CCTV14 少儿",
        "CCTV15" to "CCTV15 音乐",
        "CCTV16-HD" to "CCTV16 奥林匹克",
        "CCTV17" to "CCTV17 农业农村",
        "CGTN" to "CGTN",
-        "CGTN外语纪录频道" to "CGTN 纪录频道",
        "CGTN法语频道" to "CGTN 法语频道",
        "CGTN俄语频道" to "CGTN 俄语频道",
        "CGTN阿拉伯语频道" to "CGTN 阿拉伯语频道",
        "CGTN西班牙语频道" to "CGTN 西班牙语频道",
+//        "CGTN外语纪录频道" to "CGTN外语纪录频道",

        "东方卫视" to "东方卫视",
        "湖南卫视" to "湖南卫视",
@@ -82,7 +82,6 @@ class Request(var context: Context) {

    fun fetchData(tvModel: TVViewModel) {
        val data = ysp?.switch(tvModel)
-        val title = tvModel.title.value

        val request = data?.let { LiveInfoRequest(it) }
        request?.let { yspApiService?.getLiveInfo(it) }
@@ -90,6 +89,7 @@ class Request(var context: Context) {
                override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
                    if (response.isSuccessful) {
                        val liveInfo = response.body()
+                        Log.i(TAG, "liveInfo $liveInfo")
                        if (liveInfo?.data?.playurl != null) {
                            val chanll = liveInfo.data.chanll
                            val decodedBytes = Base64.decode(
@@ -99,34 +99,26 @@ class Request(var context: Context) {
                            val decodedString = String(decodedBytes)
                            val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
                            val matchResult = regex.find(decodedString)
+                            var keyBytes = byteArrayOf()
+                            var ivBytes = byteArrayOf()
+
                            if (matchResult != null) {
                                val (key, iv) = matchResult.destructured
-                                val keyBytes = Base64.decode(key, Base64.DEFAULT)
-                                val ivBytes = Base64.decode(iv, Base64.DEFAULT)
-                                val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
+                                keyBytes = Base64.decode(key, Base64.DEFAULT)
+                                ivBytes = Base64.decode(iv, Base64.DEFAULT)
+                            }
+                            tvModel.updateVideoUrlByYSP(
+                                liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
                                    keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                    ivBytes
                                ).uppercase()
-                                Log.i(TAG, "$title url $url")
-                                tvModel.addVideoUrl(url)
-                                tvModel.allReady()
-                            } else {
-                                Log.e(TAG, "$title key error")
-                                tvModel.firstSource()
-                            }
-                        } else {
-                            Log.e(TAG, "$title url error $request")
-                            tvModel.firstSource()
+                            )
                        }
-                    } else {
-                        Log.e(TAG, "$title status error")
-                        tvModel.firstSource()
                    }
                }

                override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                    Log.e(TAG, "$title request error")
-                    tvModel.firstSource()
+                    Log.i(TAG, "get data error")
                }
            })
    }
@@ -156,8 +148,7 @@ class Request(var context: Context) {
                            if (!mapping.containsKey(item.channelName)) {
                                continue
                            }
-                            val tv =
-                                TVList.list[channelType]?.find { it.title == mapping[item.channelName] }
+                            val tv = TVList.list[channelType]?.get(mapping[item.channelName])
                            if (tv != null) {
                                tv.logo = item.tvLogo
                                tv.pid = item.pid
@@ -189,7 +180,7 @@ class Request(var context: Context) {
    }

    private fun encryptTripleDES(key: ByteArray, iv: ByteArray): String {
-        val plaintext =
+        var plaintext =
            """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,AppleM1Pro,OpenGL4.1)"}"""
        return try {
            val keySpec = SecretKeySpec(key, "DESede")
@@ -1,45 +1,50 @@
 package com.lizongying.mytv

+import android.util.Log
+
 object TVList {
-    val list: Map<String, List<TV>> by lazy {
+    val list: Map<String, Map<String, TV>> by lazy {
        setupTV()
    }

    private var count: Int = 0

-    private fun setupTV(): Map<String, List<TV>> {
+    private fun setupTV(): Map<String, Map<String, TV>> {
        val tvs = """
 央视频道
 CCTV4K,,https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp,600002264,2000266303
 CCTV1 综合,http://tvpull.dxhmt.cn/tv/11481-4.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp,600001859,2000210103
 CCTV2 财经,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp,600001800,2000203603
 CCTV3 综艺,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8
-CCTV4 中文国际,http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp,600001814,2000204803
-CCTV5 体育,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp,600001818,2000205103
-CCTV5+ 体育赛事,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp,600001817,2000204503
-CCTV6 电影,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8
-CCTV7 国防军事,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp,600004092,2000510003
-CCTV8 电视剧,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8
-CCTV9 记录,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp,600004078,2000499403
-CCTV10 科教,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226189/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp,600001805,2000203503
-CCTV11 戏曲,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226240/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp,600001806,2000204103
-CCTV12 社会与法,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226190/index.m3u8, https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp,600001807,2000202603
-CCTV13 新闻,https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8
-CCTV14 少儿,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp,600001809,2000204403
-CCTV15 音乐,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp,600001815,2000205003
+CCTV4 中文国际,http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8;http://hlsbkmgsplive.miguvideo.com/wd_r2/cctv/cctv4hd/1500/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp,600001814,2000204803
+CCTV4 中文国际美洲,http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv4meihd/57/index.m3u8?&encrypt=
+CCTV4 中文国际欧洲,http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv4ouhd/51/index.m3u8?&encrypt=
+CCTV5 体育,http://hlsbkmgsplive.miguvideo.com/migu/kailu/cctv5hd265/57/20191230/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp,600001818,2000205103
+CCTV5+ 体育赛事,http://hlsbkmgsplive.miguvideo.com/wd_r2/cctv/cctv5plusnew/2500/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp,600001817,2000204503
+CCTV6 电影,http://hlsbkmgsplive.miguvideo.com/wd_r2/ocn/cctv6hd/3000/index.m3u8?&encrypt=
+CCTV7 国防军事,http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv7hd/51/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp,600004092,2000510003
+CCTV8 电视剧,http://hlsbkmgsplive.miguvideo.com/wd_r2/ocn/cctv8hd/3000/index.m3u8?&encrypt=
+CCTV9 记录,http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv9hd/57/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp,600004078,2000499403
+CCTV10 科教,http://hlsbkmgsplive.miguvideo.com/wd_r2/2018/ocn/cctv10hd/2000/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp,600001805,2000203503
+CCTV11 戏曲,http://hlsbkmgsplive.miguvideo.com/migu/kailu/cctv11hd/57/20200103/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp,600001806,2000204103
+CCTV12 社会与法,http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv12hd/57/index.m3u8?&encrypt=, https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp,600001807,2000202603
+CCTV13 新闻,https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8;http://hlsbkmgsplive.miguvideo.com/envivo_x/2018/SD/cctv13/2000/index.m3u8?&encrypt=
+CCTV14 少儿,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8;http://hlsbkmgsplive.miguvideo.com/wd_r2/ocn/cctv14hd/3000/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp,600001809,2000204403
+CCTV15 音乐,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8;http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv15hd/51/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp,600001815,2000205003
 CCTV16 奥林匹克,http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp,600098637,2012375003
-CCTV17 农业农村,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp,600001810,2000204203
-CGTN,,https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp,600014550,2001656803
+CCTV17 农业农村,http://hlsbkmgsplive.miguvideo.com/migu/kailu/20200324/cctv17hd/57/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp,600001810,2000204203
+CGTN,http://hlsbkmgsplive.miguvideo.com/envivo_x/2018/SD/cctvnews/1000/index.m3u8?&encrypt=,https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp,600014550,2001656803
 CGTN 新闻频道,http://live.cgtn.com/1000/prog_index.m3u8
 CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8
 CGTN 法语频道,https://livefr.cgtn.com/1000f/prog_index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp,600084704,2010153503
 CGTN 俄语频道,http://liveru.cgtn.com/1000r/prog_index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp,600084758,2010152603
-CGTN 西班牙语频道,http://livees.cgtn.com/500e/prog_index.m3u8;http://livees.cgtn.com/1000e/prog_index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp,600084744,2010152503
+CGTN 西班牙语频道,http://livees.cgtn.com/500e/prog_index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp,600084744,2010152503
 CGTN 阿拉伯语频道,http://livear.cgtn.com/1000a/prog_index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp,600084782,2010155203
+CGTN 拉丁美洲频道,http://livees.cgtn.com/1000e/prog_index.m3u8
 书画频道,http://211.103.180.178:8234/live_hls/hdmi.m3u8

 地方频道
-东方卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226217/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp,600002483,2000292403
+东方卫视,,https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp,600002483,2000292403
 内蒙古卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226389/index.m3u8
 湖南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226307/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp,600002475,2000296203
 湖北卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226477/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp,600002508,2000294503
@@ -143,6 +148,7 @@ CETV4,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226225/index.m3u8
 兵团卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226214/index.m3u8
 延边卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226220/index.m3u8
 内蒙古卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225786/index.m3u8
+康巴卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226234/index.m3u8
 电视指南,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226987/index.m3u8
 风云足球,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226984/index.m3u8
 风云剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8
@@ -205,7 +211,7 @@ CHC动作电影,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226465/in
 老故事,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226236/index.m3u8
        """.trimIndent()

-        val map: MutableMap<String, MutableList<TV>> = mutableMapOf()
+        val map: MutableMap<String, MutableMap<String, TV>> = mutableMapOf()

        var channel = ""
        for (i in tvs.split("\n")) {
@@ -217,13 +223,14 @@ CHC动作电影,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226465/in
                continue
            }
            val p = i.split(",")
-            val titleMap = map[channel] ?: mutableListOf()
+            val titleMap = map[channel] ?: mutableMapOf()

-            val tv = TV(
+            val tv = titleMap[p[0]] ?: TV(
                count,
                p[0],
                p[1].split(";").map { it.trim() }
            )
+            count++

            if (p.size > 2) {
                tv.logo = p[2]
@@ -235,9 +242,8 @@ CHC动作电影,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226465/in
                tv.sid = p[4]
            }

-            titleMap.add(tv)
+            titleMap[p[0]] = tv
            map[channel] = titleMap
-            count++
        }

        return map
@@ -64,8 +64,8 @@ class YSP(var context: Context) {
    }

    fun switch(tvModel: TVViewModel): String {
-        livepid = tvModel.pid.value!!
-        cnlid = tvModel.sid.value!!
+        livepid = tvModel.getTV().pid
+        cnlid = tvModel.getTV().sid
        defn = "fhd"

 //        guid = getGuid()
@@ -99,8 +99,8 @@ class YSP(var context: Context) {
    }

    private fun getGuid(): String {
-        var guid = sharedPref?.getString("guid", "")
-        if (guid == null || guid.length < 18) {
+        var guid = sharedPref?.getString("guid", "").toString()
+        if (guid == "") {
            guid = generateGuid()
            with(sharedPref!!.edit()) {
                putString("guid", guid)
@@ -1,61 +1,47 @@
 package com.lizongying.mytv.models

-import android.content.SharedPreferences
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.lizongying.mytv.TV

 class TVListViewModel : ViewModel() {
+    private val tvListLiveData = MutableLiveData<MutableList<TV>>()

-    var maxNum = mutableListOf<Int>()
+    private val tvModelListLiveData = MutableLiveData<MutableList<TVViewModel>>()

-    private var sharedPref: SharedPreferences? = null
-
-    private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
-
-    private val _itemPosition = MutableLiveData<Int>()
-    val itemPosition: LiveData<Int>
-        get() = _itemPosition
-
-    private val _itemPositionCurrent = MutableLiveData<Int>()
-    val itemPositionCurrent: LiveData<Int>
-        get() = _itemPositionCurrent
-
-    fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
-        return tvListViewModel
+    fun getListLiveData(): MutableLiveData<MutableList<TVViewModel>> {
+        return tvModelListLiveData
    }

-    fun addTVViewModel(tvViewModel: TVViewModel) {
-        val currentTVModelList = tvListViewModel.value ?: mutableListOf()
-        currentTVModelList.add(tvViewModel)
-        tvListViewModel.value = currentTVModelList
+    fun addTV(tv: TV) {
+        val currentList = tvListLiveData.value ?: mutableListOf()
+        currentList.add(tv)
+        tvListLiveData.value = currentList
+
+        val currentModelList = tvModelListLiveData.value ?: mutableListOf()
+        currentModelList.add(TVViewModel(tv))
+        tvModelListLiveData.value = currentModelList
    }

-    fun getTVViewModel(id: Int): TVViewModel? {
-        return tvListViewModel.value?.get(id)
+    fun updateTV(tv: TV) {
+        val currentList = tvListLiveData.value ?: mutableListOf()
+        currentList[tv.id] = tv
+        tvListLiveData.value = currentList
+
+        val currentModelList = tvModelListLiveData.value ?: mutableListOf()
+        currentModelList[tv.id].update(tv)
+        tvModelListLiveData.value = currentModelList
    }

-    fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { tvListViewModel.value?.get(it) }
+    fun getTV(id: Int): TV? {
+        return tvListLiveData.value?.get(id)
    }

-    fun setItemPosition(position: Int) {
-        _itemPosition.value = position
-        _itemPositionCurrent.value = position
-    }
-
-    fun setItemPositionCurrent(position: Int) {
-        _itemPositionCurrent.value = position
-    }
-
-    fun savePosition(position: Int) {
-        with(sharedPref!!.edit()) {
-            putInt("position", position)
-            apply()
-        }
+    fun getTVModel(id: Int): TVViewModel? {
+        return tvModelListLiveData.value?.get(id)
    }

    fun size(): Int {
-        return tvListViewModel.value!!.size
+        return tvListLiveData.value!!.size
    }
 }
@@ -1,6 +1,5 @@
 package com.lizongying.mytv.models

-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -9,7 +8,7 @@ import com.lizongying.mytv.TV
 class TVViewModel(private var tv: TV) : ViewModel() {
    private var mapping = mapOf(
        "CCTV4K" to "CCTV4K",
-        "CCTV1" to "CCTV1 综合",
+//        "CCTV1" to "CCTV1 综合",
        "CCTV2" to "CCTV2 财经",
        "CCTV4" to "CCTV4 中文国际",
        "CCTV5" to "CCTV5 体育",
@@ -19,17 +18,17 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        "CCTV10" to "CCTV10 科教",
        "CCTV11" to "CCTV11 戏曲",
        "CCTV12" to "CCTV12 社会与法",
-        "CCTV13" to "CCTV13 新闻",
+//        "CCTV13" to "CCTV13",
        "CCTV14" to "CCTV14 少儿",
        "CCTV15" to "CCTV15 音乐",
        "CCTV16-HD" to "CCTV16 奥林匹克",
        "CCTV17" to "CCTV17 农业农村",
        "CGTN" to "CGTN",
-        "CGTN外语纪录频道" to "CGTN 纪录频道",
        "CGTN法语频道" to "CGTN 法语频道",
        "CGTN俄语频道" to "CGTN 俄语频道",
        "CGTN阿拉伯语频道" to "CGTN 阿拉伯语频道",
        "CGTN西班牙语频道" to "CGTN 西班牙语频道",
+//        "CGTN外语纪录频道" to "CGTN外语纪录频道",

        "东方卫视" to "东方卫视",
        "湖南卫视" to "湖南卫视",
@@ -54,31 +53,12 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        "海南卫视" to "海南卫视",
    ).entries.associate { (key, value) -> value to key }

-    private var isFirstTime = true
-
-    private var rowPosition: Int = 0
-    private var itemPosition: Int = 0
-
-    private val _id = MutableLiveData<Int>()
-    val id: LiveData<Int>
-        get() = _id
-
-    private val _title = MutableLiveData<String>()
-    val title: LiveData<String>
-        get() = _title
+    private var updateByYSP = false

    private val _videoUrl = MutableLiveData<List<String>>()
    val videoUrl: LiveData<List<String>>
        get() = _videoUrl

-    private val _videoIndex = MutableLiveData<Int>()
-    val videoIndex: LiveData<Int>
-        get() = _videoIndex
-
-    private val _logo = MutableLiveData<String>()
-    val logo: LiveData<String>
-        get() = _logo
-
    private val _pid = MutableLiveData<String>()
    val pid: LiveData<String>
        get() = _pid
@@ -87,85 +67,37 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    val sid: LiveData<String>
        get() = _sid

-    private val _change = MutableLiveData<Boolean>()
-    val change: LiveData<Boolean>
-        get() = _change
+    private val _backgroundImage = MutableLiveData<String>()
+    val backgroundImage: LiveData<String>
+        get() = _backgroundImage

-    private val _ready = MutableLiveData<Boolean>()
-    val ready: LiveData<Boolean>
-        get() = _ready
-
-    fun addVideoUrl(url: String) {
-        if (_videoUrl.value?.isNotEmpty() == true) {
-            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)
-            }
-        } else {
-            tv.videoUrl = tv.videoUrl + listOf(url)
-        }
-        tv.videoIndex = tv.videoUrl.lastIndex
-        _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
+    fun getBackgroundImage(): String {
+        return tv.logo ?: ""
    }

-    fun firstSource() {
-        if (_videoUrl.value!!.isNotEmpty()) {
-            setVideoIndex(0)
-            allReady()
-        } else {
-            Log.e(TAG, "no first")
-        }
+    fun updateBackgroundImage(url: String) {
+        _backgroundImage.value = url
    }

-    fun changed() {
-        _change.value = true
+    private fun updateVideoUrl(url: String) {
+        tv.videoUrl = listOf(url)
+        tv.videoIndex = 0
+        _videoUrl.value = listOf(url)
    }

-    fun allReady() {
-        _ready.value = true
-    }
-
-    fun setVideoIndex(videoIndex: Int) {
-        _videoIndex.value = videoIndex
-    }
-
-    fun setLogo(url: String) {
-        _logo.value = url
+    fun updateVideoUrlByYSP(url: String) {
+        updateByYSP = true
+        updateVideoUrl(url)
    }

    init {
-        _id.value = tv.id
-        _title.value = tv.title
        _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
        _pid.value = tv.pid
        _sid.value = tv.sid
    }

-    fun getIsFirstTime(): Boolean {
-        return isFirstTime
-    }
-
-    fun isFirstTime(firstTime: Boolean) {
-        isFirstTime = firstTime
-    }
-
-    fun getRowPosition(): Int {
-        return rowPosition
-    }
-
-    fun getItemPosition(): Int {
-        return itemPosition
-    }
-
-    fun setRowPosition(position: Int) {
-        rowPosition = position
-    }
-
-    fun setItemPosition(position: Int) {
-        itemPosition = position
+    fun updateByYSP(): Boolean {
+        return updateByYSP
    }

    fun update(t: TV) {
@@ -182,8 +114,4 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        }
        return mapping[tv.title]
    }
-
-    companion object {
-        private const val TAG = "TVViewModel"
-    }
 }
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- res/layout/custom_browse_fragment.xml -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/right_content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_toRightOf="@+id/browse_headers" />
+
+    <fragment
+        android:id="@+id/browse_headers"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true" />
+</RelativeLayout>
@@ -1,7 +1,4 @@
 <resources>

-    <style name="Theme.MyTV" parent="@style/Theme.Leanback">
-        <item name="browseRowsMarginTop">40dp</item>
-    </style>
-
+    <style name="Theme.MyTV" parent="@style/Theme.Leanback" />
 </resources>