Browse Source

fix: ci

sibichiAi
高志龙 7 months ago
parent
commit
14cd2c95e4
  1. 8
      app/src/main/java/qianmu/container/activity/H5/H5Data.java
  2. 42
      app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
  3. BIN
      app/src/main/res/raw/bg1.mp4
  4. BIN
      app/src/main/res/raw/bg2.mp4
  5. BIN
      app/src/main/res/raw/musice.mp3

8
app/src/main/java/qianmu/container/activity/H5/H5Data.java

@ -375,15 +375,15 @@ public class H5Data extends BaseData {
String deviceCode = DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE); String deviceCode = DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE);
url = url +"&"+"code="+deviceCode; url = url +"&"+"code="+deviceCode;
} }
if(!url.contains("http")){
url = StringUtil.strSplice(Constant.getBaseAddress(), url);
}
String finalUrl = url; String finalUrl = url;
client.get(url, new AsyncHttpResponseHandler() {
client.get(finalUrl, new AsyncHttpResponseHandler() {
@Override @Override
public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) { public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
try { try {
String response = new String(responseBody).replace("\\\\", "/"); String response = new String(responseBody).replace("\\\\", "/");
// Log.d("url", finalUrl);
// Log.d("response", response); // Log.d("response", response);
//获取数据成功时 才解析解析素材url并更新离线文件 //获取数据成功时 才解析解析素材url并更新离线文件
Resp resp = new Gson().fromJson(response, new TypeToken<Resp>() {}.getType()); Resp resp = new Gson().fromJson(response, new TypeToken<Resp>() {}.getType());

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

@ -8,6 +8,7 @@ import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.media.MediaMetadataRetriever; import android.media.MediaMetadataRetriever;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.SoundPool;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -84,7 +85,8 @@ public class WebViewActivity extends BaseActivity {
//static String HtmlUrl = "http://192.168.1.196:5173/"; //static String HtmlUrl = "http://192.168.1.196:5173/";
int time = 0; int time = 0;
private VideoView currentVideo; private VideoView currentVideo;
private SoundPool soundPool;
private int soundId;
// 语音听写对象 // 语音听写对象
private AICloudASREngine mEngine; private AICloudASREngine mEngine;
private AICloudASRIntent aiCloudASRIntent; private AICloudASRIntent aiCloudASRIntent;
@ -174,6 +176,10 @@ public class WebViewActivity extends BaseActivity {
Uri videoUri7 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.speek1); Uri videoUri7 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.speek1);
videoMap.put("hat_speek1", videoUri7); videoMap.put("hat_speek1", videoUri7);
soundPool = new SoundPool.Builder()
.setMaxStreams(2)
.build();
loadingbgVideo(); loadingbgVideo();
currentVideo = binding.bgVideo; currentVideo = binding.bgVideo;
loadingHelloVideo(); loadingHelloVideo();
@ -189,6 +195,24 @@ public class WebViewActivity extends BaseActivity {
ttsUtil = new TTSUtil(); ttsUtil = new TTSUtil();
ttsUtil.initTts(); ttsUtil.initTts();
} }
private void playMusic(){
soundId = soundPool.load(this, R.raw.musice, 1);
soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
@Override
public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
if (status == 0) {
soundPool.play(sampleId, 0.2f, 0.2f, 1, -1, 1.0f);
}
}
});
}
private void stopMusic(){
soundPool.stop(soundId);
soundPool.unload(soundId);
}
private void loadingbgVideo(){ private void loadingbgVideo(){
binding.bgVideo.setVideoURI(videoMap.get("hat_bg")); binding.bgVideo.setVideoURI(videoMap.get("hat_bg"));
binding.bgVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { binding.bgVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@ -274,7 +298,10 @@ public class WebViewActivity extends BaseActivity {
return true; // 返回true表示已处理,不会弹出系统默认提示 return true; // 返回true表示已处理,不会弹出系统默认提示
} }
}); });
binding.backVideo.setOnCompletionListener( mp -> changeVideo("bg"));
binding.backVideo.setOnCompletionListener( mp -> {
changeVideo("bg");
stopMusic();
});
} }
//彩蛋背景视频 //彩蛋背景视频
private void loadingbgVideo1(){ private void loadingbgVideo1(){
@ -333,11 +360,12 @@ public class WebViewActivity extends BaseActivity {
//切换视频状态 //切换视频状态
private void changeVideoAfter(){ private void changeVideoAfter(){
if("".equals(videoAfter)){ //新状态正常
changeVideo("back");
}else{ //新状态彩蛋
changeVideo("to");
}
if("".equals(videoAfter)){ //新状态正常
changeVideo("back");
}else{ //新状态彩蛋
changeVideo("to");
playMusic();
}
} }
//切换视频 //切换视频

BIN
app/src/main/res/raw/bg1.mp4

Binary file not shown.

BIN
app/src/main/res/raw/bg2.mp4

Binary file not shown.

BIN
app/src/main/res/raw/musice.mp3

Binary file not shown.
Loading…
Cancel
Save