Skip to content

Commit

Permalink
fh fhd
Browse files Browse the repository at this point in the history
  • Loading branch information
@lizongying
lizongying committed Mar 9, 2024
1 parent e55e8ce commit 31988d0
Show file tree
Hide file tree
Showing 9 changed files with 164 additions and 60 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
### v1.6.3（安卓5及以上专用）

* 增加CETV1
* 凤凰卫视增强画质
* 默认关闭开机启动
* 延迟菜单自动关闭时间
* 解决一些可能导致首次打开时黑屏的问题

### v1.6.2（通用）

Expand Down
43 changes: 31 additions & 12 deletions app/src/main/java/com/lizongying/mytv/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import kotlinx.coroutines.launch
import java.security.MessageDigest


class MainActivity : FragmentActivity() {
class MainActivity : FragmentActivity(), Request.RequestListener {

private var ready = 0
private var playerFragment = PlayerFragment()
Expand All @@ -42,21 +42,24 @@ class MainActivity : FragmentActivity() {
private val delayHideMain: Long = 10000
private val delayHideSetting: Long = 10000

init {
lifecycleScope.launch(Dispatchers.IO) {
val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }

utilsJob.start()

utilsJob.await()
}
}
// init {
// lifecycleScope.launch(Dispatchers.IO) {
// val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
//
// utilsJob.start()
//
// utilsJob.await()
// }
// }

override fun onCreate(savedInstanceState: Bundle?) {
Log.i(TAG, "onCreate")
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)

Request.onCreate()
Request.setRequestListener(this)

window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
Expand All @@ -78,7 +81,13 @@ class MainActivity : FragmentActivity() {
} else {
packageInfo.versionCode.toLong()
}
settingFragment = SettingFragment(versionName, versionCode, SP.channelReversal, SP.channelNum, SP.bootStartup)
settingFragment = SettingFragment(
versionName,
versionCode,
SP.channelReversal,
SP.channelNum,
SP.bootStartup
)
}

fun showInfoFragment(tvViewModel: TVViewModel) {
Expand Down Expand Up @@ -171,7 +180,7 @@ class MainActivity : FragmentActivity() {
fun fragmentReady() {
ready++
Log.i(TAG, "ready $ready")
if (ready == 4) {
if (ready == 5) {
mainFragment.fragmentReady()
}
}
Expand Down Expand Up @@ -507,7 +516,17 @@ class MainActivity : FragmentActivity() {
handler.removeCallbacks(hideMain)
}

override fun onDestroy() {
super.onDestroy()
Request.onDestroy()
}

override fun onRequestFinished() {
fragmentReady()
}

private companion object {
const val TAG = "MainActivity"
}

}
11 changes: 5 additions & 6 deletions app/src/main/java/com/lizongying/mytv/MainFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.leanback.widget.Row
import androidx.leanback.widget.RowPresenter
import androidx.lifecycle.lifecycleScope
import com.lizongying.mytv.Utils.getDateTimestamp
import com.lizongying.mytv.api.YSP
import com.lizongying.mytv.models.TVListViewModel
import com.lizongying.mytv.models.TVViewModel
import kotlinx.coroutines.Dispatchers
Expand All @@ -29,8 +30,6 @@ class MainFragment : BrowseSupportFragment() {

private var rowsAdapter: ArrayObjectAdapter? = null

private var request = Request()

var tvListViewModel = TVListViewModel()

private var lastVideoUrl = ""
Expand All @@ -52,7 +51,7 @@ class MainFragment : BrowseSupportFragment() {
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)

activity?.let { request.initYSP(it) }
activity?.let { YSP.init(it) }

loadRows()

Expand Down Expand Up @@ -87,7 +86,7 @@ class MainFragment : BrowseSupportFragment() {
if (tvViewModel.pid.value != "") {
Log.i(TAG, "request $title")
lifecycleScope.launch(Dispatchers.IO) {
tvViewModel.let { request.fetchData(it) }
tvViewModel.let { Request.fetchData(it) }
}
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
setSelectedPosition(
Expand Down Expand Up @@ -283,11 +282,11 @@ class MainFragment : BrowseSupportFragment() {
if (timestamp - tvViewModel.programUpdateTime > 60) {
if (tvViewModel.program.value!!.isEmpty()) {
tvViewModel.programUpdateTime = timestamp
request.fetchProgram(tvViewModel)
Request.fetchProgram(tvViewModel)
} else {
if (tvViewModel.program.value!!.last().et - timestamp < 600) {
tvViewModel.programUpdateTime = timestamp
request.fetchProgram(tvViewModel)
Request.fetchProgram(tvViewModel)
}
}
}
Expand Down
126 changes: 99 additions & 27 deletions app/src/main/java/com/lizongying/mytv/Request.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.lizongying.mytv

import android.content.Context
import android.os.Handler
import android.os.Looper
import android.util.Base64
Expand All @@ -12,6 +11,7 @@ import com.lizongying.mytv.api.AuthRequest
import com.lizongying.mytv.api.FAuth
import com.lizongying.mytv.api.FAuthService
import com.lizongying.mytv.api.Info
import com.lizongying.mytv.api.InfoV2
import com.lizongying.mytv.api.LiveInfo
import com.lizongying.mytv.api.LiveInfoRequest
import com.lizongying.mytv.api.Token
Expand All @@ -32,18 +32,19 @@ import javax.crypto.spec.SecretKeySpec
import kotlin.math.max


class Request {
object Request {
private const val TAG = "Request"
private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
private var yspApiService: YSPApiService = ApiClient().yspApiService
private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
private var fAuthService: FAuthService = ApiClient().fAuthService
private var ysp: YSP? = null

private var token = ""
private var tokenFH = ""

private var needAuth = false

// TODO onDestroy
private val handler = Handler(Looper.getMainLooper())
private lateinit var btraceRunnable: BtraceRunnable
private var tokenRunnable: TokenRunnable = TokenRunnable()
Expand All @@ -52,18 +53,18 @@ class Request {
private val input =
"""{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()

init {
handler.post(tokenRunnable)
private var listener: RequestListener? = null

fun onCreate() {
Log.i(TAG, "onCreate")
fetchInfoV2()
}

fun onDestroy() {
Log.i(TAG, "onDestroy")
handler.removeCallbacks(tokenRunnable)
}

fun initYSP(context: Context) {
ysp = YSP(context)
}

var call: Call<LiveInfo>? = null
private var callAuth: Call<Auth>? = null

Expand All @@ -72,9 +73,9 @@ class Request {

val title = tvModel.title.value

val data = ysp?.getAuthData(tvModel)
val request = data?.let { AuthRequest(it) }
callAuth = request?.let { yspApiService.getAuth("guid=${ysp?.getGuid()}; $cookie", it) }
val data = YSP.getAuthData(tvModel)
val request = AuthRequest(data)
callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }

callAuth?.enqueue(object : Callback<Auth> {
override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
Expand All @@ -83,7 +84,7 @@ class Request {

if (liveInfo?.data?.token != null) {
Log.i(TAG, "token ${liveInfo.data.token}")
ysp?.token = liveInfo.data.token
YSP.token = liveInfo.data.token
fetchVideo(tvModel, cookie)
} else {
Log.e(TAG, "$title token error")
Expand Down Expand Up @@ -153,12 +154,12 @@ class Request {
val title = tvModel.title.value

tvModel.seq = 0
val data = ysp?.switch(tvModel)
val request = data?.let { LiveInfoRequest(it) }
call = request?.let {
val data = YSP.switch(tvModel)
val request = LiveInfoRequest(data)
call = request.let {
yspApiService.getLiveInfo(
"guid=${ysp?.getGuid()}; $cookie",
ysp!!.token,
"guid=${YSP.getGuid()}; $cookie",
YSP.token,
it
)
}
Expand Down Expand Up @@ -329,6 +330,7 @@ class Request {
}

fun fetchVideo(tvModel: TVViewModel) {
Log.d(TAG, "fetchVideo")
if (token == "") {
yspTokenService.getInfo("")
.enqueue(object : Callback<Info> {
Expand Down Expand Up @@ -383,7 +385,12 @@ class Request {

val title = tvModel.title.value

fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
var qa = "HD"
if (tokenFH != "") {
qa = "FHD"
}

fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
fAuth?.enqueue(object : Callback<FAuth> {
override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
if (response.isSuccessful && response.body()?.data?.live_url != null) {
Expand Down Expand Up @@ -412,6 +419,7 @@ class Request {
}

fun fetchData(tvModel: TVViewModel) {
Log.d(TAG, "fetchData")
if (tvModel.getTV().channel == "港澳台") {
fetchFAuth(tvModel)
return
Expand All @@ -434,12 +442,72 @@ class Request {
}
}

inner class TokenRunnable : Runnable {
class TokenRunnable : Runnable {
override fun run() {
fetchToken()
}
}

private fun fetchInfoV2() {
yspTokenService.getInfoV2()
.enqueue(object : Callback<InfoV2> {
override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
if (response.isSuccessful) {
val t = response.body()?.t
val f = response.body()?.f
val e = response.body()?.e
val c = response.body()?.c
if (!t.isNullOrEmpty()) {
token = t
Log.i(TAG, "token success $token")
if (e != null) {
handler.postDelayed(
tokenRunnable,
max(600000, (e - 1500) * 1000).toLong()
)
} else {
Log.e(TAG, "e empty")
handler.postDelayed(
tokenRunnable,
600000
)
}
} else {
Log.e(TAG, "token empty")
handler.postDelayed(
tokenRunnable,
600000
)
}
if (!f.isNullOrEmpty()) {
tokenFH = f
Log.i(TAG, "tokenFH success $tokenFH")
}
if (c != null) {
Utils.setBetween(c * 1000L)
Log.i(TAG, "current time $c")
}
} else {
Log.e(TAG, "token status error")
handler.postDelayed(
tokenRunnable,
600000
)
}
listener?.onRequestFinished()
}

override fun onFailure(call: Call<InfoV2>, t: Throwable) {
Log.e(TAG, "token request error $t")
handler.postDelayed(
tokenRunnable,
600000
)
listener?.onRequestFinished()
}
})
}

fun fetchToken() {
yspTokenService.getToken(token)
.enqueue(object : Callback<Token> {
Expand Down Expand Up @@ -488,7 +556,7 @@ class Request {
})
}

inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
override fun run() {
fetchBtrace(tvModel)
handler.postDelayed(this, 60000)
Expand All @@ -498,19 +566,19 @@ class Request {
fun fetchBtrace(tvModel: TVViewModel) {
val title = tvModel.title.value

val guid = ysp?.getGuid()!!
val guid = YSP.getGuid()
val pid = tvModel.pid.value!!
val sid = tvModel.sid.value!!
yspBtraceService.kvcollect(
c_timestamp = ysp?.generateGuid()!!,
c_timestamp = YSP.generateGuid(),
guid = guid,
c_guid = guid,
prog = sid,
viewid = sid,
fpid = pid,
livepid = pid,
sUrl = "https://www.yangshipin.cn/#/tv/home?pid=$pid",
playno = ysp?.getRand()!!,
playno = YSP.getRand(),
ftime = getDateFormat("yyyy-MM-dd HH:mm:ss"),
seq = tvModel.seq.toString(),
)
Expand Down Expand Up @@ -602,7 +670,11 @@ class Request {
}
}

companion object {
private const val TAG = "Request"
interface RequestListener {
fun onRequestFinished()
}

fun setRequestListener(listener: RequestListener) {
this.listener = listener
}
}
Loading

0 comments on commit 31988d0

Please sign in to comment.