Browse Source

fix: ci

dejiAi
高志龙 8 months ago
parent
commit
c2c9e4ea01
  1. 21
      app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
  2. 2
      app/src/main/java/qianmu/container/app/Constant.java

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

@ -53,6 +53,7 @@ import java.net.URI;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Scanner; import java.util.Scanner;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -104,8 +105,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;
SocketClient localSocketClient;
private SocketClient localSocketClient;
private Map<String, Uri> videoMap = new HashMap<>();
// 语音听写对象 // 语音听写对象
private ASR mAsr; private ASR mAsr;
private boolean isrun = false; // 是否正在听写 private boolean isrun = false; // 是否正在听写
@ -170,6 +171,13 @@ public class WebViewActivity extends BaseActivity {
binding.web.setBackgroundColor(0); binding.web.setBackgroundColor(0);
binding.web.getBackground().setAlpha(0); binding.web.getBackground().setAlpha(0);
Uri videoUri = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bg);
videoMap.put("hat_bg",videoUri);
Uri videoUri1 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.hello);
videoMap.put("hat_hello",videoUri1);
Uri videoUri2 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.speek);
videoMap.put("hat_speek",videoUri2);
loadingbgVideo(true); loadingbgVideo(true);
currentVideo = binding.bgVideo; currentVideo = binding.bgVideo;
loadingHelloVideo(); loadingHelloVideo();
@ -185,8 +193,7 @@ public class WebViewActivity extends BaseActivity {
} }
} }
private void loadingbgVideo(Boolean isplay){ private void loadingbgVideo(Boolean isplay){
Uri videoUri = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bg);
binding.bgVideo.setVideoURI(videoUri);
binding.bgVideo.setVideoURI(videoMap.get("hat_bg"));
binding.bgVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { binding.bgVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override @Override
public void onPrepared(MediaPlayer mp) { public void onPrepared(MediaPlayer mp) {
@ -203,8 +210,7 @@ public class WebViewActivity extends BaseActivity {
}); });
} }
private void loadingHelloVideo(){ private void loadingHelloVideo(){
Uri videoUri1 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.hello);
binding.helloVideo.setVideoURI(videoUri1);
binding.helloVideo.setVideoURI(videoMap.get("hat_hello"));
binding.helloVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { binding.helloVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override @Override
public void onPrepared(MediaPlayer mp) { public void onPrepared(MediaPlayer mp) {
@ -221,8 +227,7 @@ public class WebViewActivity extends BaseActivity {
}); });
} }
private void loadingSpeekVideo(){ private void loadingSpeekVideo(){
Uri videoUri2 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.speek);
binding.speekVideo.setVideoURI(videoUri2);
binding.speekVideo.setVideoURI(videoMap.get("hat_speek"));
binding.speekVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { binding.speekVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override @Override
public void onPrepared(MediaPlayer mp) { public void onPrepared(MediaPlayer mp) {

2
app/src/main/java/qianmu/container/app/Constant.java

@ -26,7 +26,7 @@ public class Constant {
// public static String androidBoardType = "ys"; // 设备板子型号 ys(亿晟) 北京颐堤港定制touch // public static String androidBoardType = "ys"; // 设备板子型号 ys(亿晟) 北京颐堤港定制touch
// public static String androidBoardType = "xwst"; //设备板子型号 xwst(欣威视通3399) // public static String androidBoardType = "xwst"; //设备板子型号 xwst(欣威视通3399)
// public static String androidBoardType = "xwst2"; //设备板子型号 xwst2(欣威视通3588、T982、3576) // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2(欣威视通3588、T982、3576)
// public static String androidBoardType = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院)
// public static String androidBoardType = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院)
// public static String androidBoardType = "sx"; //设备板子型号 sx(视想) // public static String androidBoardType = "sx"; //设备板子型号 sx(视想)
// public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED
// public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机 // public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机

Loading…
Cancel
Save