fix: ci

app/src/main/AndroidManifest.xml

@@ -57,6 +57,7 @@
         android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:sharedUserId="android.uid.system"
         android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme">
 

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

@@ -97,8 +97,8 @@ public class WebViewActivity extends BaseActivity {
     static final int TYPE_HINT_PASSWORD = 3;//隐藏密码输入框
     static final int TYPE_START_SERVER = 4;//重新启动web服务
     static final int TYPE_SHENG_HTML_MAG = 5;//返回接口请求值给h5
-    //static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址
-    static String HtmlUrl = "http://192.168.0.109:5173/";
+    static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址
+    //static String HtmlUrl = "http://192.168.0.109:5173/";
     int time = 0;
     String interfaceRequestData="";
     // 语音听写对象
@@ -506,12 +506,7 @@ public class WebViewActivity extends BaseActivity {
             }catch (Exception e){
 
             }
-
-//            LoggerUtil.e("MainActivity","JS调用了Android的方法:getArmNum:"+isCarousel);
-
         }
-
-
     }
 
     /**
@@ -532,7 +527,7 @@ public class WebViewActivity extends BaseActivity {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    binding.web.loadUrl(StringUtil.strSplice("javascript:window.giveAskText('" + msg + "');"));
+                    binding.web.loadUrl(StringUtil.strSplice("javascript:window.voiceContent('{\"data\":\""+msg+"\",\"flag\":0}');"));
                 }
             });
         }
@@ -615,7 +610,12 @@ public class WebViewActivity extends BaseActivity {
                 break;
             case Constant.VOID_STOP:
                 // TTS播放完成
-                //changeVideo("bg");
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        binding.web.evaluateJavascript("javascript: window.ttsPlayOver();", null);
+                    }
+                });
                 break;
             case Constant.ACTION_UPDATE_PROG2://后台下发节目通知，重置导视倒计时。
                 LoggerUtil.e(TAG,"重启导视倒计时");
@@ -646,12 +646,12 @@ public class WebViewActivity extends BaseActivity {
     private class AIASRListenerImpl implements AIASRListener {
 
         public void onError(AIError error) {
-            LoggerUtil.e("ASRInit: ",error.getMessage());
+            LoggerUtil.e("ASRError: ",error.getMessage());
             // 在非主线程中需要调用 WebView 方法时
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    binding.web.evaluateJavascript("javascript: window.youAskOver('');", null);
+                    binding.web.evaluateJavascript("javascript: window.voiceContent('{\"data\":\"\",\"error\":\""+error.getMessage()+"\",\"flag\":2}');", null);
                 }
             });
             stopAsr();
@@ -675,7 +675,7 @@ public class WebViewActivity extends BaseActivity {
             if (status == AIConstant.OPT_SUCCESS) {
                 LoggerUtil.e("ASRInit: ","初始化成功!");
             } else {
-                LoggerUtil.e("ASRInit: ","初始化失败!code:" + status);
+                binding.web.evaluateJavascript("javascript: window.voiceContent('{\"data\":\"\",\"error\":\"初始化失败\",\"flag\":2}');", null);
             }
         }
 
@@ -689,7 +689,6 @@ public class WebViewActivity extends BaseActivity {
         @Override
         public void onNotOneShot() {
             //do nothing
-            LoggerUtil.e("ASRInit: ","onNotOneShot");
         }
 
         @Override
@@ -699,7 +698,7 @@ public class WebViewActivity extends BaseActivity {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    binding.web.evaluateJavascript("javascript: window.youAskOver('');", null);
+                    binding.web.evaluateJavascript("javascript: window.voiceContent('{\"data\":\"\",\"flag\":1}');", null);
                 }
             });
             LoggerUtil.e("ASRInit: ","onEndOfSpeech");

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

@@ -22,12 +22,12 @@ public class Constant {
     public static String screenType = "HDMI"; // 欣威视通3399设备为假关机 HDMI连接：可以用来判断是否为关机状态 LVDS连接：只能用定时关机时间来判断
     public static boolean newGuide = false; // 指路机类型，true:新版指路机 false:老板指路机（流花）
     public static String mqttState = ""; // 屏幕连接方式
-    public static String TTSHome="sbc";   // sbc-思必驰   kdxf-科大讯飞
+    public static String TTSHome="";   // sbc-思必驰   kdxf-科大讯飞
     //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（卓策主板——王府井喜悦、杨浦中心医院）
+     public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院）
     // public static String androidBoardType = "sx"; //设备板子型号 sx（视想）
     // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED
     // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机

app/src/main/java/qianmu/container/app/MyApplication.java

@@ -148,6 +148,9 @@ public class MyApplication extends Application {
                 .setProductKey("ab73065d16e11bcfac026eee3db9f6cb")
                 .setProductSecret("85d9490c438099acc33be7676799399f").create();
 
+        //config.setExtraParameter("DEVICE_ID", "888888888");
+        //config.setExtraParameter("DEVICE_NAME", "888888888");
+
         DUILiteSDK.init(getApplicationContext());
         // SDK 授权
         DUILiteSDK.doAuth(getApplicationContext(), config, new DUILiteSDK.InitListener() {

app/src/main/java/qianmu/container/service/ContainerService.java

@@ -320,14 +320,14 @@ public class ContainerService extends Service {
                     String decryptDataJson = AesUtil.decrypt((String.valueOf(response.body().getData())));
                     if(decryptDataJson.equals("解密失败")){
                         long time = new BigInteger((String) response.body().getData()).longValue();
-                        if(Math.abs(time-System.currentTimeMillis())>60000){
+                        if(Math.abs(time-System.currentTimeMillis())>30000){
                             LoggerUtil.e("getCurrentTimestamp()","进行校验时间");
                             Date date = new Date(time);
                             SignWayUtil.setDeviceTime(date);
                         }
                     }else {
                         long time = new BigInteger(decryptDataJson).longValue();
-                        if(Math.abs(time-System.currentTimeMillis())>60000){
+                        if(Math.abs(time-System.currentTimeMillis())>30000){
                             LoggerUtil.e("getCurrentTimestamp()","进行校验时间");
                             Date date = new Date(time);
                             SignWayUtil.setDeviceTime(date);

app/src/main/java/qianmu/container/util/TTSUtil.java

@@ -87,7 +87,7 @@ public class TTSUtil {
         });
 
         intent = new AICloudTTSIntent();
-        intent.setSpeaker("qianranfv5");
+        intent.setSpeaker("qianranfv5");   //  qianranfv5    yyqiafv6
         intent.setVolume("100");
         intent.setSpeed("0.8");
         intent.setTextType("text");