diff --git a/HISTORY.md b/HISTORY.md index c044d9d4..0424988c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,10 +1,27 @@ ## 更新日志 +### v1.7.8（通用） + +* 修复播放过程中的卡顿问题 +* 增加时间显示 +* 频道号优化 +* 遥控器左键打开频道列表 +* 遥控器右键打开设置菜单 +* 频道列表空白处点击隐藏频道列表 + ### v1.7.6（通用） * 临时去掉部分频道，提高频道的可用性 * 部分频道增加节目单 +### v1.7.5（安卓5及以上专用） + +* 修复播放过程中的卡顿问题 +* 增加时间显示 +* 频道号优化 +* 设置中增加退出按钮 +* + ### v1.7.4（通用） * 修复368 diff --git a/README.md b/README.md index 79021db7..36eb57f0 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,10 @@ adb install my-tv.apk * 显示时间 * 软解 * 不同分辨率 +* “比如：我输了3跳转到3号频道后数字没有消失时，这时我发现按错了频道，然后我想马上换到6频道输到6就变成36了” + +無法自啟的設備： +斐讯N1盒子，[Phicomm] Phicomm p230 (Android 7.1.2) ## 赞赏 diff --git a/app/build.gradle b/app/build.gradle index 1bf5012d..1883c2bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { applicationId "com.lizongying.mytv" - minSdk 17 + minSdk 21 targetSdk 33 versionCode VersionCode() versionName VersionName() @@ -95,7 +95,7 @@ static def VersionName() { } dependencies { - def media3_version = "1.2.1" + def media3_version = "1.3.1" implementation "androidx.media3:media3-ui:$media3_version" @@ -105,18 +105,22 @@ dependencies { // For HLS playback support with ExoPlayer implementation "androidx.media3:media3-exoplayer-hls:$media3_version" - // 21:2.9.0 17:2.6.4 - def retrofit2_version = "2.9.0" + // 21:2.11.0 17:2.6.4 + def retrofit2_version = "2.11.0" implementation 'com.google.protobuf:protobuf-kotlin:3.25.1' implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version" implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version" implementation "com.squareup.retrofit2:retrofit:$retrofit2_version" - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" - implementation 'androidx.core:core-ktx:1.11.0-beta02' - implementation 'androidx.leanback:leanback:1.2.0-alpha02' + + implementation 'androidx.leanback:leanback:1.2.0-alpha04' + implementation 'com.github.bumptech.glide:glide:4.11.0' - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" + + implementation 'androidx.core:core-ktx:1.13.0' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" + + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC") implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 03c65fde..4b8c4c95 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,37 +1,43 @@ + + - + + + android:supportsRtl="true" + android:theme="@style/Theme.MyTV" + android:usesCleartextTraffic="true"> + + @@ -40,15 +46,17 @@ - + + android:exported="false" /> \ No newline at end of file diff --git a/app/src/main/cpp/arm64-v8a/libnative.so b/app/src/main/cpp/arm64-v8a/libnative.so index 48528b6f..7f2f4bad 100755 Binary files a/app/src/main/cpp/arm64-v8a/libnative.so and b/app/src/main/cpp/arm64-v8a/libnative.so differ diff --git a/app/src/main/java/com/lizongying/mytv/CardPresenter.kt b/app/src/main/java/com/lizongying/mytv/CardPresenter.kt index 7254be15..5d67542c 100644 --- a/app/src/main/java/com/lizongying/mytv/CardPresenter.kt +++ b/app/src/main/java/com/lizongying/mytv/CardPresenter.kt @@ -23,7 +23,7 @@ class CardPresenter( return ViewHolder(cardView) } - override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) { + override fun onBindViewHolder(viewHolder: ViewHolder, item: Any?) { val tvViewModel = item as TVViewModel val cardView = viewHolder.view as ImageCardView @@ -31,10 +31,12 @@ class CardPresenter( cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT) cardView.tag = tvViewModel.videoUrl.value - Glide.with(viewHolder.view.context) - .load(tvViewModel.getTV().logo) - .centerInside() - .into(cardView.mainImageView) + cardView.mainImageView?.let { + Glide.with(viewHolder.view.context) + .load(tvViewModel.getTV().logo) + .centerInside() + .into(it) + } cardView.setBackgroundColor(Color.WHITE) cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE) diff --git a/app/src/main/java/com/lizongying/mytv/ChannelFragment.kt b/app/src/main/java/com/lizongying/mytv/ChannelFragment.kt index a8806534..3a5029c3 100644 --- a/app/src/main/java/com/lizongying/mytv/ChannelFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/ChannelFragment.kt @@ -2,6 +2,7 @@ package com.lizongying.mytv import android.os.Bundle import android.os.Handler +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -16,6 +17,7 @@ class ChannelFragment : Fragment() { private val handler = Handler() private val delay: Long = 3000 private var channel = 0 + private var channelCount = 0 override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -23,7 +25,39 @@ class ChannelFragment : Fragment() { ): View { _binding = ChannelBinding.inflate(inflater, container, false) _binding!!.root.visibility = View.GONE - (activity as MainActivity).fragmentReady() + + val activity = requireActivity() + val application = activity.applicationContext as MyApplication + val displayMetrics = application.getDisplayMetrics() + + displayMetrics.density + + var screenWidth = displayMetrics.widthPixels + var screenHeight = displayMetrics.heightPixels + if (screenHeight > screenWidth) { + screenWidth = displayMetrics.heightPixels + screenHeight = displayMetrics.widthPixels + } + + val ratio = 16f / 9f + + if (screenWidth / screenHeight > ratio) { + val x = ((screenWidth - screenHeight * ratio) / 2).toInt() + val originalLayoutParams = + binding.channelFragment.layoutParams as ViewGroup.MarginLayoutParams + originalLayoutParams.rightMargin += x + binding.channelFragment.layoutParams = originalLayoutParams + } + + if (screenWidth / screenHeight < ratio) { + val y = ((screenHeight - screenWidth / ratio) / 2).toInt() + val originalLayoutParams = + binding.channelFragment.layoutParams as ViewGroup.MarginLayoutParams + originalLayoutParams.topMargin += y + binding.channelFragment.layoutParams = originalLayoutParams + } + + (activity as MainActivity).fragmentReady("ChannelFragment") return binding.root } @@ -36,11 +70,17 @@ class ChannelFragment : Fragment() { } fun show(channel: String) { - this.channel = "${binding.channelContent.text}$channel".toInt() + if (channelCount > 1) { + return + } + channelCount++ + Log.i(TAG, "channelCount ${channelCount}") + this.channel = "${this.channel}$channel".toInt() + Log.i(TAG, "this.channel ${this.channel}") handler.removeCallbacks(hideRunnable) handler.removeCallbacks(playRunnable) - if (binding.channelContent.text == "") { - binding.channelContent.text = channel + if (channelCount < 2) { + binding.channelContent.text = "${this.channel}" view?.visibility = View.VISIBLE handler.postDelayed(playRunnable, delay) } else { @@ -64,12 +104,18 @@ class ChannelFragment : Fragment() { private val hideRunnable = Runnable { binding.channelContent.text = "" view?.visibility = View.GONE + channel = 0 + channelCount = 0 + Log.i(TAG, "hideRunnable") } private val playRunnable = Runnable { (activity as MainActivity).play(channel - 1) binding.channelContent.text = "" view?.visibility = View.GONE + channel = 0 + channelCount = 0 + Log.i(TAG, "playRunnable") } override fun onDestroyView() { diff --git a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt index a41a7cea..342e9686 100644 --- a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt @@ -24,7 +24,7 @@ class InfoFragment : Fragment() { ): View { _binding = InfoBinding.inflate(inflater, container, false) _binding!!.root.visibility = View.GONE - (activity as MainActivity).fragmentReady() + (activity as MainActivity).fragmentReady("InfoFragment") return binding.root } diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt index 87860f98..ef4dc981 100644 --- a/app/src/main/java/com/lizongying/mytv/MainActivity.kt +++ b/app/src/main/java/com/lizongying/mytv/MainActivity.kt @@ -31,6 +31,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener { private val mainFragment = MainFragment() private val infoFragment = InfoFragment() private val channelFragment = ChannelFragment() + private var timeFragment = TimeFragment() private val settingFragment = SettingFragment() private val errorFragment = ErrorFragment() @@ -67,6 +68,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener { if (savedInstanceState == null) { supportFragmentManager.beginTransaction() .add(R.id.main_browse_fragment, playerFragment) + .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) @@ -169,6 +171,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener { fun settingDelayHide() { handler.removeCallbacks(hideSetting) handler.postDelayed(hideSetting, delayHideSetting) + showTime() } fun settingHideNow() { @@ -198,11 +201,21 @@ class MainActivity : FragmentActivity(), Request.RequestListener { } } - fun fragmentReady() { + fun fragmentReady(tag: String) { ready++ - Log.i(TAG, "ready $ready") - if (ready == 5) { + Log.i(TAG, "ready $tag $ready ") + if (ready == 6) { mainFragment.fragmentReady() + showTime() + } + } + + private fun showTime() { + Log.i(TAG, "showTime ${SP.time}") + if (SP.time) { + timeFragment.show() + } else { + timeFragment.hide() } } @@ -502,7 +515,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener { .commitNow() errorFragment.setErrorContent(message) } - fragmentReady() + fragmentReady("Request") } private companion object { diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt index 6f79dfba..ddf7c305 100644 --- a/app/src/main/java/com/lizongying/mytv/MainFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/MainFragment.kt @@ -125,7 +125,7 @@ class MainFragment : BrowseSupportFragment() { } } - (activity as MainActivity).fragmentReady() + (activity as MainActivity).fragmentReady("MainFragment") } fun toLastPosition() { diff --git a/app/src/main/java/com/lizongying/mytv/MyApplication.kt b/app/src/main/java/com/lizongying/mytv/MyApplication.kt new file mode 100644 index 00000000..63133543 --- /dev/null +++ b/app/src/main/java/com/lizongying/mytv/MyApplication.kt @@ -0,0 +1,23 @@ +package com.lizongying.mytv + +import android.app.Application +import android.content.Context +import android.util.DisplayMetrics +import android.view.WindowManager + +class MyApplication : Application() { + private lateinit var displayMetrics: DisplayMetrics + + override fun onCreate() { + super.onCreate() + + displayMetrics = DisplayMetrics() + val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager +// windowManager.defaultDisplay.getRealMetrics(displayMetrics) + windowManager.defaultDisplay.getMetrics(displayMetrics) + } + + fun getDisplayMetrics(): DisplayMetrics { + return displayMetrics + } +} \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt index 4c897125..cbd1aded 100644 --- a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt @@ -92,7 +92,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback { }) } }) - (activity as MainActivity).fragmentReady() + (activity as MainActivity).fragmentReady("PlayerFragment") return _binding!!.root } diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt index 90203276..b49d7219 100644 --- a/app/src/main/java/com/lizongying/mytv/Request.kt +++ b/app/src/main/java/com/lizongying/mytv/Request.kt @@ -4,6 +4,8 @@ import android.os.Handler import android.os.Looper import android.util.Base64 import android.util.Log +import com.google.gson.Gson +import java.net.URLDecoder import com.lizongying.mytv.Utils.getDateFormat import com.lizongying.mytv.api.ApiClient import com.lizongying.mytv.api.Auth @@ -13,6 +15,8 @@ import com.lizongying.mytv.api.FAuthService import com.lizongying.mytv.api.FEPG import com.lizongying.mytv.api.Info import com.lizongying.mytv.api.InfoV2 +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.YSP @@ -32,6 +36,7 @@ import retrofit2.Response import javax.crypto.Cipher import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec +import kotlin.random.Random object Request { @@ -39,6 +44,8 @@ object Request { private var yspTokenService: YSPTokenService = ApiClient().yspTokenService private var yspApiService: YSPApiService = ApiClient().yspApiService private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService + private var yspBtraceService2: YSPBtraceService = ApiClient().yspBtraceService2 + private var yspBtraceService3: YSPBtraceService = ApiClient().yspBtraceService3 private var yspProtoService: YSPProtoService = ApiClient().yspProtoService private var yspJceService: YSPJceService = ApiClient().yspJceService private var fAuthService: FAuthService = ApiClient().fAuthService @@ -531,7 +538,7 @@ object Request { class BtraceRunnable(private val tvModel: TVViewModel) : Runnable { override fun run() { - fetchBtrace(tvModel) + fetchBtrace3(tvModel) } } @@ -558,7 +565,133 @@ object Request { callBtracePage?.enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { if (response.isSuccessful) { - // Log.d(TAG, "$title kvcollect success") + Log.d(TAG, "$title kvcollect success") + } else { + Log.e(TAG, "$title kvcollect status error") + } + handler.postDelayed(btraceRunnable, 60 * 1000) + } + + override fun onFailure(call: Call, t: Throwable) { + Log.e(TAG, "$title kvcollect request error") + handler.postDelayed(btraceRunnable, 60 * 1000) + } + }) + tvModel.seq++ + } + + fun fetchBtrace2(tvModel: TVViewModel) { + callBtracePage?.cancel() + val title = tvModel.getTV().title + + val guid = YSP.getGuid() + val pid = tvModel.getTV().pid + val sid = tvModel.getTV().sid + val randomNumber = Random.nextDouble() + val url = tvModel.getTV().videoUrl.first() + + var r = KvcollectRequest( + guid = guid, + prog = sid, + viewid = sid, + livepid = pid, + sUrl = "https://www.yangshipin.cn/#/tv/home?pid=$pid", + playno = YSP.getRand(), + rand_str = YSP.getRand(), + ftime = getDateFormat("yyyy-MM-dd HH:mm:ss"), + seq = tvModel.seq, + durl = url, + url = url, + _dc = randomNumber, + ) + + var 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=6&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=&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}" + println(e) + r.signature = YSP.getAuthSignature(e) + println(r.signature) + +// val ttt = """{"BossId":2727,"Pwd":1424084450,"prog":"2022576801","playno":"BEoZw3cpZh","guid":"luccvoyr_58va8i3cqw6","hh_ua":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36","cdn":"waibao","sdtfrom":"ysp_pc_01","prd":60000,"platform":"5910204","errcode":"","durl":"https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1","firstreport":1,"sUrl":"https://www.yangshipin.cn/#/tv/home?pid=600001859","sRef":"","fplayerver":"100","livepid":"600001859","viewid":"2022576801","seq":0,"cmd":263,"login_type":"","geturltime":6,"downspeed":1.75,"hc_openid":"","open_id":"","defn":"fhd","fact1":"ysp_pc_live_b","openid":"","_dc":0.7140416315131102,"live_type":"","ftime":"2024-04-17 22:58:31","url":"https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1","rand_str":"oKkkZs8lON"}""" +// val gson = Gson() +// r = gson.fromJson(ttt, KvcollectRequest::class.java) +// +// 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=6&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=&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}" +// println(e) +// e = "BossId=2727&Pwd=1424084450&_dc=0.7140416315131102&cdn=waibao&cmd=263&defn=fhd&downspeed=1.75&durl=https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1&errcode=&fact1=ysp_pc_live_b&firstreport=1&fplayerver=100&ftime=2024-04-17 22:58:31&geturltime=6&guid=luccvoyr_58va8i3cqw6&hc_openid=&hh_ua=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36&live_type=&livepid=600001859&login_type=&open_id=&openid=&platform=5910204&playno=BEoZw3cpZh&prd=60000&prog=2022576801&rand_str=oKkkZs8lON&sRef=&sUrl=https://www.yangshipin.cn/#/tv/home?pid=600001859&sdtfrom=ysp_pc_01&seq=0&url=https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1&viewid=2022576801" +// println(e) +// r.signature = YSP.getAuthSignature(e) +// println(r.signature) + + callBtracePage = yspBtraceService2.kvcollect2( + r + ) + callBtracePage?.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + if (response.isSuccessful) { + Log.d(TAG, "$title kvcollect success") + } else { + Log.e(TAG, "$title kvcollect status error") + } + handler.postDelayed(btraceRunnable, 60 * 1000) + } + + override fun onFailure(call: Call, t: Throwable) { + Log.e(TAG, "$title kvcollect request error") + handler.postDelayed(btraceRunnable, 60 * 1000) + } + }) + tvModel.seq++ + } + + fun fetchBtrace3(tvModel: TVViewModel) { + callBtracePage?.cancel() + val title = tvModel.getTV().title + + val guid = YSP.getGuid() + val pid = tvModel.getTV().pid + val sid = tvModel.getTV().sid + val randomNumber = Random.nextDouble() + val url = tvModel.getTV().videoUrl.first() + + val r = KvcollectRequest2( + guid = guid, + prog = sid, + viewid = sid, + livepid = pid, + sUrl = "https://www.yangshipin.cn/#/tv/home?pid=$pid", + playno = YSP.getRand(), + rand_str = YSP.getRand(), + ftime = getDateFormat("yyyy-MM-dd HH:mm:ss"), + seq = tvModel.seq, + durl = url, + url = url, + _dc = randomNumber, + ) + + 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}" + r.signature = YSP.getAuthSignature(e) + + callBtracePage = yspBtraceService3.kvcollect3( + guid = r.guid, + prog = r.prog, + viewid = r.viewid, + livepid = r.livepid, + sUrl = r.sUrl, + playno = r.playno, + rand_str = r.rand_str, + ftime = r.ftime, + seq = "${r.seq}", + durl = r.durl, + url = r.url, + _dc = "${r._dc}", + signature = r.signature + ) + callBtracePage?.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + if (response.isSuccessful) { + Log.d(TAG, "$title kvcollect success") } else { Log.e(TAG, "$title kvcollect status error") } diff --git a/app/src/main/java/com/lizongying/mytv/SP.kt b/app/src/main/java/com/lizongying/mytv/SP.kt index 7f8595ab..70f3d763 100644 --- a/app/src/main/java/com/lizongying/mytv/SP.kt +++ b/app/src/main/java/com/lizongying/mytv/SP.kt @@ -13,9 +13,13 @@ 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" + // If start app on device boot or not private const val KEY_BOOT_STARTUP = "boot_startup" + private const val KEY_GRID = "grid" + // Position in list of the selected channel item private const val KEY_POSITION = "position" @@ -39,10 +43,18 @@ object SP { get() = sp.getBoolean(KEY_CHANNEL_NUM, true) set(value) = sp.edit().putBoolean(KEY_CHANNEL_NUM, value).apply() + var time: Boolean + get() = sp.getBoolean(KEY_TIME, true) + set(value) = sp.edit().putBoolean(KEY_TIME, value).apply() + var bootStartup: Boolean get() = sp.getBoolean(KEY_BOOT_STARTUP, false) set(value) = sp.edit().putBoolean(KEY_BOOT_STARTUP, value).apply() + var grid: Boolean + get() = sp.getBoolean(KEY_GRID, false) + set(value) = sp.edit().putBoolean(KEY_GRID, value).apply() + var itemPosition: Int get() = sp.getInt(KEY_POSITION, 0) set(value) = sp.edit().putInt(KEY_POSITION, value).apply() diff --git a/app/src/main/java/com/lizongying/mytv/SettingFragment.kt b/app/src/main/java/com/lizongying/mytv/SettingFragment.kt index f0f2392a..1ff9cc9b 100644 --- a/app/src/main/java/com/lizongying/mytv/SettingFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/SettingFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.view.WindowManager import androidx.fragment.app.DialogFragment import com.lizongying.mytv.databinding.SettingBinding @@ -15,6 +16,14 @@ class SettingFragment : DialogFragment() { private lateinit var updateManager: UpdateManager + override fun onStart() { + super.onStart() + dialog?.window?.apply { + addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) + decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + } + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setStyle(STYLE_NO_TITLE, 0) @@ -46,6 +55,14 @@ class SettingFragment : DialogFragment() { } } + binding.switchTime.run { + isChecked = SP.time + setOnCheckedChangeListener { _, isChecked -> + SP.time = isChecked + (activity as MainActivity).settingDelayHide() + } + } + binding.switchBootStartup.run { isChecked = SP.bootStartup setOnCheckedChangeListener { _, isChecked -> @@ -62,6 +79,10 @@ class SettingFragment : DialogFragment() { ) ) + binding.exit.setOnClickListener{ + requireActivity().finishAffinity() + } + return binding.root } diff --git a/app/src/main/java/com/lizongying/mytv/TVList.kt b/app/src/main/java/com/lizongying/mytv/TVList.kt index 535b08c5..142c8268 100644 --- a/app/src/main/java/com/lizongying/mytv/TVList.kt +++ b/app/src/main/java/com/lizongying/mytv/TVList.kt @@ -14,7 +14,7 @@ object TVList { 0, "CCTV1 综合", "CCTV1", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp", "600001859", @@ -27,7 +27,7 @@ object TVList { 0, "CCTV2 财经", "CCTV2", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp", "600001800", @@ -40,7 +40,7 @@ object TVList { 0, "CCTV3 综艺", "CCTV3", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp", "600001801", @@ -53,10 +53,7 @@ object TVList { 0, "CCTV4 中文国际", "CCTV4", - listOf( - "http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8" - ), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp", "600001814", @@ -69,7 +66,7 @@ object TVList { 0, "CCTV5 体育", "CCTV5", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp", "600001818", @@ -82,7 +79,7 @@ object TVList { 0, "CCTV6 电影", "CCTV6", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp", "600108442", @@ -95,7 +92,7 @@ object TVList { 0, "CCTV7 国防军事", "CCTV7", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp", "600004092", @@ -108,7 +105,7 @@ object TVList { 0, "CCTV8 电视剧", "CCTV8", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp", "600001803", @@ -121,7 +118,7 @@ object TVList { 0, "CCTV9 纪录", "CCTV9", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp", "600004078", @@ -134,7 +131,7 @@ object TVList { 0, "CCTV10 科教", "CCTV10", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226189/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp", "600001805", @@ -147,7 +144,7 @@ object TVList { 0, "CCTV11 戏曲", "CCTV11", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226240/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp", "600001806", @@ -160,7 +157,7 @@ object TVList { 0, "CCTV12 社会与法", "CCTV12", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226190/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp", "600001807", @@ -173,9 +170,7 @@ object TVList { 0, "CCTV13 新闻", "CCTV13", - listOf( - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226233/index.m3u8" - ), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp", "600001811", @@ -188,7 +183,7 @@ object TVList { 0, "CCTV14 少儿", "CCTV14", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp", "600001809", @@ -201,7 +196,7 @@ object TVList { 0, "CCTV15 音乐", "CCTV15", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp", "600001815", @@ -214,10 +209,7 @@ object TVList { 0, "CCTV16 奥林匹克", "CCTV16-HD", - listOf( - "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" - ), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp", "600098637", @@ -230,7 +222,7 @@ object TVList { 0, "CCTV17 农业农村", "CCTV17", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp", "600001810", @@ -243,7 +235,7 @@ object TVList { 0, "CCTV5+ 体育赛事", "CCTV5+", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp", "600001817", @@ -282,7 +274,7 @@ object TVList { 0, "风云剧场", "CCTV风云剧场频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp", "600099658", @@ -295,7 +287,7 @@ object TVList { 0, "第一剧场", "CCTV第一剧场频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp", "600099655", @@ -308,7 +300,7 @@ object TVList { 0, "怀旧剧场", "CCTV怀旧剧场频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp", "600099620", @@ -334,7 +326,7 @@ object TVList { 0, "风云音乐", "CCTV风云音乐频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226953/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp", "600099660", @@ -347,7 +339,7 @@ object TVList { 0, "兵器科技", "CCTV兵器科技频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226975/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp", "600099649", @@ -360,7 +352,7 @@ object TVList { 0, "风云足球", "CCTV风云足球频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226984/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp", "600099636", @@ -373,7 +365,7 @@ object TVList { 0, "高尔夫网球", "CCTV高尔夫·网球频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226978/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp", "600099659", @@ -386,7 +378,7 @@ object TVList { 0, "女性时尚", "CCTV女性时尚频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226969/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp", "600099650", @@ -399,7 +391,7 @@ object TVList { 0, "央视文化精品", "CCTV央视文化精品频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226981/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp", "600099653", @@ -412,7 +404,7 @@ object TVList { 0, "央视台球", "CCTV央视台球频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226956/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp", "600099652", @@ -425,7 +417,7 @@ object TVList { 0, "电视指南", "CCTV电视指南频道", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226987/index.m3u8"), + listOf(), "央视", "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp", "600099656", @@ -453,7 +445,7 @@ object TVList { 0, "东方卫视", "东方卫视", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226217/index.m3u8"), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp", "600002483", @@ -466,10 +458,7 @@ object TVList { 0, "湖南卫视", "湖南卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226307/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226211/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp", "600002475", @@ -482,10 +471,7 @@ object TVList { 0, "湖北卫视", "湖北卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226477/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226194/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp", "600002508", @@ -498,10 +484,7 @@ object TVList { 0, "辽宁卫视", "辽宁卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226546/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226201/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp", "600002505", @@ -514,10 +497,7 @@ object TVList { 0, "江苏卫视", "江苏卫视", - listOf( - "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp", "600002521", @@ -530,10 +510,7 @@ object TVList { 0, "江西卫视", "江西卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226344/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225764/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp", "600002503", @@ -546,7 +523,7 @@ object TVList { 0, "山东卫视", "山东卫视", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226209/index.m3u8"), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp", "600002513", @@ -559,7 +536,7 @@ object TVList { 0, "广东卫视", "广东卫视", - listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226216/index.m3u8"), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp", "600002485", @@ -572,10 +549,7 @@ object TVList { 0, "广西卫视", "广西卫视", - listOf( - "http://live.gxrb.com.cn/tv/gxtvlive03/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225770/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp", "600002509", @@ -588,10 +562,7 @@ object TVList { 0, "重庆卫视", "重庆卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226409/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226202/index.m3u8" - ), + listOf(), "地方", R.drawable.chongqing, "600002531", @@ -604,10 +575,7 @@ object TVList { 0, "河南卫视", "河南卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226480/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225767/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp", "600002525", @@ -620,10 +588,7 @@ object TVList { 0, "河北卫视", "河北卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226406/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225750/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp", "600002493", @@ -636,10 +601,7 @@ object TVList { 0, "贵州卫视", "贵州卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226474/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225793/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp", "600002490", @@ -652,10 +614,7 @@ object TVList { 0, "北京卫视", "北京卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225728/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226222/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp", "600002309", @@ -668,10 +627,7 @@ object TVList { 0, "黑龙江卫视", "黑龙江卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226327/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226215/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp", "600002498", @@ -684,10 +640,7 @@ object TVList { 0, "浙江卫视", "浙江卫视", - listOf( - "http://hw-m-l.cztv.com/channels/lantian/channel01/1080p.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226199/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp", "600002520", @@ -700,10 +653,7 @@ object TVList { 0, "安徽卫视", "安徽卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226391/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226203/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp", "600002532", @@ -716,10 +666,7 @@ object TVList { 0, "深圳卫视", "深圳卫视", - listOf( - "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp", "600002481", @@ -732,10 +679,7 @@ object TVList { 0, "四川卫视", "四川卫视", - listOf( - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8", - "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp", "600002516", @@ -748,10 +692,7 @@ object TVList { 0, "东南卫视", "福建东南卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp", "600002484", @@ -764,10 +705,7 @@ object TVList { 0, "海南卫视", "海南卫视", - listOf( - "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8", - "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8" - ), + listOf(), "地方", "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp", "600002506", @@ -875,7 +813,7 @@ object TVList { 0, "CGTN", "CGTN", - listOf("http://live.cgtn.com/1000/prog_index.m3u8"), + listOf(), "国际", "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp", "600014550", @@ -888,7 +826,7 @@ object TVList { 0, "CGTN 法语频道", "CGTN法语频道", - listOf("https://livefr.cgtn.com/1000f/prog_index.m3u8"), + listOf(), "国际", "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp", "600084704", @@ -901,7 +839,7 @@ object TVList { 0, "CGTN 俄语频道", "CGTN俄语频道", - listOf("http://liveru.cgtn.com/1000r/prog_index.m3u8"), + listOf(), "国际", "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp", "600084758", @@ -914,7 +852,7 @@ object TVList { 0, "CGTN 阿拉伯语频道", "CGTN阿拉伯语频道", - listOf("http://livear.cgtn.com/1000a/prog_index.m3u8"), + listOf(), "国际", "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp", "600084782", @@ -927,10 +865,7 @@ object TVList { 0, "CGTN 西班牙语频道", "CGTN西班牙语频道", - listOf( - "http://livees.cgtn.com/500e/prog_index.m3u8", - "http://livees.cgtn.com/1000e/prog_index.m3u8" - ), + listOf(), "国际", "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp", "600084744", @@ -943,7 +878,7 @@ object TVList { 0, "CGTN 纪录频道", "CGTN外语纪录频道", - listOf("https://livedoc.cgtn.com/500d/prog_index.m3u8"), + listOf(), "国际", "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp", "600084781", diff --git a/app/src/main/java/com/lizongying/mytv/TimeFragment.kt b/app/src/main/java/com/lizongying/mytv/TimeFragment.kt new file mode 100644 index 00000000..e2e9858a --- /dev/null +++ b/app/src/main/java/com/lizongying/mytv/TimeFragment.kt @@ -0,0 +1,99 @@ +package com.lizongying.mytv + +import android.os.Bundle +import android.os.Handler +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.lizongying.mytv.Utils.getDateFormat +import com.lizongying.mytv.databinding.TimeBinding + +class TimeFragment : Fragment() { + private var _binding: TimeBinding? = null + private val binding get() = _binding!! + + private val handler = Handler() + private val delay: Long = 1000 + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + Log.i(TAG, "onCreateView") + _binding = TimeBinding.inflate(inflater, container, false) + + val activity = requireActivity() + val application = activity.applicationContext as MyApplication + val displayMetrics = application.getDisplayMetrics() + + displayMetrics.density + + var screenWidth = displayMetrics.widthPixels + var screenHeight = displayMetrics.heightPixels + if (screenHeight > screenWidth) { + screenWidth = displayMetrics.heightPixels + screenHeight = displayMetrics.widthPixels + } + + val ratio = 16f / 9f + + if (screenWidth / screenHeight > ratio) { + val x = ((screenWidth - screenHeight * ratio) / 2).toInt() + val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams + originalLayoutParams.rightMargin += x + binding.time.layoutParams = originalLayoutParams + } + + if (screenWidth / screenHeight < ratio) { + val y = ((screenHeight - screenWidth / ratio) / 2).toInt() + val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams + originalLayoutParams.topMargin += y + binding.time.layoutParams = originalLayoutParams + } + + (activity as MainActivity).fragmentReady("TimeFragment") + return binding.root + } + + override fun onResume() { + super.onResume() + if (view?.visibility == View.VISIBLE) { + handler.removeCallbacks(showRunnable) + handler.postDelayed(showRunnable, 0) + } + } + + override fun onPause() { + super.onPause() + handler.removeCallbacks(showRunnable) + } + + private val showRunnable: Runnable = Runnable { + run { + binding.content.text = getDateFormat("HH:mm") + handler.postDelayed(showRunnable, delay) + } + } + + 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() { + super.onDestroyView() + _binding = null + } + + companion object { + private const val TAG = "TimeFragment" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/Utils.kt b/app/src/main/java/com/lizongying/mytv/Utils.kt index 2bef59f1..92b39b7b 100644 --- a/app/src/main/java/com/lizongying/mytv/Utils.kt +++ b/app/src/main/java/com/lizongying/mytv/Utils.kt @@ -77,5 +77,15 @@ object Utils { ).toInt() } + fun pxToDp(px: Float): Int { + val scale = Resources.getSystem().displayMetrics.density + return (px / scale).toInt() + } + + fun pxToDp(px: Int): Int { + val scale = Resources.getSystem().displayMetrics.density + return (px / scale).toInt() + } + fun isTmallDevice() = Build.MANUFACTURER.equals("Tmall", ignoreCase = true) } \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt b/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt index 4f191935..cf0d918d 100644 --- a/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt +++ b/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt @@ -22,6 +22,8 @@ class ApiClient { private val myUrl = "https://lyrics.run/" private val protoUrl = "https://capi.yangshipin.cn/" private val traceUrl = "https://btrace.yangshipin.cn/" + private val trace2Url = "https://aatc-api.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/" @@ -67,6 +69,22 @@ class ApiClient { .build().create(YSPBtraceService::class.java) } + val yspBtraceService2: YSPBtraceService by lazy { + Retrofit.Builder() + .baseUrl(trace2Url) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build().create(YSPBtraceService::class.java) + } + + val yspBtraceService3: YSPBtraceService by lazy { + Retrofit.Builder() + .baseUrl(trace3Url) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build().create(YSPBtraceService::class.java) + } + val yspJceService: YSPJceService by lazy { Retrofit.Builder() .baseUrl(jceUrl) diff --git a/app/src/main/java/com/lizongying/mytv/api/KvcollectRequest.kt b/app/src/main/java/com/lizongying/mytv/api/KvcollectRequest.kt new file mode 100644 index 00000000..2079d271 --- /dev/null +++ b/app/src/main/java/com/lizongying/mytv/api/KvcollectRequest.kt @@ -0,0 +1,76 @@ +package com.lizongying.mytv.api + +data class KvcollectRequest( + val BossId: Int = 2727, + val Pwd: Int = 1424084450, + val cdn: String = "waibao", + val cmd: Int = 263, + val defn: String = "fhd", + val downspeed: Double = 10.0, + val durl: String = "", // + val errcode: String = "", + val fact1: String = "ysp_pc_live_b", + val firstreport: Int = 0, + val fplayerver: String = "100", + val ftime: String = "", // + val geturltime: Int = 0, + val guid: String = "", // + val hc_openid: String = "", + val hh_ua: String = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", + val live_type: String = "", + val livepid: String = "", // + val login_type: String = "", + val open_id: String = "", + val openid: String = "", + val platform: String = "5910204", + val playno: String = "", // + val prd: Int = 60000, + val prog: String = "", // + val rand_str: String = "", // + val sRef: String = "", + val sUrl: String = "", // + val sdtfrom: String = "ysp_pc_01", + val seq: Int = 9, // + var signature: String = "", + val url: String = "", // + val viewid: String = "", // + val _dc: Double = 0.0, +) + + +data class KvcollectRequest2( + val BossId: Int = 2727, + val Pwd: Int = 1424084450, + val cdn: String = "waibao", + val cmd: Int = 263, + val defn: String = "fhd", + val downspeed: String = "10", + val durl: String = "", // + val errcode: String = "", + val fact1: String = "ysp_pc_live_b", + val firstreport: Int = 0, + val fplayerver: String = "100", + val ftime: String = "", // + val geturltime: Int = 0, + val guid: String = "", // + val hc_openid: String = "", + val hh_ua: String = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", + val live_type: String = "", + val livepid: String = "", // + val login_type: String = "", + val open_id: String = "", + val openid: String = "", + val platform: String = "5910204", + val playno: String = "", // + val prd: Int = 60000, + val prog: String = "", // + val rand_str: String = "", // + val sRef: String = "", + val sUrl: String = "", // + val sdtfrom: String = "ysp_pc_01", + val seq: Int = 9, // + var signature: String = "", + val url: String = "", // + val viewid: String = "", // + val _dc: Double = 0.0, +) \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/api/YSP.kt b/app/src/main/java/com/lizongying/mytv/api/YSP.kt index 6d88d4df..89ccf89c 100644 --- a/app/src/main/java/com/lizongying/mytv/api/YSP.kt +++ b/app/src/main/java/com/lizongying/mytv/api/YSP.kt @@ -141,4 +141,9 @@ object YSP { val hashedData = encryptor.hash2(e) ?: return "" return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } } } + + fun getAuthSignature(e: String): String { + val hashedData = encryptor.hash2(e.toByteArray()) ?: return "" + return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } } + } } \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/api/YSPApiService.kt b/app/src/main/java/com/lizongying/mytv/api/YSPApiService.kt index 41a85c91..e9bbee23 100644 --- a/app/src/main/java/com/lizongying/mytv/api/YSPApiService.kt +++ b/app/src/main/java/com/lizongying/mytv/api/YSPApiService.kt @@ -21,18 +21,6 @@ interface YSPApiService { @Body request: LiveInfoRequest, ): Call - @POST("v1/player/get_live_info") - @Headers( - "content-type: application/json;charset=UTF-8", - "referer: https://www.yangshipin.cn/", - "yspappid: 519748109", - "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 getLiveInfoV2( - @Header("cookie") cookie: String, - @Body request: LiveInfoRequest, - ): Call - @POST("v1/player/auth") @Headers( "content-type: application/x-www-form-urlencoded;charset=UTF-8", diff --git a/app/src/main/java/com/lizongying/mytv/api/YSPBtraceService.kt b/app/src/main/java/com/lizongying/mytv/api/YSPBtraceService.kt index 11068756..7d40f0c5 100644 --- a/app/src/main/java/com/lizongying/mytv/api/YSPBtraceService.kt +++ b/app/src/main/java/com/lizongying/mytv/api/YSPBtraceService.kt @@ -1,11 +1,11 @@ package com.lizongying.mytv.api import retrofit2.Call +import retrofit2.http.Body import retrofit2.http.Field import retrofit2.http.FormUrlEncoded import retrofit2.http.Headers import retrofit2.http.POST -import retrofit2.http.Path import retrofit2.http.Query @@ -68,4 +68,58 @@ interface YSPBtraceService { @Field("c_guid") c_guid: String = "", @Field("c_vuid") c_vuid: String = "-", ): Call + + @POST("kvcollect") + @Headers( + "content-type: application/json", + "referer: https://www.yangshipin.cn/", + "Cookie: guid=1; versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=123", + "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", + ) + fun kvcollect2( + @Body request: KvcollectRequest, + ): Call + + @FormUrlEncoded + @POST("kvcollect") + @Headers( + "content-type: application/x-www-form-urlencoded", + "referer: https://www.yangshipin.cn/", + ) + fun kvcollect3( + @Field("BossId") BossId: String = "9141", + @Field("Pwd") Pwd: String = "1137850982", + @Field("prog") prog: String = "", // + @Field("playno") playno: String = "", // + @Field("guid") guid: String = "", // + @Field("hh_ua") hh_ua: String = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", + @Field("cdn") cdn: String = "waibao", + @Field("sdtfrom") sdtfrom: String = "ysp_pc_01", + @Field("prd") prd: String = "60000", + @Field("platform") platform: String = "5910204", + @Field("errcode") errcode: String = "-", + @Field("durl") durl: String = "", // + @Field("firstreport") firstreport: String = "-", + @Field("sUrl") sUrl: String = "", // + @Field("sRef") sRef: String = "-", + @Field("fplayerver") fplayerver: String = "100", + @Field("livepid") livepid: String = "", + @Field("viewid") viewid: String = "", + @Field("seq") seq: String = "", + @Field("cmd") cmd: String = "263", + @Field("login_type") login_type: String = "-", + @Field("geturltime") geturltime: String = "-", + @Field("downspeed") downspeed: String = "10", + @Field("hc_openid") hc_openid: String = "-", + @Field("open_id") open_id: String = "-", + @Field("defn") defn: String = "fhd", + @Field("fact1") fact1: String = "ysp_pc_live_b", + @Field("openid") openid: String = "-", + @Field("_dc") _dc: String = "", + @Field("live_type") live_type: String = "-", + @Field("ftime") ftime: String = "", + @Field("url") url: String = "", + @Field("rand_str") rand_str: String = "", // + @Field("signature") signature: String = "", + ): Call } \ No newline at end of file diff --git a/app/src/main/res/layout/channel.xml b/app/src/main/res/layout/channel.xml index 7c48bd52..70eaced2 100644 --- a/app/src/main/res/layout/channel.xml +++ b/app/src/main/res/layout/channel.xml @@ -1,11 +1,11 @@ + android:layout_marginEnd="170dp"> + android:textSize="40sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/setting.xml b/app/src/main/res/layout/setting.xml index bb69502c..45d093dc 100644 --- a/app/src/main/res/layout/setting.xml +++ b/app/src/main/res/layout/setting.xml @@ -51,23 +51,35 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - +