1、修改传感器短信报警信息错误，修改MQTT传感器报警信息错误

pro/src/Cellular.c

@@ -1227,7 +1227,7 @@ int cell_send_sms_all(int type, int subtype, int alarm_type,char *txt)
         case SENSOR_TYPE_TEMP_DOUBLE:
         case SENSOR_TYPE_TEMP_HUMI:
         case SENSOR_TYPE_TEMP:
-            snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_temperature[langID], language_alarm[langID]);
+            snprintf(temp, sizeof(temp), "%s %d %s/%s %s", prod_name, prod_id, language_temperature[langID], language_humidity[langID], language_alarm[langID]);
             break;
 
         case SENSOR_TYPE_SMOKE:

pro/src/mail.c

@@ -437,7 +437,7 @@ int mail_post_alarm(int type, int subtype, int alarm_type, char *content)
                 case SENSOR_TYPE_TEMP_DOUBLE:
                 case SENSOR_TYPE_TEMP_HUMI:
                 case SENSOR_TYPE_TEMP:
-                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_temperature[langID], language_alarm[langID]);
+                 snprintf(temp, sizeof(temp), "%s %d %s/%s %s", prod_name, prod_id, language_temperature[langID], language_humidity[langID], language_alarm[langID]);
                 break;
 
                 case SENSOR_TYPE_SMOKE:

pro/src/sqlite_handle.c

@@ -4135,7 +4135,7 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
 
     mail_post_alarm(ALARM_TYPE_POWER, 1, _AlarmType, AlarmText);
 
-    cell_send_sms_all(ALARM_TYPE_POWER, 0, _AlarmType, AlarmText);
+    cell_send_sms_all(ALARM_TYPE_POWER, 1, _AlarmType, AlarmText);
 
     alarm_para_t para;
     para.id = __globalPowerTemp->product_ch_id;
@@ -4315,14 +4315,14 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
     int subtype=__globalPowerTemp->sensor_type;
     mail_post_alarm(ALARM_TYPE_SENSOR, subtype, _AlarmType, AlarmText);
 
-    cell_send_sms_all(ALARM_TYPE_POWER, 0, _AlarmType, AlarmText);
+    cell_send_sms_all(ALARM_TYPE_SENSOR, subtype, _AlarmType, AlarmText);
 
     alarm_para_t para;
     para.id = __globalPowerTemp->sensor_id;
     para.nalarm = 1;
     para.action = -1;
     para.actionId = -1;
-    mqtt_post_alarm(ALARM_TYPE_POWER, subtype, AlarmText, &para);
+    mqtt_post_alarm(ALARM_TYPE_SENSOR, subtype, AlarmText, &para);
 
     AlarmTrapinfo pAlarmTrapinfo; ////Trap information
     pAlarmTrapinfo.ID = __globalPowerTemp->sensor_id;