@@ -36,7 +36,6 @@ import com.xyoye.player_component.BR
36
36
import com.xyoye.player_component.R
37
37
import com.xyoye.player_component.databinding.ActivityPlayerBinding
38
38
import com.xyoye.player_component.utils.BatteryHelper
39
- import com.xyoye.player_component.utils.PlayerLaunchHelper
40
39
import com.xyoye.player_component.widgets.popup.PlayerPopupManager
41
40
import kotlinx.coroutines.Dispatchers
42
41
import kotlinx.coroutines.launch
@@ -111,20 +110,10 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
111
110
applyPlaySource(VideoSourceManager .getInstance().getSource())
112
111
}
113
112
114
- override fun onNewIntent ( intent : Intent ? ) {
115
- super .onNewIntent(intent )
113
+ override fun onResume ( ) {
114
+ super .onResume( )
116
115
117
116
exitPopupMode()
118
-
119
- val newSource = VideoSourceManager .getInstance().getSource()
120
- if (newSource != null && newSource.getUniqueKey() != videoSource?.getUniqueKey()) {
121
- applyPlaySource(newSource)
122
- }
123
- }
124
-
125
- override fun onStart () {
126
- super .onStart()
127
- PlayerLaunchHelper .instance.register(this )
128
117
}
129
118
130
119
override fun onPause () {
@@ -145,6 +134,7 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
145
134
super .onDestroy()
146
135
}
147
136
137
+ @Deprecated(" Deprecated in Java" )
148
138
override fun onBackPressed () {
149
139
if (danDanPlayer.onBackPressed()) {
150
140
return
@@ -157,11 +147,6 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
157
147
return danDanPlayer.onKeyDown(keyCode, event) or super .onKeyDown(keyCode, event)
158
148
}
159
149
160
- override fun finish () {
161
- PlayerLaunchHelper .instance.unregister(this )
162
- super .finish()
163
- }
164
-
165
150
override fun onScreenLocked () {
166
151
167
152
}
@@ -492,7 +477,6 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
492
477
493
478
private fun enterTaskBackground () {
494
479
moveTaskToBack(true )
495
- PlayerLaunchHelper .instance.onEnterPopupMode()
496
480
}
497
481
498
482
private fun exitTaskBackground () {
0 commit comments