From 7e080cadf2d4a7c2d80e022dbcc8785d6f47abf4 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 21 十月 2019 14:50:19 +0800
Subject: [PATCH] 获取放电参数时同时获取当前电池组名称
---
platforms/android/app/src/main/java/com/service/MyInteractionService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 81b655e..4db7759 100644
--- a/platforms/android/app/src/main/java/com/service/MyInteractionService.java
+++ b/platforms/android/app/src/main/java/com/service/MyInteractionService.java
@@ -8,6 +8,7 @@
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;
import com.socket.MySocketClientThread;
@@ -43,6 +44,10 @@
ServiceModel model = (ServiceModel)msg.obj;
if(FBS_ComBase.CMD_GETDISCHARGEPARAM == model.cmd){
//鑾峰彇娴嬭瘯鍙傛暟
+ if(deviceState != null && model.code ==1){
+ BattTestParam param = (BattTestParam)model.data;
+ param.battName = deviceState.nowBattName;
+ }
jsInterface.SendCallDataToJS("getTestParam",model);
}else if(FBS_ComBase.CMD_HEARTBEAT == model.cmd){
//蹇冭烦鍖呰繑
@@ -141,6 +146,7 @@
//鑾峰彇娴嬭瘯鍙傛暟
public boolean getTestParam(){
+ sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_HEARTBEAT, "");
return sendMessageToSocketClient(mSocketHandle, FBS_ComBase.CMD_GETDISCHARGEPARAM, "");
}
--
Gitblit v1.9.1