From 4828e96bcc651f1ef7f952189a676a828676a2a8 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 24 十月 2019 10:44:43 +0800
Subject: [PATCH] 添加活化测试的启动暂停修改接口，并且在切换电池组的时候判断设备状态
---
platforms/android/app/src/main/java/com/service/MyInteractionService.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/service/MyInteractionService.java b/platforms/android/app/src/main/java/com/service/MyInteractionService.java
index f860ae4..af4161b 100644
--- a/platforms/android/app/src/main/java/com/service/MyInteractionService.java
+++ b/platforms/android/app/src/main/java/com/service/MyInteractionService.java
@@ -1,13 +1,11 @@
package com.service;
+import android.app.Service;
import android.os.Handler;
-import android.os.Looper;
import android.os.Message;
import android.util.Log;
import com.ftpfile.FTPFileUtil;
-import com.ftpfile.FileAttribute;
-import com.google.gson.Gson;
import com.mode.BattTestParam;
import com.mode.DeviceState;
import com.mode.ServiceModel;
@@ -29,6 +27,7 @@
private Handler mSocketHandle = null;
private DeviceState deviceState = null;
private FTPFileUtil ftpFileUtil = null;
+ private JsInterface jsInterface = null;
public static boolean isRunning = false;
@@ -37,7 +36,7 @@
ftpFileUtil = new FTPFileUtil();
this.serverip = serverip;
-
+ this.jsInterface = jsInterface;
this.mSocketHandle = new Handler(){
@Override
public void handleMessage(Message msg) {
@@ -97,13 +96,26 @@
//鑾峰彇鍏呯數鏁版嵁
jsInterface.SendCallDataToJS("getChargeData",model);
}else if(FBS_ComBase.CMD_CLEARALARM == model.cmd){
+ //娓呴櫎鎵�鏈夊憡璀�
jsInterface.SendCallDataToJS("clearAllAlarm",model);
}else if(FBS_ComBase.CMD_RETURNMAIN == model.cmd){
+ //杩涘叆鎸囧畾鐣岄潰
jsInterface.SendCallDataToJS("changeAppForm",model);
}else if(FBS_ComBase.CMD_EXITMACHINECONTROL == model.cmd){
+ //閫�鍑篈ndroid鎺у埗
sockethread.closeConn();
jsInterface.SendCallDataToJS("exitDeiviceConn",model);
+ }else if(FBS_ComBase.CMD_STARTHHTEST == model.cmd){
+ //鍚姩娲诲寲
+ jsInterface.SendCallDataToJS("startHHTest",model);
+ }else if(FBS_ComBase.CMD_PAUSEHHTEST == model.cmd){
+ //鏆傚仠娲诲寲
+ jsInterface.SendCallDataToJS("pauseHHTest",model);
+ }else if(FBS_ComBase.CMD_STOPHHTEST == model.cmd){
+ //鍋滄娲诲寲
+ jsInterface.SendCallDataToJS("stopHHTest",model);
}
+
}
};
@@ -165,7 +177,15 @@
//鍒囨崲鐢垫睜缁�
public boolean changeBatt(String battName){
- return sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_CHANGEBATT, battName);
+ if(deviceState.devWorkState != 0){
+ ServiceModel model = new ServiceModel();
+ model.code = 0;
+ model.msg = "褰撳墠鐢垫睜缁勬鍦ㄨ繘琛屾祴璇�";
+ jsInterface.SendCallDataToJS("changeBatt",model);
+ }else{
+ return sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_CHANGEBATT, battName);
+ }
+ return false;
}
//鍒犻櫎鐢垫睜缁�
@@ -243,6 +263,21 @@
return sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_RETURNMAIN, code);
}
+ //鍚姩娲诲寲娴嬭瘯
+ public void startHHTest(){
+ sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_STARTHHTEST, "");
+ }
+
+ //鏆傚仠娲诲寲娴嬭瘯
+ public void pauseHHTest(){
+ sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_PAUSEHHTEST, "");
+ }
+
+ //鍋滄娲诲寲娴嬭瘯
+ public void stopHHTest(){
+ sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_STOPHHTEST, "");
+ }
+
private boolean sendMessageToSocketClient(Handler handler, int cmd, String json)
{
ServiceModel model = new ServiceModel();
--
Gitblit v1.9.1