Skip to content

Commit 95ea83e

Browse files
committed
add phoenix tv
1 parent a6078e7 commit 95ea83e

File tree

15 files changed

+384
-139
lines changed

15 files changed

+384
-139
lines changed

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@
1414

1515
## 更新日志
1616

17+
### v1.6.2(通用)
18+
19+
* 修复按键无效的问题
20+
* 新的频道列表样式
21+
22+
### v1.6.1(安卓5及以上专用)
23+
24+
* 增加凤凰卫视
25+
1726
### v1.6.0(通用)
1827

1928
* 通用(春晚緊急修復)
@@ -199,9 +208,8 @@ adb install my-tv.apk
199208
* 凤凰卫视、凤凰资讯台
200209
* 海外
201210
* 1.5.0 无法安装,1.5.1 可以安装
202-
* 选中的图标比例能否相差更大
203-
* 自动重连
204211
* 节目增加预告
212+
* 频道列表优化
205213

206214
## 赞赏
207215

1.29 KB
Binary file not shown.

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ class MainActivity : FragmentActivity() {
4949
private var channelNum = true
5050
private var bootStartup = true
5151

52-
private var versionName = ""
53-
5452
init {
5553
lifecycleScope.launch(Dispatchers.IO) {
5654
val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
@@ -87,7 +85,7 @@ class MainActivity : FragmentActivity() {
8785
bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
8886

8987
val packageInfo = getPackageInfo()
90-
versionName = packageInfo.versionName
88+
val versionName = packageInfo.versionName
9189
val versionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
9290
packageInfo.longVersionCode
9391
} else {
@@ -148,19 +146,24 @@ class MainActivity : FragmentActivity() {
148146

149147
if (mainFragment.isHidden) {
150148
transaction.show(mainFragment)
151-
keepRunnable()
149+
mainActive()
152150
} else {
153151
transaction.hide(mainFragment)
154152
}
155153

156154
transaction.commit()
157155
}
158156

159-
fun keepRunnable() {
157+
fun mainActive() {
160158
handler.removeCallbacks(hideMain)
161159
handler.postDelayed(hideMain, delayHideMain)
162160
}
163161

162+
fun settingActive() {
163+
handler.removeCallbacks(hideSetting)
164+
handler.postDelayed(hideSetting, delayHideSetting)
165+
}
166+
164167
private val hideMain = Runnable {
165168
if (!mainFragment.isHidden) {
166169
supportFragmentManager.beginTransaction().hide(mainFragment).commit()
@@ -267,8 +270,7 @@ class MainActivity : FragmentActivity() {
267270
Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
268271
if (!settingFragment.isVisible) {
269272
settingFragment.show(supportFragmentManager, "setting")
270-
handler.removeCallbacks(hideSetting)
271-
handler.postDelayed(hideSetting, delayHideSetting)
273+
settingActive()
272274
} else {
273275
handler.removeCallbacks(hideSetting)
274276
settingFragment.dismiss()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class MainFragment : BrowseSupportFragment() {
222222
) {
223223
if (item is TVViewModel) {
224224
tvListViewModel.setItemPositionCurrent(item.id.value!!)
225-
(activity as MainActivity).keepRunnable()
225+
(activity as MainActivity).mainActive()
226226
}
227227
}
228228
}
@@ -321,7 +321,7 @@ class MainFragment : BrowseSupportFragment() {
321321
putInt(POSITION, itemPosition)
322322
apply()
323323
}
324-
Log.i(TAG, "$POSITION saved")
324+
Log.i(TAG, "$POSITION $itemPosition saved")
325325
}
326326

327327
override fun onDestroy() {

0 commit comments

Comments
 (0)