Browse Source

fix: ci

sibichiAi
高志龙 6 months ago
parent
commit
422fbdb49e
  1. 2
      app/build.gradle
  2. 18
      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.36"
versionName "V2.0.7.38"
// 7.0.2.35 // 7.0.2.35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@ -417,6 +417,7 @@ public class WebViewActivity extends BaseActivity {
} }
currentVideo.clearAnimation(); currentVideo.clearAnimation();
currentVideo.setVisibility(View.VISIBLE);
nextVideo.clearAnimation(); nextVideo.clearAnimation();
// 旧视频淡出 // 旧视频淡出
@ -456,6 +457,7 @@ public class WebViewActivity extends BaseActivity {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
currentVideo = nextVideo; currentVideo = nextVideo;
currentVideo.setVisibility(View.VISIBLE);
currentVideo.start(); currentVideo.start();
} }
@Override @Override
@ -696,15 +698,17 @@ public class WebViewActivity extends BaseActivity {
} }
// h5调用android:停止合成语音 // h5调用android:停止合成语音
@JavascriptInterface @JavascriptInterface
public void stopTTS() {
public void stopTTS(String txt) {
LoggerUtil.e(TAG,"JS调用了Android的方法:stopTTS()"); LoggerUtil.e(TAG,"JS调用了Android的方法:stopTTS()");
ttsUtil.stopTTs(); ttsUtil.stopTTs();
runOnUiThread(new Runnable() {
@Override
public void run() {
changeVideo("bg");
}
});
if("change".equals(txt)){
runOnUiThread(new Runnable() {
@Override
public void run() {
changeVideo("bg");
}
});
}
} }
// h5调用android:播放指定视频 // h5调用android:播放指定视频
@JavascriptInterface @JavascriptInterface

Loading…
Cancel
Save