From 1eb2f257b5c40e6786fdc6439e8f420736bfbecb Mon Sep 17 00:00:00 2001 From: Li ZongYing Date: Thu, 25 Jan 2024 11:04:06 +0800 Subject: [PATCH] change channel order --- app/src/main/cpp/arm64-v8a/libnative.so | Bin 4166608 -> 4166608 bytes app/src/main/cpp/armeabi-v7a/libnative.so | Bin 3584360 -> 3584360 bytes .../com/lizongying/mytv/PlayerFragment.kt | 5 ++--- .../main/java/com/lizongying/mytv/TVList.kt | 4 ++-- .../com/lizongying/mytv/models/TVViewModel.kt | 11 +++++++++-- build.gradle | 4 ++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/main/cpp/arm64-v8a/libnative.so b/app/src/main/cpp/arm64-v8a/libnative.so index 2a26e7a977c66c5e7bc613cb4aece5eb5a5a4b18..f90b96a7d7a92bf0081aaf1101dc85996ff8fe24 100755 GIT binary patch delta 1358 zcmXBTYiv_x7zgn8c~5(`Zl&!m?8Y`qdviqO^fDx*?)-hsWHx{NQDdlvy2S}+48A=(e+;ed|gtXCa zelBSt4(Vy9G=zA$o-`5zA@Ib|lw-T6}vtf~G6Ce3R;osD^wS_v8Y$c~e; zwSwc}vsfYp?L>y|_f6Q9^@W}HkN%(U_%Gj|jES#Q@Lqa9@mwW0k;iQ+Rf&jk`t88C z4jHWC0D0x>Dvr`e^011xE(l|=iCiQuCR6acWTmF<;(H$jhqY2q?BY@m1=pr1m7j;= zvY&!+IaJL%JYONOXbyVUw^Q(0@x-{8uVOD}?cR+63ci)2)GfQXIY`0FNdIFOw}vSA z6Ji|Vgd{)D41{lJ5NVWT@2x65&q93^I{^tW&W1rt*(eAh>@#K;ORchVlYvzl}1 zpgdm9ztSnW+rjVZ>(0c+m-(cT=SO|4c4-L?mIJ3Sfukv4}&q)~o delta 1358 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 delta 3432 zcmYk83viXi7037N_uZR&;k&sv56C46A$)i9fK4vpl@LsL2!i-XMUsjF4v`?$3grz| z(uDH#F$xsB43*BHwxUG?2Acpu0t5&Mf(9iJgox-^hf-|CqJv}q=fW_}%s=1$&YnGc z_UwN9-LEg6rLUoFHz+xM>(dJ+9x0ufH1GPFhlgbsN3$aZ%R+KhND{&pQBY!Z+k!DFm5?#6`kPuEf{>}2i(96joVdm89 zB>734Sy``DQVJ(C!g&%dbxCOEdXvnadYw+2&DnaLT9}D&uVA&F%Lm{>@h32)=kkYW z2RQ@b@c%pEXNm1QqvnZX~+{XT7m)S8#Ko}^Pbl7hSzL)Pxqlx^YMFnOmP`6 z+)F94Iz2YnOFSAFj*a#b4+kbchmCQbH(svwg%Z)7eKVX~>*R29w=vXe-^Q?2eN3dJnxqDu zk(rBKrF`NN!rm$4Z`32Q`fz&bn=nrFy85vr8quJK zYPjkHU%VMDyxC0IsVilxZJKxLZuGkObf+Gev!A0zZbkKdz@#`%>ajLQ6d(-mFvb+@ z(%n3-A-ybf&n_LIGBazJ9uQoHW8vG(=MD*r$)=9`CY!chx}wJ}ocgZlv5f65!21zv zZ}7P_X5?<25?FU{7K$DIHUdF1Av#D{i`?4u*!c_UrEw83uxg$*_ys-Qg zc#Io}1z!xq`QUQ5j?2{p?Zd0xSFx^iZnwVR7UQ(v!R;e!+~LUS5pEw{@3vrl3%LEk z26u}278B88xktrtHxvrAM)_Gi*BD z>W)Do*SXz(%x%H2lr*%@oOI8?X8^a)o^sn@AJ6TMcDL4SM~FZY@_vg==P$XBnNN^F zk7k&P(_#AJx?6#$<=nn>BQnqQd|&q{yca8~XVW)6iu?;(beiF^LyJGqRF-)B-}DYoJbhUli1$Y1X4(q)8Y{q%EmQ$`&skRV5FjY{V zRMU`YI1BVkDv;_LPD>HfLo`ULtvGjOOcQB{RISM338sgsM5+O1_I`Xwo-rHo7`h$h z@@AuN8cmey1MF-jQx#2?Y82)h$~2v(N_8H608^lbnv-L@uE!BVE zvzO`DG+(MP)^wKXDOxO560Y}aOfzYTROzTiCAY)=M?PBg9Uo1++n`Is`kxw2)qrD$X(nqlN1aj?WBTn(&(kHT=9#7zohDDjn=>uCu;)W4@XEgE zTu;JM_aN$KrazKxsRWaE5U!Wv&A5X)H{*a`h*27yuTi?CronX@(_bjlQlEOwO9ypo zu@{LPVC&x~&r(18g!qE#Z7Q(TqkPHdL3K39Qs2Wf!nB=+SgOoiJgAGNJ&W3$X5${Z z&r<*J;)2fy?WG4SRgZg7Gwq{tOU*{!6-)UI$U2Dm_DOdER|ExsPS)2uXm@@>;C{DPY z<1IjS;-qsAEUyOP*W2MQ$0EFhcBwNJ%_CTco$b9J7obNvb7AQXSrMli4~@|FC}%aA z6X0M+y?$(#$LDN>r5(RXE#+;vd{mc&YMZgx(+dn$u zZ997VS4YtHMGLXwtr%z}*iLjbpot;T4n-HDlChp7J30CTw!VXVlI?JG1-2#T*3JCb zsXOUUrsH$HTsC`5> { val tvs = """ 央视频道 -CCTV4K 超高清, -CCTV8K 超高清, CCTV1 综合,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8 CCTV2 财经,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8 CCTV3 综艺,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8 @@ -216,6 +214,8 @@ CCTV14 少儿,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/inde CCTV15 音乐,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8 CCTV16 奥林匹克,http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8 CCTV17 农业农村,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8 +CCTV4K 超高清, +CCTV8K 超高清, 风云剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8 第一剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8 怀旧剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8 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 e33ebb1..66f20db 100644 --- a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt +++ b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt @@ -222,18 +222,25 @@ class TVViewModel(private var tv: TV) : ViewModel() { mMinimumLoadableRetryCount = minimumLoadableRetryCount } + /** + * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource()) + */ @OptIn(UnstableApi::class) - fun buildSource(videoUrl: String, mHeaders: Map?): HlsMediaSource { + fun buildSource(): HlsMediaSource { val httpDataSource = DefaultHttpDataSource.Factory() mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) } return HlsMediaSource.Factory(httpDataSource).createMediaSource( MediaItem.fromUri( - Uri.parse(videoUrl) + Uri.parse(getVideoUrlCurrent()) ) ) } + fun getVideoUrlCurrent(): String { + return _videoUrl.value!![_videoIndex.value!!] + } + companion object { private const val TAG = "TVViewModel" } diff --git a/build.gradle b/build.gradle index e014bd8..4cfc6a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.2.0' apply false - id 'com.android.library' version '8.2.0' apply false + id 'com.android.application' version '8.2.1' apply false + id 'com.android.library' version '8.2.1' apply false id 'org.jetbrains.kotlin.android' version '1.9.21' apply false } \ No newline at end of file