diff --git a/applications/EmsShow/.gitignore b/applications/EmsShow/.gitignore deleted file mode 100644 index 4a0b530..0000000 --- a/applications/EmsShow/.gitignore +++ /dev/null @@ -1,74 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* -CMakeLists.txt.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/applications/EmsShow/EmsShow.pro b/applications/EmsShow/EmsShow.pro deleted file mode 100644 index 959743d..0000000 --- a/applications/EmsShow/EmsShow.pro +++ /dev/null @@ -1,34 +0,0 @@ -QT += core gui serialport serialbus - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG += c++17 - -# You can make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - main.cpp \ - mainwindow.cpp \ - modbuscontroller.cpp - -HEADERS += \ - mainwindow.h \ - modbuscontroller.h - -FORMS += \ - mainwindow.ui - -#TRANSLATIONS += \ -# EmsShow_en_US.ts -#CONFIG += lrelease -#CONFIG += embed_translations - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target - -DISTFILES += \ - emsshow.ini diff --git a/applications/EmsShow/EmsShow_en_US.ts b/applications/EmsShow/EmsShow_en_US.ts deleted file mode 100644 index edd0d34..0000000 --- a/applications/EmsShow/EmsShow_en_US.ts +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/applications/EmsShow/emsshow.ini b/applications/EmsShow/emsshow.ini deleted file mode 100644 index a50261d..0000000 --- a/applications/EmsShow/emsshow.ini +++ /dev/null @@ -1,49 +0,0 @@ -;通用设置 -[general] -ver="1.0.0" - -[modbus] -;1=RTU 0=TCP -type=1 - -;if type=1, ignore ip and port setting -ip="127.0.0.1" -port=502 - -com="COM20" -baund=9600 -data=8 - -;0=None 1=Odd 2=Even -parity=0 - -stop=1 - -[slaves] -;如果从机数量多于1，则从机地址slave_id以:分隔（英文冒号） -slave_id="1" - -;每一个从机的配置 -;由两个节组成：slave_%d 和 slave_%d_function_%d - -[slave_0] -;支持的功能码数量 -function_code_counts=1 - -[slave_0_function_0] -;功能码 -function_code=3 - -;起始地址，10进制 -start_addr=40001 - -;读取数量 -quantity=10 - -;扫描间隔,单位ms -interval=1000 - -;serial_number与read_quantity的元素数量要一样 -equipment_code=81 -serial_number="0:1:2:3:4:5:6:7:8:9:10:11:12:13:14" -read_quantity="1:1:1:1:1:1:1:1:1:1:1:1:1:1:1" diff --git a/applications/EmsShow/main.cpp b/applications/EmsShow/main.cpp deleted file mode 100644 index ee1ac0b..0000000 --- a/applications/EmsShow/main.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "mainwindow.h" - -#include -#include -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - - QTranslator translator; - const QStringList uiLanguages = QLocale::system().uiLanguages(); - for (const QString &locale : uiLanguages) - { - const QString baseName = "EmsShow_" + QLocale(locale).name(); - if (translator.load(":/i18n/" + baseName)) - { - a.installTranslator(&translator); - break; - } - } - - MainWindow w; - w.show(); - return a.exec(); -} diff --git a/applications/EmsShow/mainwindow.cpp b/applications/EmsShow/mainwindow.cpp deleted file mode 100644 index 32f649a..0000000 --- a/applications/EmsShow/mainwindow.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) - , ui(new Ui::MainWindow) -{ - ui->setupUi(this); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - -void MainWindow::on_btn_Initialize_clicked() -{ - QString appDir = QCoreApplication::applicationDirPath(); - QString iniFilePath = appDir + QString::fromStdString("/emsshow.ini"); - - m_controller.getConfiguration(iniFilePath); -} - - -void MainWindow::on_btn_Read_clicked() -{ - if (!m_controller.Open()) - { - QMessageBox::critical(this, tr("Critical Message"), tr("串口打开失败")); - return; - } - m_controller.Read(); -} - diff --git a/applications/EmsShow/mainwindow.h b/applications/EmsShow/mainwindow.h deleted file mode 100644 index d6e9255..0000000 --- a/applications/EmsShow/mainwindow.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H -#pragma execution_character_set("utf-8") - -#include -#include "modbuscontroller.h" - -QT_BEGIN_NAMESPACE -namespace Ui -{ -class MainWindow; -} -QT_END_NAMESPACE - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(QWidget *parent = nullptr); - ~MainWindow(); - -private slots: - void on_btn_Initialize_clicked(); - - void on_btn_Read_clicked(); - -private: - Ui::MainWindow *ui; - -protected: - ModbusController m_controller; -}; -#endif // MAINWINDOW_H diff --git a/applications/EmsShow/mainwindow.ui b/applications/EmsShow/mainwindow.ui deleted file mode 100644 index 7399d6c..0000000 --- a/applications/EmsShow/mainwindow.ui +++ /dev/null @@ -1,58 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 800 - 600 - - - - MainWindow - - - - - - 30 - 30 - 93 - 29 - - - - Initialize - - - - - - 130 - 30 - 121 - 29 - - - - Read Modbus - - - - - - - 0 - 0 - 800 - 26 - - - - - - - - diff --git a/applications/EmsShow/modbuscontroller.cpp b/applications/EmsShow/modbuscontroller.cpp deleted file mode 100644 index 280b260..0000000 --- a/applications/EmsShow/modbuscontroller.cpp +++ /dev/null @@ -1,191 +0,0 @@ -#include "modbuscontroller.h" - -#define _DEBUG_VSPD_ - -ModbusController::ModbusController():m_pModbusMaster(nullptr), m_pSettings(nullptr) -{ - m_version= "1.0.0"; - m_modbus_type = 1; - m_modbus_ip = "127.0.0.1"; - m_modbus_port = 502; - m_modbus_com = "COM1"; - m_modbus_baund = 9600; - m_modbus_data = 1; - m_modbus_parity = 0; - m_modbus_stop = 1; -} - -ModbusController::~ModbusController() -{ - if (m_pSettings!=nullptr) - { - delete m_pSettings; - m_pSettings = nullptr; - } - - for (SlaveData* ptr : m_slaves) - { - delete ptr; - ptr = nullptr; - } - - m_slaves.clear(); - m_slaves.squeeze(); - - if (m_pModbusMaster != nullptr) - { - m_pModbusMaster->disconnectDevice(); - delete m_pModbusMaster; - m_pModbusMaster = nullptr; - } -} - -void ModbusController::getConfiguration(QString iniFilePath) -{ - m_pSettings = new QSettings(iniFilePath, QSettings::IniFormat); - - m_version = m_pSettings->value("general/ver").toString(); - m_modbus_type = m_pSettings->value("modbus/type").toInt(); - - m_modbus_ip = m_pSettings->value("modbus/ip").toString(); - m_modbus_port = m_pSettings->value("modbus/port").toInt(); - - m_modbus_com = m_pSettings->value("modbus/com").toString(); - m_modbus_baund = m_pSettings->value("modbus/baund").toInt(); - m_modbus_data = m_pSettings->value("modbus/data").toInt(); - m_modbus_parity = m_pSettings->value("modbus/parity").toInt(); - m_modbus_stop = m_pSettings->value("modbus/stop").toInt(); - - QStringList slaves_list = m_pSettings->value("slaves/slave_id").toString().split(":", Qt::SkipEmptyParts); - - int slave_id = 0; - foreach (const QString &str, slaves_list) - { - QString app = QString("slave_%1/function_code_counts").arg(slave_id); - - int functions_count = m_pSettings->value(app).toInt(); - for(int i=0; ivalue(app2 + "/equipment_code").toInt(); - equipmentCode = equipmentCode << 9; - equipmentCode &= 0xFE00; // 二进制掩码: 1111 1110 0000 0000（保留高7位） - - QStringList sn_list = m_pSettings->value(app2 + "/serial_number").toString().split(":", Qt::SkipEmptyParts); - QStringList quantity_list = m_pSettings->value(app2 + "/read_quantity").toString().split(":", Qt::SkipEmptyParts); - - assert(sn_list.size() == quantity_list.size()); - - int j = 0; - foreach(const QString sn, sn_list) - { - SlaveData* pSlaveData = new SlaveData(); - pSlaveData->id = str.toInt(); - pSlaveData->function_code = m_pSettings->value(app2 + "/function_code").toInt(); - pSlaveData->interval = m_pSettings->value(app2 + "/interval").toInt(); - - - unsigned short serialNumber = sn.toInt(); - - serialNumber &= 0x01FF; // 二进制掩码: 0000 0001 1111 1111（保留低9位） - - // 组合操作：高7位左移9位，低9位直接填充 - unsigned short address = pSlaveData->start_address = (equipmentCode ) | serialNumber; // 关键位操作 - - pSlaveData->start_address = address; - pSlaveData->quantity = quantity_list.at(j).toInt(); - m_slaves.push_back(pSlaveData); - j++; - } -#else - SlaveData* pSlaveData = new SlaveData(); - pSlaveData->id = str.toInt(); - pSlaveData->function_code = m_pSettings->value(app2 + "/function_code").toInt(); - pSlaveData->interval = m_pSettings->value(app2 + "/interval").toInt(); - pSlaveData->quantity = m_pSettings->value(app2 + "/quantity").toInt(); - pSlaveData->start_address = m_pSettings->value(app2 + "/start_addr").toInt(); - m_slaves.push_back(pSlaveData); -#endif - } - - slave_id++; - } -} - -bool ModbusController::Open() -{ - if (m_modbus_type == 1) - { - return modbus_rtu(); - } - else - { - return modbus_tcp(); - } -} - -bool ModbusController::modbus_rtu() -{ - m_pModbusMaster = new QModbusRtuSerialClient(); - m_pModbusMaster->setConnectionParameter(QModbusDevice::SerialPortNameParameter, m_modbus_com); //串口号 - m_pModbusMaster->setConnectionParameter(QModbusDevice::SerialBaudRateParameter, m_modbus_baund); //波特率 - m_pModbusMaster->setConnectionParameter(QModbusDevice::SerialParityParameter, m_modbus_parity); //无校验 - m_pModbusMaster->setConnectionParameter(QModbusDevice::SerialDataBitsParameter, m_modbus_data); //数据位 - m_pModbusMaster->setConnectionParameter(QModbusDevice::SerialStopBitsParameter, m_modbus_stop); //停止位 - m_pModbusMaster->setTimeout(1000); // 设置超时2秒 - - return m_pModbusMaster->connectDevice(); -} - -bool ModbusController::modbus_tcp() -{ - return false; -} - -bool ModbusController::Read() -{ - //对每一个从机进行操作 - for( SlaveData* sd : m_slaves) - { - //定义读写单元 - QModbusDataUnit readUnit(QModbusDataUnit::HoldingRegisters, sd->start_address, sd->quantity); - //发送请求 - auto* reply = m_pModbusMaster->sendReadRequest(readUnit, sd->id); - if (reply) - { - connect(reply, &QModbusReply::finished, this, &ModbusController::readRegisters); - } - } - - return true; -} - -void ModbusController::readRegisters() -{ - //接收信号 - auto reply = qobject_cast(sender()); - if (!reply) - { - qDebug() << "无效回复"; - return; - } - //处理响应 - const QModbusDataUnit unit = reply->result(); - // 将数据值转换为字符串 - QString dataStr; - for (int i = 0; i < unit.valueCount(); ++i) - { - dataStr += QString::number(unit.value(i)) + " "; - } - if (dataStr.size() != 0) - { - qDebug() << "读取成功"; - qDebug() << dataStr; - } - else - { - qDebug() << "无数据"; - } -} \ No newline at end of file diff --git a/applications/EmsShow/modbuscontroller.h b/applications/EmsShow/modbuscontroller.h deleted file mode 100644 index 83bb901..0000000 --- a/applications/EmsShow/modbuscontroller.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef MODBUSCONTROLLER_H -#define MODBUSCONTROLLER_H - -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include - -typedef struct _tagSlave -{ - int id; - int function_code; - int start_address; - int quantity; - int interval; -} SlaveData; - -class ModbusController :public QObject -{ - Q_OBJECT -public: - ModbusController(); - ~ModbusController(); - -public: - void getConfiguration(QString iniFilePath); - bool Open(); - bool Read(); - - -protected: - bool modbus_rtu(); - bool modbus_tcp(); -protected: - QString m_version; - int m_modbus_type; - QString m_modbus_ip; - int m_modbus_port; - QString m_modbus_com; - int m_modbus_baund; - int m_modbus_data; - int m_modbus_parity; - int m_modbus_stop; - - QVector m_slaves; - -protected: - QModbusRtuSerialClient* m_pModbusMaster; //创建modbus对象 - QSettings* m_pSettings; - -public slots: - void readRegisters(); //读寄存器函数 -}; - -#endif // MODBUSCONTROLLER_H diff --git a/applications/EmsShower/配置文件/CRWTab_风扇控制器_JPF4826型全能款_兢志_V200.csv b/applications/EmsShower/配置文件/CRWTab_风扇控制器_JPF4826型全能款_兢志_V200.csv new file mode 100644 index 0000000..1f626aa --- /dev/null +++ b/applications/EmsShower/配置文件/CRWTab_风扇控制器_JPF4826型全能款_兢志_V200.csv @@ -0,0 +1,22 @@ +SerialNumber,SubSerialNumber,DeviceClass,EquipmentCode,SubDeviceName,LogicClass,SearchName,Value,SignalStandardName,SignalType,Unit,Factor,SignalNotes,SignalID,AlarmCategory,AlarmThreshold,AlarmReDiff,AlarmDelay_S,AlarmRecoveryDelay_S,OID,FunctionTypeCode,FuncCodeRead,FuncCodeWrite,DevRegAddr,DevRegAddrEnd,DataType,SourceSerialNumber,StartBit,StopBit,OID_ForwardFlag,MultibyteFlag,DataShiftFlag,ModbusSlaveReg,ModbusSlaveFactor +0,1,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸ɼ,DeviceComStatus,1,豸ͨѶ״̬,ң,,1,0:ͨѶ쳣;1:ͨѶ,423101001,,,,,,.1.3.6.1.4.1.61262.4.23.1.1.1,3ComSt,3,6,,,0U16,,0,15,1,0,0,0x2E00,1 +1,2,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸ɼ,TempValue,65,¶ֵ,ң,,1,"ƫ 40,ʵ¶ֵ=ֵ-40;",423102001,,,,,,.1.3.6.1.4.1.61262.4.23.1.2.1,0Read,3,6,0x0000,0x0000,1S16,,0,15,1,0,0,0x2E01,1 +2,3,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸ɼ,Fan1Status,1,1״̬,ң,,1,״̬=1 =1ͣת,423103001,,,,,,.1.3.6.1.4.1.61262.4.23.1.3.1,0Read,3,6,0x0001,0x0001,0U16,,0,0,1,0,0,0x2E02,1 +3,4,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸ɼ,Fan2Status,1,2״̬,ң,,1,״̬=1 =1ͣת,423104001,,,,,,.1.3.6.1.4.1.61262.4.23.1.4.1,0Read,3,6,0x0001,0x0001,0U16,,1,1,1,0,0,0x2E03,1 +4,5,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸ɼ,Fan3Status,1,3״̬,ң,,1,״̬=1 =1ͣת,423105001,,,,,,.1.3.6.1.4.1.61262.4.23.1.5.1,0Read,3,6,0x0001,0x0001,0U16,,2,2,1,0,0,0x2E04,1 +5,6,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸ɼ,Fan4Status,1,4״̬,ң,,1,״̬=1 =1ͣת,423106001,,,,,,.1.3.6.1.4.1.61262.4.23.1.6.1,0Read,3,6,0x0001,0x0001,0U16,,3,3,1,0,0,0x2E05,1 +6,1,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸״̬,DeviceComStatus,0,豸ͨѶ״̬,ң,,1,0:ͨѶ쳣;1:ͨѶ,423001001,,,,,,.1.3.6.1.4.1.61262.4.23.0.1.1,3ComSt,3,6,,,0U16,,0,15,1,0,0,0x2E06,1 +7,2,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸״̬,Fan1AlmStatus,1,1澯״̬,ң,,1,澯=1 =0澯,423002001,,,,,,.1.3.6.1.4.1.61262.4.23.0.2.1,0Read,3,6,0x0001,0x0001,0U16,,0,0,1,0,0,0x2E07,1 +8,3,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸״̬,Fan2AlmStatus,1,2澯״̬,ң,,1,澯=1 =0澯,423003001,,,,,,.1.3.6.1.4.1.61262.4.23.0.3.1,0Read,3,6,0x0001,0x0001,0U16,,1,1,1,0,0,0x2E08,1 +9,4,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸״̬,Fan3AlmStatus,1,3澯״̬,ң,,1,澯=1 =0澯,423004001,,,,,,.1.3.6.1.4.1.61262.4.23.0.4.1,0Read,3,6,0x0001,0x0001,0U16,,2,2,1,0,0,0x2E09,1 +10,5,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸״̬,Fan4AlmStatus,1,4澯״̬,ң,,1,澯=1 =0澯,423005001,,,,,,.1.3.6.1.4.1.61262.4.23.0.5.1,0Read,3,6,0x0001,0x0001,0U16,,3,3,1,0,0,0x2E0A,1 +11,1,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸,ModifyDeviceAdd,1,޸豸ַ,ң,,1,õַ,423301001,,,,,,.1.3.6.1.4.1.61262.4.23.3.1.1,4DevSelfAdd,3,6,,,0U16,,0,15,1,0,0,0x2E0B,1 +12,2,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸,FanStartUp_FullTemp,10538,ȫ¶,ң,,1,λֽڴ¶ȣλֽڴȫ¶ ȡֵΧ 0x292A~0x8B8C,423303001,,,,,,.1.3.6.1.4.1.61262.4.23.3.3.1,1Write,3,6,0x0004,0x0004,0U16,,0,15,1,0,0,0x2E0C,1 +13,3,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸,WorkMode,1,ģʽ,ң,,1,0x0001=Сתģʽ0x0000=ͣģʽ,423304001,,,,,,.1.3.6.1.4.1.61262.4.23.3.4.1,1Write,3,6,0x0005,0x0005,0U16,,0,15,1,0,0,0x2E0D,1 +14,4,ͨϵͳ,23,ȿ_JPF4826ȫܿ_־,豸,FanNum,2,,ң,,1,ȡֵΧ0x0001~0x0004,423305001,,,,,,.1.3.6.1.4.1.61262.4.23.3.5.1,1Write,3,6,0x0006,0x0006,0U16,,0,15,1,0,0,0x2E0E,1 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/applications/EmsShower/配置文件/CfgTab_DevInfo_13.csv b/applications/EmsShower/配置文件/CfgTab_DevInfo_13.csv new file mode 100644 index 0000000..8f06983 --- /dev/null +++ b/applications/EmsShower/配置文件/CfgTab_DevInfo_13.csv @@ -0,0 +1,56 @@ +SerialNumber,DeviceClass,DeviceCoding,LogicClass,SearchName,Value,SignalStandardName,ModifyEnable,SignalNotes,SignalType,Unit,Factor,SignalID,OID,OID_ForwardFlag,DataType +1,FSU豸,98,豸Ϣ,DeviceNumber,31012010052,豸,1,DeviceID+SiteNumber,ң,,1,499101001,.1.3.6.1.4.1.41475.4.98.1.1.1,1,4str +2,FSU豸,98,豸Ϣ,DeviceID,10010,豸ID,1,,ң,,1,499102001,.1.3.6.1.4.1.41475.4.98.1.2.1,1,4str +3,FSU豸,98,豸Ϣ,DeviceName,IoTԵ,豸,1,,ң,,1,499103001,.1.3.6.1.4.1.41475.4.98.1.3.1,1,4str +4,FSU豸,98,豸Ϣ,DeviceModel,HJ-MU108,豸ͺ,1,,ң,,1,499104001,.1.3.6.1.4.1.41475.4.98.1.4.1,1,4str +5,FSU豸,98,豸Ϣ,DevicePowerConsumption,100,豸,1,ģλW,ң,W,1,499105001,.1.3.6.1.4.1.41475.4.98.1.5.1,1,4str +6,FSU豸,98,豸Ϣ,DeviceSN,HJWL2309010001,豸к,1,++豸,ң,,1,499106001,.1.3.6.1.4.1.41475.4.98.1.6.1,1,4str +7,FSU豸,98,豸Ϣ,DeviceAssertCode,0000000000,豸ʲ,1,,ң,,1,499107001,.1.3.6.1.4.1.41475.4.98.1.7.1,1,4str +8,FSU豸,98,豸Ϣ,InstallTime,2023-12-13 15:47:22,װʱ,1,,ң,,1,499108001,.1.3.6.1.4.1.41475.4.98.1.8.1,1,4str +9,FSU豸,98,豸Ϣ,RegionCode,310120,,1,,ң,,1,499109001,.1.3.6.1.4.1.41475.4.98.1.9.1,1,4str +10,FSU豸,98,豸Ϣ,SiteNumber,10001,վ,1,ͬ豸ID,ң,,1,499110001,.1.3.6.1.4.1.41475.4.98.1.10.1,1,4str +11,FSU豸,98,豸Ϣ,RoomName,cn-room,,1,Ļ//,ң,,1,499111001,.1.3.6.1.4.1.41475.4.98.1.11.1,1,4str +12,FSU豸,98,豸Ϣ,DevDescribe,Ե1Ż,豸Ϣ,1,,ң,,1,499112001,.1.3.6.1.4.1.41475.4.98.1.12.1,1,4str +13,FSU豸,98,豸Ϣ,DeviceBrand,,豸Ʒ,1,,ң,,1,499113001,.1.3.6.1.4.1.41475.4.98.1.13.1,1,4str +14,FSU豸,98,Ϣ,NetworkingMethods,LAN,ʽ,1,4/5GߡLAN/WiFi,ң,,1,499114001,.1.3.6.1.4.1.41475.4.98.1.14.1,1,4str +15,FSU豸,98,Ϣ,IPAddress,192.168.2.146,IPַ,1,ƽ̨IPƽ̨ԷʵDzŷʽõĶ̬IP,ң,,1,499115001,.1.3.6.1.4.1.41475.4.98.1.15.1,1,4str +16,FSU豸,98,Ϣ,AccessPort,8080,ʶ˿,1,Э飬豸ܻض˿808080,ң,,1,499116001,.1.3.6.1.4.1.41475.4.98.1.16.1,1,4str +17,FSU豸,98,Ϣ,SNMPAccessPort,161,SNMPʶ˿,1,ȱʡ161,ң,,1,499117001,.1.3.6.1.4.1.41475.4.98.1.17.1,1,4str +18,FSU豸,98,Ϣ,Operator,йƶ,Ӫ,1,4/5G߷ʽ£SIMӪ̣ƶ/ͨ//,ң,,1,499118001,.1.3.6.1.4.1.41475.4.98.1.18.1,1,4str +19,FSU豸,98,Ϣ,SIMCARDNUMBER,,SIM,1,SIMԴ,ң,,1,499119001,.1.3.6.1.4.1.41475.4.98.1.19.1,1,4str +20,FSU豸,98,Ϣ,IMEI,868540050954128,IMEI,1,"ƶ豸ʶ룺15Ϊ֣ÿһƶͨ豸ͨѶģ +IMEI룺868540050954128",ң,,1,499120001,.1.3.6.1.4.1.41475.4.98.1.20.1,1,4str +21,FSU豸,98,Ϣ,IMSI,460080585306741,IMSI,1,,ң,,1,499121001,.1.3.6.1.4.1.41475.4.98.1.21.1,1,4str +22,FSU豸,98,Ϣ,bRemoteServer,http://10.10.63.88:8080,BӿԶ̷ַ,1,,ң,,1,499122001,.1.3.6.1.4.1.41475.4.98.1.22.1,1,4str +23,FSU豸,98,Ϣ,webAccessAddr,192.168.2.146:8080,webʵַ,1,,ң,,1,499123001,.1.3.6.1.4.1.41475.4.98.1.23.1,1,4str +24,FSU豸,98,MQTT,GateWayPublicTopic_Server,GateWayPublicTopic_Server,ط⵽,1,,ң,,1,499124001,.1.3.6.1.4.1.41475.4.98.1.24.1,1,4str +25,FSU豸,98,MQTT,ServerPublicTopic_GateWay,ServerPublicTopic_GateWay,⵽,1,,ң,,1,499125001,.1.3.6.1.4.1.41475.4.98.1.25.1,1,4str +26,FSU豸,98,MQTT,BrokerAddress_Port,116.236.50.106:8764,MQTTBrokerַ˿,1,,ң,,1,499126001,.1.3.6.1.4.1.41475.4.98.1.26.1,1,4str +27,FSU豸,98,MQTT,MqttClientID,hjcid-13,MqttͻID,1,,ң,,1,499127001,.1.3.6.1.4.1.41475.4.98.1.27.1,1,4str +28,FSU豸,98,MQTT,MqttUserName,hjemq-c13,Mqttû,1,,ң,,1,499128001,.1.3.6.1.4.1.41475.4.98.1.28.1,1,4str +29,FSU豸,98,MQTT,MqttPassWord,Hj57471000,Mqtt,1,,ң,,1,499129001,.1.3.6.1.4.1.41475.4.98.1.29.1,1,4str +30,FSU豸,98,MQTT,MqttWillToplic_Server,MqttWillToplic_Server,ط⵽,1,,ң,,1,499130001,.1.3.6.1.4.1.41475.4.98.1.30.1,1,4str +31,FSU豸,98,άϢ,OwnerName,,ҵ,1,,ң,,1,499131001,.1.3.6.1.4.1.41475.4.98.1.31.1,1,4str +32,FSU豸,98,άϢ,OperationsCompanyName,,ά˾,1,,ң,,1,499132001,.1.3.6.1.4.1.41475.4.98.1.32.1,1,4str +33,FSU豸,98,άϢ,OperationsPersonName,,άԱ,1,,ң,,1,499133001,.1.3.6.1.4.1.41475.4.98.1.33.1,1,4str +34,FSU豸,98,άϢ,OperationsPersonMobile,,άԱMobile,1,,ң,,1,499134001,.1.3.6.1.4.1.41475.4.98.1.34.1,1,4str +35,FSU豸,98,άϢ,OperationsPersonEmail,,άԱemail,1,,ң,,1,499135001,.1.3.6.1.4.1.41475.4.98.1.35.1,1,4str +36,FSU豸,98,άϢ,OperationsPersonWeChat,,άԱ΢ź,1,,ң,,1,499136001,.1.3.6.1.4.1.41475.4.98.1.36.1,1,4str +37,FSU豸,98,άϢ,BeginRunTime,2023-12-13 15:47:22,ʱ,1,,ң,,1,499137001,.1.3.6.1.4.1.41475.4.98.1.37.1,1,4str +38,FSU豸,98,忨Ϣ,SoftwareVersion,FSU_SW_V1.0.0,汾,1,,ң,,1,499138001,.1.3.6.1.4.1.41475.4.98.1.38.1,1,4str +39,FSU豸,98,忨Ϣ,SW_LastUpdateTime,2023-12-13 15:47:22,ϴʱ,1,,ң,,1,499139001,.1.3.6.1.4.1.41475.4.98.1.39.1,1,4str +40,FSU豸,98,忨Ϣ,HardwareVersion,FSU_HW_V1.0.0,Ӳ汾,1,,ң,,1,499140001,.1.3.6.1.4.1.41475.4.98.1.40.1,1,4str +41,FSU豸,98,忨Ϣ,HW_LastUpdateTime,2023-12-13 15:47:22,Ӳϴʱ,1,,ң,,1,499141001,.1.3.6.1.4.1.41475.4.98.1.41.1,1,4str +42,FSU豸,98,忨Ϣ,OnlineStatus,,״̬,1,߻,ң,,1,499142001,.1.3.6.1.4.1.41475.4.98.1.42.1,1,4str +43,FSU豸,98,忨Ϣ,RSSI,-60,źǿ,1,,ң,dBm,1,499143001,.1.3.6.1.4.1.41475.4.98.1.43.1,1,4str +44,FSU豸,98,忨Ϣ,InfoSysname,Linux,ϵͳ,1,ϵͳԤȻȡ,ң,,1,499144001,.1.3.6.1.4.1.41475.4.98.1.44.1,1,4str +45,FSU豸,98,忨Ϣ,InfoNodename,HJWL,,1,ϵͳԤȻȡ,ң,,1,499145001,.1.3.6.1.4.1.41475.4.98.1.45.1,1,4str +46,FSU豸,98,忨Ϣ,InfoRelease,4.1.15,ں˰汾,1,ϵͳԤȻȡ,ң,,1,499146001,.1.3.6.1.4.1.41475.4.98.1.46.1,1,4str +47,FSU豸,98,忨Ϣ,InfoVersion,#1 SMP PREEMPT Thu May 9 17:08:50 CST 2024,а汾,1,ϵͳԤȻȡ,ң,,1,499147001,.1.3.6.1.4.1.41475.4.98.1.47.1,1,4str +48,FSU豸,98,忨Ϣ,InfoMachine,armv7l,Ӳܹ,1,ϵͳԤȻȡ,ң,,1,499148001,.1.3.6.1.4.1.41475.4.98.1.48.1,1,4str +49,FSU豸,98,忨Ϣ,InfoUptime,0,ʱ,1,ϵͳʱȡ,ң,,1,499149001,.1.3.6.1.4.1.41475.4.98.1.49.1,1,2U32 +50,FSU豸,98,忨Ϣ,InfoTotalram,518057984,ڴС,1,ϵͳʱȡ,ң,byte,1,499150001,.1.3.6.1.4.1.41475.4.98.1.50.1,1,2U32 +51,FSU豸,98,忨Ϣ,InfoFreeram,453234688,ʣڴС,1,ϵͳʱȡ,ң,byte,1,499151001,.1.3.6.1.4.1.41475.4.98.1.51.1,1,2U32 +52,FSU豸,98,忨Ϣ,InfoProcs,0,ǰ,1,ϵͳʱȡ,ң,,1,499152001,.1.3.6.1.4.1.41475.4.98.1.52.1,1,2U32 +53,FSU豸,98,Ϣ,ProtocolSelection,OID,Эѡ,1,ѡID,ң,,1,499153001,.1.3.6.1.4.1.41475.4.98.1.53.1,1,4str +54,FSU豸,98,Ϣ,FSUDeviceSelfTableName,FSUDEVICEDATATABLE,FSU豸,1,豸ıݴֵ,ң,,1,499154001,.1.3.6.1.4.1.41475.4.98.1.54.1,1,4str diff --git a/applications/EmsShower/配置文件/CfgTab_DevInfo_14.csv b/applications/EmsShower/配置文件/CfgTab_DevInfo_14.csv new file mode 100644 index 0000000..16e784d --- /dev/null +++ b/applications/EmsShower/配置文件/CfgTab_DevInfo_14.csv @@ -0,0 +1,56 @@ +SerialNumber,DeviceClass,DeviceCoding,LogicClass,SearchName,Value,SignalStandardName,ModifyEnable,SignalNotes,SignalType,Unit,Factor,SignalID,OID,OID_ForwardFlag,DataType +1,FSU豸,98,豸Ϣ,DeviceNumber,31012010053,豸,1,DeviceID+SiteNumber,ң,,1,499101001,.1.3.6.1.4.1.41475.4.98.1.1.1,1,4str +2,FSU豸,98,豸Ϣ,DeviceID,10010,豸ID,1,,ң,,1,499102001,.1.3.6.1.4.1.41475.4.98.1.2.1,1,4str +3,FSU豸,98,豸Ϣ,DeviceName,IoTԵ,豸,1,,ң,,1,499103001,.1.3.6.1.4.1.41475.4.98.1.3.1,1,4str +4,FSU豸,98,豸Ϣ,DeviceModel,HJ-MU108,豸ͺ,1,,ң,,1,499104001,.1.3.6.1.4.1.41475.4.98.1.4.1,1,4str +5,FSU豸,98,豸Ϣ,DevicePowerConsumption,100,豸,1,ģλW,ң,W,1,499105001,.1.3.6.1.4.1.41475.4.98.1.5.1,1,4str +6,FSU豸,98,豸Ϣ,DeviceSN,HJWL2309010001,豸к,1,++豸,ң,,1,499106001,.1.3.6.1.4.1.41475.4.98.1.6.1,1,4str +7,FSU豸,98,豸Ϣ,DeviceAssertCode,0000000000,豸ʲ,1,,ң,,1,499107001,.1.3.6.1.4.1.41475.4.98.1.7.1,1,4str +8,FSU豸,98,豸Ϣ,InstallTime,2023/12/13 15:47,װʱ,1,,ң,,1,499108001,.1.3.6.1.4.1.41475.4.98.1.8.1,1,4str +9,FSU豸,98,豸Ϣ,RegionCode,310120,,1,,ң,,1,499109001,.1.3.6.1.4.1.41475.4.98.1.9.1,1,4str +10,FSU豸,98,豸Ϣ,SiteNumber,10001,վ,1,ͬ豸ID,ң,,1,499110001,.1.3.6.1.4.1.41475.4.98.1.10.1,1,4str +11,FSU豸,98,豸Ϣ,RoomName,cn-room,,1,Ļ//,ң,,1,499111001,.1.3.6.1.4.1.41475.4.98.1.11.1,1,4str +12,FSU豸,98,豸Ϣ,DevDescribe,Ե1Ż,豸Ϣ,1,,ң,,1,499112001,.1.3.6.1.4.1.41475.4.98.1.12.1,1,4str +13,FSU豸,98,豸Ϣ,DeviceBrand,,豸Ʒ,1,,ң,,1,499113001,.1.3.6.1.4.1.41475.4.98.1.13.1,1,4str +14,FSU豸,98,Ϣ,NetworkingMethods,LAN,ʽ,1,4/5GߡLAN/WiFi,ң,,1,499114001,.1.3.6.1.4.1.41475.4.98.1.14.1,1,4str +15,FSU豸,98,Ϣ,IPAddress,192.168.2.146,IPַ,1,ƽ̨IPƽ̨ԷʵDzŷʽõĶ̬IP,ң,,1,499115001,.1.3.6.1.4.1.41475.4.98.1.15.1,1,4str +16,FSU豸,98,Ϣ,AccessPort,8080,ʶ˿,1,Э飬豸ܻض˿808080,ң,,1,499116001,.1.3.6.1.4.1.41475.4.98.1.16.1,1,4str +17,FSU豸,98,Ϣ,SNMPAccessPort,161,SNMPʶ˿,1,ȱʡ161,ң,,1,499117001,.1.3.6.1.4.1.41475.4.98.1.17.1,1,4str +18,FSU豸,98,Ϣ,Operator,йƶ,Ӫ,1,4/5G߷ʽ£SIMӪ̣ƶ/ͨ//,ң,,1,499118001,.1.3.6.1.4.1.41475.4.98.1.18.1,1,4str +19,FSU豸,98,Ϣ,SIMCARDNUMBER,,SIM,1,SIMԴ,ң,,1,499119001,.1.3.6.1.4.1.41475.4.98.1.19.1,1,4str +20,FSU豸,98,Ϣ,IMEI,868540050954128,IMEI,1,"ƶ豸ʶ룺15Ϊ֣ÿһƶͨ豸ͨѶģ +IMEI룺868540050954128",ң,,1,499120001,.1.3.6.1.4.1.41475.4.98.1.20.1,1,4str +21,FSU豸,98,Ϣ,IMSI,460080585306741,IMSI,1,,ң,,1,499121001,.1.3.6.1.4.1.41475.4.98.1.21.1,1,4str +22,FSU豸,98,Ϣ,bRemoteServer,http://10.10.63.88:8080,BӿԶ̷ַ,1,,ң,,1,499122001,.1.3.6.1.4.1.41475.4.98.1.22.1,1,4str +23,FSU豸,98,Ϣ,webAccessAddr,192.168.2.146:8080,webʵַ,1,,ң,,1,499123001,.1.3.6.1.4.1.41475.4.98.1.23.1,1,4str +24,FSU豸,98,MQTT,GateWayPublicTopic_Server,GateWayPublicTopic_Server,ط⵽,1,,ң,,1,499124001,.1.3.6.1.4.1.41475.4.98.1.24.1,1,4str +25,FSU豸,98,MQTT,ServerPublicTopic_GateWay,ServerPublicTopic_GateWay,⵽,1,,ң,,1,499125001,.1.3.6.1.4.1.41475.4.98.1.25.1,1,4str +26,FSU豸,98,MQTT,BrokerAddress_Port,116.236.50.106:8764,MQTTBrokerַ˿,1,,ң,,1,499126001,.1.3.6.1.4.1.41475.4.98.1.26.1,1,4str +27,FSU豸,98,MQTT,MqttClientID,hjcid-14,MqttͻID,1,,ң,,1,499127001,.1.3.6.1.4.1.41475.4.98.1.27.1,1,4str +28,FSU豸,98,MQTT,MqttUserName,hjemq-c14,Mqttû,1,,ң,,1,499128001,.1.3.6.1.4.1.41475.4.98.1.28.1,1,4str +29,FSU豸,98,MQTT,MqttPassWord,Hj57471000,Mqtt,1,,ң,,1,499129001,.1.3.6.1.4.1.41475.4.98.1.29.1,1,4str +30,FSU豸,98,MQTT,MqttWillToplic_Server,MqttWillToplic_Server,ط⵽,1,,ң,,1,499130001,.1.3.6.1.4.1.41475.4.98.1.30.1,1,4str +31,FSU豸,98,άϢ,OwnerName,,ҵ,1,,ң,,1,499131001,.1.3.6.1.4.1.41475.4.98.1.31.1,1,4str +32,FSU豸,98,άϢ,OperationsCompanyName,,ά˾,1,,ң,,1,499132001,.1.3.6.1.4.1.41475.4.98.1.32.1,1,4str +33,FSU豸,98,άϢ,OperationsPersonName,,άԱ,1,,ң,,1,499133001,.1.3.6.1.4.1.41475.4.98.1.33.1,1,4str +34,FSU豸,98,άϢ,OperationsPersonMobile,,άԱMobile,1,,ң,,1,499134001,.1.3.6.1.4.1.41475.4.98.1.34.1,1,4str +35,FSU豸,98,άϢ,OperationsPersonEmail,,άԱemail,1,,ң,,1,499135001,.1.3.6.1.4.1.41475.4.98.1.35.1,1,4str +36,FSU豸,98,άϢ,OperationsPersonWeChat,,άԱ΢ź,1,,ң,,1,499136001,.1.3.6.1.4.1.41475.4.98.1.36.1,1,4str +37,FSU豸,98,άϢ,BeginRunTime,2023/12/13 15:47,ʱ,1,,ң,,1,499137001,.1.3.6.1.4.1.41475.4.98.1.37.1,1,4str +38,FSU豸,98,忨Ϣ,SoftwareVersion,FSU_SW_V1.0.0,汾,1,,ң,,1,499138001,.1.3.6.1.4.1.41475.4.98.1.38.1,1,4str +39,FSU豸,98,忨Ϣ,SW_LastUpdateTime,2023/12/13 15:47,ϴʱ,1,,ң,,1,499139001,.1.3.6.1.4.1.41475.4.98.1.39.1,1,4str +40,FSU豸,98,忨Ϣ,HardwareVersion,FSU_HW_V1.0.0,Ӳ汾,1,,ң,,1,499140001,.1.3.6.1.4.1.41475.4.98.1.40.1,1,4str +41,FSU豸,98,忨Ϣ,HW_LastUpdateTime,2023/12/13 15:47,Ӳϴʱ,1,,ң,,1,499141001,.1.3.6.1.4.1.41475.4.98.1.41.1,1,4str +42,FSU豸,98,忨Ϣ,OnlineStatus,,״̬,1,߻,ң,,1,499142001,.1.3.6.1.4.1.41475.4.98.1.42.1,1,4str +43,FSU豸,98,忨Ϣ,RSSI,-60,źǿ,1,,ң,dBm,1,499143001,.1.3.6.1.4.1.41475.4.98.1.43.1,1,4str +44,FSU豸,98,忨Ϣ,InfoSysname,Linux,ϵͳ,1,ϵͳԤȻȡ,ң,,1,499144001,.1.3.6.1.4.1.41475.4.98.1.44.1,1,4str +45,FSU豸,98,忨Ϣ,InfoNodename,HJWL,,1,ϵͳԤȻȡ,ң,,1,499145001,.1.3.6.1.4.1.41475.4.98.1.45.1,1,4str +46,FSU豸,98,忨Ϣ,InfoRelease,4.1.15,ں˰汾,1,ϵͳԤȻȡ,ң,,1,499146001,.1.3.6.1.4.1.41475.4.98.1.46.1,1,4str +47,FSU豸,98,忨Ϣ,InfoVersion,#1 SMP PREEMPT Thu May 9 17:08:50 CST 2024,а汾,1,ϵͳԤȻȡ,ң,,1,499147001,.1.3.6.1.4.1.41475.4.98.1.47.1,1,4str +48,FSU豸,98,忨Ϣ,InfoMachine,armv7l,Ӳܹ,1,ϵͳԤȻȡ,ң,,1,499148001,.1.3.6.1.4.1.41475.4.98.1.48.1,1,4str +49,FSU豸,98,忨Ϣ,InfoUptime,0,ʱ,1,ϵͳʱȡ,ң,,1,499149001,.1.3.6.1.4.1.41475.4.98.1.49.1,1,2U32 +50,FSU豸,98,忨Ϣ,InfoTotalram,518057984,ڴС,1,ϵͳʱȡ,ң,byte,1,499150001,.1.3.6.1.4.1.41475.4.98.1.50.1,1,2U32 +51,FSU豸,98,忨Ϣ,InfoFreeram,453234688,ʣڴС,1,ϵͳʱȡ,ң,byte,1,499151001,.1.3.6.1.4.1.41475.4.98.1.51.1,1,2U32 +52,FSU豸,98,忨Ϣ,InfoProcs,0,ǰ,1,ϵͳʱȡ,ң,,1,499152001,.1.3.6.1.4.1.41475.4.98.1.52.1,1,2U32 +53,FSU豸,98,Ϣ,ProtocolSelection,OID,Эѡ,1,ѡID,ң,,1,499153001,.1.3.6.1.4.1.41475.4.98.1.53.1,1,4str +54,FSU豸,98,Ϣ,FSUDeviceSelfTableName,FSUDEVICEDATATABLE,FSU豸,1,豸ıݴֵ,ң,,1,499154001,.1.3.6.1.4.1.41475.4.98.1.54.1,1,4str diff --git a/applications/emsConfigurer/devicepropertypage.cpp b/applications/emsConfigurer/devicepropertypage.cpp index c91af47..4c06b9e 100644 --- a/applications/emsConfigurer/devicepropertypage.cpp +++ b/applications/emsConfigurer/devicepropertypage.cpp @@ -14,7 +14,7 @@ #include "globalparameters.h" #include "mytablemodel.h" -#define PAGES_FORMAT_STRING ("Total %1 Pages, Current No.%2 Page") +#define PAGES_FORMAT_STRING tr("Total %1 Pages, Current No.%2 Page") #define PER_PAGE_SIZE (30) DevicePropertyPage::DevicePropertyPage(QWidget *parent) : @@ -357,7 +357,7 @@ int DevicePropertyPage::PageDataProcess() void DevicePropertyPage::updatePageLabel() { - QString s = QString(PAGES_FORMAT_STRING).arg(m_totalPageCount).arg(m_currentPage); + QString s = QString(tr("Total %1 Pages, Current No.%2 Page")).arg(m_totalPageCount).arg(m_currentPage); m_pPagesLabel->setText(s); } diff --git a/applications/emsConfigurer/emsConfigurer_en_US.ts b/applications/emsConfigurer/emsConfigurer_en_US.ts index 74d93cd..440f2f9 100644 --- a/applications/emsConfigurer/emsConfigurer_en_US.ts +++ b/applications/emsConfigurer/emsConfigurer_en_US.ts @@ -10,7 +10,7 @@ About Configurer - + TextLabel @@ -107,6 +107,12 @@ Interval(Sec.) Interval(Sec.) + + + Total %1 Pages, Current No.%2 Page + Total %1 Pages, Current No.%2 Page + Total %1 Pages, Current No.%2 Page + Page number should be large than 0 and less than %1 ! @@ -360,73 +366,86 @@ Contact Developement for supporting! EMU Configurer Kit - + EMU Configurer Kit Power - + Power + Power Battery - + Battery + Battery Switch - + Switch + Switch Air - + Air + Air Fan - + Fan + Fan Sensor - + Sensor + Sensor Add Device - + Add Device + Add Device Add a new device - + Add a new device + Add a new device Remove Device - + Remove Device + Remove Device Remove a device - + Remove a devic + Remove a devic Refresh - + Refresh + Refresh About... - + About... + About... Show information about EMU Configurer toolkit - + Show information about EMU Configurer toolkit + Show information about EMU Configurer toolkit @@ -462,31 +481,31 @@ Contact Developement for supporting! Test - + Logon Logon Logon - + Close Close Close - + Login name Login name Login name - + Password Password Password - + Lang Lang Lang @@ -560,22 +579,26 @@ Contact Developement for supporting! Normal - + Normal + Normal INFO - + INFO + INFO WARN - + WARN + WARN ERROR - + ERROR + ERROR diff --git a/applications/emsConfigurer/emsConfigurer_zh_CN.ts b/applications/emsConfigurer/emsConfigurer_zh_CN.ts index f371799..14b8ef9 100644 --- a/applications/emsConfigurer/emsConfigurer_zh_CN.ts +++ b/applications/emsConfigurer/emsConfigurer_zh_CN.ts @@ -10,7 +10,7 @@ 关于配置器... - + TextLabel @@ -107,6 +107,12 @@ 间隔(秒) 间隔(秒) + + + Total %1 Pages, Current No.%2 Page + 共 %1 页, 当前第 %2 页 + 共 %1 页, 当前第 %2 页 + Page number should be large than 0 and less than %1 ! @@ -365,68 +371,81 @@ Contact Developement for supporting! Power - + 电源 + 电源 Battery - + 电池 + 电池 Switch - + 配电开关 + 配电开关 Air - + 空调 + 空调 Fan - + 风机 + 风机 Sensor - + 传感器 + 传感器 Add Device - + 增加设备 + 增加设备 Add a new device - + 增加新设备 + 增加新设备 Remove Device - + 删除设备 + 删除设备 Remove a device - + 删除设备 + 删除设备 Refresh - + 刷新 + 刷新 About... - + 关于... + 关于... Show information about EMU Configurer toolkit - + 显示EMU配置工具相关信息 + 显示EMU配置工具相关信息 @@ -462,31 +481,31 @@ Contact Developement for supporting! 测试 - + Logon 登录 登录 - + Close 退出 退出 - + Login name 登录账号 登录账号 - + Password 登录密码 登录密码 - + Lang 语言 语言 @@ -560,22 +579,26 @@ Contact Developement for supporting! Normal - + 正常 + 正常 INFO - + 信息 + 信息 WARN - + 告警 + 告警 ERROR - + 错误 + 错误 diff --git a/applications/emsConfigurer/globalparameters.cpp b/applications/emsConfigurer/globalparameters.cpp index abf4659..5da9c91 100644 --- a/applications/emsConfigurer/globalparameters.cpp +++ b/applications/emsConfigurer/globalparameters.cpp @@ -4,10 +4,11 @@ #include #include #include +#include #include #include #include - +#include #include #include "globalparameters.h" @@ -22,11 +23,11 @@ AppData::~AppData() AppData::AppData(token) { - lstDataTableHeaderText << ("Status") - << ("Parameter") - << ("Value") - << ("Unit") - << ("Time") + lstDataTableHeaderText << tr("Status") + << tr("Parameter") + << tr("Value") + << tr("Unit") + << tr("Time") << (""); nTimeOut = 5000;