Skip to content

Commit 73239a6

Browse files
lizongyinglizongying
committed
replay
1 parent cc2514a commit 73239a6

File tree

7 files changed

+76
-29
lines changed

7 files changed

+76
-29
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 我的电视
22

3-
安卓电视直播软件，内置直播源
3+
电视直播软件，安装即可使用
44

55
## 使用
66

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99
<uses-permission android:name="android.permission.INTERNET" />
1010
<application
1111
android:allowBackup="true"
12+
android:largeHeap="true"
1213
android:icon="@drawable/logo"
14+
android:logo="@drawable/logo"
15+
android:banner="@drawable/banner"
1316
android:label="@string/app_name"
1417
android:supportsRtl="true"
18+
android:networkSecurityConfig="@xml/network"
19+
android:usesCleartextTraffic="true"
1520
android:theme="@style/Theme.MyTV">
1621
<activity
1722
android:keepScreenOn="true"
1823
android:name=".MainActivity"
19-
android:banner="@drawable/banner"
2024
android:exported="true"
21-
android:icon="@drawable/logo"
22-
android:logo="@drawable/logo"
2325
android:screenOrientation="landscape">
2426
<intent-filter>
2527
<action android:name="android.intent.action.MAIN" />

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

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class MainActivity : FragmentActivity() {
3535
private lateinit var gestureDetector: GestureDetector
3636

3737
private val handler = Handler()
38-
private val delay: Long = 4000
39-
private val delayHideHelp: Long = 10000
38+
private val delayHideMain: Long = 5000
39+
private val delayHideSetting: Long = 10000
4040

4141
lateinit var sharedPref: SharedPreferences
4242
private var channelReversal = false
@@ -45,6 +45,7 @@ class MainActivity : FragmentActivity() {
4545
private var versionName = ""
4646

4747
override fun onCreate(savedInstanceState: Bundle?) {
48+
Log.i(TAG, "onCreate")
4849
super.onCreate(savedInstanceState)
4950
setContentView(R.layout.activity_main)
5051

@@ -53,13 +54,17 @@ class MainActivity : FragmentActivity() {
5354
window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
5455

5556
if (savedInstanceState == null) {
57+
Log.i(TAG, "beginTransaction begin")
5658
supportFragmentManager.beginTransaction()
5759
.add(R.id.main_browse_fragment, playerFragment)
5860
.add(R.id.main_browse_fragment, infoFragment)
5961
.add(R.id.main_browse_fragment, channelFragment)
6062
.add(R.id.main_browse_fragment, mainFragment)
6163
.hide(mainFragment)
6264
.commit()
65+
Log.i(TAG, "beginTransaction end")
66+
} else {
67+
Log.i(TAG, "savedInstanceState $savedInstanceState")
6368
}
6469
gestureDetector = GestureDetector(this, GestureListener())
6570

@@ -131,11 +136,11 @@ class MainActivity : FragmentActivity() {
131136
}
132137

133138
fun keepRunnable() {
134-
handler.removeCallbacks(hideRunnable)
135-
handler.postDelayed(hideRunnable, delay)
139+
handler.removeCallbacks(hideMain)
140+
handler.postDelayed(hideMain, delayHideMain)
136141
}
137142

138-
private val hideRunnable = Runnable {
143+
private val hideMain = Runnable {
139144
if (!mainFragment.isHidden) {
140145
supportFragmentManager.beginTransaction().hide(mainFragment).commit()
141146
}
@@ -221,23 +226,23 @@ class MainActivity : FragmentActivity() {
221226
this.channelNum = channelNum
222227
}
223228

224-
private fun showHelp() {
229+
private fun showSetting() {
225230
if (!mainFragment.isHidden) {
226231
return
227232
}
228233

229234
Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
230235
if (!settingFragment.isVisible) {
231236
settingFragment.show(supportFragmentManager, "setting")
232-
handler.removeCallbacks(hideHelp)
233-
handler.postDelayed(hideHelp, delayHideHelp)
237+
handler.removeCallbacks(hideSetting)
238+
handler.postDelayed(hideSetting, delayHideSetting)
234239
} else {
235-
handler.removeCallbacks(hideHelp)
240+
handler.removeCallbacks(hideSetting)
236241
settingFragment.dismiss()
237242
}
238243
}
239244

240-
private val hideHelp = Runnable {
245+
private val hideSetting = Runnable {
241246
if (settingFragment.isVisible) {
242247
settingFragment.dismiss()
243248
}
@@ -358,27 +363,27 @@ class MainActivity : FragmentActivity() {
358363
}
359364

360365
KeyEvent.KEYCODE_BOOKMARK -> {
361-
showHelp()
366+
showSetting()
362367
return true
363368
}
364369

365370
KeyEvent.KEYCODE_UNKNOWN -> {
366-
showHelp()
371+
showSetting()
367372
return true
368373
}
369374

370375
KeyEvent.KEYCODE_HELP -> {
371-
showHelp()
376+
showSetting()
372377
return true
373378
}
374379

375380
KeyEvent.KEYCODE_SETTINGS -> {
376-
showHelp()
381+
showSetting()
377382
return true
378383
}
379384

380385
KeyEvent.KEYCODE_MENU -> {
381-
showHelp()
386+
showSetting()
382387
return true
383388
}
384389

@@ -486,6 +491,22 @@ class MainActivity : FragmentActivity() {
486491
}
487492
}
488493

494+
override fun onStart() {
495+
Log.i(TAG, "onStart")
496+
super.onStart()
497+
}
498+
499+
override fun onResume() {
500+
Log.i(TAG, "onResume")
501+
super.onResume()
502+
}
503+
504+
override fun onPause() {
505+
Log.i(TAG, "onPause")
506+
super.onPause()
507+
handler.removeCallbacks(hideMain)
508+
}
509+
489510
companion object {
490511
private const val TAG = "MainActivity"
491512
private const val CHANNEL_REVERSAL = "channel_reversal"

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,16 @@ class MainFragment : BrowseSupportFragment() {
4444
private var ready = 0
4545

4646
override fun onCreate(savedInstanceState: Bundle?) {
47+
Log.i(TAG, "onCreate")
4748
super.onCreate(savedInstanceState)
4849
headersState = HEADERS_DISABLED
4950
}
5051

52+
override fun onStart() {
53+
Log.i(TAG, "onStart")
54+
super.onStart()
55+
}
56+
5157
override fun onActivityCreated(savedInstanceState: Bundle?) {
5258
super.onActivityCreated(savedInstanceState)
5359

@@ -308,14 +314,19 @@ class MainFragment : BrowseSupportFragment() {
308314
}
309315
}
310316

317+
override fun onResume() {
318+
Log.i(TAG, "onResume")
319+
super.onResume()
320+
}
321+
311322
override fun onStop() {
312323
Log.i(TAG, "onStop")
313324
super.onStop()
314325
with(sharedPref.edit()) {
315326
putInt(POSITION, itemPosition)
316327
apply()
317328
}
318-
Log.i(TAG, "POSITION saved")
329+
Log.i(TAG, "$POSITION saved")
319330
}
320331

321332
override fun onDestroy() {
@@ -324,11 +335,6 @@ class MainFragment : BrowseSupportFragment() {
324335
handler.removeCallbacks(mUpdateProgramRunnable)
325336
}
326337

327-
override fun onResume() {
328-
super.onResume()
329-
view?.post { view?.requestFocus() }
330-
}
331-
332338
companion object {
333339
private const val TAG = "MainFragment"
334340
private const val POSITION = "position"

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,23 @@ class PlayerFragment : Fragment() {
8181
}
8282

8383
override fun onStart() {
84+
Log.i(TAG, "onStart")
8485
super.onStart()
8586
if (playerView != null && playerView!!.player?.isPlaying == false) {
86-
playerView!!.player?.play()
87+
Log.i(TAG, "replay")
88+
playerView!!.player?.prepare()
89+
} else {
90+
Log.i(TAG, "playing")
8791
}
8892
}
8993

90-
override fun onStop() {
91-
super.onStop()
94+
override fun onResume() {
95+
Log.i(TAG, "onResume")
96+
super.onResume()
97+
}
98+
99+
override fun onPause() {
100+
super.onPause()
92101
if (playerView != null && playerView!!.player?.isPlaying == true) {
93102
playerView!!.player?.stop()
94103
}

‎app/src/main/java/com/lizongying/mytv/Request.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ class Request {
361361
val program = response.body()
362362
if (program != null) {
363363
tvViewModel.addProgram(program.dataListList)
364-
Log.i(TAG, "$title program ${program.dataListList.size}")
364+
Log.d(TAG, "$title program ${program.dataListList.size}")
365365
}
366366
} else {
367367
Log.w(TAG, "$title program error")

‎app/src/main/res/xml/network.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<base-config cleartextTrafficPermitted="true">
4+
<trust-anchors>
5+
<certificates src="system" />
6+
<certificates src="user" />
7+
</trust-anchors>
8+
</base-config>
9+
</network-security-config>

0 commit comments

Comments
 (0)