Skip to content

Commit a325393

Browse files
committed
[功能优化]: 优化悬浮窗展示逻辑
1 parent 9343476 commit a325393

File tree

3 files changed

+3
-100
lines changed

3 files changed

+3
-100
lines changed

player_component/src/main/AndroidManifest.xml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<activity
99
android:name=".ui.activities.player.PlayerActivity"
1010
android:configChanges="orientation|screenSize|screenLayout"
11-
android:launchMode="singleInstance"
1211
android:screenOrientation="landscape"
1312
android:theme="@style/Theme.DanDanPlay.PlayerActivity" />
1413

player_component/src/main/java/com/xyoye/player_component/ui/activities/player/PlayerActivity.kt

+3-19
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import com.xyoye.player_component.BR
3636
import com.xyoye.player_component.R
3737
import com.xyoye.player_component.databinding.ActivityPlayerBinding
3838
import com.xyoye.player_component.utils.BatteryHelper
39-
import com.xyoye.player_component.utils.PlayerLaunchHelper
4039
import com.xyoye.player_component.widgets.popup.PlayerPopupManager
4140
import kotlinx.coroutines.Dispatchers
4241
import kotlinx.coroutines.launch
@@ -111,20 +110,10 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
111110
applyPlaySource(VideoSourceManager.getInstance().getSource())
112111
}
113112

114-
override fun onNewIntent(intent: Intent?) {
115-
super.onNewIntent(intent)
113+
override fun onResume() {
114+
super.onResume()
116115

117116
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)
128117
}
129118

130119
override fun onPause() {
@@ -145,6 +134,7 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
145134
super.onDestroy()
146135
}
147136

137+
@Deprecated("Deprecated in Java")
148138
override fun onBackPressed() {
149139
if (danDanPlayer.onBackPressed()) {
150140
return
@@ -157,11 +147,6 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
157147
return danDanPlayer.onKeyDown(keyCode, event) or super.onKeyDown(keyCode, event)
158148
}
159149

160-
override fun finish() {
161-
PlayerLaunchHelper.instance.unregister(this)
162-
super.finish()
163-
}
164-
165150
override fun onScreenLocked() {
166151

167152
}
@@ -492,7 +477,6 @@ class PlayerActivity : BaseActivity<PlayerViewModel, ActivityPlayerBinding>(),
492477

493478
private fun enterTaskBackground() {
494479
moveTaskToBack(true)
495-
PlayerLaunchHelper.instance.onEnterPopupMode()
496480
}
497481

498482
private fun exitTaskBackground() {

player_component/src/main/java/com/xyoye/player_component/utils/PlayerLaunchHelper.kt

-80
This file was deleted.

0 commit comments

Comments
 (0)