Merge branch 'PureCode' of http://x-copper.cn:8418/WolfSpirit/EJM_Display into PureCode

Pages/P08_AlarmPage.cpp

@@ -105,9 +105,16 @@ void P08_AlarmPage::UIRefreshTimeOut()
         uint16_t localOldAlarmCode = m_oldAlarmCode;
         m_oldAlarmCode = NewAlarmCode;
 
+<<<<<<< HEAD
         // 解析设备码 + 索引码
         uint8_t devCode = NewAlarmCode >> 8;   // 高 8 位
         uint8_t idxCode = NewAlarmCode & 0xFF; // 低 8 位
+=======
+    uint16_t NewAlarmCode = getNodeValue("AlarmCode.New").toUInt();
+    if (NewAlarmCode == m_oldAlarmCode)
+        return;
+    m_oldAlarmCode = NewAlarmCode;
+>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
 
         // 格式化字符串
         QString timeStr = QDateTime::currentDateTime().toString("MM-dd hh:mm:ss");