Commit 19593d03 by konghaorui

修改版本号

parent 721db115
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = false dev_mode = true
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
...@@ -42,11 +42,11 @@ ext { ...@@ -42,11 +42,11 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.21", "m-confide" : "0.0.22",
"m-consultant" : "0.0.38", "m-consultant" : "0.0.38",
"m-course" : "0.0.24", "m-course" : "0.0.25",
"m-fm" : "0.0.16", "m-fm" : "0.0.18",
"m-muse" : "0.0.13", "m-muse" : "0.0.14",
"m-tests" : "0.0.10", "m-tests" : "0.0.10",
"m-user" : "0.0.31", "m-user" : "0.0.31",
...@@ -65,7 +65,7 @@ ext { ...@@ -65,7 +65,7 @@ ext {
"ydl-platform" : "0.0.24", "ydl-platform" : "0.0.24",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.26", "ydl-webview" : "0.0.26",
"ydl-media" : "0.0.12", "ydl-media" : "0.0.13",
"ydl-pay" : "0.0.9", "ydl-pay" : "0.0.9",
"m-audioim" : "0.0.15", "m-audioim" : "0.0.15",
//以下 几乎不会动 //以下 几乎不会动
...@@ -100,7 +100,7 @@ ext { ...@@ -100,7 +100,7 @@ ext {
"ydl-platform" : "0.0.24", "ydl-platform" : "0.0.24",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.24", "ydl-webview" : "0.0.24",
"ydl-media" : "0.0.12", "ydl-media" : "0.0.13",
"ydl-pay" : "0.0.9", "ydl-pay" : "0.0.9",
"m-audioim" : "0.0.15", "m-audioim" : "0.0.15",
//以下 几乎不会动 //以下 几乎不会动
......
...@@ -62,7 +62,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; ...@@ -62,7 +62,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
* Created by softrice on 15/12/11. * Created by softrice on 15/12/11.
*/ */
@Route(path = "/fm/detail") @Route(path = "/fm/detail")
public class FMDetailActivity extends BaseActivity implements View.OnClickListener, OnPlayerEventListener { public class FMDetailActivity extends BaseActivity implements View.OnClickListener, OnPlayerEventListener, PlayerFloatView.FloatViewPlayListener {
int id; int id;
boolean isSplash; boolean isSplash;
...@@ -227,23 +227,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen ...@@ -227,23 +227,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
init(); init();
initSurfaceView(); initSurfaceView();
initImg(); initImg();
PlayerFloatHelper.Companion.addClickListener(new PlayerFloatView.FloatViewPlayListener() { PlayerFloatHelper.Companion.addClickListener(this);
@Override
public void onPauseClick() {
iv_play.setImageResource(R.drawable.fm_play_2);
fmSurfaceView.stopTimer();
}
@Override
public void onStartClick() {
iv_play.setImageResource(R.drawable.fm_stop_2);
fmSurfaceView.playTimer();
}
@Override
public void onPlayFinish() {
}
});
} }
@SuppressLint("WrongConstant") @SuppressLint("WrongConstant")
...@@ -607,8 +591,8 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen ...@@ -607,8 +591,8 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
anim.cancel(); anim.cancel();
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
AudioPlayer.Companion.get().removeOnPlayEventListener(this); AudioPlayer.Companion.get().removeOnPlayEventListener(this);
PlayerFloatHelper.Companion.removeClickListener(this);
} }
@Override @Override
...@@ -656,4 +640,21 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen ...@@ -656,4 +640,21 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
updateAnimateStatus(); updateAnimateStatus();
getFMDetail(fmDetail.getNext_id(), true); getFMDetail(fmDetail.getNext_id(), true);
} }
@Override
public void onPauseClick() {
iv_play.setImageResource(R.drawable.fm_play_2);
fmSurfaceView.stopTimer();
}
@Override
public void onStartClick() {
iv_play.setImageResource(R.drawable.fm_stop_2);
fmSurfaceView.playTimer();
}
@Override
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