diff --git a/app/build.gradle b/app/build.gradle index 79cdb9d..ace82e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.38" + versionName "V2.0.7.39" // 7.0.2.35 接口加密 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java index e06f679..80c285c 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -417,13 +417,13 @@ public class WebViewActivity extends BaseActivity { } currentVideo.clearAnimation(); - currentVideo.setVisibility(View.VISIBLE); + currentVideo.animate().cancel(); nextVideo.clearAnimation(); - + nextVideo.animate().cancel(); // 旧视频淡出 currentVideo.animate() .alpha(0.5f) - .setDuration(150) + .setDuration(200) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { @@ -446,7 +446,7 @@ public class WebViewActivity extends BaseActivity { nextVideo.setVisibility(View.VISIBLE); nextVideo.animate() .alpha(1f) - .setDuration(300) + .setDuration(400) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { @@ -461,7 +461,14 @@ public class WebViewActivity extends BaseActivity { currentVideo.start(); } @Override - public void onAnimationCancel(Animator animation) {} + public void onAnimationCancel(Animator animation) { + currentVideo.setVisibility(View.GONE); + currentVideo.setAlpha(1f); + currentVideo = nextVideo; + nextVideo.setVisibility(View.VISIBLE); + nextVideo.setAlpha(1f); + nextVideo.start(); + } @Override public void onAnimationRepeat(Animator animation) {} });