广播和声光报警器bug处理。

pro/src/appweb_handle.c

@@ -4050,15 +4050,10 @@ static void communicationManagement(void *conn)
                 {
                     broadcast_deinit();
                 }
-                ack_str = ctrl_sts_ack_to_json(); 
-            }else
-            {
-                ack_str = ctrl_breaker_err_ack_to_json("check mulcast err!!!");  
             }
-        }else
-        {
-            ack_str = ctrl_sts_ack_to_json(); 
+
         }
+        ack_str = ctrl_sts_ack_to_json(); 
     }
 
     cJSON_Delete(cjson);

pro/src/json_handle.c

@@ -1903,7 +1903,9 @@ char* ctrl_breaker_err_ack_to_json(char *string)
     // 添加基本键值对
     cJSON_AddNumberToObject(root, "code", 201);       
     //添加结果
-    cJSON_AddStringToObject(root, "msg", string);    
+    char temp[100] = {0};
+    sprintf(temp,"%s %s",string,language_Operation_Failed[__globalDeviceManage._globalDevInfo.product.language]);
+    cJSON_AddStringToObject(root, "msg", temp);    
     //转换
     str = cJSON_Print(root);    
     //释放资源
@@ -4992,8 +4994,12 @@ char *communication_broadcast_ack_to_json(mulcast_t* broad)
 
     // memset(temp, 0, sizeof(temp));
     // sprintf(temp,"%d",_modbusInfo_t->addr);
-    cJSON_AddNumberToObject(data_root_array, "broadcastPort", broad->broadcast_port); 
-    cJSON_AddNumberToObject(data_root_array, "multcastPort", broad->mulcast_port); 
+
+    sprintf(temp,"%d",broad->broadcast_port);
+    cJSON_AddStringToObject(data_root_array, "broadcastPort", temp); 
+
+    sprintf(temp,"%d",broad->mulcast_port);
+    cJSON_AddStringToObject(data_root_array, "multcastPort", temp); 
 
 
     memset(temp, 0, sizeof(temp));
@@ -5766,12 +5772,12 @@ cJSON* json_to_communication_manage(const char* str,_CommunicationManageRequestI
         _cjson = cJSON_GetObjectItem(cjson, "broadcastPort");
         if (_cjson != NULL)
         {
-            _communicationRequestInfo->broadcast.broadcast_port = _cjson->valueint;
+            _communicationRequestInfo->broadcast.broadcast_port = atoi(_cjson->valuestring);
         }        
         _cjson = cJSON_GetObjectItem(cjson, "multcastPort");
         if (_cjson != NULL)
         {
-            _communicationRequestInfo->broadcast.mulcast_port = _cjson->valueint;
+            _communicationRequestInfo->broadcast.mulcast_port = atoi(_cjson->valuestring);
         }
         _cjson = cJSON_GetObjectItem(cjson, "broadcastIp");
         if (_cjson != NULL)

pro/src/language_common.h

@@ -103,6 +103,6 @@ extern const char* language_login_wrong_param[LANG_MAX];
 extern const char* language_login_query_failed[LANG_MAX];
 
 extern const char* language_Broadcast_install[LANG_MAX];
-
+extern const char* language_Operation_Failed[LANG_MAX];
 
 #endif

pro/ui/beep.c

@@ -91,6 +91,15 @@ int beep_init(void)
     h->mode = -1;
 
     //beep_set(BEEP_MODE_FATAL);
+    MiscInfo_t* misc=get_misc();
+
+    beep_para[BEEP_MODE_WARN1].off_ms =  misc->interval;
+    beep_para[BEEP_MODE_WARN1].on_ms =   misc->interval;
+    beep_para[BEEP_MODE_WARN1].times = misc->interval > 0 ? (misc->duption * 1000) / (misc->interval * 2) : 0;
+
+    beep_para[BEEP_MODE_WARN1].off_ms =  misc->interval;
+    beep_para[BEEP_MODE_WARN1].on_ms =  misc->interval;
+    beep_para[BEEP_MODE_WARN1].times = misc->interval > 0 ? (misc->duption * 1000) / (misc->interval * 2) : 0;
     return 0;
 }