改页面错误翻译

添加干接点顺序映射

pro/src/appweb_handle.c

@@ -2033,8 +2033,13 @@ static void sensorStatusMonitoring(void* conn)
                     return ;
                 }   
             }            
-              if(_over_all_sensor_request.cgqtd)
+            if(_over_all_sensor_request.cgqtd)
             {
+             #ifdef IN_INDEX_MAP
+                char index_map[4]=IN_INDEX_MAP;
+             #else 
+                char index_map[4]={0,1,3,2}};
+             #endif
                 if (strcmp(_over_all_sensor_request.cgqtd, "RS485") == 0)
                 {
                     _globalSensorMangerTemp->sensor_interface_type = 1;
@@ -2048,28 +2053,28 @@ static void sensorStatusMonitoring(void* conn)
                    //     strcpy(_globalSensorMangerTemp->sensor_port_name, _over_all_sensor_request.comSlogan);
                   //  }
                 }
-                else if (strcmp(_over_all_sensor_request.cgqtd, "IN3") == 0)
+                else if (strcmp(_over_all_sensor_request.cgqtd, "IN1") == 0)
                 {
                     _globalSensorMangerTemp->sensor_interface_type = 2;
-                    _globalSensorMangerTemp->sensor_addr = IN3_Map_Index;
+                    _globalSensorMangerTemp->sensor_addr = index_map[0];
                     strcpy(_globalSensorMangerTemp->sensor_port_name, _over_all_sensor_request.cgqtd);
                 }
-                else if (strcmp(_over_all_sensor_request.cgqtd, "IN4") == 0)
+                else if (strcmp(_over_all_sensor_request.cgqtd, "IN2") == 0)
                 {
                     _globalSensorMangerTemp->sensor_interface_type = 2;
-                    _globalSensorMangerTemp->sensor_addr = IN4_Map_Index;
+                    _globalSensorMangerTemp->sensor_addr = index_map[1];
                     strcpy(_globalSensorMangerTemp->sensor_port_name, _over_all_sensor_request.cgqtd);
                 }
-                else if (strcmp(_over_all_sensor_request.cgqtd, "IN2") == 0)
+                else if (strcmp(_over_all_sensor_request.cgqtd, "IN3") == 0)
                 {
                     _globalSensorMangerTemp->sensor_interface_type = 2;
-                    _globalSensorMangerTemp->sensor_addr = IN2_Map_Index;
+                    _globalSensorMangerTemp->sensor_addr = index_map[2];
                     strcpy(_globalSensorMangerTemp->sensor_port_name, _over_all_sensor_request.cgqtd);
                 }
-                else if (strcmp(_over_all_sensor_request.cgqtd, "IN1") == 0)
+                else if (strcmp(_over_all_sensor_request.cgqtd, "IN4") == 0)
                 {
                     _globalSensorMangerTemp->sensor_interface_type = 2;
-                    _globalSensorMangerTemp->sensor_addr = IN1_Map_Index;
+                    _globalSensorMangerTemp->sensor_addr = index_map[3];
                     strcpy(_globalSensorMangerTemp->sensor_port_name, _over_all_sensor_request.cgqtd);
                 }
             }

pro/src/language_common.c

@@ -19,15 +19,15 @@ const char language_nick_name[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_user_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "用户管理",
-    "User Management",
-    "Управление пользователями ",
+    "User management",
+    "Управление учётными записями",
     " "
 };
 
 const char language_role_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "角色管理",
-    "Role Management",
+    "Role management",
     "Управление ролями ",
     " "
 };
@@ -35,7 +35,7 @@ const char language_role_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_menu_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "菜单管理",
-    "Menu Management",
+    "Menu management",
     "Управление меню ",
     " "
 };
@@ -43,7 +43,7 @@ const char language_menu_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_power_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "电源监控",
-    "Power Monitor",
+    "Power monitor",
     "Мониторинг питания",
     " "
 };
@@ -51,31 +51,31 @@ const char language_power_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_power_sts_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "总体状态监控",
-    "Device Monitor",
-    "Мониторинг устройств",
+    "Device monitor",
+    "Мониторинг и управление фазами",
     " "
 };
 
 const char language_power_channel_sts_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "通道状态监控",
-    "Device Channel Monitor",
-    "Мониторинг каналов устройств",
+    "Device channel monitor",
+    "Мониторинг и управление розетками",
     " "
 };
 
 const char language_power_switch_sts_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "开关状态监控",
-    "Device Switch Monitor",
+    "Device swith monitor",
     "Монитор коммутатора оборудования",
     " "
 };
 const char language_power_history_search[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "历史记录查询",
-    "Device History",
-    "История устройств",
+    "Sensor status history",
+    "График энергопотребления",
     " "
 };
 
@@ -98,8 +98,8 @@ const char language_sensor_status_monitoring[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_sensor_history_search[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "历史记录查询",
-    "Device History",
-    "История устройств",
+    " Sensor status history",
+    "История состояния датчиков",
     " "
 };
 
@@ -115,15 +115,15 @@ const char language_Alarm_System[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "系统告警",
     "System alarm",
-    "Системная тревога",
+    "Аварийные оповещения",
     " "
 };
 
 const char language_Alarm_Threshold_rule[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "阈值及规则设置",
-    "Threshold and rule Settings",
-    "Настройка порогов и правил",
+    "Threshold and rule settings",
+    "Установка пороговых значений",
     " "
 };
 
@@ -146,7 +146,7 @@ const char language_log_Alarm[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_log_operation[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "操作日志",
-    "operation log",
+    "Operation log",
     "Журнал операций",
     " "
 };
@@ -154,8 +154,8 @@ const char language_log_operation[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_log_running[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "运行日志",
-    "running log",
-    "Журнал работы",
+    "Running log",
+    "Журнал событий",
     " "
 };
 
@@ -163,7 +163,7 @@ const char language_communication_management[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "通信管理",
     "communication management",
-    "Управление связью",
+    "Настройки сети",
     " "
 };
 
@@ -171,23 +171,23 @@ const char language_communication_management[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_net_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "网口设置",
-    "net opening install",
-    "Установка сетевого порта",
+    "Net opening settings",
+    "Настройки IP",
     " "
 } ;
 
 const char language_RS485_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "RS485设置",
-    "RS485 install",
-    "Установка RS485",
+    "RS485 settings",
+    "Настройки RS485",
     " "
 } ;
 
 const char language_serve_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "服务管理",
-    "serve install",
+    "serve settings",
     "Установка службы ",
     " "
 } ;
@@ -196,23 +196,23 @@ const char language_serve_manage[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_SMTP_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "SMTP设置",
-    "SMTP install",
-    "Установка SMTP",
+    "SMTP settings",
+    "Настройки SMTP",
     " "
 } ;
 
 const char language_SNMP_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "SNMP设置",
-    "SNMP install",
-    "Установка SNMP",
+    "SNMP settings",
+    "Настройки SNMP",
     " "
 } ;
 
 const char language_SNMP_TRAP_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "SNMP TRAP设置",
-    "SNMP TRAP install",
+    "SNMP settings",
     "Установка SNMP TRAP",
     " "
 } ;
@@ -220,24 +220,24 @@ const char language_SNMP_TRAP_install[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_MQTT_iot_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "MQTT物联设置",
-    "MQTT iot install",
-    "Установка MQTT для IoT",
+    "MQTT settings",
+    "Настройки MQTT для IoT",
     " "
 } ;
 
 const char language_NTP_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "NTP设置",
-    "NTP install",
-    "Установка NTP",
+    "NTP settings",
+    "Настройки NTP",
     " "
 } ;
 
 const char language_Timing_install[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "定时设置",
-    "Timing install",
-    "Установка времени",
+    "Timing settings",
+    "Настройка сценариев",
     " "
 } ;
 
@@ -245,7 +245,7 @@ const char language_Sequential_setting[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "时序设置",
     "Sequential setting",
-    "Установка последовательности",
+    "Настройки включения розеток",
     " "
 } ;
 
@@ -253,7 +253,7 @@ const char language_Group_setting[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "分组设置",
     "Group setting",
-    "Установка группы",
+    "Настройки групп розеток",
     " "
 } ;
 
@@ -261,7 +261,7 @@ const char language_maintenance_equipment[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "设备维护",
     "maintenance of equipment",
-    "Обслуживание оборудования",
+    "Сервисные функции",
     " "
 } ;
 
@@ -276,7 +276,7 @@ const char language_Device_restart[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_firmware_upgrade[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "固件升级",
-    "firmware upgrade",
+    "Firmware upgrade",
     "Обновление прошивки",
     " "
 } ;
@@ -300,15 +300,15 @@ const char language_Configure_inport_export[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 const char language_after_sales_service[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "售后服务",
-    "after-sales service",
-    "Послепродажное обслуживание",
+    "Customizing the logo",
+    "Сведения о производителе",
     " "
 } ;
 
 const char language_about_Equipment[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
 {
     "关于设备",
-    "About Equipment",
+    "About PDU",
     "О оборудовании",
     " "
 } ;
@@ -435,7 +435,7 @@ const char language_alarm_P[LANGUAGE_TYPE][LANGUAGE_SIZE] =
 {
     "耗电量",
     "power consumption ",
-    "Потребление электроэнергии",
+    "Потребление (кВт)",
     " "
 } ;