优化看门狗和环境程序逻辑

AGBoxDog/dogcore.cpp

@@ -54,7 +54,7 @@ void DogCore::time_out()
                                       .arg(chkTime[1])
                                       .arg(chkrootprocmem("agDP0001")));
                 system("killall agDP0001");
-                sleep(1);
+                sleep(3);
                 system("/root/bin/agDP0001 &");
             }
 
@@ -62,7 +62,7 @@ void DogCore::time_out()
         if((agBoxShm->processStatus[1].t_time>0)
                 &&(static_cast<int>(chkTime1-agBoxShm->processStatus[1].t_time)>60)){
             if(system("killall agDP0001")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/agDP0001 &")!=-1){
                     logThread->appendData(QString("[ %1 agBoxDog %2 ] agDP0001 time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))
@@ -81,7 +81,7 @@ void DogCore::time_out()
                                       .arg(chkTime[2])
                                       .arg(chkrootprocmem("agDP0002")));
                 system("killall agDP0002");
-                sleep(1);
+                sleep(3);
                 system("/root/bin/agDP0002 &");
             }
 
@@ -89,7 +89,7 @@ void DogCore::time_out()
         if((agBoxShm->processStatus[2].t_time>0)
                 &&(static_cast<int>(chkTime1-agBoxShm->processStatus[2].t_time)>60)){
             if(system("killall agDP0002")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/agDP0002 &")!=-1){
                     logThread->appendData(QString("[%1 agBoxDog %2] agDP0002 time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))
@@ -110,14 +110,14 @@ void DogCore::time_out()
                                       .arg(chkTime[3])
                                       .arg(chkrootprocmem("agDP0003")));
                 system("killall agDP0003");
-                sleep(1);
+                sleep(3);
                 system("/root/bin/agDP0003 &");
             }
         }
         if((agBoxShm->processStatus[3].t_time>0)
                 &&(static_cast<int>(chkTime1-agBoxShm->processStatus[3].t_time)>60)){
             if(system("killall agDP0003")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/agDP0003 &")!=-1){
                     logThread->appendData(QString("[%1 agBoxDog %2] agDP0003 time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))
@@ -136,14 +136,14 @@ void DogCore::time_out()
                                       .arg(chkTime[4])
                                       .arg(chkrootprocmem("agDP0004")));
                 system("killall agDP0004");
-                sleep(1);
+                sleep(3);
                 system("/root/bin/agDP0004 &");
             }
         }
         if((agBoxShm->processStatus[4].t_time>0)
                 &&(static_cast<int>(chkTime1-agBoxShm->processStatus[4].t_time)>60)){
             if(system("killall agDP0004")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/agDP0004 &")!=-1){
                     logThread->appendData(QString("[%1 agBoxDog %2] agDP0004 time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))
@@ -162,14 +162,14 @@ void DogCore::time_out()
                                       .arg(chkTime[5])
                                       .arg(chkrootprocmem("agDP0005")));
                 system("killall agDP0005");
-                sleep(1);
+                sleep(3);
                 system("/root/bin/agDP0005 &");
             }
         }
         if((agBoxShm->processStatus[5].t_time>0)
                 &&(static_cast<int>(chkTime1-agBoxShm->processStatus[5].t_time)>300)){
             if(system("killall agDP0005")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/agDP0005 &")!=-1){
                     logThread->appendData(QString("[%1 agBoxDog %2] agDP0005 time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))
@@ -188,14 +188,14 @@ void DogCore::time_out()
                                       .arg(chkTime[6])
                                       .arg(chkrootprocmem("agDP0006")));
                 system("killall agDP0006");
-                sleep(1);
+                sleep(3);
                 system("/root/bin/agDP0006 &");
             }
         }
         if((agBoxShm->processStatus[6].t_time>0)
                 &&(static_cast<int>(chkTime1-agBoxShm->processStatus[6].t_time)>90)){
             if(system("killall agDP0006")!=-1){
-                sleep(1);
+                sleep(3);
                 if(system("/root/bin/agDP0006 &")!=-1){
                     logThread->appendData(QString("[%1 agBoxDog %2] agDP0006 time out: %3")
                                           .arg(QDateTime::fromTime_t(chkTime1).toString("yyyy-MM-dd HH:mm:ss"))

agEnvironmentProcess/mqttpub.cpp

@@ -29,7 +29,7 @@ void MqttPub::run()
 
                 QJsonParseError parseErr;
                 QJsonDocument doc = QJsonDocument::fromJson(data,&parseErr);
-//                printf("environment parseErr.error %d\n",parseErr.error);
+                printf("environment parseErr.error %d\n",parseErr.error);
                 if(parseErr.error==QJsonParseError::NoError){
                     QString nodeInfo = "";
                     QString deviceId = "";
@@ -40,13 +40,14 @@ void MqttPub::run()
                     int ts = obj_doc.value("ts").toInt();
                     QDateTime datetime = QDateTime::fromTime_t(ts);
                     int minute = datetime.time().minute();
+                    printf("topic:%s, datetime: %s, minute: %d\n",topic.toUtf8().data(),datetime.toString("yyyy-MM-dd HH:mm:ss").toUtf8().data(),minute);
                     QJsonValue dev_value = obj_doc.value("devs");
                     if(dev_value.isArray() && (minute == 00)){
                         QJsonArray list_array = dev_value.toArray();
                         for(int i=0;i<list_array.size();i++){
                             QJsonObject obj_dev = list_array.at(i).toObject();
                             QString deviceCode = sn + "-" + obj_dev.value("dev").toString();
-//                            printf("deviceCode: %s\n",deviceCode.toUtf8().data());
+                            printf("deviceCode: %s\n",deviceCode.toUtf8().data());
                             for(int i=0;i<1024;i++){
                                 if(boxDeviceShm->device[i].Enabled == 0x01){
                                     if(deviceCode.compare(QString(boxDeviceShm->device[i].device_code))==0){

agEnvironmentProcess/mqttsub.cpp

@@ -60,13 +60,17 @@ void MqttSub::onReceived(const QMQTT::Message &message)
     agBoxShm->processStatus[5].t_time=QDateTime::currentDateTime().toTime_t();
 
     minute = QDateTime::currentDateTime().time().minute();
-    if((minute==01)||(minute==02)){
-        QString topic = message.topic();
-        QByteArray data = message.payload();
+//    if((minute==01)||(minute==02)){
+//        QString topic = message.topic();
+//        QByteArray data = message.payload();
 
-        emit sendMqttData(topic,data);
-    }
+//        emit sendMqttData(topic,data);
+//    }
+
+    QString topic = message.topic();
+    QByteArray data = message.payload();
 
+    emit sendMqttData(topic,data);
 }