diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89aaa83..a7a8da6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: distribution: 'temurin' - name: Run build with Gradle wrapper - run: ./gradlew assembleRelease + run: ./gradlew assembleRelease -PIS_SO_BUILD=false - name: Sign app APK id: sign_app diff --git a/app/build.gradle b/app/build.gradle index 6d2470e..0194a1e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,7 @@ android { // For ndk-build, instead use the ndkBuild block. cmake { -// arguments "-DIS_SO_BUILD=${project.hasProperty('IS_SO_BUILD') ? project.IS_SO_BUILD : false}" - arguments "-DIS_SO_BUILD=${false}" + arguments "-DIS_SO_BUILD=${project.hasProperty('IS_SO_BUILD') ? project.IS_SO_BUILD : true}" abiFilters "armeabi-v7a", "arm64-v8a" } diff --git a/app/src/main/cpp/armeabi-v7a/libnative.so b/app/src/main/cpp/armeabi-v7a/libnative.so index e586369..31d1ee4 100755 Binary files a/app/src/main/cpp/armeabi-v7a/libnative.so and b/app/src/main/cpp/armeabi-v7a/libnative.so differ diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt index 7bbd215..5bb1e60 100644 --- a/app/src/main/java/com/lizongying/mytv/MainFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/MainFragment.kt @@ -61,11 +61,12 @@ class MainFragment : BrowseSupportFragment() { } tvListViewModel.getListLiveData().value?.forEach { tvViewModel -> - tvViewModel.videoUrl.observe(viewLifecycleOwner) { _ -> -// Log.i(TAG, "tv ${tvViewModel.getTV()}") - if (tvViewModel.updateByYSP()) { + tvViewModel.videoIndex.observe(viewLifecycleOwner) { videoIndex -> + if (tvViewModel.getIsFirstTime()) { + tvViewModel.isFirstTime(false) + } else { val tv = tvViewModel.getTV() - if (tv.id == itemPosition) { + if (tvViewModel.id.value == itemPosition) { (activity as? MainActivity)?.play(tv) // (activity as? MainActivity)?.switchInfoFragment(tv) } @@ -129,7 +130,6 @@ class MainFragment : BrowseSupportFragment() { val tvModel = tvListViewModel.getTVModel(itemPosition) if (tvModel?.ysp() != null) { - Log.i(TAG, "ysp ${tvModel.getTV()}") lifecycleScope.launch(Dispatchers.IO) { tvModel.let { request?.fetchData(it) } } @@ -171,6 +171,7 @@ class MainFragment : BrowseSupportFragment() { val tvModel = tvListViewModel.getTVModel(itemPosition) if (tvModel?.ysp() != null) { + Log.i(TAG, "${tvModel.title} to get ysp") lifecycleScope.launch(Dispatchers.IO) { tvModel.let { request?.fetchData(it) } } @@ -202,6 +203,7 @@ class MainFragment : BrowseSupportFragment() { val tvModel = tvListViewModel.getTVModel(itemPosition) if (tvModel?.ysp() != null) { + Log.i(TAG, "${tvModel.title} to get ysp") lifecycleScope.launch(Dispatchers.IO) { tvModel.let { request?.fetchData(it) } } @@ -270,6 +272,7 @@ class MainFragment : BrowseSupportFragment() { val tvModel = tvListViewModel.getTVModel(itemPosition) if (tvModel?.ysp() != null) { + Log.i(TAG, "${tvModel.title} to get ysp") lifecycleScope.launch(Dispatchers.IO) { tvModel.let { request?.fetchData(it) } } diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt index 9de7715..8f11894 100644 --- a/app/src/main/java/com/lizongying/mytv/Request.kt +++ b/app/src/main/java/com/lizongying/mytv/Request.kt @@ -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,6 +82,7 @@ class Request(var context: Context) { fun fetchData(tvModel: TVViewModel) { val data = ysp?.switch(tvModel) + val title = tvModel.getTV().title val request = data?.let { LiveInfoRequest(it) } request?.let { yspApiService?.getLiveInfo(it) } @@ -89,7 +90,6 @@ class Request(var context: Context) { override fun onResponse(call: Call, response: Response) { 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,26 +99,33 @@ 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 - keyBytes = Base64.decode(key, Base64.DEFAULT) - ivBytes = Base64.decode(iv, Base64.DEFAULT) - } - tvModel.updateVideoUrlByYSP( - liveInfo.data.playurl + "&revoi=" + encryptTripleDES( + val keyBytes = Base64.decode(key, Base64.DEFAULT) + val ivBytes = Base64.decode(iv, Base64.DEFAULT) + val url = 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) + } else { + Log.e(TAG, "$title key error") + tvModel.firstSource() + } + } else { + Log.e(TAG, "$title url error") + tvModel.firstSource() } + } else { + Log.e(TAG, "$title status error") + tvModel.firstSource() } } override fun onFailure(call: Call, t: Throwable) { - Log.i(TAG, "get data error") + Log.e(TAG, "${tvModel.getTV().title} request error") + tvModel.firstSource() } }) } diff --git a/app/src/main/java/com/lizongying/mytv/TVList.kt b/app/src/main/java/com/lizongying/mytv/TVList.kt index fddbb23..0ba2fce 100644 --- a/app/src/main/java/com/lizongying/mytv/TVList.kt +++ b/app/src/main/java/com/lizongying/mytv/TVList.kt @@ -1,7 +1,5 @@ package com.lizongying.mytv -import android.util.Log - object TVList { val list: Map> by lazy { setupTV() @@ -17,34 +15,31 @@ CCTV1 综合,http://tvpull.dxhmt.cn/tv/11481-4.m3u8,https://resources.yangshipin 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;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 +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 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://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 +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 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,https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp,600084744,2010152503 +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://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 地方频道 -东方卫视,,https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp,600002483,2000292403 +东方卫视,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 内蒙古卫视,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 diff --git a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt index 304cf0b..8b0a7dd 100644 --- a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt +++ b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt @@ -1,5 +1,6 @@ package com.lizongying.mytv.models +import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel @@ -8,7 +9,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 体育", @@ -18,17 +19,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 "湖南卫视", @@ -53,12 +54,24 @@ class TVViewModel(private var tv: TV) : ViewModel() { "海南卫视" to "海南卫视", ).entries.associate { (key, value) -> value to key } - private var updateByYSP = false + private var isFirstTime = true + + private val _id = MutableLiveData() + val id: LiveData + get() = _id + + private val _title = MutableLiveData() + val title: LiveData + get() = _title private val _videoUrl = MutableLiveData>() val videoUrl: LiveData> get() = _videoUrl + private val _videoIndex = MutableLiveData() + val videoIndex: LiveData + get() = _videoIndex + private val _pid = MutableLiveData() val pid: LiveData get() = _pid @@ -79,25 +92,37 @@ class TVViewModel(private var tv: TV) : ViewModel() { _backgroundImage.value = url } - private fun updateVideoUrl(url: String) { - tv.videoUrl = listOf(url) - tv.videoIndex = 0 - _videoUrl.value = listOf(url) + fun addVideoUrl(url: String) { + tv.videoUrl = tv.videoUrl + listOf(url) + tv.videoIndex = tv.videoUrl.lastIndex + _videoUrl.value = tv.videoUrl + _videoIndex.value = tv.videoIndex } - fun updateVideoUrlByYSP(url: String) { - updateByYSP = true - updateVideoUrl(url) + fun firstSource() { + if (tv.videoUrl.isNotEmpty()) { + tv.videoIndex = 0 + _videoIndex.value = 0 + } else { + Log.e(TAG, "no first") + } } 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 updateByYSP(): Boolean { - return updateByYSP + fun getIsFirstTime(): Boolean { + return isFirstTime + } + + fun isFirstTime(firstTime: Boolean) { + isFirstTime = firstTime } fun update(t: TV) { @@ -114,4 +139,8 @@ class TVViewModel(private var tv: TV) : ViewModel() { } return mapping[tv.title] } + + companion object { + private const val TAG = "TVViewModel" + } } \ No newline at end of file