diff --git a/app/build.gradle b/app/build.gradle index 0759e1d..5c907db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.46" + versionName "V2.0.7.48" 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 271078e..8311edb 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -423,27 +423,27 @@ public class WebViewActivity extends BaseActivity { if(currentVideo == binding.bgVideo && "".equals(videoAfter)){ return; } - if(currentVideo == binding.bgVideo1 && "1".equals(videoAfter)){ - return; - } +// if(currentVideo == binding.bgVideo1 && "1".equals(videoAfter)){ +// return; +// } nextVideo = "".equals(videoAfter) ? binding.bgVideo : binding.bgVideo1; break; case "answer" : if(currentVideo == binding.speekVideo && "".equals(videoAfter)){ return; } - if(currentVideo == binding.speekVideo1 && "1".equals(videoAfter)){ - return; - } +// if(currentVideo == binding.speekVideo1 && "1".equals(videoAfter)){ +// return; +// } nextVideo = "".equals(videoAfter) ? binding.speekVideo : binding.speekVideo1; break; case "hello" : if(currentVideo == binding.helloVideo && "".equals(videoAfter)){ return; } - if(currentVideo == binding.helloVideo1 && "1".equals(videoAfter)){ - return; - } +// if(currentVideo == binding.helloVideo1 && "1".equals(videoAfter)){ +// return; +// } nextVideo = "".equals(videoAfter) ? binding.helloVideo : binding.helloVideo1; break; default: diff --git a/app/src/main/res/raw/bg.mp4 b/app/src/main/res/raw/bg.mp4 index 7adb3f2..e306634 100644 Binary files a/app/src/main/res/raw/bg.mp4 and b/app/src/main/res/raw/bg.mp4 differ diff --git a/app/src/main/res/raw/hello.mp4 b/app/src/main/res/raw/hello.mp4 index 6c6c021..60d1acf 100644 Binary files a/app/src/main/res/raw/hello.mp4 and b/app/src/main/res/raw/hello.mp4 differ diff --git a/app/src/main/res/raw/speek.mp4 b/app/src/main/res/raw/speek.mp4 index a374f00..e85b625 100644 Binary files a/app/src/main/res/raw/speek.mp4 and b/app/src/main/res/raw/speek.mp4 differ