Commit 400d2004 by 刘鹏

Merge branch 'fix/lp/lp_fix_flow_play' into 'release'

feat: 修复倾诉视频列表流量播放开关问题

See merge request app_android_lib/YDL-Component!131
parents 96033667 ff8ccb04
...@@ -460,13 +460,6 @@ public class WVClickAbstractListener implements WebViewClientClickListener { ...@@ -460,13 +460,6 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
@Override @Override
public void playMeditation(int mediaId, long meditationId, int meditationType, String mediaCoverUrl) { public void playMeditation(int mediaId, long meditationId, int meditationType, String mediaCoverUrl) {
public void getNextExpertStatus(String doctorID, String title,String uid) {
EventBus.getDefault().post(new ChangeAnotherExpertEvent(doctorID,title,uid));
}
if (mContext instanceof NewH5Activity) { if (mContext instanceof NewH5Activity) {
// YDLRouterManager.Companion.router(ROUTER_MUSE_PLAY, // YDLRouterManager.Companion.router(ROUTER_MUSE_PLAY,
// new YDLRouterParams().putExtra("MEDITATION_ID", String.valueOf(meditationId)) // new YDLRouterParams().putExtra("MEDITATION_ID", String.valueOf(meditationId))
...@@ -485,6 +478,11 @@ public class WVClickAbstractListener implements WebViewClientClickListener { ...@@ -485,6 +478,11 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
} }
@Override @Override
public void getNextExpertStatus(String doctorID, String title, String uid) {
EventBus.getDefault().post(new ChangeAnotherExpertEvent(doctorID,title,uid));
}
@Override
public void switchSound(int mediaId, long meditationId, int meditationType, int businessType, public void switchSound(int mediaId, long meditationId, int meditationType, int businessType,
String buried, String mediaUrl, String mediaCoverUrl, String buried, String mediaUrl, String mediaCoverUrl,
String title, String desc, int status) { String title, String desc, int status) {
......
...@@ -5,7 +5,7 @@ ext { ...@@ -5,7 +5,7 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.50.16", "m-confide" : "0.0.50.18",
"m-consultant" : "0.0.60.27", "m-consultant" : "0.0.60.27",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.26", "m-user" : "0.0.62.26",
...@@ -94,7 +94,7 @@ ext { ...@@ -94,7 +94,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.50.16", "m-confide" : "0.0.50.18",
"m-consultant" : "0.0.60.27", "m-consultant" : "0.0.60.27",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.26", "m-user" : "0.0.62.26",
......
...@@ -91,6 +91,7 @@ internal class IntroAdapter( ...@@ -91,6 +91,7 @@ internal class IntroAdapter(
val lastCheck = context.getSharedPreferences("temp_test", Context.MODE_PRIVATE).getLong(keySp, 0) val lastCheck = context.getSharedPreferences("temp_test", Context.MODE_PRIVATE).getLong(keySp, 0)
val duration = System.currentTimeMillis() - lastCheck val duration = System.currentTimeMillis() - lastCheck
if (duration < 24 * 60 * 60 * 1000) { if (duration < 24 * 60 * 60 * 1000) {
hasAgreePlayWithoutWiFi = true
return return
} }
val dialog = CommonDialog.create(context) val dialog = CommonDialog.create(context)
...@@ -114,6 +115,7 @@ internal class IntroAdapter( ...@@ -114,6 +115,7 @@ internal class IntroAdapter(
.setLeftButton_color(R.color.platform_but_text_color_selected) .setLeftButton_color(R.color.platform_but_text_color_selected)
.setRightButton_color(R.color.platform_text_bright_color) .setRightButton_color(R.color.platform_text_bright_color)
.setRightClick("取消") { .setRightClick("取消") {
hasAgreePlayWithoutWiFi = false
for (entry in videoViews.entries) { for (entry in videoViews.entries) {
val value = entry.value val value = entry.value
if (value.canPause()) { if (value.canPause()) {
......
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