1.0.8.737修复736崩溃的bug和整点数据强制储存.

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@26 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

4.Data/Device.h

@@ -179,7 +179,7 @@ public:
 		auto tmStartTimeSecond = tmStartTime / 1000;
 		//TRACE("%s:%d %s\r\n", __FUNCTION__, __LINE__, CTime(tmStartTime / 1000).Format("%Y-%m-%d %H:%M:%S"));
 		lock_guard<mutex> lock(m_mtx);
-		if (nNewNum == 1)
+		if (nNewNum == 1 && tmStartTimeSecond % 3600 != 0)
 		{
 			switch (idx)
 			{

4.Data/ResistAlarm.cpp

@@ -1287,7 +1287,7 @@ void CResistAlarmMng::JudgeAlarm2(CResistAlarmMng* pService, RETENSION_FORCE_DRO
 void CResistAlarmMng::JudgeAlarm(CResistAlarmMng* pService, RETENSION_FORCE_DROP* pConstRetensionForceWaveInfo, 
 	time_t show_time, int show_val, eSuoBiPosi posi, string mo, string mp, void* pInfo)
 {
-	ASSERT(pConstRetensionForceWaveInfo);
+	if (pConstRetensionForceWaveInfo == nullptr) return;
 	ST_MOMP_INFO* pMoMpInfo = (ST_MOMP_INFO*)pInfo;
 	CTime ctShowTime(show_time / 1000);
 	bool bSkylight = CSkylightMng::GetInstance()->IsSkylight(&ctShowTime);