number selection

README.md

@@ -14,6 +14,15 @@
 
 ## 更新日志
 
+### v1.4.5（高版本专用）
+
+* 数字选台配置
+
+### v1.4.4（通用版）
+
+* 优化图标显示
+* 增加换台反转
+
 ### v1.3.3
 
 * 部分错误会提示用户

app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/logo"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyTV">

app/src/main/java/com/lizongying/mytv/ChannelFragment.kt

@@ -0,0 +1,74 @@
+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.databinding.ChannelBinding
+import com.lizongying.mytv.models.TVViewModel
+
+class ChannelFragment : Fragment() {
+    private var _binding: ChannelBinding? = null
+    private val binding get() = _binding!!
+
+    private val handler = Handler()
+    private val delay: Long = 3000
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ChannelBinding.inflate(inflater, container, false)
+        (activity as MainActivity).fragmentReady()
+        return binding.root
+    }
+
+    fun show(tvViewModel: TVViewModel) {
+        binding.channelContent.text = tvViewModel.id.value.toString()
+        handler.removeCallbacks(removeRunnable)
+        view?.visibility = View.VISIBLE
+        handler.postDelayed(removeRunnable, delay)
+    }
+
+    fun show(channel: String) {
+        if (binding.channelContent.text == "") {
+            binding.channelContent.text = channel
+            handler.removeCallbacks(removeRunnable)
+            view?.visibility = View.VISIBLE
+            handler.postDelayed(removeRunnable, delay)
+        } else {
+            val ch = "${binding.channelContent.text}$channel".toInt()
+            Log.i(TAG, "channel $ch")
+            (activity as MainActivity).play(ch)
+            binding.channelContent.text = ""
+            view?.visibility = View.GONE
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        handler.postDelayed(removeRunnable, delay)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        handler.removeCallbacks(removeRunnable)
+    }
+
+    private val removeRunnable = Runnable {
+        binding.channelContent.text = ""
+        view?.visibility = View.GONE
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val TAG = "ChannelFragment"
+    }
+}

app/src/main/java/com/lizongying/mytv/MainActivity.kt

@@ -1,11 +1,11 @@
 package com.lizongying.mytv
 
-import android.app.AlertDialog
+import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.Signature
 import android.content.pm.SigningInfo
-import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -16,11 +16,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
-import android.widget.ImageView
-import android.widget.LinearLayout
-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
@@ -31,6 +27,7 @@ class MainActivity : FragmentActivity() {
     var playerFragment = PlayerFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
+    private val channelFragment = ChannelFragment()
 
     private var doubleBackToExitPressedOnce = false
 
@@ -38,6 +35,14 @@ class MainActivity : FragmentActivity() {
 
     private val handler = Handler()
     private val delay: Long = 4000
+    private val delayHideHelp: Long = 10000
+
+    private lateinit var sharedPref: SharedPreferences
+    private var channelReversal = false
+    private var channelNum = true
+
+    private var versionName = ""
+    private lateinit var dialogFragment: MyDialogFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -51,24 +56,39 @@ class MainActivity : FragmentActivity() {
             supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
+                .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(infoFragment)
+                .hide(channelFragment)
                 .commit()
             mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
+
+        sharedPref = getPreferences(Context.MODE_PRIVATE)
+        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
+        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
+
+        versionName = getPackageInfo().versionName
+        dialogFragment = MyDialogFragment(versionName, channelReversal, channelNum)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
+        if (channelNum) {
+            channelFragment.show(tvViewModel)
+        }
     }
 
     fun play(tvViewModel: TVViewModel) {
-        Log.i(TAG, "play: ${tvViewModel.getTV()}")
         playerFragment.play(tvViewModel)
         mainFragment.view?.requestFocus()
     }
 
+    fun play(itemPosition: Int) {
+        mainFragment.play(itemPosition)
+    }
+
     fun prev() {
         mainFragment.prev()
     }
@@ -78,11 +98,11 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun prevSource() {
-        mainFragment.prevSource()
+//        mainFragment.prevSource()
     }
 
     private fun nextSource() {
-        mainFragment.nextSource()
+//        mainFragment.nextSource()
     }
 
     fun switchMainFragment() {
@@ -104,7 +124,9 @@ class MainActivity : FragmentActivity() {
     }
 
     private val hideRunnable = Runnable {
-        supportFragmentManager.beginTransaction().hide(mainFragment).commit()
+        if (!mainFragment.isHidden) {
+            supportFragmentManager.beginTransaction().hide(mainFragment).commit()
+        }
     }
 
     private fun mainFragmentIsHidden(): Boolean {
@@ -171,59 +193,184 @@ class MainActivity : FragmentActivity() {
         }
     }
 
+    fun saveChannelReversal(channelReversal: Boolean) {
+        with(sharedPref.edit()) {
+            putBoolean(CHANNEL_REVERSAL, channelReversal)
+            apply()
+        }
+        this.channelReversal = channelReversal
+    }
+
+    fun saveChannelNum(channelNum: Boolean) {
+        with(sharedPref.edit()) {
+            putBoolean(CHANNEL_NUM, channelNum)
+            apply()
+        }
+        this.channelNum = channelNum
+    }
+
     private fun showHelp() {
-        val versionName = getPackageInfo().versionName
+        if (!mainFragment.isHidden) {
+            return
+        }
 
-        val textView = TextView(this)
+        Log.i(TAG, "dialogFragment ${dialogFragment.isVisible}")
-        textView.text =
+        if (!dialogFragment.isVisible) {
-            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+            dialogFragment.show(supportFragmentManager, "settings_dialog")
-        textView.setBackgroundColor(0xFF263238.toInt())
+            handler.removeCallbacks(hideHelp)
-        textView.setPadding(20, 50, 20, 20)
+            handler.postDelayed(hideHelp, delayHideHelp)
+        } else {
+            handler.removeCallbacks(hideHelp)
+            dialogFragment.dismiss()
+        }
+    }
 
-        val imageView = ImageView(this)
+    private val hideHelp = Runnable {
-        val drawable = ContextCompat.getDrawable(this, R.drawable.appreciate)
+        if (dialogFragment.isVisible) {
-        imageView.setImageDrawable(drawable)
+            dialogFragment.dismiss()
-        imageView.setBackgroundColor(Color.WHITE)
+        }
+    }
 
-        val linearLayout = LinearLayout(this)
+    private fun channelUp() {
-        linearLayout.orientation = LinearLayout.VERTICAL
+        if (mainFragment.isHidden) {
-        linearLayout.addView(textView)
+            if (channelReversal) {
-        linearLayout.addView(imageView)
+                next()
+                return
+            }
+            prev()
+        } else {
+//                    if (mainFragment.selectedPosition == 0) {
+//                        mainFragment.setSelectedPosition(
+//                            mainFragment.tvListViewModel.maxNum.size - 1,
+//                            false
+//                        )
+//                    }
+        }
+    }
 
-        val layoutParams = LinearLayout.LayoutParams(
+    private fun channelDown() {
-            LinearLayout.LayoutParams.MATCH_PARENT,
+        if (mainFragment.isHidden) {
-            LinearLayout.LayoutParams.WRAP_CONTENT
+            if (channelReversal) {
-        )
+                prev()
-        imageView.layoutParams = layoutParams
+                return
-        textView.layoutParams = layoutParams
+            }
+            next()
+        } else {
+//                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
+////                        mainFragment.setSelectedPosition(0, false)
+//                        hideMainFragment()
+//                        return false
+//                    }
+        }
+    }
 
-        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+    private fun back() {
-        builder
+        if (!mainFragmentIsHidden()) {
-            .setView(linearLayout)
+            hideMainFragment()
+            return
+        }
 
-        val dialog: AlertDialog = builder.create()
+        if (doubleBackToExitPressedOnce) {
-        dialog.show()
+            super.onBackPressed()
+            return
+        }
+
+        doubleBackToExitPressedOnce = true
+        Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            doubleBackToExitPressedOnce = false
+        }, 2000)
+    }
+
+    private fun showChannel(channel: String) {
+        if (!mainFragment.isHidden) {
+            return
+        }
+
+        if (dialogFragment.isVisible) {
+            return
+        }
+
+        if (channelNum) {
+            channelFragment.show(channel)
+        }
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
+            KeyEvent.KEYCODE_0 -> {
+                showChannel("0")
+                return true
+            }
+
+            KeyEvent.KEYCODE_1 -> {
+                showChannel("1")
+                return true
+            }
+
+            KeyEvent.KEYCODE_2 -> {
+                showChannel("2")
+                return true
+            }
+
+            KeyEvent.KEYCODE_3 -> {
+                showChannel("3")
+                return true
+            }
+
+            KeyEvent.KEYCODE_4 -> {
+                showChannel("4")
+                return true
+            }
+
+            KeyEvent.KEYCODE_5 -> {
+                showChannel("5")
+                return true
+            }
+
+            KeyEvent.KEYCODE_6 -> {
+                showChannel("6")
+                return true
+            }
+
+            KeyEvent.KEYCODE_7 -> {
+                showChannel("7")
+                return true
+            }
+
+            KeyEvent.KEYCODE_8 -> {
+                showChannel("8")
+                return true
+            }
+
+            KeyEvent.KEYCODE_9 -> {
+                showChannel("9")
+                return true
+            }
+
+            KeyEvent.KEYCODE_ESCAPE -> {
+                back()
+                return true
+            }
+
             KeyEvent.KEYCODE_BACK -> {
-                if (!mainFragmentIsHidden()) {
+                back()
-                    hideMainFragment()
+                return true
-                    return true
+            }
-                }
 
-                if (doubleBackToExitPressedOnce) {
+            KeyEvent.KEYCODE_BOOKMARK -> {
-                    super.onBackPressed()
+                showHelp()
-                    return true
+                return true
-                }
+            }
 
-                this.doubleBackToExitPressedOnce = true
+            KeyEvent.KEYCODE_UNKNOWN -> {
-                Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
+                showHelp()
+                return true
+            }
 
-                Handler(Looper.getMainLooper()).postDelayed({
+            KeyEvent.KEYCODE_HELP -> {
-                    doubleBackToExitPressedOnce = false
+                showHelp()
-                }, 2000)
                 return true
             }
 
@@ -237,34 +384,28 @@ class MainActivity : FragmentActivity() {
                 return true
             }
 
+            KeyEvent.KEYCODE_ENTER -> {
+                switchMainFragment()
+            }
+
             KeyEvent.KEYCODE_DPAD_CENTER -> {
-                Log.i(TAG, "KEYCODE_DPAD_CENTER")
                 switchMainFragment()
             }
 
             KeyEvent.KEYCODE_DPAD_UP -> {
-                if (mainFragment.isHidden) {
+                channelUp()
-                    prev()
+            }
-                } else {
+
-//                    if (mainFragment.selectedPosition == 0) {
+            KeyEvent.KEYCODE_CHANNEL_UP -> {
-//                        mainFragment.setSelectedPosition(
+                channelUp()
-//                            mainFragment.tvListViewModel.maxNum.size - 1,
-//                            false
-//                        )
-//                    }
-                }
             }
 
             KeyEvent.KEYCODE_DPAD_DOWN -> {
-                if (mainFragment.isHidden) {
+                channelDown()
-                    next()
+            }
-                } else {
+
-//                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
+            KeyEvent.KEYCODE_CHANNEL_DOWN -> {
-////                        mainFragment.setSelectedPosition(0, false)
+                channelDown()
-//                        hideMainFragment()
-//                        return false
-//                    }
-                }
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
@@ -349,5 +490,7 @@ class MainActivity : FragmentActivity() {
 
     companion object {
         private const val TAG = "MainActivity"
+        private const val CHANNEL_REVERSAL = "channel_reversal"
+        private const val CHANNEL_NUM = "channel_num"
     }
 }

app/src/main/java/com/lizongying/mytv/MainFragment.kt

@@ -209,14 +209,14 @@ class MainFragment : BrowseSupportFragment() {
         itemPosition = sharedPref?.getInt("position", 0)!!
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
-            tvListViewModel.setItemPosition(itemPosition)
         }
+        tvListViewModel.setItemPosition(itemPosition)
     }
 
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 3) {
+        if (ready == 4) {
 //            request.fetchPage()
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
             tvViewModel?.changed()
@@ -225,6 +225,16 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    fun play(itemPosition: Int) {
+        view?.post {
+            if (itemPosition < tvListViewModel.size()) {
+                this.itemPosition = itemPosition
+                tvListViewModel.setItemPosition(itemPosition)
+                tvListViewModel.getTVViewModel(itemPosition)?.changed()
+            }
+        }
+    }
+
     fun prev() {
         view?.post {
             itemPosition--
@@ -232,9 +242,7 @@ class MainFragment : BrowseSupportFragment() {
                 itemPosition = tvListViewModel.size() - 1
             }
             tvListViewModel.setItemPosition(itemPosition)
-
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
         }
     }
 
@@ -245,9 +253,7 @@ class MainFragment : BrowseSupportFragment() {
                 itemPosition = 0
             }
             tvListViewModel.setItemPosition(itemPosition)
-
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
         }
     }
 
@@ -297,9 +303,7 @@ class MainFragment : BrowseSupportFragment() {
                 if (itemPosition != item.id.value!!) {
                     itemPosition = item.id.value!!
                     tvListViewModel.setItemPosition(itemPosition)
-
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
-                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-                    tvViewModel?.changed()
                 }
                 (activity as? MainActivity)?.switchMainFragment()
             }

app/src/main/java/com/lizongying/mytv/MyDialogFragment.kt

@@ -0,0 +1,58 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import com.lizongying.mytv.databinding.DialogBinding
+
+
+class MyDialogFragment(private val versionName: String,
+                       private val channelReversal: Boolean,
+                       private val channelNum: Boolean,
+    ) :
+    DialogFragment() {
+
+    private var _binding: DialogBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = DialogBinding.inflate(inflater, container, false)
+        _binding?.version?.text =
+            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+
+        val switchChannelReversal = _binding?.switchChannelReversal
+        switchChannelReversal?.isChecked = channelReversal
+        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelReversal(isChecked)
+        }
+
+        val switchChannelNum = _binding?.switchChannelNum
+        switchChannelNum?.isChecked = channelNum
+        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelNum(isChecked)
+        }
+
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        const val TAG = "MyDialogFragment"
+    }
+}
+

app/src/main/java/com/lizongying/mytv/PlayerFragment.kt

@@ -103,6 +103,11 @@ class PlayerFragment : Fragment() {
         }
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     companion object {
         private const val TAG = "PlaybackVideoFragment"
     }

app/src/main/res/layout/channel.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/channel_fragment"
+    android:layout_width="80dp"
+    android:layout_height="80dp"
+    android:layout_gravity="end|top"
+    android:layout_marginTop="20dp"
+    android:layout_marginEnd="50dp">
+
+    <TextView
+        android:id="@+id/channel_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginTop="0dp"
+        android:text="99"
+        android:textColor="#FFEEEEEE"
+        android:textStyle="bold"
+        android:textSize="50sp" />
+</FrameLayout>

app/src/main/res/layout/dialog.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingTop="20dp"
+            android:paddingLeft="7dp"
+            android:paddingRight="7dp"
+            android:background="#FF263238"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+                ></TextView>
+            <Switch
+                android:id="@+id/switch_channel_reversal"
+                android:text="@string/title_channel_reversal"
+                android:layout_marginTop="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <Switch
+                android:id="@+id/switch_channel_num"
+                android:text="@string/title_channel_num"
+                android:layout_marginTop="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+        <ImageView
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/appreciate"
+            android:background="@color/white" />
+    </LinearLayout>
+</FrameLayout>

app/src/main/res/layout/info.xml

@@ -12,7 +12,6 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:contentDescription="@string/logo"
         android:padding="10dp" />
 
     <LinearLayout

app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">我的电视</string>
-    <string name="logo">logo</string>
+    <string name="title_channel_reversal">换台反转</string>
+    <string name="title_channel_num">数字选台</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,6 +1,5 @@
 <resources>
 
-
     <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
         <item name="lbImageCardViewType">Title|Content</item>
     </style>