Skip to content

Y
YDL-Component-Medical
Commit caec909a by konghaorui
Options

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev 

# Conflicts:
#	config.gradle
parents 19593d03 3ca211b8
Showing with 16 additions and 16 deletions
config.gradle
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = true dev_mode = false
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
applicationId: "com.cxzapp.yidianling", applicationId: "com.cxzapp.yidianling",
versionName : "3.9.50", versionName : "4.0.00",
versionCode : 3950, versionCode : 4000,
] ]
xlzx_app = [ xlzx_app = [
...@@ -43,12 +43,12 @@ ext { ...@@ -43,12 +43,12 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.22", "m-confide" : "0.0.22",
"m-consultant" : "0.0.38", "m-consultant" : "0.0.39",
"m-course" : "0.0.25", "m-course" : "0.0.25",
"m-fm" : "0.0.18", "m-fm" : "0.0.17",
"m-muse" : "0.0.14", "m-muse" : "0.0.14",
"m-tests" : "0.0.10", "m-tests" : "0.0.11",
"m-user" : "0.0.31", "m-user" : "0.0.32",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.1", "m-audioim-api" : "0.0.1",
...@@ -62,12 +62,12 @@ ext { ...@@ -62,12 +62,12 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.24", "ydl-platform" : "0.0.26",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.26", "ydl-webview" : "0.0.27",
"ydl-media" : "0.0.13", "ydl-media" : "0.0.13",
"ydl-pay" : "0.0.9", "ydl-pay" : "0.0.10",
"m-audioim" : "0.0.15", "m-audioim" : "0.0.16",
//以下 几乎不会动 //以下 几乎不会动
"router" : "0.0.1", "router" : "0.0.1",
"ydl-net" : "0.0.2", "ydl-net" : "0.0.2",
...@@ -97,12 +97,12 @@ ext { ...@@ -97,12 +97,12 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.24", "ydl-platform" : "0.0.26",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.24", "ydl-webview" : "0.0.27",
"ydl-media" : "0.0.13", "ydl-media" : "0.0.13",
"ydl-pay" : "0.0.9", "ydl-pay" : "0.0.10",
"m-audioim" : "0.0.15", "m-audioim" : "0.0.16",
//以下 几乎不会动 //以下 几乎不会动
"router" : "0.0.1", "router" : "0.0.1",
......
m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java
...@@ -652,7 +652,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen ...@@ -652,7 +652,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
iv_play.setImageResource(R.drawable.fm_stop_2); iv_play.setImageResource(R.drawable.fm_stop_2);
fmSurfaceView.playTimer(); fmSurfaceView.playTimer();
} }
@Override @Override
public void onPlayFinish() { public void onPlayFinish() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment