Преглед на файлове

语音播报间隔时间加长,点阵屏信息自动清除时间加长

weizhengliang преди 1 година
родител
ревизия
4e5768a16d

+ 1 - 1
android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/led/LedC2MManager.java

@@ -44,7 +44,7 @@ public class LedC2MManager extends LedManager {
     private static String deleteVoiceText;
     private static boolean stopVoice = false;
 
-    private static long LED_TIMEOUT = 30*60*1000L;
+    private static long LED_TIMEOUT = 60*60*1000L;
 
     private final static Object lockObject = new Object();
 

+ 5 - 1
android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/util/SpeechUtil.java

@@ -9,6 +9,7 @@ import android.util.Log;
 import com.wdkl.ncs.android.component.nursehome.settingconfig.SettingConfig;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.middleware.common.Constants;
+import com.wdkl.ncs.android.middleware.utils.StringUtil;
 
 
 import java.util.ArrayList;
@@ -128,6 +129,9 @@ public class SpeechUtil {
 
     public synchronized void speak(final String text) {
         Log.d(TAG, "tts speak: " + text);
+        if (!StringUtil.notEmpty(text)) {
+            return;
+        }
 
         isStop = false;
         textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, null, "uniqueId");
@@ -239,7 +243,7 @@ public class SpeechUtil {
                 }
 
                 try {
-                    Thread.sleep(500);
+                    Thread.sleep(1500);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

+ 4 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/StringUtil.java

@@ -7,4 +7,8 @@ public class StringUtil {
     public static String getResString(int resId) {
         return BaseApplication.appContext.getString(resId);
     }
+
+    public static boolean notEmpty(String str) {
+        return str != null && str.length() > 0 && !str.equalsIgnoreCase("null");
+    }
 }