diff --git a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt index f41e80b..6de7aca 100644 --- a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt @@ -1,16 +1,23 @@ 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.bumptech.glide.Glide import com.lizongying.mytv.databinding.InfoBinding +import com.lizongying.mytv.models.TVViewModel class InfoFragment : Fragment() { private var _binding: InfoBinding? = null private val binding get() = _binding!! + private val handler = Handler() + private val delay: Long = 3000 + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -19,8 +26,41 @@ class InfoFragment : Fragment() { return binding.root } - fun setInfo(info: TV) { - binding.textView.text = info.title + override fun onResume() { + super.onResume() + + // Use a Handler to delay the fragment transaction + handler.postDelayed(removeRunnable, delay) + } + + fun show() { + Log.i("", "show") + handler.removeCallbacks(removeRunnable) + view?.visibility = View.VISIBLE + handler.postDelayed(removeRunnable, delay) + } + + override fun onPause() { + super.onPause() + Log.i("", "onPause") + // Cancel the delayed task when the fragment is paused + handler.removeCallbacks(removeRunnable) + } + + private val removeRunnable = Runnable { + Log.i("", "hide") + view?.visibility = View.GONE + } + + fun setInfo(tvViewModel: TVViewModel) { + binding.textView.text = tvViewModel.title.value + Glide.with(this) + .load(tvViewModel.logo.value) + .into(binding.infoLogo) + val program = tvViewModel.getProgramOne() + if (program != null) { + binding.infoDesc.text = program.name + } } override fun onDestroyView() { diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt index 23bcafa..a7ea683 100644 --- a/app/src/main/java/com/lizongying/mytv/MainActivity.kt +++ b/app/src/main/java/com/lizongying/mytv/MainActivity.kt @@ -55,25 +55,9 @@ class MainActivity : FragmentActivity() { gestureDetector = GestureDetector(this, GestureListener()) } - fun switchInfoFragment(tv: TV) { - infoFragment.setInfo(tv) - - if (infoFragment.isHidden) { - supportFragmentManager.beginTransaction().show(infoFragment).commit() - } - } - - fun showInfoFragment(tv: TV) { - infoFragment.setInfo(tv) - supportFragmentManager.beginTransaction() - .show(infoFragment) - .commit() - } - - fun hideInfoFragment() { - supportFragmentManager.beginTransaction() - .hide(infoFragment) - .commit() + fun showInfoFragment(tvViewModel: TVViewModel) { + infoFragment.setInfo(tvViewModel) + infoFragment.show() } fun play(tvViewModel: TVViewModel) { diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt index 7761332..7ec172a 100644 --- a/app/src/main/java/com/lizongying/mytv/MainFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/MainFragment.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.SharedPreferences import android.os.Bundle import android.util.Log -import android.widget.Toast import androidx.leanback.app.BrowseSupportFragment import androidx.leanback.widget.ArrayObjectAdapter import androidx.leanback.widget.HeaderItem @@ -64,7 +63,6 @@ class MainFragment : BrowseSupportFragment() { ) { Log.i(TAG, "ready ${tvViewModel.title.value}") (activity as? MainActivity)?.play(tvViewModel) -// (activity as? MainActivity)?.switchInfoFragment(item) } } tvViewModel.change.observe(viewLifecycleOwner) { _ -> @@ -76,29 +74,20 @@ class MainFragment : BrowseSupportFragment() { lifecycleScope.launch(Dispatchers.IO) { tvViewModel.let { request?.fetchData(it) } } + (activity as? MainActivity)?.showInfoFragment(tvViewModel) setSelectedPosition( tvViewModel.getRowPosition(), true, SelectItemViewHolderTask(tvViewModel.getItemPosition()) ) - Toast.makeText( - activity, - title, - Toast.LENGTH_SHORT - ).show() } else { if (check(tvViewModel)) { (activity as? MainActivity)?.play(tvViewModel) -// (activity as? MainActivity)?.switchInfoFragment(item) + (activity as? MainActivity)?.showInfoFragment(tvViewModel) setSelectedPosition( tvViewModel.getRowPosition(), true, SelectItemViewHolderTask(tvViewModel.getItemPosition()) ) - Toast.makeText( - activity, - title, - Toast.LENGTH_SHORT - ).show() } } } diff --git a/app/src/main/java/com/lizongying/mytv/TVList.kt b/app/src/main/java/com/lizongying/mytv/TVList.kt index 2abce55..7b6a912 100644 --- a/app/src/main/java/com/lizongying/mytv/TVList.kt +++ b/app/src/main/java/com/lizongying/mytv/TVList.kt @@ -69,10 +69,10 @@ CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8,https://resource 四川卫视,http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp,600002516,2000295003 东南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp,600002484,2000292503 海南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8,https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp,600002506,2000291503 -三沙卫视,https://pullsstv90080111.ssws.tv/live/SSTV20220729.m3u8 移动专区 +三沙卫视,https://pullsstv90080111.ssws.tv/live/SSTV20220729.m3u8 天津卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225740/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226204/index.m3u8 吉林卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226397/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225792/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 d0d07f5..f81e9b3 100644 --- a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt +++ b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt @@ -324,7 +324,7 @@ class TVViewModel(private var tv: TV) : ViewModel() { _title.value = tv.title _videoUrl.value = tv.videoUrl _videoIndex.value = tv.videoIndex - Log.i(TAG, "tv.title ${tv.title} ${mappingLogo[tv.title]}") + Log.d(TAG, "${tv.title} ${mappingLogo[tv.title]}") if (mappingLogo[tv.title] != null) { _logo.value = mappingLogo[tv.title] } diff --git a/app/src/main/res/drawable/rounded_background.xml b/app/src/main/res/drawable/rounded_background.xml new file mode 100644 index 0000000..23bb633 --- /dev/null +++ b/app/src/main/res/drawable/rounded_background.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/rounded_background2.xml b/app/src/main/res/drawable/rounded_background2.xml new file mode 100644 index 0000000..a6c4056 --- /dev/null +++ b/app/src/main/res/drawable/rounded_background2.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/info.xml b/app/src/main/res/layout/info.xml index 59d7591..196df19 100644 --- a/app/src/main/res/layout/info.xml +++ b/app/src/main/res/layout/info.xml @@ -5,15 +5,50 @@ android:layout_height="80dp" android:layout_gravity="center_horizontal|bottom" android:layout_marginBottom="20dp" - android:background="@color/fastlane_background" - > + android:background="@drawable/rounded_background"> - + android:layout_marginTop="8dp" + android:contentDescription="@string/logo" + android:padding="10dp" /> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9f683fe..78385ca 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,4 +1,5 @@ #30000000 #000 + #FFF \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab5ca41..db86576 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ 我的电视 + logo \ No newline at end of file