mirrors/my-tv
1
0
Fork 0
mirror of https://github.com/lizongying/my-tv.git synced 2026-10-26 22:26:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

opitimize request

Browse Source
This commit is contained in:
Li ZongYing
2024-05-01 16:52:33 +08:00
parent df5b006024
commit 39e5cc7c1f
8 changed files with 135 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HISTORY.md
+5
View File
@@ -1,5 +1,10 @@
## 更新日志 ## 更新日志
### v1.9.0（通用）
* 减少视频播放失败情况
* 全面屏手机居中显示
### v1.8.8（通用） ### v1.8.8（通用）
* 样式优化 * 样式优化
app/src/main/java/com/lizongying/mytv/ChannelFragment.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class ChannelFragment : Fragment() {
binding.main.layoutParams.width = application.shouldWidthPx() binding.main.layoutParams.width = application.shouldWidthPx()
binding.main.layoutParams.height = application.shouldHeightPx() binding.main.layoutParams.height = application.shouldHeightPx()
(activity as MainActivity).fragmentReady("ChannelFragment") (activity as MainActivity).fragmentReady(TAG)
return binding.root return binding.root
} }
app/src/main/java/com/lizongying/mytv/InfoFragment.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class InfoFragment : Fragment() {
_binding!!.root.visibility = View.GONE _binding!!.root.visibility = View.GONE
(activity as MainActivity).fragmentReady("InfoFragment") (activity as MainActivity).fragmentReady(TAG)
return binding.root return binding.root
} }
app/src/main/java/com/lizongying/mytv/MainActivity.kt
+55 -24
View File
@@ -17,6 +17,7 @@ import android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
import android.view.WindowManager import android.view.WindowManager
import android.widget.Toast import android.widget.Toast
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.lizongying.mytv.models.TVViewModel import com.lizongying.mytv.models.TVViewModel
@@ -65,6 +66,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
Request.setRequestListener(this) Request.setRequestListener(this)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
val lp = window.attributes
lp.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
window.setAttributes(lp)
}
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
window.decorView.systemUiVisibility = window.decorView.systemUiVisibility =
@@ -89,28 +97,32 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
.hide(mainFragment) .hide(mainFragment)
.hide(errorFragment) .hide(errorFragment)
// .hide(loadingFragment) // .hide(loadingFragment)
.hide(timeFragment)
.commit() .commit()
} }
gestureDetector = GestureDetector(this, GestureListener()) gestureDetector = GestureDetector(this, GestureListener())
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val connectivityManager = // val connectivityManager =
getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager // getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
connectivityManager.registerDefaultNetworkCallback(object : // connectivityManager.registerDefaultNetworkCallback(object :
ConnectivityManager.NetworkCallback() { // ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) { // override fun onAvailable(network: Network) {
super.onAvailable(network) // super.onAvailable(network)
Log.i(TAG, "net ${Build.VERSION.SDK_INT}") // Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
if (this@MainActivity.isNetworkConnected) { // if (this@MainActivity.isNetworkConnected) {
Log.i(TAG, "net isNetworkConnected") // Log.i(TAG, "net isNetworkConnected")
ready++ // ready++
} // }
} // }
}) // })
} else { // } else {
Log.i(TAG, "net ${Build.VERSION.SDK_INT}") // Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
ready++ // ready++
} // }
showTime()
mainFragment.changeMenu()
} }
fun showInfoFragment(tvViewModel: TVViewModel) { fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -211,6 +223,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
handler.removeCallbacks(hideSetting) handler.removeCallbacks(hideSetting)
handler.postDelayed(hideSetting, delayHideSetting) handler.postDelayed(hideSetting, delayHideSetting)
showTime() showTime()
mainFragment.changeMenu()
} }
fun settingNeverHide() { fun settingNeverHide() {
@@ -238,20 +251,37 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
fun fragmentReady(tag: String) { fun fragmentReady(tag: String) {
ready++ ready++
Log.i(TAG, "ready $tag $ready ") Log.i(TAG, "ready $tag $ready ")
if (ready == 8) { if (ready == 7) {
mainFragment.fragmentReady() mainFragment.fragmentReady()
showTime()
} }
} }
private fun showTime() { private fun showTime() {
Log.i(TAG, "showTime ${SP.time}")
if (SP.time) { if (SP.time) {
timeFragment.show() showFragment(timeFragment)
} else { } else {
timeFragment.hide() hideFragment(timeFragment)
} }
mainFragment.changeStyle() }
private fun showFragment(fragment: Fragment) {
if (!fragment.isHidden) {
return
}
supportFragmentManager.beginTransaction()
.show(fragment)
.commitNow()
}
private fun hideFragment(fragment: Fragment) {
if (fragment.isHidden) {
return
}
supportFragmentManager.beginTransaction()
.hide(fragment)
.commitNow()
} }
override fun onTouchEvent(event: MotionEvent?): Boolean { override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -326,6 +356,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
if (settingFragment.isVisible) { if (settingFragment.isVisible) {
settingFragment.dismiss() settingFragment.dismiss()
showTime() showTime()
mainFragment.changeMenu()
} }
} }
app/src/main/java/com/lizongying/mytv/MainFragment.kt
+2 -2
View File
@@ -205,11 +205,11 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
} }
} }
} }
(activity as MainActivity).fragmentReady("MainFragment") (activity as MainActivity).fragmentReady(TAG)
} }
} }
fun changeStyle() { fun changeMenu() {
if (SP.grid) { if (SP.grid) {
for (i in rowList) { for (i in rowList) {
if (i is RecyclerView) { if (i is RecyclerView) {
app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
+2 -2
View File
@@ -93,7 +93,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
}) })
} }
}) })
(activity as MainActivity).fragmentReady("PlayerFragment") (activity as MainActivity).fragmentReady(TAG)
return _binding!!.root return _binding!!.root
} }
@@ -154,7 +154,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
} }
companion object { companion object {
private const val TAG = "PlaybackVideoFragment" private const val TAG = "PlayerFragment"
} }
override fun surfaceCreated(holder: SurfaceHolder) { override fun surfaceCreated(holder: SurfaceHolder) {
app/src/main/java/com/lizongying/mytv/TimeFragment.kt
+6 -20
View File
@@ -40,23 +40,20 @@ class TimeFragment : Fragment() {
binding.main.layoutParams.width = application.shouldWidthPx() binding.main.layoutParams.width = application.shouldWidthPx()
binding.main.layoutParams.height = application.shouldHeightPx() binding.main.layoutParams.height = application.shouldHeightPx()
(activity as MainActivity).fragmentReady("TimeFragment") (activity as MainActivity).fragmentReady(TAG)
return binding.root return binding.root
} }
override fun onResume() { override fun onHiddenChanged(hidden: Boolean) {
super.onResume() super.onHiddenChanged(hidden)
if (view?.visibility == View.VISIBLE) { if (!hidden) {
handler.removeCallbacks(showRunnable) handler.removeCallbacks(showRunnable)
handler.postDelayed(showRunnable, 0) handler.postDelayed(showRunnable, 0)
} else {
handler.removeCallbacks(showRunnable)
} }
} }
override fun onPause() {
super.onPause()
handler.removeCallbacks(showRunnable)
}
private val showRunnable: Runnable = Runnable { private val showRunnable: Runnable = Runnable {
run { run {
if (_binding == null) { if (_binding == null) {
@@ -67,17 +64,6 @@ class TimeFragment : Fragment() {
} }
} }
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() { override fun onDestroyView() {
handler.removeCallbacks(showRunnable) handler.removeCallbacks(showRunnable)
super.onDestroyView() super.onDestroyView()
app/src/main/java/com/lizongying/mytv/requests/Request.kt
+63 -24
View File
@@ -119,7 +119,9 @@ object Request {
if (!tvModel.getTV().mustToken) { if (!tvModel.getTV().mustToken) {
fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else { } else {
// TODO val err = "错误"
Log.e(TAG, "$title $err")
tvModel.setErrInfo(err)
} }
} }
} else { } else {
@@ -144,7 +146,9 @@ object Request {
if (!tvModel.getTV().mustToken) { if (!tvModel.getTV().mustToken) {
fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else { } else {
// TODO val err = "错误"
Log.e(TAG, "$title $err")
tvModel.setErrInfo(err)
} }
} }
} else { } else {
@@ -171,7 +175,9 @@ object Request {
if (!tvModel.getTV().mustToken) { if (!tvModel.getTV().mustToken) {
fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else { } else {
// TODO val err = "错误"
Log.e(TAG, "$title $err")
tvModel.setErrInfo(err)
} }
} }
} else { } else {
@@ -241,19 +247,30 @@ object Request {
if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) { if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
tvModel.tokenYSPRetryTimes++ tvModel.tokenYSPRetryTimes++
tvModel.needGetToken = true tvModel.needGetToken = true
fetchVideo(tvModel) if (needAuth) {
// fetchAuth(tvModel) fetchAuth(tvModel)
} else {
fetchVideo(tvModel)
}
} else { } else {
if (!tvModel.getTV().mustToken) { if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie) if (needAuth) {
// fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} else { } else {
// TODO val err = "错误"
Log.e(TAG, "$title $err")
tvModel.setErrInfo(err)
} }
} }
} else { } else {
fetchVideo(tvModel, cookie) if (needAuth) {
// fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} }
} else { } else {
val err = "结果错误" val err = "结果错误"
@@ -274,19 +291,30 @@ object Request {
if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) { if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
tvModel.tokenYSPRetryTimes++ tvModel.tokenYSPRetryTimes++
tvModel.needGetToken = true tvModel.needGetToken = true
fetchVideo(tvModel) if (needAuth) {
// fetchAuth(tvModel) fetchAuth(tvModel)
} else {
fetchVideo(tvModel)
}
} else { } else {
if (!tvModel.getTV().mustToken) { if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie) if (needAuth) {
// fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} else { } else {
// TODO val err = "错误"
Log.e(TAG, "$title $err")
tvModel.setErrInfo(err)
} }
} }
} else { } else {
fetchVideo(tvModel, cookie) if (needAuth) {
// fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} }
} else { } else {
val err = "其他错误" val err = "其他错误"
@@ -303,19 +331,30 @@ object Request {
if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) { if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
tvModel.tokenYSPRetryTimes++ tvModel.tokenYSPRetryTimes++
tvModel.needGetToken = true tvModel.needGetToken = true
fetchVideo(tvModel) if (needAuth) {
// fetchAuth(tvModel) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} else { } else {
if (!tvModel.getTV().mustToken) { if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie) if (needAuth) {
// fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} else { } else {
// TODO val err = "错误"
Log.e(TAG, "$title $err")
tvModel.setErrInfo(err)
} }
} }
} else { } else {
fetchVideo(tvModel, cookie) if (needAuth) {
// fetchAuth(tvModel, cookie) fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
} }
} else { } else {
val err = "状态错误" val err = "状态错误"