diff --git a/README.md b/README.md
index b79412e..a9860c3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# 我的电视
-安卓电视直播软件,内置直播源
+电视直播软件,安装即可使用
## 使用
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b38f486..5a058f9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,17 +9,19 @@
diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt
index 5a0164e..4875b6a 100644
--- a/app/src/main/java/com/lizongying/mytv/MainActivity.kt
+++ b/app/src/main/java/com/lizongying/mytv/MainActivity.kt
@@ -35,8 +35,8 @@ class MainActivity : FragmentActivity() {
private lateinit var gestureDetector: GestureDetector
private val handler = Handler()
- private val delay: Long = 4000
- private val delayHideHelp: Long = 10000
+ private val delayHideMain: Long = 5000
+ private val delayHideSetting: Long = 10000
lateinit var sharedPref: SharedPreferences
private var channelReversal = false
@@ -45,6 +45,7 @@ class MainActivity : FragmentActivity() {
private var versionName = ""
override fun onCreate(savedInstanceState: Bundle?) {
+ Log.i(TAG, "onCreate")
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
@@ -53,6 +54,7 @@ class MainActivity : FragmentActivity() {
window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
if (savedInstanceState == null) {
+ Log.i(TAG, "beginTransaction begin")
supportFragmentManager.beginTransaction()
.add(R.id.main_browse_fragment, playerFragment)
.add(R.id.main_browse_fragment, infoFragment)
@@ -60,6 +62,9 @@ class MainActivity : FragmentActivity() {
.add(R.id.main_browse_fragment, mainFragment)
.hide(mainFragment)
.commit()
+ Log.i(TAG, "beginTransaction end")
+ } else {
+ Log.i(TAG, "savedInstanceState $savedInstanceState")
}
gestureDetector = GestureDetector(this, GestureListener())
@@ -131,11 +136,11 @@ class MainActivity : FragmentActivity() {
}
fun keepRunnable() {
- handler.removeCallbacks(hideRunnable)
- handler.postDelayed(hideRunnable, delay)
+ handler.removeCallbacks(hideMain)
+ handler.postDelayed(hideMain, delayHideMain)
}
- private val hideRunnable = Runnable {
+ private val hideMain = Runnable {
if (!mainFragment.isHidden) {
supportFragmentManager.beginTransaction().hide(mainFragment).commit()
}
@@ -221,7 +226,7 @@ class MainActivity : FragmentActivity() {
this.channelNum = channelNum
}
- private fun showHelp() {
+ private fun showSetting() {
if (!mainFragment.isHidden) {
return
}
@@ -229,15 +234,15 @@ class MainActivity : FragmentActivity() {
Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
if (!settingFragment.isVisible) {
settingFragment.show(supportFragmentManager, "setting")
- handler.removeCallbacks(hideHelp)
- handler.postDelayed(hideHelp, delayHideHelp)
+ handler.removeCallbacks(hideSetting)
+ handler.postDelayed(hideSetting, delayHideSetting)
} else {
- handler.removeCallbacks(hideHelp)
+ handler.removeCallbacks(hideSetting)
settingFragment.dismiss()
}
}
- private val hideHelp = Runnable {
+ private val hideSetting = Runnable {
if (settingFragment.isVisible) {
settingFragment.dismiss()
}
@@ -358,27 +363,27 @@ class MainActivity : FragmentActivity() {
}
KeyEvent.KEYCODE_BOOKMARK -> {
- showHelp()
+ showSetting()
return true
}
KeyEvent.KEYCODE_UNKNOWN -> {
- showHelp()
+ showSetting()
return true
}
KeyEvent.KEYCODE_HELP -> {
- showHelp()
+ showSetting()
return true
}
KeyEvent.KEYCODE_SETTINGS -> {
- showHelp()
+ showSetting()
return true
}
KeyEvent.KEYCODE_MENU -> {
- showHelp()
+ showSetting()
return true
}
@@ -486,6 +491,22 @@ class MainActivity : FragmentActivity() {
}
}
+ override fun onStart() {
+ Log.i(TAG, "onStart")
+ super.onStart()
+ }
+
+ override fun onResume() {
+ Log.i(TAG, "onResume")
+ super.onResume()
+ }
+
+ override fun onPause() {
+ Log.i(TAG, "onPause")
+ super.onPause()
+ handler.removeCallbacks(hideMain)
+ }
+
companion object {
private const val TAG = "MainActivity"
private const val CHANNEL_REVERSAL = "channel_reversal"
diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt
index 0b094fb..2b6793d 100644
--- a/app/src/main/java/com/lizongying/mytv/MainFragment.kt
+++ b/app/src/main/java/com/lizongying/mytv/MainFragment.kt
@@ -44,10 +44,16 @@ class MainFragment : BrowseSupportFragment() {
private var ready = 0
override fun onCreate(savedInstanceState: Bundle?) {
+ Log.i(TAG, "onCreate")
super.onCreate(savedInstanceState)
headersState = HEADERS_DISABLED
}
+ override fun onStart() {
+ Log.i(TAG, "onStart")
+ super.onStart()
+ }
+
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
@@ -308,6 +314,11 @@ class MainFragment : BrowseSupportFragment() {
}
}
+ override fun onResume() {
+ Log.i(TAG, "onResume")
+ super.onResume()
+ }
+
override fun onStop() {
Log.i(TAG, "onStop")
super.onStop()
@@ -315,7 +326,7 @@ class MainFragment : BrowseSupportFragment() {
putInt(POSITION, itemPosition)
apply()
}
- Log.i(TAG, "POSITION saved")
+ Log.i(TAG, "$POSITION saved")
}
override fun onDestroy() {
@@ -324,11 +335,6 @@ class MainFragment : BrowseSupportFragment() {
handler.removeCallbacks(mUpdateProgramRunnable)
}
- override fun onResume() {
- super.onResume()
- view?.post { view?.requestFocus() }
- }
-
companion object {
private const val TAG = "MainFragment"
private const val POSITION = "position"
diff --git a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
index f9ea6a0..89aa03c 100644
--- a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
+++ b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
@@ -81,14 +81,23 @@ class PlayerFragment : Fragment() {
}
override fun onStart() {
+ Log.i(TAG, "onStart")
super.onStart()
if (playerView != null && playerView!!.player?.isPlaying == false) {
- playerView!!.player?.play()
+ Log.i(TAG, "replay")
+ playerView!!.player?.prepare()
+ } else {
+ Log.i(TAG, "playing")
}
}
- override fun onStop() {
- super.onStop()
+ override fun onResume() {
+ Log.i(TAG, "onResume")
+ super.onResume()
+ }
+
+ override fun onPause() {
+ super.onPause()
if (playerView != null && playerView!!.player?.isPlaying == true) {
playerView!!.player?.stop()
}
diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt
index 7dcbdbe..dc34c1f 100644
--- a/app/src/main/java/com/lizongying/mytv/Request.kt
+++ b/app/src/main/java/com/lizongying/mytv/Request.kt
@@ -361,7 +361,7 @@ class Request {
val program = response.body()
if (program != null) {
tvViewModel.addProgram(program.dataListList)
- Log.i(TAG, "$title program ${program.dataListList.size}")
+ Log.d(TAG, "$title program ${program.dataListList.size}")
}
} else {
Log.w(TAG, "$title program error")
diff --git a/app/src/main/res/xml/network.xml b/app/src/main/res/xml/network.xml
new file mode 100644
index 0000000..bb6ab93
--- /dev/null
+++ b/app/src/main/res/xml/network.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file