update

CamCore/coreobject.cpp

@@ -301,7 +301,7 @@ bool CoreObject::checkAlarmDevTime(QString deviceid){
     for(int i=0;i<DEVICES_COUNT;i++){
         QString devId = QString(ytShm->eHomeDevice[i].deviceID);
         if(QString::compare(devId,deviceid)==0){
-            if((t-alarmTime[i])>120){
+            if((t-alarmTime[i])>180){
                 alarmTime[i] = t;
                 return true;
             }
@@ -391,6 +391,7 @@ BOOL CALLBACK AlarmMSGCallBack(LONG lHandle, NET_EHOME_ALARM_MSG *pAlarmMsg, voi
     CoreObject *obj = (CoreObject *)pUserData;
     DWORD dwType = pAlarmMsg->dwAlarmType;  //不同的报警类型(dwAlarmType)，pAlarmInfo对应不同的报警信息类型
     ytShm->workingTime[0] = dt.toTime_t();
+
     if(pAlarmMsg->pHttpUrl!=NULL)
         dwType = EHOME_ISAPI_ALARM;
     switch(dwType)
@@ -653,12 +654,13 @@ void CoreObject::clear_devalarm(AlarmEvent devAlarm)
                                     .arg(2).arg(devAlarm.Device_Code).arg(devAlarm.Event_Time).arg(1)
                                     .arg(106).arg(devAlarm.Event_Status).arg("").arg("")));
             }
+            break;
         }
     }
     for(int i=0;i<alarmList.length();i++){
         if(alarmList.at(i).Device_Code.compare(devAlarm.Device_Code)==0){
             alarmList.removeAt(i);
-            break;
+//            break;
         }
     }
 }
@@ -914,32 +916,17 @@ void CoreObject::time_out()
     }
     int a_count=0;
     t = QDateTime::currentDateTime();
-    if((t.toTime_t()-ChkTime)>60){
+    if((t.toTime_t()-ChkTime)>60)
+    {
         ChkTime = t.toTime_t();
-//        foreach(auto ae,alarmList){
-//            if((t.toTime_t()-ae.t_stamp)>120){
-//                a_count++;
-//                appendLog(QString("[ %1 tmo(%2:%3) ] %4 %5").arg(t.toString("yyyy-MM-dd HH:mm:ss")).arg(alarmList.length()).arg(a_count).arg(ae.Device_Code).arg(ae.Event_Time));
-//                if(a_count>8){
-//                    sleep(5);
-//                    exit(1);
-//                }
-//                clear_devalarm(ae);
-//                alarmList.removeOne(ae);
-//            }
-//        }
+
         QListIterator<AlarmEvent> AlaList(alarmList);
         while(AlaList.hasNext()){
             AlarmEvent ae = AlaList.next();
             if((t.toTime_t()-ae.t_stamp)>120){
                 a_count++;
-                appendLog(QString("[ %1 tmo(%2:%3) ] %4 %5").arg(t.toString("yyyy-MM-dd HH:mm:ss")).arg(alarmList.length()).arg(a_count).arg(ae.Device_Code).arg(ae.Event_Time));
-                if(a_count>8){
-                    sleep(5);
-                    exit(1);
-                }
+                appendLog(QString("[ %1 out(%2:%3) ] %4 %5").arg(t.toString("yyyy-MM-dd HH:mm:ss")).arg(alarmList.length()).arg(a_count).arg(ae.Device_Code).arg(ae.Event_Time));
                 clear_devalarm(ae);
-//                alarmList.removeOne((const AlarmEvent)ae);
             }
         }
     }

YtCam.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.7.2, 2021-05-27T17:45:53. -->
+<!-- Written by QtCreator 4.7.2, 2021-05-28T16:09:21. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>