Browse Source

fix: ci

sibichiAi
高志龙 6 months ago
parent
commit
3d80a029f4
  1. 2
      app/build.gradle
  2. 17
      app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java

2
app/build.gradle

@ -13,7 +13,7 @@ android {
minSdkVersion 22 minSdkVersion 22
targetSdkVersion 30 targetSdkVersion 30
versionCode 6 versionCode 6
versionName "V2.0.7.38"
versionName "V2.0.7.39"
// 7.0.2.35 // 7.0.2.35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

17
app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java

@ -417,13 +417,13 @@ public class WebViewActivity extends BaseActivity {
} }
currentVideo.clearAnimation(); currentVideo.clearAnimation();
currentVideo.setVisibility(View.VISIBLE);
currentVideo.animate().cancel();
nextVideo.clearAnimation(); nextVideo.clearAnimation();
nextVideo.animate().cancel();
// 旧视频淡出 // 旧视频淡出
currentVideo.animate() currentVideo.animate()
.alpha(0.5f) .alpha(0.5f)
.setDuration(150)
.setDuration(200)
.setListener(new Animator.AnimatorListener() { .setListener(new Animator.AnimatorListener() {
@Override @Override
public void onAnimationStart(Animator animation) { public void onAnimationStart(Animator animation) {
@ -446,7 +446,7 @@ public class WebViewActivity extends BaseActivity {
nextVideo.setVisibility(View.VISIBLE); nextVideo.setVisibility(View.VISIBLE);
nextVideo.animate() nextVideo.animate()
.alpha(1f) .alpha(1f)
.setDuration(300)
.setDuration(400)
.setListener(new Animator.AnimatorListener() { .setListener(new Animator.AnimatorListener() {
@Override @Override
public void onAnimationStart(Animator animation) { public void onAnimationStart(Animator animation) {
@ -461,7 +461,14 @@ public class WebViewActivity extends BaseActivity {
currentVideo.start(); currentVideo.start();
} }
@Override @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 @Override
public void onAnimationRepeat(Animator animation) {} public void onAnimationRepeat(Animator animation) {}
}); });

Loading…
Cancel
Save