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 82d0587..3d1b98f 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -857,11 +857,11 @@ public class WebViewActivity extends BaseActivity { aiCloudASRIntent = new AICloudASRIntent(); aiCloudASRIntent.setEnablePunctuation(true); aiCloudASRIntent.setRealback(true);//打开实时反馈功能 - aiCloudASRIntent.setResourceType("aihome"); + aiCloudASRIntent.setResourceType("aihome"); // 模型 aiCloudASRIntent.setEnableNumberConvert(true);//设置启用识别结果汉字数字转阿拉伯数字功能 - aiCloudASRIntent.setWaitingTimeout(30000); //设置等待识别结果超时时长,默认5000ms - aiCloudASRIntent.setNoSpeechTimeOut(10000); - aiCloudASRIntent.setPauseTime(2000); + aiCloudASRIntent.setWaitingTimeout(30000); //设置等待识别结果超时时长 + aiCloudASRIntent.setNoSpeechTimeOut(10000); //收不到声音超时时间 + aiCloudASRIntent.setPauseTime(2000); // 中间停顿时间 mEngine.init(config, new AIASRListenerImpl()); } } diff --git a/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java b/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java index ccb5890..561fa9f 100644 --- a/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java +++ b/app/src/main/java/qianmu/container/activity/program/ScreenSaverActivity.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import android.hardware.display.DisplayManager; import android.os.Handler; +import android.os.Looper; import android.os.Message; import android.util.Log; import android.view.Display; @@ -63,6 +64,7 @@ import qianmu.container.util.AppUtil; import qianmu.container.util.BitmapUtil; import qianmu.container.util.CalendarUtils; import qianmu.container.util.DeviceUtil; +import qianmu.container.util.FileUtil; import qianmu.container.util.GsonUtil; import qianmu.container.util.LoggerUtil; import qianmu.container.util.SignWayUtil; @@ -90,7 +92,7 @@ public class ScreenSaverActivity extends BaseActivity { static final int NOVA_HINT = 4;// 隐藏密码输入框 static final int SHOW_JXB = 5;// 机械臂轮播 String TB40_password = "SN2008@+";// 华贸SN2008@+ - + private Handler mainHandler = new Handler(Looper.getMainLooper()); int time = 0; int jxbPlayNum = 0; Handler handler = new Handler() { @@ -133,7 +135,6 @@ public class ScreenSaverActivity extends BaseActivity { } } break; - } } }; @@ -436,7 +437,6 @@ public class ScreenSaverActivity extends BaseActivity { * 华贸led设备 */ String sn; - public void initNova() { String companyInfo = "{\"company\":\"NovaStar\",\"phone\":\"029-68216000\",\"email\":\"hr@novastar.tech\"}"; instance.nvSetDevLang("Java"); @@ -458,14 +458,12 @@ public class ScreenSaverActivity extends BaseActivity { // TB40 华贸SN2008@+ 江湾里123456 public void login(String cmd) { + LoggerUtil.e("QHT: ","登录"); instance.nvLoginAsync("{\"sn\":\"" + sn + "\",\"username\":\"admin\",\"rememberPwd\":1,\"password\":\"" + TB40_password + "\",\"loginType\":0}", new ViplexCore.CallBack() { @Override public void dataCallBack(int code, String data) { LoggerUtil.e("QHT: 登录1: ", "code: " + code + "data: " + data); - if(code == 65300){ - - } } }); instance.nvLoginAsync("{\"sn\":\"" + sn + "\",\"username\":\"admin\",\"rememberPwd\":1,\"password\":\"" diff --git a/app/src/main/java/qianmu/container/util/FileUtil.java b/app/src/main/java/qianmu/container/util/FileUtil.java index ada1f08..cce080e 100644 --- a/app/src/main/java/qianmu/container/util/FileUtil.java +++ b/app/src/main/java/qianmu/container/util/FileUtil.java @@ -179,7 +179,9 @@ public class FileUtil { * @param localPath */ private static void downloadSuccess(com.lzy.okgo.model.Response response, String localPath) { - + if (response == null) { + return; + } try { String fileTotalLength = response.headers().get("Content-Range"); File tempFile = new File(localPath);