~whyclj/BattMonitor_FBO_4831NT.git

			@@ -86,6 +86,8 @@
			private FGCD_Station_inf station_inf; //一体机机房信息.

			boolean isNewRead = true;

			private int m_Read_Rate = 1; //数据读取速率



			@@ -367,7 +369,7 @@
			SocketComm(FGCD_ComBase.CMD_CLEARALARM, ByteBuffer.allocate(0));
			}
			}
			Thread.sleep(200);
			Thread.sleep(100);
			/********************** 文件下载 ***************************************************/
			{

			@@ -405,14 +407,15 @@
			// readMonData = false;
			// }

			if(DevReadCount %10 == 0) {
			if(DevReadCount %(2*m_Read_Rate) == 0) {
			//System.err.println(Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms)+"\tReadRate:"+m_Read_Rate);
			FGCD_Cmd tmp_cmd = new FGCD_Cmd(FGCD_ComBase.CMD_ReadSysInfo);
			SocketComm(tmp_cmd, ByteBuffer.allocate(0));
			Thread.sleep(50);
			if(SocketComm(tmp_cmd, ByteBuffer.allocate(0)))
			Thread.sleep(50);
			}


			if(DevReadCount % 50 == 0) {
			if(DevReadCount % 70 == 0) {
			//15s读取一次版本信息
			//logger.info("获取设备版本号");
			FGCD_Cmd tmp_cmd = new FGCD_Cmd(FGCD_ComBase.CMD_READDEVICEVERSION);
			@@ -439,9 +442,15 @@
			FGCD_Thread_Mark = false;
			}

			if(sysState.dev_workstate > FGCD_ComBase.WORK_STATE_STOPPED) {
			m_Read_Rate = 1;
			}else {
			m_Read_Rate = 12;
			}


			DevReadCount++;
			if(DevReadCount >= 2400) {
			if(DevReadCount >= 240000) {
			DevReadCount = 0;
			}
			} catch (Exception e) {
			@@ -1293,7 +1302,16 @@
			}
			//now_dev_workstate = sysState.dev_workstate;
			now_dev_workstate = battInfo.sysWorkState;
			if(FGCD_ComBase.DeviceTestType_HuoHua == battInfo.DeviceTestType && FGCD_ComBase.WORK_STATE_STOPPED != battInfo.sysWorkState) {
			if(FGCD_ComBase.DeviceTestType_HuoHua == battInfo.DeviceTestType
			&& FGCD_ComBase.WORK_STATE_STOPPED != battInfo.sysWorkState

			/**
			* 屏蔽静置时的历史数据存储
			*/
			&& FGCD_ComBase.WORK_STATE_WAITCHAR != battInfo.sysWorkState
			&& FGCD_ComBase.WORK_STATE_WAITDIS != battInfo.sysWorkState

			) {
			//非停止状态活化有效,否则活化无效
			now_dev_workstate = FGCD_ComBase.WORK_STATE_HUOHUA;
			}
			@@ -1317,6 +1335,7 @@
			m_RTData[n].mTestData.updateOnlineVolFrom_FBSDev(battInfo.onlineVol);
			m_RTData[n].mTestData.updateGroupVolFrom_FBSDev(battInfo.groupVol); //更新电池组组端电压
			m_RTData[n].mTestData.updateCurrFrom_FBSDev(battInfo.groupCurrent);
			m_RTData[n].mTestData.updateTestTimeLong_FBSDev(battInfo.getTestTimeLong());

			//---------------------------------------------------------------------------//
			//--------------------- 接着更新当前时间 -----------------------------------------//