Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-08 3143aab798b6ea93a472a6b32f69a6aabc7da04e

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

@@ -70,7 +70,7 @@
}

bool TriggerElement::getTriggerState() const {
    return state;
    return triggerState;
}

void TriggerElement::threadInitial() {
@@ -78,7 +78,13 @@
    lastDown = 0;
    triggerType = DOWN;
}
void TriggerElement::resetTriggerState()
{

    //state=false;
    triggerState=false;
    triggerTimes=0;
}

void TriggerElement::timerFunc() {