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
caec909a
Commit
caec909a
authored
Nov 22, 2019
by
konghaorui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component
into dev
# Conflicts: # config.gradle
parents
19593d03
3ca211b8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
config.gradle
config.gradle
+15
-15
FMDetailActivity.java
m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java
+1
-1
No files found.
config.gradle
View file @
caec909a
ext
{
kotlin_version
=
"1.3.21"
dev_mode
=
tru
e
dev_mode
=
fals
e
ydl_app
=
[
appName
:
"心理咨询壹点灵"
,
applicationId:
"com.cxzapp.yidianling"
,
versionName
:
"
3.9.5
0"
,
versionCode
:
395
0
,
versionName
:
"
4.0.0
0"
,
versionCode
:
400
0
,
]
xlzx_app
=
[
...
...
@@ -43,12 +43,12 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide"
:
"0.0.22"
,
"m-consultant"
:
"0.0.3
8
"
,
"m-consultant"
:
"0.0.3
9
"
,
"m-course"
:
"0.0.25"
,
"m-fm"
:
"0.0.1
8
"
,
"m-fm"
:
"0.0.1
7
"
,
"m-muse"
:
"0.0.14"
,
"m-tests"
:
"0.0.1
0
"
,
"m-user"
:
"0.0.3
1
"
,
"m-tests"
:
"0.0.1
1
"
,
"m-user"
:
"0.0.3
2
"
,
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.1"
,
...
...
@@ -62,12 +62,12 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.2
4
"
,
"ydl-platform"
:
"0.0.2
6
"
,
//第二步 若干
"ydl-webview"
:
"0.0.2
6
"
,
"ydl-webview"
:
"0.0.2
7
"
,
"ydl-media"
:
"0.0.13"
,
"ydl-pay"
:
"0.0.
9
"
,
"m-audioim"
:
"0.0.1
5
"
,
"ydl-pay"
:
"0.0.
10
"
,
"m-audioim"
:
"0.0.1
6
"
,
//以下 几乎不会动
"router"
:
"0.0.1"
,
"ydl-net"
:
"0.0.2"
,
...
...
@@ -97,12 +97,12 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.2
4
"
,
"ydl-platform"
:
"0.0.2
6
"
,
//第二步 若干
"ydl-webview"
:
"0.0.2
4
"
,
"ydl-webview"
:
"0.0.2
7
"
,
"ydl-media"
:
"0.0.13"
,
"ydl-pay"
:
"0.0.
9
"
,
"m-audioim"
:
"0.0.1
5
"
,
"ydl-pay"
:
"0.0.
10
"
,
"m-audioim"
:
"0.0.1
6
"
,
//以下 几乎不会动
"router"
:
"0.0.1"
,
...
...
m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java
View file @
caec909a
...
...
@@ -652,7 +652,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
iv_play
.
setImageResource
(
R
.
drawable
.
fm_stop_2
);
fmSurfaceView
.
playTimer
();
}
@Override
public
void
onPlayFinish
()
{
...
...
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