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
79185d0b
Commit
79185d0b
authored
Nov 05, 2019
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "修复FM播放动画在页面onResume的时候出现的异常"
This reverts commit
7eaad204
.
parent
7eaad204
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
build.gradle
app/build.gradle
+2
-2
FMDetailActivity.java
m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java
+1
-5
FMSurfaceView.kt
m-fm/src/main/java/com/yidianling/fm/widget/FMSurfaceView.kt
+2
-0
No files found.
app/build.gradle
View file @
79185d0b
...
@@ -168,13 +168,13 @@ dependencies {
...
@@ -168,13 +168,13 @@ dependencies {
if
(
rootProject
.
ext
.
dev_mode
)
{
if
(
rootProject
.
ext
.
dev_mode
)
{
//开发模式
//开发模式
api
project
(
':m-user'
)
api
project
(
':m-user'
)
api
project
(
':m-fm'
)
//
api project(':m-fm')
api
project
(
':m-tests'
)
api
project
(
':m-tests'
)
api
project
(
':m-consultant'
)
api
project
(
':m-consultant'
)
api
(
project
(
':ydl-platform'
)){
api
(
project
(
':ydl-platform'
)){
transitive
=
true
transitive
=
true
}
}
//
implementation project(':ydl-webview')
implementation
project
(
':ydl-webview'
)
implementation
project
(
':ydl-media'
)
implementation
project
(
':ydl-media'
)
}
else
{
}
else
{
//发布模式
//发布模式
...
...
m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java
View file @
79185d0b
...
@@ -555,11 +555,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
...
@@ -555,11 +555,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
@Override
@Override
protected
void
onResume
()
{
protected
void
onResume
()
{
super
.
onResume
();
super
.
onResume
();
if
(
AudioPlayer
.
Companion
.
get
().
isPlaying
())
{
fmSurfaceView
.
surfaceCreated
(
null
);
fmSurfaceView
.
playTimer
();
}
else
{
fmSurfaceView
.
stopTimer
();
}
if
(
PlayerFloatHelper
.
Companion
.
isShow
(
this
))
{
if
(
PlayerFloatHelper
.
Companion
.
isShow
(
this
))
{
PlayerFloatHelper
.
Companion
.
removeView
(
this
);
PlayerFloatHelper
.
Companion
.
removeView
(
this
);
...
...
m-fm/src/main/java/com/yidianling/fm/widget/FMSurfaceView.kt
View file @
79185d0b
...
@@ -86,6 +86,7 @@ class FMSurfaceView(context: Context?, attrs: AttributeSet?) : SurfaceView(conte
...
@@ -86,6 +86,7 @@ class FMSurfaceView(context: Context?, attrs: AttributeSet?) : SurfaceView(conte
}
}
private
fun
drawAnimate
()
{
private
fun
drawAnimate
()
{
synchronized
(
this
)
{
mHolder
?.
let
{
mHolder
?.
let
{
canvas
=
mHolder
?.
lockCanvas
()
canvas
=
mHolder
?.
lockCanvas
()
canvas
?.
let
{
canvas
?.
let
{
...
@@ -122,6 +123,7 @@ class FMSurfaceView(context: Context?, attrs: AttributeSet?) : SurfaceView(conte
...
@@ -122,6 +123,7 @@ class FMSurfaceView(context: Context?, attrs: AttributeSet?) : SurfaceView(conte
}
}
}
}
}
}
}
private
fun
drawPath
(
point
:
Point
,
pointRadius
:
Float
)
{
private
fun
drawPath
(
point
:
Point
,
pointRadius
:
Float
)
{
path
=
Path
()
path
=
Path
()
...
...
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