diff --git a/app/build.gradle b/app/build.gradle index 5c907db..a803561 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.48" + versionName "V2.0.7.49" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' 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 8311edb..515ba31 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -406,6 +406,8 @@ public class WebViewActivity extends BaseActivity { public void changeVideo(String type){ LoggerUtil.e("changeVideo", type); VideoView nextVideo; + currentVideo.setAlpha(1.0f); + currentVideo.setVisibility(View.VISIBLE); switch(type.trim()){ // case "back" : // if(currentVideo == binding.backVideo){ @@ -452,6 +454,11 @@ public class WebViewActivity extends BaseActivity { currentVideo.clearAnimation(); nextVideo.clearAnimation(); + if (currentVideo != null && currentVideo.isPlaying()) { + currentVideo.pause(); + currentVideo.stopPlayback(); + } + // 旧视频淡出 currentVideo.animate() .alpha(0.5f) @@ -489,7 +496,9 @@ public class WebViewActivity extends BaseActivity { @Override public void onAnimationEnd(Animator animation) { currentVideo = nextVideo; - currentVideo.start(); + if (!currentVideo.isPlaying()) { + currentVideo.start(); + } } @Override public void onAnimationCancel(Animator animation) {} diff --git a/app/src/main/res/raw/bg1.mp4 b/app/src/main/res/raw/bg1.mp4 deleted file mode 100644 index dda523e..0000000 Binary files a/app/src/main/res/raw/bg1.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/bg2.mp4 b/app/src/main/res/raw/bg2.mp4 deleted file mode 100644 index 6166711..0000000 Binary files a/app/src/main/res/raw/bg2.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/hatback.mp4 b/app/src/main/res/raw/hatback.mp4 deleted file mode 100644 index 1a9314d..0000000 Binary files a/app/src/main/res/raw/hatback.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/hatback2.mp4 b/app/src/main/res/raw/hatback2.mp4 deleted file mode 100644 index 3862e78..0000000 Binary files a/app/src/main/res/raw/hatback2.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/hatto.mp4 b/app/src/main/res/raw/hatto.mp4 deleted file mode 100644 index 6fca142..0000000 Binary files a/app/src/main/res/raw/hatto.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/hatto2.mp4 b/app/src/main/res/raw/hatto2.mp4 deleted file mode 100644 index 32004a2..0000000 Binary files a/app/src/main/res/raw/hatto2.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/hello1.mp4 b/app/src/main/res/raw/hello1.mp4 deleted file mode 100644 index 15de1c8..0000000 Binary files a/app/src/main/res/raw/hello1.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/hello2.mp4 b/app/src/main/res/raw/hello2.mp4 deleted file mode 100644 index 8c6804a..0000000 Binary files a/app/src/main/res/raw/hello2.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/speek1.mp4 b/app/src/main/res/raw/speek1.mp4 deleted file mode 100644 index e47eae1..0000000 Binary files a/app/src/main/res/raw/speek1.mp4 and /dev/null differ diff --git a/app/src/main/res/raw/speek2.mp4 b/app/src/main/res/raw/speek2.mp4 deleted file mode 100644 index 1e932ab..0000000 Binary files a/app/src/main/res/raw/speek2.mp4 and /dev/null differ