hg
/
my-tv
mirror of https://github.com/lizongying/my-tv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto auth

Browse Source
pull/731/head
Li ZongYing 2 years ago
parent a4da01adf4
commit 6ede7f76ef
3 changed files with 44 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      app/src/main/java/com/lizongying/mytv/MainActivity.kt
  2. 49
      app/src/main/java/com/lizongying/mytv/Request.kt
  3. 3
      app/src/main/java/com/lizongying/mytv/SettingFragment.kt

12
app/src/main/java/com/lizongying/mytv/MainActivity.kt
Unescape View File

@ -49,8 +49,6 @@ class MainActivity : FragmentActivity() {
private var channelNum = true
private var bootStartup = true
private var versionName = ""
init {
lifecycleScope.launch(Dispatchers.IO) {
val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
@ -87,7 +85,7 @@ class MainActivity : FragmentActivity() {
bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
val packageInfo = getPackageInfo()
versionName = packageInfo.versionName
val versionName = packageInfo.versionName
val versionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
packageInfo.longVersionCode
} else {
@ -162,6 +160,11 @@ class MainActivity : FragmentActivity() {
handler.postDelayed(hideMain, delayHideMain)
}
fun settingActive() {
handler.removeCallbacks(hideSetting)
handler.postDelayed(hideSetting, delayHideSetting)
}
private val hideMain = Runnable {
if (!mainFragment.isHidden) {
supportFragmentManager.beginTransaction().hide(mainFragment).commit()
@ -268,8 +271,7 @@ class MainActivity : FragmentActivity() {
Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
if (!settingFragment.isVisible) {
settingFragment.show(supportFragmentManager, "setting")
handler.removeCallbacks(hideSetting)
handler.postDelayed(hideSetting, delayHideSetting)
settingActive()
} else {
handler.removeCallbacks(hideSetting)
settingFragment.dismiss()

49
app/src/main/java/com/lizongying/mytv/Request.kt
Unescape View File

@ -36,6 +36,8 @@ class Request {
private var ysp: YSP? = null
private var token = ""
private var needAuth = false
// TODO onDestroy
private val handler = Handler(Looper.getMainLooper())
private lateinit var btraceRunnable: BtraceRunnable
@ -54,7 +56,7 @@ class Request {
}
var call: Call<LiveInfo>? = null
var callAuth: Call<Auth>? = null
private var callAuth: Call<Auth>? = null
private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
callAuth?.cancel()
@ -119,7 +121,7 @@ class Request {
if (tvModel.getTV().needToken) {
if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
} else {
token = ""
@ -186,14 +188,17 @@ class Request {
if (tvModel.getTV().needToken) {
if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
} else {
token = ""
fetchVideo(tvModel)
// fetchVideo(tvModel)
fetchAuth(tvModel)
}
} else {
fetchVideo(tvModel, cookie)
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
}
}
@ -208,14 +213,17 @@ class Request {
if (tvModel.getTV().needToken) {
if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
} else {
token = ""
fetchVideo(tvModel)
// fetchVideo(tvModel)
fetchAuth(tvModel)
}
} else {
fetchVideo(tvModel, cookie)
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
}
}
@ -227,14 +235,17 @@ class Request {
if (tvModel.getTV().needToken) {
if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
} else {
token = ""
fetchVideo(tvModel)
// fetchVideo(tvModel)
fetchAuth(tvModel)
}
} else {
fetchVideo(tvModel, cookie)
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
}
}
}
@ -323,6 +334,7 @@ class Request {
Log.e(TAG, "info status error")
if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
tvModel.tokenRetryTimes++
if (needAuth)
fetchVideo(tvModel)
} else {
if (!tvModel.getTV().mustToken) {
@ -357,13 +369,20 @@ class Request {
fun fetchData(tvModel: TVViewModel) {
if (tvModel.getTV().needToken) {
// fetchVideo(tvModel)
fetchAuth(tvModel)
if (needAuth) {
fetchAuth(tvModel)
} else {
fetchVideo(tvModel)
}
} else {
val cookie =
"versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205"
// fetchVideo(tvModel, cookie)
fetchAuth(tvModel, cookie)
if (needAuth) {
fetchAuth(tvModel, cookie)
} else {
fetchVideo(tvModel, cookie)
}
}
}

3
app/src/main/java/com/lizongying/mytv/SettingFragment.kt
Unescape View File

@ -40,18 +40,21 @@ class SettingFragment(
switchChannelReversal?.isChecked = channelReversal
switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
(activity as MainActivity).saveChannelReversal(isChecked)
(activity as MainActivity).settingActive()
}
val switchChannelNum = _binding?.switchChannelNum
switchChannelNum?.isChecked = channelNum
switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
(activity as MainActivity).saveChannelNum(isChecked)
(activity as MainActivity).settingActive()
}
val switchBootStartup = _binding?.switchBootStartup
switchBootStartup?.isChecked = bootStartup
switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
(activity as MainActivity).saveBootStartup(isChecked)
(activity as MainActivity).settingActive()
}
updateManager = UpdateManager(context, this, versionCode)

Write Preview
Loading…
Cancel
Save