BattMonitor_FGCD-A059NT/src/com/battmonitor/data/BattData_RT.java
@@ -741,9 +741,17 @@ if(Math.abs(mTestData.testCurr) < mBattFloatCurrLevel) { if(BattStatData.BATTDATA_FLOAT != mTestData.battTestState) { if((FBS9100_ComBase.SYS_STATE_DISCHARGING != mTestData.dev_FBS9100S_WorkState) && (FBS9100_ComBase.SYS_STATE_HELUQI_DISCHARGING != mTestData.dev_FBS9100S_WorkState)) { //2018年12月15日添加,只要设备处于核容测试或升压续航状态,数据就不停止记录. //if((FBS9100_ComBase.SYS_STATE_DISCHARGING != mTestData.dev_FBS9100S_WorkState) // && (FBS9100_ComBase.SYS_STATE_HELUQI_DISCHARGING != mTestData.dev_FBS9100S_WorkState)) { /** * 充放电一体机充/放电/活化的时候当电流<浮充电流阈值是不停止记录 */ if((FGCD_ComBase.WORK_STATE_CHARTEST != mTestData.dev_FBS9100S_WorkState) && (FGCD_ComBase.WORK_STATE_DISTEST != mTestData.dev_FBS9100S_WorkState) && (FGCD_ComBase.WORK_STATE_HUOHUA != mTestData.dev_FBS9100S_WorkState)) { //2018年12月15日添加,只要设备处于核容测试或升压续航状态,数据就不停止记录. printBattRtDataDebugInf_FBS9100S(1); mTestData.battTestState = BattStatData.BATTSTATE_FLOAT; @@ -792,10 +800,12 @@ initTestData(BattStatData.BATTSTATE_DISCHARGE); printBattRtDataDebugInf_FBS9100S(5); } } else {//edit by mxpopstar @2018.12.18 } else { /** * 2022-03-31 lijun 根据设备状态进行数据记录 */ if(BattStatData.BATTSTATE_FLOAT == mTestData.battTestState) { if((FGCD_ComBase.WORK_STATE_STOPDIS == mTestData.dev_FBS9100S_WorkState) ||(FGCD_ComBase.WORK_STATE_DISTEST == mTestData.dev_FBS9100S_WorkState)) { if((FGCD_ComBase.WORK_STATE_DISTEST == mTestData.dev_FBS9100S_WorkState)) { initTestData(BattStatData.BATTSTATE_DISCHARGE); printBattRtDataDebugInf_FBS9100S(6); }/* else if(FBS9100_ComBase.SYS_STATE_CHARGING == mTestData.dev_FBS9100S_WorkState) { 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(); BattMonitor_FGCD-A059NT/src/main/main_Monitor_FGCD_A059NT.java
@@ -17,7 +17,7 @@ public class main_Monitor_FGCD_A059NT { public final static double m_VersionNum = 1.107; public final static double m_VersionNum = 1.109; public final static String m_Version = "Welcome To Use main_Monitor_FGCD_A059NT PRO 20210714 V" + m_VersionNum ; /**************************************************************************/
