From 13faa2d0004b0f42cb47fd3dc622d41fc7627edc Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期四, 31 三月 2022 10:20:34 +0800
Subject: [PATCH] V1.109  2022-03-30 	1.修复充放电以及活化时记录多笔充放电数据问题

---
 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java b/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
index b8300f9..f74fe58 100644
--- a/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
+++ b/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
@@ -596,7 +596,7 @@
                 Date d1 = new Date();
                 int rx_read_time_out = 0;
                 //int rx_len = 0;
-                System.out.println("数据长度" + plain_tx_t.length + "\t发送数据:" + ComFn.bytesToHexString(plain_tx_t, plain_tx_t.length));
+                //System.out.println("数据长度" + plain_tx_t.length + "\t发送数据:" + ComFn.bytesToHexString(plain_tx_t, plain_tx_t.length));
                 out.write(plain_tx_t);
                 out.flush();
                 sysState.makeDevCommDataFlowSum(plain_tx_t.length);
@@ -639,7 +639,7 @@
                 
                 sysState.makeDevCommDataFlowSum(cipher_buf.length);
                 
-                System.err.println("数据长度"+cipher_buf.length+"\t返回数据:"+ ComFn.bytesToHexString(cipher_buf, cipher_buf.length));
+                //System.err.println("数据长度"+cipher_buf.length+"\t返回数据:"+ ComFn.bytesToHexString(cipher_buf, cipher_buf.length));
                 //Log.e(TAG, "SocketComm: "+ComFn.bytesToHexString(plain_buf, plain_buf.length));
                 if(true == getDataFromCommBuf(cipher_buf)) {
                 	res_t = true; 
@@ -1095,6 +1095,8 @@
     			//--------------------- 再读取端电压 -----------------------------------------//
     			//--------------------- 如果软件版本大于35,在线电压和组端电压保留2位小数-------//
     			//m_RTData[n].mTestData.updateGroupTempFrom_FBSDev((float)(vc_data.batttemp[n]));
+				//---------------------------------------------------------------------------//
+				m_RTData[n].mTestData.updateGroupNumFrom_FBSDev(onlineInfo.currBattNum);	//更新当前电池组号
     			m_RTData[n].mTestData.updateOnlineVolFrom_FBSDev((float)(sysState.on_online_vol));
     			//m_RTData[n].mTestData.updateGroupVolFrom_FBSDev((float)(sysState.tatalVol));    				
     			m_RTData[n].mTestData.updateGroupVolFrom_FBSDev((float)(onlineInfo.getGroupVol())); 			//更新电池组组端电压   				
@@ -1104,8 +1106,6 @@
     			//--------------------- 接着更新当前时间 -----------------------------------------//
 				m_RTData[n].mTestData.updateNewDataRCTime(new Date());
     			//---------------------------------------------------------------------------//
-				//---------------------------------------------------------------------------//
-				m_RTData[n].mTestData.updateGroupNumFrom_FBSDev(onlineInfo.currBattNum);	//更新当前电池组号
 				//--------------------- 先更新单体数据,再更新电池状态数据 ----------------------//
 				m_RTData[n].updata_BattRtData_To_RamDb();
 				m_RTData[n].updata_BattRtSate_To_RamDb();

--
Gitblit v1.9.1