Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/json_handle.c

@@ -5131,5 +5131,8 @@ void InitHashTable(HashTable *table)
     insert_Newhash(table,(const char*)language_alarm_Type_Sensor[0],language_alarm_Type_Sensor,nMaxSize);
     insert_Newhash(table,(const char*)language_alarm_Type_Network[0],language_alarm_Type_Network,nMaxSize);
     //28
-
+    insert_Newhash(table,(const char*)language_alarm_phaseA_lose[0], language_alarm_phaseA_lose, nMaxSize);
+    insert_Newhash(table,(const char*)language_alarm_phaseB_lose[0], language_alarm_phaseB_lose, nMaxSize);
+    insert_Newhash(table,(const char*)language_alarm_phaseC_lose[0], language_alarm_phaseC_lose, nMaxSize);
+    //31
 }

pro/src/language_common.c

@@ -524,6 +524,30 @@ const char language_alarm_NULL_ERROR[LANGUAGE_TYPE][LANGUAGE_SIZE] =
     " "
 } ;
 
+const char language_alarm_phaseA_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "相位A缺失",
+    " Phase A Loss! ",
+    " Фаза A отсутствует！",
+    " "
+} ;
+
+const char language_alarm_phaseB_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "相位B缺失",
+    " Phase B Loss! ",
+    " Фаза B отсутствует！",
+    " "
+} ;
+
+const char language_alarm_phaseC_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "相位C缺失",
+    " Phase C Loss! ",
+    " Фаза C отсутствует！",
+    " "
+} ;
+
 const char language_alarm_RS485_master[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "主机",

pro/src/language_common.h

@@ -129,6 +129,12 @@ extern const char language_alarm_Init_Success[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
 extern const char language_alarm_NULL_ERROR[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
+extern const char language_alarm_phaseA_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+
+extern const char language_alarm_phaseB_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+
+extern const char language_alarm_phaseC_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+
 extern const char language_alarm_RS485_master[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
 extern const char language_alarm_RS485_slave[LANGUAGE_TYPE][LANGUAGE_SIZE];

pro/src/sqlite_handle.c

@@ -3326,6 +3326,21 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     }
     break;
     case ENABLE_TAC_STIME:
+     {
+        if ( __globalPowerTemp->product_ph_type==0)
+        {
+            sprintf(AlarmText, "$通道$|%d |$%s$", __globalPowerTemp->product_ch_id, language_alarm_phaseA_lose[languagesID]);
+        }
+        else if (__globalPowerTemp->product_ph_type==1)
+        {
+            sprintf(AlarmText, "$通道$|%d |$%s$", __globalPowerTemp->product_ch_id, language_alarm_phaseB_lose[languagesID]);
+        }
+        else if (__globalPowerTemp->product_ph_type==2)
+        {
+            sprintf(AlarmText, "$通道$|%d |$%s$", __globalPowerTemp->product_ch_id, language_alarm_phaseC_lose[languagesID]);
+        }
+    }
+    break;
     case ENABLE_TAC_ETIME:
     default:
         sprintf(AlarmText, "$通道$|%d%c |$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_NULL_ERROR[languagesID]);