From d4c7dbd51fa93b0dae3d55f68518a12bb20ed79c Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 23 十一月 2019 11:54:57 +0800
Subject: [PATCH] 修改
---
platforms/android/app/src/main/java/com/socket/BattDataThread.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/socket/BattDataThread.java b/platforms/android/app/src/main/java/com/socket/BattDataThread.java
index 31c2f08..956f56a 100644
--- a/platforms/android/app/src/main/java/com/socket/BattDataThread.java
+++ b/platforms/android/app/src/main/java/com/socket/BattDataThread.java
@@ -38,6 +38,7 @@
public int battIndex = 1; //鐢垫睜缁処D 榛樿鐢垫睜缁処D
public Concentrator_Param param; //姹囬泦鍣ㄥ弬鏁�
public Concentrator_State state; //姹囬泦鍣ㄧ姸鎬�
+ public Battinf battinf; //鐢垫睜缁勪俊鎭�
public DBHelper dbHelper;
public WebView webView;
@@ -80,16 +81,19 @@
//Log.e(TAG, "handleMessage: 鑾峰彇璁惧鐘舵�佹垚鍔�" );
}else if(model.cmd >= Concentrator_ComBase.CMD_MODEBUS_BATTMONVOL_INDEX && model.cmd < Concentrator_ComBase.CMD_MODEBUS_BATTMONTMP_INDEX){
//璇诲彇鍗曚綋鐢靛帇鎴愬姛
+ int index = (model.cmd - Concentrator_ComBase.CMD_MODEBUS_BATTMONVOL_INDEX);
//Log.e(TAG, "handleMessage: 鑾峰彇鍗曚綋鐢靛帇鎴愬姛" );
- state.cloneMonVol((Concentrator_State)model.data);
+ state.cloneMonVol((Concentrator_State)model.data,index);
}else if(model.cmd >= Concentrator_ComBase.CMD_MODEBUS_BATTMONTMP_INDEX && model.cmd < Concentrator_ComBase.CMD_MODEBUS_BATTMONRES_INDEX){
//璇诲彇鍗曚綋娓╁害鎴愬姛
+ int index = (model.cmd - Concentrator_ComBase.CMD_MODEBUS_BATTMONTMP_INDEX);
//Log.e(TAG, "handleMessage: 鑾峰彇鍗曚綋娓╁害鎴愬姛" );
- state.cloneMonTmp((Concentrator_State)model.data);
+ state.cloneMonTmp((Concentrator_State)model.data,index);
}else if(model.cmd >= Concentrator_ComBase.CMD_MODEBUS_BATTMONRES_INDEX && model.cmd < (Concentrator_ComBase.CMD_MODEBUS_BATTMONRES_INDEX+300)){
//璇诲彇鍗曚綋鍐呴樆鎴愬姛
+ int index = (model.cmd - Concentrator_ComBase.CMD_MODEBUS_BATTMONRES_INDEX);
//Log.e(TAG, "handleMessage: 鑾峰彇鍗曚綋鍐呴樆鎴愬姛" );
- state.cloneMonRes((Concentrator_State)model.data);
+ state.cloneMonRes((Concentrator_State)model.data,index);
}
}else if(model.cmd_type == Concentrator_ComBase.CMD_MODEBUS_WRITECMD){
//璁剧疆鎴愬姛
@@ -238,8 +242,7 @@
Message childMsg = clientThread.mHandler.obtainMessage();
childMsg.obj = model;
- childMsg.what = isInstall?1:0;
- Log.e(TAG, battIndex+"sendMessageToSocketClient: isStall"+ isInstall);
+ //Log.e(TAG, battIndex+"sendMessageToSocketClient: isStall"+ isInstall);
return (clientThread.mHandler.sendMessage(childMsg));
}
--
Gitblit v1.9.1