Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
1669b637
Commit
1669b637
authored
3 years ago
by
范玉宾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch float play view
parent
004e2b7f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
4 deletions
+15
-4
PlayFragment.java
app/src/main/java/com/ydl/component/music/PlayFragment.java
+4
-0
config.gradle
config.gradle
+4
-4
PlayMeditationActivity.kt
m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
+6
-0
MeditationWindowService.kt
m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt
+1
-0
No files found.
app/src/main/java/com/ydl/component/music/PlayFragment.java
View file @
1669b637
...
@@ -66,6 +66,10 @@ public class PlayFragment extends Fragment implements View.OnClickListener,
...
@@ -66,6 +66,10 @@ public class PlayFragment extends Fragment implements View.OnClickListener,
super
.
onActivityCreated
(
savedInstanceState
);
super
.
onActivityCreated
(
savedInstanceState
);
EventBus
.
getDefault
().
register
(
this
);
EventBus
.
getDefault
().
register
(
this
);
initPlayMode
();
initPlayMode
();
MeditationFloatEvent
event
=
new
MeditationFloatEvent
(
false
,
true
,
null
,
null
);
EventBus
.
getDefault
().
post
(
event
);
onChangeImpl
(
AudioPlayer
.
Companion
.
get
().
getPlayMusic
());
onChangeImpl
(
AudioPlayer
.
Companion
.
get
().
getPlayMusic
());
AudioPlayer
.
Companion
.
get
().
addOnPlayEventListener
(
this
);
AudioPlayer
.
Companion
.
get
().
addOnPlayEventListener
(
this
);
}
}
...
...
This diff is collapsed.
Click to expand it.
config.gradle
View file @
1669b637
...
@@ -9,12 +9,12 @@ ext {
...
@@ -9,12 +9,12 @@ ext {
"m-consultant"
:
"0.0.60.25"
,
"m-consultant"
:
"0.0.60.25"
,
"m-fm"
:
"0.0.30.08"
,
"m-fm"
:
"0.0.30.08"
,
"m-user"
:
"0.0.62.17"
,
"m-user"
:
"0.0.62.17"
,
"m-home"
:
"0.0.23.6
4
"
,
"m-home"
:
"0.0.23.6
5
"
,
"m-im"
:
"0.0.21.44"
,
"m-im"
:
"0.0.21.44"
,
"m-dynamic"
:
"0.0.7.73"
,
"m-dynamic"
:
"0.0.7.73"
,
"m-article"
:
"0.0.0.10"
,
"m-article"
:
"0.0.0.10"
,
"m-muse"
:
"0.0.28.4
2
"
,
"m-muse"
:
"0.0.28.4
5
"
,
"m-tests"
:
"0.0.24.18"
,
"m-tests"
:
"0.0.24.18"
,
"m-course"
:
"0.0.43.37"
,
"m-course"
:
"0.0.43.37"
,
...
@@ -94,12 +94,12 @@ ext {
...
@@ -94,12 +94,12 @@ ext {
"m-consultant"
:
"0.0.60.25"
,
"m-consultant"
:
"0.0.60.25"
,
"m-fm"
:
"0.0.30.08"
,
"m-fm"
:
"0.0.30.08"
,
"m-user"
:
"0.0.62.17"
,
"m-user"
:
"0.0.62.17"
,
"m-home"
:
"0.0.23.6
4
"
,
"m-home"
:
"0.0.23.6
5
"
,
"m-im"
:
"0.0.21.44"
,
"m-im"
:
"0.0.21.44"
,
"m-dynamic"
:
"0.0.7.73"
,
"m-dynamic"
:
"0.0.7.73"
,
"m-article"
:
"0.0.0.8"
,
"m-article"
:
"0.0.0.8"
,
"m-muse"
:
"0.0.28.4
2
"
,
"m-muse"
:
"0.0.28.4
5
"
,
"m-tests"
:
"0.0.24.18"
,
"m-tests"
:
"0.0.24.18"
,
"m-course"
:
"0.0.43.37"
,
"m-course"
:
"0.0.43.37"
,
//-------------- 业务模块 API 层 --------------
//-------------- 业务模块 API 层 --------------
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
View file @
1669b637
...
@@ -10,6 +10,8 @@ import android.widget.SeekBar
...
@@ -10,6 +10,8 @@ import android.widget.SeekBar
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.bumptech.glide.Glide
import
com.bumptech.glide.Glide
import
com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import
com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import
com.ydl.media.audio.AudioPlayer
import
com.ydl.media.view.PlayerFloatHelper
import
com.ydl.webview.H5Params
import
com.ydl.webview.H5Params
import
com.ydl.webview.NewH5Activity
import
com.ydl.webview.NewH5Activity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
...
@@ -100,6 +102,10 @@ class PlayMeditationActivity : BaseActivity() {
...
@@ -100,6 +102,10 @@ class PlayMeditationActivity : BaseActivity() {
statusBarLightMode
(
this
)
statusBarLightMode
(
this
)
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
PlayerFloatHelper
.
removeView
(
mContext
)
PlayerFloatHelper
.
playTempData
.
clear
()
AudioPlayer
.
get
().
stopPlayer
()
mMediaPlayer
=
MediaPlayerManager
.
getInstance
(
this
)
?.
getMediaPlayer
()
mMediaPlayer
=
MediaPlayerManager
.
getInstance
(
this
)
?.
getMediaPlayer
()
EventBus
.
getDefault
().
register
(
this
)
EventBus
.
getDefault
().
register
(
this
)
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt
View file @
1669b637
...
@@ -131,6 +131,7 @@ class MeditationWindowService : LifecycleService() {
...
@@ -131,6 +131,7 @@ class MeditationWindowService : LifecycleService() {
}
catch
(
e
:
Exception
){
}
catch
(
e
:
Exception
){
}
}
hideFloatWindow
()
}
}
hideFloatWindow
()
hideFloatWindow
()
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment