update

CamCore/coreobject.cpp

@@ -83,6 +83,7 @@ CoreObject::CoreObject(QObject *parent) :
     logThread->start();
     chkPhoneList();
     connect(timer,SIGNAL(timeout()),this,SLOT(time_out()));
+    time_out();
 }
 
 CoreObject::~CoreObject()
@@ -524,6 +525,7 @@ void CoreObject::appendLog(QString log)
 void CoreObject::start()
 {
     //预览监听参数
+    timer->start(3000);
     NET_EHOME_LOCAL_GENERAL_CFG struGeneralCfg = {0};
     struGeneralCfg.byAlarmPictureSeparate = 1;
     if(!NET_EALARM_SetSDKLocalCfg(LOCAL_CFG_TYPE_GENERAL,&struGeneralCfg)){
@@ -599,7 +601,6 @@ void CoreObject::start()
         NET_EALARM_Fini();
         exit(1);
     }
-    timer->start(3000);
 //    qDebug()<<"start core";
 }
 
@@ -783,7 +784,7 @@ void CoreObject::time_out()
                                 reportList.append(Alarm_Report(alarmList.at(j).Device_Code,alarmList.at(j).Event_Time,QString::fromUtf8("200105"),
                                                                     QString::fromUtf8("insert into sp_video2017 (id,port,device_code,time,status,address,ncmd,data1,data2,data3,data4,data5,clsj,clr,clnr,clwb,cllxr,cldh,clzt,cllx,video) values (NULL,'%1','%2','%3','%4','','%5','%6','%7','%8','电动车禁入/区域入侵告警','','1970-01-01 08:00:00','','','','','',0,'','')")
                                                     .arg(2).arg(alarmList.at(j).Device_Code).arg(alarmList.at(j).Event_Time).arg(1)
-                                                    .arg(104).arg(alarmList.at(j).Event_Status).arg(pic1name).arg("")));
+                                                    .arg(106).arg(alarmList.at(j).Event_Status).arg(pic1name).arg("")));
                             }
 
                             if(processList.at(i)->pid()>0)
@@ -830,6 +831,7 @@ void CoreObject::time_out()
             while (reportList.length()>0) {
                 QString phonelist = "";
                 Alarm_Report rep = reportList.first();
+                appendLog(QString("[ %1 sql ] %2").arg(t.toString("yyyy-MM-dd HH:mm:ss")).arg(rep.Sql));
                 QSqlQuery qry = db.exec(rep.Sql);
                 quint64 insertId = qry.lastInsertId().toULongLong();
                 QString type="";
@@ -842,8 +844,8 @@ void CoreObject::time_out()
                     type=QString::fromUtf8("电动车禁入/区域入侵告警");
 //                printf("device code:%s\nget company code:%s\n",rep.Device_Code.toUtf8().data(),companyCode.toUtf8().data());
                 if(companyCode.length()>0){
-//                    QString rep1 = QString("{\"SubType\":16,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":false}").arg(rep.Device_Code).arg(insertId);
-//                    spThread[repcur]->appendData(rep1);
+                    QString rep1 = QString("{\"SubType\":16,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":false}").arg(rep.Device_Code).arg(insertId);
+                    spThread[repcur]->appendData(rep1);
                     QString rep2 = QString("{\"SubType\":16,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":0,\"CompanyCode\":\"%3\",\"evt_name\":\"%4\",\"evt\":0,\"alarm_time\":\"%5\"}")
                                     .arg(rep.Device_Code).arg(insertId).arg(companyCode).arg(type).arg(rep.Event_Time);
 //                    printf("%s\n",rep2.toUtf8().data());

CamCore/logthread.cpp

@@ -6,7 +6,7 @@ LogThread::LogThread(QObject *parent) :
     keep = false;
     dataList.clear();
     wrongList.clear();
-    printf("logthread init\n");
+//    printf("logthread init\n");
     QDir dir("/var/log/usky");
     if(!dir.exists())
         dir.mkdir("/var/log/usky");
@@ -32,9 +32,11 @@ void LogThread::stop()
 
 void LogThread::run()
 {
-    printf("log thread start\n");
+//    printf("log thread start\n");
+    QString log = QString("ytCamCore start at %1.\r\n").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss.zzz"));
+    printf("%s\n",log.toUtf8().data());
     if(file->open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text)){
-        file->write(QString("ytCamCore start at %1.\r\n").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss.zzz")).toUtf8());
+        file->write(log.toUtf8());
         file->close();
     }
     keep = true;

CamDog/dogobject.cpp

@@ -87,7 +87,7 @@ bool DogObject::load_shm()
 void DogObject::start()
 {
     if(shmLoad&&db.isOpen())
-        timer->start(1000);
+        timer->start(5000);
 }
 
 void DogObject::time_out()
@@ -130,7 +130,7 @@ void DogObject::time_out()
         }
     }
 
-    if((t-ytShm->workingTime[0])>5){
+    if((t-ytShm->workingTime[0])>60){
         system("killall ytCamCore");
         system("rm -f /usr/local/nginx/html/hls/*");
         system("rm /tmp/*.mp4");