709，新网页

cust_data/web/unique/css/chunk-6cfd20a9.e00f629d.css

@@ -1 +1 @@
-.el-tabs__item{font-size:16px;font-weight:700;border-radius:20px;border-color:#fff}.el-tabs__item.is-active{font-weight:700;background-color:#0e35ff;color:#fff;border-radius:20px}.fOrange[data-v-5a285b8b]{color:#f60}
+.el-tabs__item{font-size:16px;font-weight:700;border-radius:20px;border-color:#fff}.el-tabs__item.is-active{font-weight:700;background-color:#0e35ff;color:#fff;border-radius:20px}.fOrange[data-v-d5ae205c]{color:#f60}

cust_data/web/unique/i18n/i18n_zh_CN.js

@@ -494,7 +494,7 @@ const i18n_zh_CN = {
   "ledgjzt":"LED告警状态",
   "sygjzt":"声音告警状态",
   "gjjg":"告警间隔(ms)",
-  "gjsj":"告警时间(s)",
+  "gjsj1":"告警时间(s)",
 
 
 

f427/applications/cascade.c

@@ -738,10 +738,10 @@ void cascade_scan_thread(void *arg)
 				slave_info.chache->north.data.ac_3.dev_cnt = (p_data->prod.type << 8 | channels);
 				for(int i = A_P; i <= C_P;i++)
 				{
-					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].consumer = all.ttl.total[i].consump *1000;
-					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].current  = all.ttl.total[i].current *1000;
-					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].power    = all.ttl.total[i].power *1000;
-					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].voltage  = all.ttl.total[i].voltage *1000;
+					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].consumer = all.ttl.total[i].consump *10;
+					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].current  = all.ttl.total[i].current *10;
+					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].power    = all.ttl.total[i].power *10;
+					slave_info.chache->north.data.ac_3.ac_3_all_pw[i].voltage  = all.ttl.total[i].voltage *10;
 				}
 				int cnt = all.chs > POWER_SLAVE_CH_MAX ? POWER_SLAVE_CH_MAX : channels;
 				for(int i = 0; i < cnt;i++)

pro/src/app.c

@@ -2487,8 +2487,16 @@ static void* sensor_thread(void* arg)
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
 
                 Max_Temprature=  _globalSensorInfo.val1*100>Max_Temprature? _globalSensorInfo.val1*100:Max_Temprature;
+                for(int i = 0 ; i < NOARTH_MAX_SENSOR;i++)           //最多4个
+                {
+                    if(_globalSensorMangerTemp->sensor_addr == sen.serser_addr[i])
+                    {
+                        set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,i);
+                        break;
+                    }
+                }   
 
-                set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
+               //set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
             }
             break;
 
@@ -2496,6 +2504,8 @@ static void* sensor_thread(void* arg)
             case SENSOR_TYPE_LEAK://泄漏传感器
             {
                 sensor_dat_t sdat;
+                bool alarmflag=false;
+                int alarmType=-1;
                 ret = sensor_get_data(SENSOR_TYPE_LEAK, SENSOR_TYPE_LEAK_XWDC01A, _globalSensorMangerTemp->sensor_addr, 0, &sdat);
                 if (ret == -1){
                     _globalSensorMangerTemp->sensor_check_count++;
@@ -2515,9 +2525,15 @@ static void* sensor_thread(void* arg)
                 }
                 else {
                     _globalSensorMangerTemp->sensor_status = 0;
+                    _globalSensorMangerTemp->sensor_check_count = 0;
+                    if (sdat.flag == 1 && _globalSensorMangerTemp->Cur_sensor_info.val1 != 1)
+                    {
+                        alarmflag = true;
+                    }
+
                     _globalSensorInfo.val1 = sdat.flag;
                     _globalSensorInfo.val2 = 0.0f;
-                    _globalSensorMangerTemp->sensor_check_count = 0;
+
                 }
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
                 for(int i = 0 ; i < NOARTH_MAX_SENSOR;i++)           //最多4个
@@ -2528,6 +2544,21 @@ static void* sensor_thread(void* arg)
                         break;
                     }
                 }   
+
+                if (alarmflag){
+                    dev_sensor_Alarm_send_message(&__globalDeviceManage, _globalSensorMangerTemp, -1);
+                    time_t now;
+                    time(&now);
+                    t = localtime(&now);
+                    _globalSensorMangerTemp->Cur_sensor_info.product_log_time = now;
+                    ret = dev_insert_sensor_info(_globalDeviceManager->db, &_globalSensorMangerTemp->Cur_sensor_info, &nSaveIndex);
+                    if (ret != 0)
+                    {
+                        log_e("sensor_temp_write database error.");
+                    }
+                }                
+
+
                 //set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
 
                 //printf("_______SENSOR_TYPE_LEAK: addr:%d, %d, %d, ____%f\n", _globalSensorMangerTemp->sensor_addr, ret, sdat.flag, sensor_info.val1);

pro/src/appweb_handle.c

@@ -6161,6 +6161,13 @@ static void equipmentMintenance(void *conn)
     }
     else if (strcmp(_Over_equipment_mintenance.type,"listRtHisQuery") == 0) {
         ack_str = upgrade_to_json();
+    }else if(strcmp(_Over_equipment_mintenance.type,"chipType") == 0)
+    {
+#if (CHIP_TYPE == CHIP_T113s)
+        ack_str = json_get_chip_type(0);
+#else
+        ack_str = json_get_chip_type(1);
+#endif
     }
 
     cJSON_Delete(cjson);

pro/src/common.c

@@ -938,7 +938,7 @@ void SetMenuAuthority(int RoleID)
         _GlobalMenuAuthority.SnmpszEnabled = true;
         _GlobalMenuAuthority.MqszEnabled = true;
         _GlobalMenuAuthority.NtpszEnabled = true;
-#ifndef NOT_USE_CONTROL
+#if ((MONWAY != 1) && (MONWAY != 3)) 
         _GlobalMenuAuthority.DsszEnabled = true;
         _GlobalMenuAuthority.SxszEnabled = true;
         _GlobalMenuAuthority.FzszEnabled = true;
@@ -949,7 +949,7 @@ void SetMenuAuthority(int RoleID)
 #endif
         // 8、设备维护菜单
         _GlobalMenuAuthority.SbcqEnabled = true;
-#ifndef NOT_USE_CONTROL
+#if ((MONWAY != 1) && (MONWAY != 3)) 
         _GlobalMenuAuthority.GjsjEnabled = true;
 #else
          _GlobalMenuAuthority.GjsjEnabled = false;
@@ -1009,7 +1009,7 @@ void SetMenuAuthority(int RoleID)
         _GlobalMenuAuthority.SnmpszEnabled = false;
         _GlobalMenuAuthority.MqszEnabled = false;
         _GlobalMenuAuthority.NtpszEnabled = true;
-#ifndef NOT_USE_CONTROL
+#if ((MONWAY != 1) && (MONWAY != 3)) 
         _GlobalMenuAuthority.DsszEnabled = true;
         _GlobalMenuAuthority.SxszEnabled = true;
         _GlobalMenuAuthority.FzszEnabled = true;

pro/src/json_handle.c

@@ -1303,6 +1303,37 @@ int json_to_switch_language(const char* str)
     return 0;
 }
 
+///返回芯片类型
+
+
+char * json_get_chip_type(int type)
+{
+    char* str = NULL;
+    // 创建 JSON 对象
+    cJSON* root = cJSON_CreateObject();   
+    // 添加基本键值对
+    cJSON_AddNumberToObject(root, "code", 200); 
+    //创建数据
+    //cJSON* data_root_array = cJSON_CreateObject();
+    cJSON* data_filed = cJSON_CreateObject();
+    if(type == 0)
+    {
+        cJSON_AddStringToObject(data_filed,"chipType","T113-s");
+    }else
+    {
+        cJSON_AddStringToObject(data_filed,"chipType","T113-i");
+    }
+    //cJSON_AddItemToObject(data_root_array, "data", data_filed);
+    //第二条记录
+    cJSON_AddItemToObject(root, "data", data_filed);
+    str = cJSON_Print(root);    
+    //释放资源
+    cJSON_Delete(root);
+    return str;   
+}
+
+
+
 /// @brief 返回监控总信息
 /// @param _over_back_sts_info 
 /// @return 

pro/src/json_handle.h

@@ -735,5 +735,9 @@ char *threshold_status_ack_to_json(GlobalDeviceManager *dm);
 char* upgrade_to_json(void);
 char* board_to_json(handle_t l, int is_ws);
 char *upg_chk_to_json(int r);
+
+char * json_get_chip_type(int type);
+
+
 #endif
 

pro/src/language_common.c

@@ -900,6 +900,21 @@ const char* language_alarm_NULL_ERROR[LANG_MAX] =
 } ;
 
 
+const char * language_alarm_immerse[LANG_MAX] =
+{
+    "泄露",                                        //中文
+    "Leak",                                        //英文
+    "утечка",                                      //俄语
+    "fuite",                                       //法语
+    "lecken",                                      //德语
+    "filtración",                                  //西班牙 
+    "vazar",                                       //葡萄牙
+    "perdita",                                     //意大利语
+    "漏洩",                                        //日语
+};
+
+
+
 const char* language_alarm_phase_lose[LANG_MAX] = 
 {
     "相位缺失",

pro/src/language_common.h

@@ -104,5 +104,5 @@ 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];
-
+extern const char * language_alarm_immerse[LANG_MAX];
 #endif

pro/src/sqlite_handle.c

@@ -4549,6 +4549,11 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         sprintf(AlarmText, "%s %s |$%s$", __globalPowerTemp->sensor_name,"released", language_alarm[languagesID]);
     }
     break;
+    case SENSOR_TYPE_LEAK:
+    {
+        sprintf(AlarmText,"%s %s |$%s$",__globalPowerTemp->sensor_name,language_alarm_immerse[languagesID],language_alarm[languagesID]);
+    }
+    break;
     default:
         sprintf(AlarmText,"%s |$%s$",__globalPowerTemp->sensor_name,language_alarm_NULL_ERROR[languagesID]);
         break;

pub

@@ -30,7 +30,7 @@
 #PRJS="PRJ_GOWONE_125A_AC_I3_O1"
 #PRJS="PRJ_Malaysia_AC_I3_O1"
 #PRJS="PRJ_2405_AC_I1_O1_OLED"
-PRJS="PRJ_2503_AC_I1_O1_OLED"
+#PRJS="PRJ_2503_AC_I1_O1_OLED"
 #PRJS="PRJ_CHANGCHUN_AC_I1_O1_OLED"
 #PRJS="PRJ_TIDA_AC_I3_O1"
 #PRJS="PRJ_BYD_UPS_AC_I1_O1"
@@ -56,6 +56,10 @@ PRJS="PRJ_2503_AC_I1_O1_OLED"
 #PRJS="PRJ_IP_GOX001_4_AC_I3_O1"
 #PRJS="PRJ_IP_GANGKEDA_AC_I3_O1"
 
+
+PRJS="PRJ_709_AC_I3_O1_OLED"
+
+
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
 ip_flag=0
@@ -236,7 +240,10 @@ function do_copy()
     elif [ "$1" = "PRJ_2405_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_2405_OLED_release
 	rm -f $appdir/Qt_Test
-    elif [ "$1" = "PRJ_2503_AC_I1_O1_OLED" ];then
+    elif [ "$1" = "PRJ_709_AC_I3_O1_OLED" ];then
+        name=ac_in3_out1_709_oled_release
+        rm -f $appdir/Qt_Test	
+    elif [ "$1" = "PRJ_2405_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_2503_OLED_release
 	rm -f $appdir/Qt_Test
     elif [ "$1" = "PRJ_CHANGCHUN_AC_I1_O1_OLED" ];then