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 11c6e83..c791f84 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -101,8 +101,8 @@ public class WebViewActivity extends BaseActivity { static final int TYPE_GO_SAVESCREEN = 300;//导视通知跳转屏保 static final int TYPE_HINT_PASSWORD = 3;//隐藏密码输入框 static final int TYPE_START_SERVER = 4;//重新启动web服务 - //static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址 http://192.168.1.218:5173/ - static String HtmlUrl = "http://192.168.1.196:5173/"; + static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址 http://192.168.1.218:5173/ + //static String HtmlUrl = "http://192.168.1.196:5173/"; int time = 0; private VideoView currentVideo; private SocketClient localSocketClient; @@ -368,15 +368,11 @@ public class WebViewActivity extends BaseActivity { //切换视频状态 private void changeVideoAfter(){ - try{ if("".equals(videoAfter)){ //新状态正常 changeVideo("back"); }else{ //新状态彩蛋 changeVideo("to"); } - }catch (Exception e){ - LoggerUtil.e("ERROR: ",e.getMessage()); - } } //切换视频 @@ -384,21 +380,48 @@ public class WebViewActivity extends BaseActivity { LoggerUtil.e("changeVideo", type); VideoView nextVideo; currentVideo.clearAnimation(); - if("bg".equals(type.trim())){ - if(currentVideo == binding.bgVideo){ - return; - } - nextVideo = binding.bgVideo; - }else if("answer".equals(type.trim())){ - if(currentVideo == binding.speekVideo){ - return; - } - nextVideo = binding.speekVideo; - }else{ - if(currentVideo == binding.helloVideo){ - return; - } - nextVideo = binding.helloVideo; + switch(type.trim()){ + case "back" : + if(currentVideo == binding.backVideo){ + return; + } + nextVideo = binding.backVideo; + break; + case "to" : + if(currentVideo == binding.toVideo){ + return; + } + nextVideo = binding.toVideo; + break; + case "bg" : + if(currentVideo == binding.bgVideo && "".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; + } + 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; + } + nextVideo = "".equals(videoAfter) ? binding.helloVideo : binding.helloVideo1; + break; + default: + nextVideo = "".equals(videoAfter) ? binding.bgVideo : binding.bgVideo1; } // 新视频淡入动画 diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 0c14758..8fece7e 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -23,7 +23,7 @@ public class Constant { public static boolean newGuide = false; // 指路机类型，true:新版指路机 false:老板指路机（流花） public static String mqttState = ""; // 屏幕连接方式 // public static String androidBoardType = ""; //设备板子型号 无固定版 - 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 = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576） // public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） @@ -31,9 +31,9 @@ public class Constant { // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M - // public static String androidBoardType = "smt"; //设备板子型号 视美泰 + public static String androidBoardType = "smt"; //设备板子型号 视美泰 - public static String TTSFac = "kdxf"; // 语音识别厂家 kdxf--科大讯飞 sbc-思必驰 + public static String TTSFac = "sbc"; // 语音识别厂家 kdxf--科大讯飞 sbc-思必驰 public static final String VOID_STOP = "void_stop";// public static String whoActivity = ""; // 哪个activity页面 // 本地缓存地址 diff --git a/app/src/main/res/raw/bg1.mp4 b/app/src/main/res/raw/bg1.mp4 index 815d213..6166711 100644 Binary files a/app/src/main/res/raw/bg1.mp4 and b/app/src/main/res/raw/bg1.mp4 differ diff --git a/app/src/main/res/raw/hatto.mp4 b/app/src/main/res/raw/hatto.mp4 index 36ea6c4..32004a2 100644 Binary files a/app/src/main/res/raw/hatto.mp4 and b/app/src/main/res/raw/hatto.mp4 differ diff --git a/app/src/main/res/raw/hello1.mp4 b/app/src/main/res/raw/hello1.mp4 index bb07555..8c6804a 100644 Binary files a/app/src/main/res/raw/hello1.mp4 and b/app/src/main/res/raw/hello1.mp4 differ diff --git a/app/src/main/res/raw/speek1.mp4 b/app/src/main/res/raw/speek1.mp4 index 26f7f7e..1e932ab 100644 Binary files a/app/src/main/res/raw/speek1.mp4 and b/app/src/main/res/raw/speek1.mp4 differ