From 377842f83e516b7ae92cfc60f5eed87096a62843 Mon Sep 17 00:00:00 2001 From: gangphon Date: Tue, 25 Apr 2023 16:30:58 +0800 Subject: [PATCH] ledok --- LedOK/LedOK.pro | 4 - LedOK/base/pixbmpshowdialog.cpp | 41 - LedOK/base/pixbmpshowdialog.h | 30 - LedOK/base/pixbmpshowdialog.ui | 88 -- LedOK/base/softconfigdialog.cpp | 10 +- LedOK/base/softconfigdialog.h | 6 +- LedOK/device/ctrladvancedpanel.cpp | 36 +- LedOK/device/ctrlbrightpanel.cpp | 4 +- LedOK/device/ctrlnetworkpanel.cpp | 83 +- LedOK/deviceitem.cpp | 31 +- LedOK/deviceitem.h | 7 + LedOK/progpanel.cpp | 26 +- LedOK/progpanel.h | 7 +- LedOK/program/progcreatedlg.cpp | 32 +- LedOK/program/progcreatedlg.h | 4 +- LedOK/program/progeditorwin.cpp | 4 +- LedOK/program/wplanitem.cpp | 208 ++-- LedOK/program/wplanitem.h | 38 +- LedOK/program/wplanitem.ui | 351 ------- LedOK/program/wplanlist.cpp | 18 +- LedOK/program/wplanlist.h | 3 +- LedOK/translations/app_en.ts | 1545 ++++++++++++++-------------- LedOK/translations/app_ja.ts | 1545 ++++++++++++++-------------- LedOK/translations/app_zh_CN.ts | 1545 ++++++++++++++-------------- LedOK/translations/app_zh_TW.ts | 1545 ++++++++++++++-------------- 25 files changed, 3253 insertions(+), 3958 deletions(-) delete mode 100644 LedOK/base/pixbmpshowdialog.cpp delete mode 100644 LedOK/base/pixbmpshowdialog.h delete mode 100644 LedOK/base/pixbmpshowdialog.ui delete mode 100644 LedOK/program/wplanitem.ui diff --git a/LedOK/LedOK.pro b/LedOK/LedOK.pro index df065a4..5493f87 100644 --- a/LedOK/LedOK.pro +++ b/LedOK/LedOK.pro @@ -55,7 +55,6 @@ SOURCES += \ base/changepasswordform.cpp \ base/customprogressindicator.cpp \ base/loemptydialog.cpp \ - base/pixbmpshowdialog.cpp \ base/softconfigdialog.cpp \ base/switchcontrol.cpp \ base/taesclass.cpp \ @@ -147,7 +146,6 @@ HEADERS += \ base/changepasswordform.h \ base/customprogressindicator.h \ base/loemptydialog.h \ - base/pixbmpshowdialog.h \ base/softconfigdialog.h \ base/switchcontrol.h \ base/taesclass.h \ @@ -234,14 +232,12 @@ HEADERS += \ program/wprogrampublishitem.h \ FORMS += \ - base/pixbmpshowdialog.ui \ base/updateledset3dialog.ui \ base/x_uimsgboxok.ui \ mguangyingpinwidget.ui \ device/controlpowerschedule.ui \ device/controltestwidget.ui \ device/controlvolumeschedule.ui \ - program/wplanitem.ui \ TRANSLATIONS += \ translations/app_zh_CN.ts \ diff --git a/LedOK/base/pixbmpshowdialog.cpp b/LedOK/base/pixbmpshowdialog.cpp deleted file mode 100644 index 6ad57d6..0000000 --- a/LedOK/base/pixbmpshowdialog.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include "pixbmpshowdialog.h" -#include "ui_pixbmpshowdialog.h" -#include -PixbmpShowDialog::PixbmpShowDialog(QWidget *parent) : - BaseDlg(parent), - ui(new Ui::PixbmpShowDialog) -{ - setAttribute(Qt::WA_DeleteOnClose); - ui->setupUi(this); - -} - -PixbmpShowDialog::~PixbmpShowDialog() -{ - delete ui; -} -void PixbmpShowDialog::ResizeByPixmap(int w,int h) -{ - m_iWidth=w; - m_iHeight=h; - int iWidth=w; - int iHeight=h; - if(iWidthresize(iWidth,iHeight); - else { - if(iWidth>iHeight) - this->resize(rect().height()*iWidth/iHeight,rect().height()); - else - this->resize(rect().width(),rect().width()*iHeight/iWidth); - } -} -void PixbmpShowDialog::paintEvent(QPaintEvent * event) -{ - Q_UNUSED(event); - QPainter painter(this); - //painter.eraseRect(rect()); - // painter.scale(m_PixMap.width(), m_PixMap.height()); - QRectF sourceRt(0,0,m_iWidth,m_iHeight); - painter.drawPixmap(rect(), m_PixMap,sourceRt); - -} diff --git a/LedOK/base/pixbmpshowdialog.h b/LedOK/base/pixbmpshowdialog.h deleted file mode 100644 index 005b545..0000000 --- a/LedOK/base/pixbmpshowdialog.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef PIXBMPSHOWDIALOG_H -#define PIXBMPSHOWDIALOG_H - -#include - -namespace Ui { -class PixbmpShowDialog; -} - -class PixbmpShowDialog : public BaseDlg -{ - Q_OBJECT - -public: - explicit PixbmpShowDialog(QWidget *parent = nullptr); - ~PixbmpShowDialog(); - QPixmap m_PixMap; - void ResizeByPixmap(int w,int h); - int m_iWidth; - int m_iHeight; - -public: - virtual void paintEvent(QPaintEvent *); - -private: - Ui::PixbmpShowDialog *ui; - -}; - -#endif // PIXBMPSHOWDIALOG_H diff --git a/LedOK/base/pixbmpshowdialog.ui b/LedOK/base/pixbmpshowdialog.ui deleted file mode 100644 index 4e92161..0000000 --- a/LedOK/base/pixbmpshowdialog.ui +++ /dev/null @@ -1,88 +0,0 @@ - - - PixbmpShowDialog - - - - 0 - 0 - 800 - 600 - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 30 - 20 - - - - - 40 - 30 - - - - X - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - pushButton - clicked() - PixbmpShowDialog - close() - - - 199 - 20 - - - 199 - 149 - - - - - diff --git a/LedOK/base/softconfigdialog.cpp b/LedOK/base/softconfigdialog.cpp index fb9d5e4..8c713c1 100644 --- a/LedOK/base/softconfigdialog.cpp +++ b/LedOK/base/softconfigdialog.cpp @@ -6,16 +6,12 @@ #include #include -SoftConfigDialog::SoftConfigDialog(QWidget *parent) : BaseDlg(parent) { +SoftConfigDialog::SoftConfigDialog(QWidget *parent) : QDialog(parent) { + setWindowFlag(Qt::WindowContextHelpButtonHint, 0); resize(400, 300); setWindowTitle(tr("Software Config")); auto vbox = new QVBoxLayout(this); - auto pushButton = new QPushButton("X"); - pushButton->setMinimumSize(30, 24); - connect(pushButton, &QPushButton::clicked, this, &QWidget::close); - vbox->addWidget(pushButton, 0, Qt::AlignRight); - press_fd = new QCheckBox(tr("Video compress to")+" 720p"); press_fd->setChecked(gVideoCompress); vbox->addWidget(press_fd); @@ -31,7 +27,7 @@ SoftConfigDialog::SoftConfigDialog(QWidget *parent) : BaseDlg(parent) { hbox->addWidget(anti_fd, 0, Qt::AlignTop); auto anti_tip = new QLabel(tr("TextAntilaTip")); - anti_tip->setStyleSheet("color:#FF0000;"); + anti_tip->setStyleSheet("QLabel{color: #f00;}"); anti_tip->setWordWrap(true); hbox->addWidget(anti_tip); diff --git a/LedOK/base/softconfigdialog.h b/LedOK/base/softconfigdialog.h index c1f4f13..2ed1e80 100644 --- a/LedOK/base/softconfigdialog.h +++ b/LedOK/base/softconfigdialog.h @@ -1,13 +1,13 @@ #ifndef SOFTCONFIGDIALOG_H #define SOFTCONFIGDIALOG_H -#include "basedlg.h" +#include #include -class SoftConfigDialog : public BaseDlg { +class SoftConfigDialog : public QDialog { Q_OBJECT public: - explicit SoftConfigDialog(QWidget *parent = nullptr); + explicit SoftConfigDialog(QWidget *parent = 0); QCheckBox *press_fd, *trans_fd, *anti_fd, *guangying_fd, *fdWidthSplit; }; diff --git a/LedOK/device/ctrladvancedpanel.cpp b/LedOK/device/ctrladvancedpanel.cpp index 49c5d2d..c1a3430 100644 --- a/LedOK/device/ctrladvancedpanel.cpp +++ b/LedOK/device/ctrladvancedpanel.cpp @@ -1216,21 +1216,29 @@ CtrlAdvancedPanel::CtrlAdvancedPanel(QWidget *parent) : QWidget(parent) { json.insert("_id", "GetMinBrightness"); json.insert("_type", "GetMinBrightness"); if(gSelCards->count() == 1) { - auto waitingDlg = new WaitingDlg(this, tr("GetMinBrightness")); + auto waitingDlg = new WaitingDlg(this, tr("GetMinBrightness")+" ..."); Def_CtrlReqPre - connect(reply, &QNetworkReply::finished, this, [this, reply, waitingDlg] { + auto brightLevel = card->BrightnessLevel; + connect(reply, &QNetworkReply::finished, this, [=] { Def_CtrlSingleGetReply waitingDlg->success(); - fdMinBright->setText(QString::number(json["minBrightnessPercentage"].toInt())); + auto value = json["minBrightnessPercentage"].toInt(-1); + if(value==-1) value = qRound(json["brightness"].toInt() * 100.0 / brightLevel); + fdMinBright->setText(QString::number(value)); }); } else { foreach(auto card, *gSelCards) { auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json); auto cardId = card->m_strCardId; - connect(reply, &QNetworkReply::finished, this, [reply, cardId] { + auto brightLevel = card->BrightnessLevel; + connect(reply, &QNetworkReply::finished, this, [=] { QJsonDocument json; QString err = checkReplyForJson(reply, &json); - if(err.isEmpty()) err = QString::number(json["minBrightnessPercentage"].toInt()); + if(err.isEmpty()) { + auto value = json["minBrightnessPercentage"].toInt(-1); + if(value==-1) value = qRound(json["brightness"].toInt() * 100.0 / brightLevel); + err = QString::number(value)+"%"; + } gFdResInfo->append(cardId+" "+tr("GetMinBrightness")+" "+err); }); } @@ -1285,21 +1293,29 @@ CtrlAdvancedPanel::CtrlAdvancedPanel(QWidget *parent) : QWidget(parent) { json.insert("_id", "GetMaxBrightness"); json.insert("_type", "GetMaxBrightness"); if(gSelCards->count() == 1) { - auto waitingDlg = new WaitingDlg(this, tr("GetMaxBrightness")); + auto waitingDlg = new WaitingDlg(this, tr("GetMaxBrightness")+" ..."); Def_CtrlReqPre - connect(reply, &QNetworkReply::finished, this, [this, reply, waitingDlg] { + auto brightLevel = card->BrightnessLevel; + connect(reply, &QNetworkReply::finished, this, [=] { Def_CtrlSingleGetReply waitingDlg->success(); - fdMaxBright->setText(QString::number(json["maxBrightnessPercentage"].toInt())); + auto value = json["maxBrightnessPercentage"].toInt(-1); + if(value==-1) value = qRound(json["brightness"].toInt() * 100.0 / brightLevel); + fdMaxBright->setText(QString::number(value)); }); } else { foreach(auto card, *gSelCards) { auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json); auto cardId = card->m_strCardId; - connect(reply, &QNetworkReply::finished, this, [reply, cardId] { + auto brightLevel = card->BrightnessLevel; + connect(reply, &QNetworkReply::finished, this, [=] { QJsonDocument json; QString err = checkReplyForJson(reply, &json); - if(err.isEmpty()) err = QString::number(json["maxBrightnessPercentage"].toInt()); + if(err.isEmpty()) { + auto value = json["maxBrightnessPercentage"].toInt(-1); + if(value==-1) value = qRound(json["brightness"].toInt() * 100.0 / brightLevel); + err = QString::number(value)+"%"; + } gFdResInfo->append(cardId+" "+tr("GetMaxBrightness")+" "+err); }); } diff --git a/LedOK/device/ctrlbrightpanel.cpp b/LedOK/device/ctrlbrightpanel.cpp index cae39f7..aded67e 100644 --- a/LedOK/device/ctrlbrightpanel.cpp +++ b/LedOK/device/ctrlbrightpanel.cpp @@ -209,7 +209,7 @@ CtrlBrightPanel::CtrlBrightPanel(QWidget *parent) : QWidget(parent) { auto waitingDlg = new WaitingDlg(this, tr("GetMinBrightness")+" ..."); Def_CtrlReqPre auto brightLevel = card->BrightnessLevel; - connect(reply, &QNetworkReply::finished, this, [this, reply, waitingDlg, brightLevel] { + connect(reply, &QNetworkReply::finished, this, [=] { Def_CtrlSingleGetReply waitingDlg->success(); auto value = json["minBrightnessPercentage"].toInt(-1); @@ -221,7 +221,7 @@ CtrlBrightPanel::CtrlBrightPanel(QWidget *parent) : QWidget(parent) { auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json); auto cardId = card->m_strCardId; auto brightLevel = card->BrightnessLevel; - connect(reply, &QNetworkReply::finished, this, [reply, cardId, brightLevel] { + connect(reply, &QNetworkReply::finished, this, [=] { QJsonDocument json; QString err = checkReplyForJson(reply, &json); if(err.isEmpty()) { diff --git a/LedOK/device/ctrlnetworkpanel.cpp b/LedOK/device/ctrlnetworkpanel.cpp index c60ade4..d6c45a8 100644 --- a/LedOK/device/ctrlnetworkpanel.cpp +++ b/LedOK/device/ctrlnetworkpanel.cpp @@ -326,56 +326,65 @@ CtrlNetworkPanel::CtrlNetworkPanel(QWidget *parent) : QWidget(parent) { return; } auto isWifi = fdIsWifi->isChecked(); - QJsonObject json; - json.insert("_id", "SetSwitchWiFi"); - json.insert("_type", "SetSwitchWiFi"); - json.insert("enable", isWifi); - QString tip; - QJsonObject json2; if(isWifi) { - tip = tr("ConfigurationWiFi"); + QJsonObject json; + json.insert("_id", "SetSwitchWiFi"); + json.insert("_type", "SetSwitchWiFi"); + json.insert("enable", true); + QJsonObject json2; json2.insert("_id", "ConfigurationWiFi"); json2.insert("_type", "ConfigurationWiFi"); json2.insert("ssid", fdWifiName->currentText()); json2.insert("password", fdWifiPassword->text()); - } else if(fdIsHotspot->isChecked()) { - tip = tr("ConfigurationHotSpot"); - json2.insert("_id", "ConfigurationHotSpot"); - json2.insert("_type", "ConfigurationHotSpot"); - json2.insert("apName", fdHotspotName->text()); - json2.insert("password", fdHotspotPassword->text()); - } - if(gSelCards->count() == 1) { - auto waitingDlg = new WaitingDlg(this, tip+" ..."); - Def_CtrlReqPre - connect(reply, &QNetworkReply::finished, card, [=] { - QString err = checkReplyForJson(reply); - if(! err.isEmpty()) { - waitingDlg->close(); - QMessageBox::critical(gMainWin, tr("Error"), err); - return; - } - auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json2); - waitingDlg->connAbort(reply); - connect(reply, &QNetworkReply::finished, card, [reply, waitingDlg] { - Def_CtrlSetReqAfter - }); - }); - } else { - foreach(auto card, *gSelCards) { - auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json); + if(gSelCards->count() == 1) { + auto waitingDlg = new WaitingDlg(this, tr("ConfigurationWiFi")+" ..."); + Def_CtrlReqPre connect(reply, &QNetworkReply::finished, card, [=] { QString err = checkReplyForJson(reply); if(! err.isEmpty()) { - gFdResInfo->append(card->m_strCardId+" "+tip+" "+err); + waitingDlg->close(); + QMessageBox::critical(gMainWin, tr("Error"), err); return; } auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json2); - connect(reply, &QNetworkReply::finished, card, [=] { - QString err = checkReplyForJson(reply); - gFdResInfo->append(card->m_strCardId+" "+tip+" "+(err.isEmpty()?QCoreApplication::translate("Def","Success"):err)); + waitingDlg->connAbort(reply); + connect(reply, &QNetworkReply::finished, card, [reply, waitingDlg] { + Def_CtrlSetReqAfter }); }); + } else { + foreach(auto card, *gSelCards) { + auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json); + connect(reply, &QNetworkReply::finished, card, [=] { + QString err = checkReplyForJson(reply); + if(! err.isEmpty()) { + gFdResInfo->append(card->m_strCardId+" "+tr("ConfigurationWiFi")+" "+err); + return; + } + auto reply = NetReq("http://"+card->m_strCardIp+":2016/settings").timeout(120000).post(json2); + connect(reply, &QNetworkReply::finished, card, [=] { + QString err = checkReplyForJson(reply); + gFdResInfo->append(card->m_strCardId+" "+tr("ConfigurationWiFi")+" "+(err.isEmpty()?QCoreApplication::translate("Def","Success"):err)); + }); + }); + } + } + } else { + QJsonObject json; + json.insert("_id", "ConfigurationHotSpot"); + json.insert("_type", "ConfigurationHotSpot"); + json.insert("apName", fdHotspotName->text()); + json.insert("password", fdHotspotPassword->text()); + if(gSelCards->count() == 1) { + auto waitingDlg = new WaitingDlg(this, tr("ConfigurationHotSpot")+" ..."); + Def_CtrlReqPre + connect(reply, &QNetworkReply::finished, card, [=] { + Def_CtrlSetReqAfter + }); + } else { + foreach(auto card, *gSelCards) { + Def_CtrlSetMulti(tr("ConfigurationHotSpot")); + } } } }); diff --git a/LedOK/deviceitem.cpp b/LedOK/deviceitem.cpp index 57bcc95..727485b 100644 --- a/LedOK/deviceitem.cpp +++ b/LedOK/deviceitem.cpp @@ -12,7 +12,6 @@ #include #include #include -#include "base/pixbmpshowdialog.h" #include #include #include @@ -428,19 +427,8 @@ void DeviceItem::OnProHttpResponse(QString url, QString postMD5, QByteArray data } else if(strType == "GetScreenshotFull") { MACRO_ASKTIME_STOP MACRO_POSTING_DLG_UNLOCK - - qDebug()<<"GetScreenshotFull"; - QString iTemp=jsonObject["data"].toString(); - QByteArray byte_array =iTemp.toLatin1(); - QByteArray Ret_bytearray = QByteArray::fromBase64(byte_array); - //QBuffer buffer(&Ret_bytearray); - //buffer.open(QIODevice::WriteOnly); - //QPixmap imageresult; - //imageresult.loadFromData(Ret_bytearray); - PixbmpShowDialog *dlg=new PixbmpShowDialog(m_pWnd); - dlg->m_PixMap.loadFromData(Ret_bytearray); - dlg->ResizeByPixmap(mCard->m_iWidth,mCard->m_iHeight); - dlg->exec(); + ImgDlg dlg(QByteArray::fromBase64(jsonObject["data"].toString().toLatin1()), m_pWnd); + dlg.exec(); } } } @@ -469,3 +457,18 @@ void DeviceItem::DeletePostingDlg() m_PostingDlg=nullptr; } } + +ImgDlg::ImgDlg(const QByteArray &data, QWidget *parent) : QDialog(parent) { + setWindowFlag(Qt::WindowContextHelpButtonHint, 0); + setWindowTitle(tr("Screenshot")); + mImg.loadFromData(data); + auto www = mImg.width(); + auto hhh = mImg.height(); + if(www <= 1600 && hhh <= 900) resize(www, hhh); + else if(www > hhh) resize(900 * www / hhh, 900); + else resize(1600, 1600 * hhh / www); +} +void ImgDlg::paintEvent(QPaintEvent *) { + QPainter painter(this); + painter.drawImage(rect(), mImg); +} diff --git a/LedOK/deviceitem.h b/LedOK/deviceitem.h index 9a66b43..6bb081f 100644 --- a/LedOK/deviceitem.h +++ b/LedOK/deviceitem.h @@ -75,4 +75,11 @@ private: QTimer *m_pGetAskTimer=nullptr; }; +class ImgDlg : public QDialog { +public: + explicit ImgDlg(const QByteArray &, QWidget *parent = 0); + QImage mImg; +public: + void paintEvent(QPaintEvent *) override; +}; #endif // DEVICEITEM_H diff --git a/LedOK/progpanel.cpp b/LedOK/progpanel.cpp index 6a8ab07..36075ca 100644 --- a/LedOK/progpanel.cpp +++ b/LedOK/progpanel.cpp @@ -419,29 +419,13 @@ void ProgPanel::FilterProgram(const QString &strtemp){ } -ProgPortDlg::ProgPortDlg(QWidget *parent, QString title) : BaseDlg(parent) { +ProgPortDlg::ProgPortDlg(QWidget *parent, QString title) : QDialog(parent) { + setWindowFlag(Qt::WindowContextHelpButtonHint, 0); resize(600, 400); + setWindowTitle(title); auto vBox = new VBox(this); - auto hBox = new HBox(vBox); - hBox->setContentsMargins(0, 0, 0, 0); - hBox->addStretch(); - - auto fdTitle = new QLabel(title); - fdTitle->setStyleSheet("QLabel{font-size:16px;}"); - hBox->addWidget(fdTitle); - hBox->addStretch(); - - bnClose = new QPushButton("X"); - bnClose->setFixedSize(30, 24); - connect(bnClose, &QPushButton::clicked, this, &BaseDlg::close); - hBox->addWidget(bnClose); - - auto line = new QFrame; - line->setFrameShape(QFrame::HLine); - line->setFrameShadow(QFrame::Sunken); - vBox->addWidget(line); - + vBox->setContentsMargins(0, 0, 0, 6); table = new QTableWidget(0, 2); table->setSelectionMode(QTableWidget::NoSelection); @@ -453,7 +437,7 @@ ProgPortDlg::ProgPortDlg(QWidget *parent, QString title) : BaseDlg(parent) { table->setHorizontalHeaderLabels({tr("Solution Name"), tr("Progress")}); vBox->addWidget(table); - hBox = new HBox(vBox); + auto hBox = new HBox(vBox); hBox->addStretch(); bnOK = new QPushButton(title); diff --git a/LedOK/progpanel.h b/LedOK/progpanel.h index 52d1b24..f5ec73c 100644 --- a/LedOK/progpanel.h +++ b/LedOK/progpanel.h @@ -3,10 +3,10 @@ #include "base/loqtreewidget.h" #include "program/progitem.h" -#include "basedlg.h" #include #include #include +#include class ProgPanel : public QWidget { Q_OBJECT @@ -39,13 +39,12 @@ private: QPushButton *bnSend, *btnPlay; }; -class ProgPortDlg : public BaseDlg { - Q_OBJECT +class ProgPortDlg : public QDialog { public: ProgPortDlg(QWidget *parent, QString title); QTableWidget *table{0}; - QPushButton *bnOK, *bnClose; + QPushButton *bnOK; }; #endif // PROGPANEL_H diff --git a/LedOK/program/progcreatedlg.cpp b/LedOK/program/progcreatedlg.cpp index 40f36a1..e20ed9a 100644 --- a/LedOK/program/progcreatedlg.cpp +++ b/LedOK/program/progcreatedlg.cpp @@ -4,30 +4,13 @@ #include #include -ProgCreateDlg::ProgCreateDlg(QString name, int width, int height, QString remarks, QString widths, QWidget *parent) : BaseDlg(parent) { +ProgCreateDlg::ProgCreateDlg(QString name, int width, int height, QString remarks, QString widths, QWidget *parent) : QDialog(parent) { + setWindowFlag(Qt::WindowContextHelpButtonHint, 0); + setWindowTitle(tr("Solution Information")); auto vBox = new VBox(this); - auto hBox = new HBox(vBox); - hBox->setContentsMargins(0, 0, 0, 0); - hBox->addStretch(); - auto label = new QLabel(tr("Solution Information")); - hBox->addWidget(label); - hBox->addStretch(); - - auto btnClose = new QPushButton("X"); - btnClose->setProperty("ssType", "progManageTool"); - connect(btnClose, &QPushButton::clicked, this, &QDialog::close); - hBox->addWidget(btnClose); - - auto line = new QFrame; - line->setFrameShape(QFrame::HLine); - line->setFrameShadow(QFrame::Sunken); - vBox->addWidget(line); - - hBox = new HBox(vBox); - - label = new QLabel(tr("Solution Name")); + auto label = new QLabel(tr("Solution Name")); label->setMinimumWidth(90); label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); hBox->addWidget(label); @@ -77,11 +60,6 @@ ProgCreateDlg::ProgCreateDlg(QString name, int width, int height, QString remark fdRemark->setFixedSize(300, 80); hBox->addWidget(fdRemark); - line = new QFrame; - line->setFrameShape(QFrame::HLine); - line->setFrameShadow(QFrame::Sunken); - vBox->addWidget(line); - hBox = new HBox(vBox); auto lbSplitWidth = new QLabel(tr("每段打折宽度 (用空格分隔)")); @@ -95,6 +73,8 @@ ProgCreateDlg::ProgCreateDlg(QString name, int width, int height, QString remark fdSplitWidths->setVisible(false); } + vBox->addSpacing(6); + hBox = new HBox(vBox); hBox->addStretch(); diff --git a/LedOK/program/progcreatedlg.h b/LedOK/program/progcreatedlg.h index 07284da..bbf93ee 100644 --- a/LedOK/program/progcreatedlg.h +++ b/LedOK/program/progcreatedlg.h @@ -1,12 +1,12 @@ #ifndef PROGCREATEDLG_H #define PROGCREATEDLG_H -#include "basedlg.h" +#include #include #include #include -class ProgCreateDlg : public BaseDlg { +class ProgCreateDlg : public QDialog { Q_OBJECT public: ProgCreateDlg(QString name, int width, int height, QString remarks, QString, QWidget *parent = nullptr); diff --git a/LedOK/program/progeditorwin.cpp b/LedOK/program/progeditorwin.cpp index 8c199dc..9a49e3b 100644 --- a/LedOK/program/progeditorwin.cpp +++ b/LedOK/program/progeditorwin.cpp @@ -40,6 +40,8 @@ QWidget *gProgEditorWin; ProgEditorWin::ProgEditorWin(ProgItem *progItem, QWidget *parent) : QDialog(parent), mProgItem(progItem) { gProgEditorWin = this; gProgItem = progItem; + setWindowFlag(Qt::WindowContextHelpButtonHint, 0); + setWindowFlag(Qt::WindowMaximizeButtonHint); setAttribute(Qt::WA_AlwaysShowToolTips); if(parent && ! parent->isMaximized()) resize(parent->size()); else resize(1280, 720); @@ -244,7 +246,7 @@ ProgEditorWin::ProgEditorWin(ProgItem *progItem, QWidget *parent) : QDialog(pare auto files = QFileDialog::getOpenFileNames(this, tr("Select File"), gFileHome, EPhoto::filters()); for(int i=0; iimg.width(), ePhoto->img.height(), mProgItem->mWidth, mProgItem->mHeight); ePhoto->setPos(rect.topLeft()); ePhoto->setSize(rect.width(), rect.height()); diff --git a/LedOK/program/wplanitem.cpp b/LedOK/program/wplanitem.cpp index 3d2fe15..bae9087 100644 --- a/LedOK/program/wplanitem.cpp +++ b/LedOK/program/wplanitem.cpp @@ -1,115 +1,125 @@ #include "wplanitem.h" -#include "ui_wplanitem.h" +#include "gutil/qgui.h" +#include -wPlanItem::wPlanItem(QListWidgetItem *item, QWidget *parent) : - QWidget(parent), - ui(new Ui::wPlanItem), - m_item(item) -{ +wPlanItem::wPlanItem(QListWidgetItem *item, const QJsonObject *json) : m_item(item) { setAttribute(Qt::WA_DeleteOnClose); - ui->setupUi(this); - initBegin(); - ui->sMon ->setChecked(true); - ui->sTues->setChecked(true); - ui->sWed ->setChecked(true); - ui->sThur->setChecked(true); - ui->sFri ->setChecked(true); - ui->sSat ->setChecked(true); - ui->sSun ->setChecked(true); - initEnd(); + + auto vBox = new VBox(this); + vBox->setContentsMargins(6, 6, 0, 6); + auto hBox = new HBox(vBox); + + fdIdx = new QLabel("1"); + hBox->addWidget(fdIdx); + + tStart = new QTimeEdit; + tStart->setDisplayFormat("HH:mm"); + hBox->addWidget(tStart); + + tEnd = new QTimeEdit; + tEnd->setDisplayFormat("HH:mm"); + tEnd->setTime(QTime(23, 59, 59)); + + hBox->addWidget(tEnd); + + bnDel = new QPushButton; + hBox->addWidget(bnDel); + + hBox = new HBox(vBox); + + sMon = new QPushButton(tr("M")); + sMon ->setCheckable(true); + sMon ->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sMon); + hBox->addStretch(); + + sTues = new QPushButton(tr("Tu")); + sTues->setCheckable(true); + sTues->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sTues); + hBox->addStretch(); + + sWed = new QPushButton(tr("W")); + sWed ->setCheckable(true); + sWed ->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sWed); + hBox->addStretch(); + + sThur = new QPushButton(tr("Th")); + sThur->setCheckable(true); + sThur->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sThur); + hBox->addStretch(); + + sFri = new QPushButton(tr("F")); + sFri ->setCheckable(true); + sFri ->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sFri); + hBox->addStretch(); + + sSat = new QPushButton(tr("Sa")); + sSat ->setCheckable(true); + sSat ->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sSat); + hBox->addStretch(); + + sSun = new QPushButton(tr("Su")); + sSun ->setCheckable(true); + sSun ->setProperty("ssName", "weeklySelector"); + hBox->addWidget(sSun); + + if(json==0) { + sMon ->setChecked(true); + sTues->setChecked(true); + sWed ->setChecked(true); + sThur->setChecked(true); + sFri ->setChecked(true); + sSat ->setChecked(true); + sSun ->setChecked(true); + } else { + tStart->setTime(QTime::fromString(json->value("start").toString(), "hh:mm")); + tEnd->setTime(QTime::fromString(json->value("end").toString(), "hh:mm")); + auto oWeekly = json->value("weekly").toArray(); + sMon ->setChecked(oWeekly.contains(1)); + sTues->setChecked(oWeekly.contains(2)); + sWed ->setChecked(oWeekly.contains(3)); + sThur->setChecked(oWeekly.contains(4)); + sFri ->setChecked(oWeekly.contains(5)); + sSat ->setChecked(oWeekly.contains(6)); + sSun ->setChecked(oWeekly.contains(7)); + } + connect(tStart, SIGNAL(timeChanged(const QTime&)), this, SLOT(onItemChanged())); + connect(tEnd, SIGNAL(timeChanged(const QTime&)), this, SLOT(onItemChanged())); + connect(sMon, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(sTues, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(sWed, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(sThur, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(sFri, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(sSat, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(sSun, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); + connect(bnDel, SIGNAL(clicked(bool)), this, SLOT(onDelete(bool))); } -wPlanItem::wPlanItem(const QJsonObject &oRoot, QListWidgetItem *item, QWidget *parent) : - QWidget(parent), - ui(new Ui::wPlanItem), - m_item(item) -{ - setAttribute(Qt::WA_DeleteOnClose); - ui->setupUi(this); - initBegin(); - setPlan(oRoot); - initEnd(); -} - -void wPlanItem::initBegin() -{ - ui->sMon ->setCheckable(true); - ui->sTues->setCheckable(true); - ui->sWed ->setCheckable(true); - ui->sThur->setCheckable(true); - ui->sFri ->setCheckable(true); - ui->sSat ->setCheckable(true); - ui->sSun ->setCheckable(true); - ui->sMon ->setProperty("ssName", "weeklySelector"); - ui->sTues->setProperty("ssName", "weeklySelector"); - ui->sWed ->setProperty("ssName", "weeklySelector"); - ui->sThur->setProperty("ssName", "weeklySelector"); - ui->sFri ->setProperty("ssName", "weeklySelector"); - ui->sSat ->setProperty("ssName", "weeklySelector"); - ui->sSun ->setProperty("ssName", "weeklySelector"); -} - -void wPlanItem::initEnd() -{ - connect(ui->tStart, SIGNAL(timeChanged(const QTime&)), this, SLOT(onItemChanged())); - connect(ui->tEnd, SIGNAL(timeChanged(const QTime&)), this, SLOT(onItemChanged())); - connect(ui->sMon, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->sTues, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->sWed, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->sThur, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->sFri, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->sSat, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->sSun, SIGNAL(toggled(bool)), this, SLOT(onItemChanged())); - connect(ui->bnDel, SIGNAL(clicked(bool)), this, SLOT(onDelete(bool))); -} - -wPlanItem::~wPlanItem() -{ - delete ui; -} - -void wPlanItem::onItemChanged() -{ +void wPlanItem::onItemChanged(){ emit sigItemChanged(m_item); } -void wPlanItem::onDelete(bool) -{ +void wPlanItem::onDelete(bool){ emit sigDelete(m_item); } -void wPlanItem::setNum(int n) -{ - ui->wNum->setText(QString("%1").arg(n)); -} - -void wPlanItem::setPlan(const QJsonObject &oRoot) -{ - QJsonArray oWeekly = oRoot["weekly"].toArray(); - ui->tStart->setTime(QTime::fromString(oRoot["start"].toString(), "hh:mm")); - ui->tEnd->setTime(QTime::fromString(oRoot["end"].toString(), "hh:mm")); - ui->sMon ->setChecked(oWeekly.contains(QJsonValue(1))); - ui->sTues->setChecked(oWeekly.contains(QJsonValue(2))); - ui->sWed ->setChecked(oWeekly.contains(QJsonValue(3))); - ui->sThur->setChecked(oWeekly.contains(QJsonValue(4))); - ui->sFri ->setChecked(oWeekly.contains(QJsonValue(5))); - ui->sSat ->setChecked(oWeekly.contains(QJsonValue(6))); - ui->sSun ->setChecked(oWeekly.contains(QJsonValue(7))); -} - -QJsonObject wPlanItem::planJson() const -{ +QJsonObject wPlanItem::planJson() const { QJsonObject oRoot; QJsonArray oWeekly; - if(ui->sMon ->isChecked()) oWeekly.append(QJsonValue(1)); - if(ui->sTues->isChecked()) oWeekly.append(QJsonValue(2)); - if(ui->sWed ->isChecked()) oWeekly.append(QJsonValue(3)); - if(ui->sThur->isChecked()) oWeekly.append(QJsonValue(4)); - if(ui->sFri ->isChecked()) oWeekly.append(QJsonValue(5)); - if(ui->sSat ->isChecked()) oWeekly.append(QJsonValue(6)); - if(ui->sSun ->isChecked()) oWeekly.append(QJsonValue(7)); - oRoot["start"] = ui->tStart->time().toString("hh:mm"); - oRoot["end"] = ui->tEnd->time().toString("hh:mm"); + if(sMon ->isChecked()) oWeekly.append(QJsonValue(1)); + if(sTues->isChecked()) oWeekly.append(QJsonValue(2)); + if(sWed ->isChecked()) oWeekly.append(QJsonValue(3)); + if(sThur->isChecked()) oWeekly.append(QJsonValue(4)); + if(sFri ->isChecked()) oWeekly.append(QJsonValue(5)); + if(sSat ->isChecked()) oWeekly.append(QJsonValue(6)); + if(sSun ->isChecked()) oWeekly.append(QJsonValue(7)); + oRoot["start"] = tStart->time().toString("hh:mm"); + oRoot["end"] = tEnd->time().toString("hh:mm"); oRoot["weekly"] = oWeekly; return oRoot; } diff --git a/LedOK/program/wplanitem.h b/LedOK/program/wplanitem.h index d87d7b7..011f10e 100644 --- a/LedOK/program/wplanitem.h +++ b/LedOK/program/wplanitem.h @@ -1,33 +1,19 @@ #ifndef WPLANITEM_H #define WPLANITEM_H -#include +#include #include -#include -#include +#include +#include #include -#include -namespace Ui { -class wPlanItem; -} - -class wPlanItem : public QWidget -{ +class wPlanItem : public QWidget { Q_OBJECT - public: - explicit wPlanItem(QListWidgetItem *item, QWidget *parent = nullptr); - explicit wPlanItem(const QJsonObject &oRoot, QListWidgetItem *item, QWidget *parent = nullptr); - ~wPlanItem(); + explicit wPlanItem(QListWidgetItem *item, const QJsonObject * = 0); - void setNum(int n); - void setPlan(const QJsonObject &oRoot); QJsonObject planJson() const; - -private: - void initBegin(); - void initEnd(); + QLabel *fdIdx; signals: void sigItemChanged(QListWidgetItem *); @@ -38,8 +24,18 @@ protected slots: void onDelete(bool); private: - Ui::wPlanItem *ui; QListWidgetItem *m_item; + + QTimeEdit *tStart; + QTimeEdit *tEnd; + QPushButton *bnDel; + QPushButton *sMon; + QPushButton *sTues; + QPushButton *sWed; + QPushButton *sThur; + QPushButton *sFri; + QPushButton *sSat; + QPushButton *sSun; }; #endif // WPLANITEM_H diff --git a/LedOK/program/wplanitem.ui b/LedOK/program/wplanitem.ui deleted file mode 100644 index aa67dc6..0000000 --- a/LedOK/program/wplanitem.ui +++ /dev/null @@ -1,351 +0,0 @@ - - - wPlanItem - - - - 0 - 0 - 318 - 80 - - - - Form - - - - 0 - - - 0 - - - 6 - - - 0 - - - 12 - - - - - 12 - - - 9 - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - HH:mm - - - - - - - - 0 - 0 - - - - HH:mm - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - 0 - 0 - - - - Every week: - - - Qt::AlignCenter - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - M - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Tu - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - W - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Th - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - F - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Sa - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Su - - - - - - - - - - diff --git a/LedOK/program/wplanlist.cpp b/LedOK/program/wplanlist.cpp index be30e5e..02a3a5d 100644 --- a/LedOK/program/wplanlist.cpp +++ b/LedOK/program/wplanlist.cpp @@ -1,23 +1,18 @@ #include "wplanlist.h" #include "wplanitem.h" +#include -wPlanList::wPlanList(QWidget *parent) : QListWidget(parent) -{ +wPlanList::wPlanList(QWidget *parent) : QListWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); setFrameShape(QListWidget::NoFrame); } -void wPlanList::adjustItemNum() -{ +void wPlanList::adjustItemNum() { int n = count(); - for(int i=0; i(itemWidget(item(i))); - w->setNum(i+1); - } + for(int i=0; i(itemWidget(item(i)))->fdIdx->setNum(i+1); } -QJsonArray wPlanList::plansJson() -{ +QJsonArray wPlanList::plansJson() { QJsonArray oRoot; int n = count(); for(int i=0; isetFlags(item->flags() & ~Qt::ItemIsSelectable); - wPlanItem *widget = new wPlanItem(jRoot.at(i).toObject(), item); + auto json = jRoot.at(i).toObject(); + wPlanItem *widget = new wPlanItem(item, &json); addItem(item); setItemWidget(item, widget); setCurrentItem(item); diff --git a/LedOK/program/wplanlist.h b/LedOK/program/wplanlist.h index 0e6749f..5d16738 100644 --- a/LedOK/program/wplanlist.h +++ b/LedOK/program/wplanlist.h @@ -4,8 +4,7 @@ #include #include -class wPlanList : public QListWidget -{ +class wPlanList : public QListWidget { Q_OBJECT public: explicit wPlanList(QWidget *parent = nullptr); diff --git a/LedOK/translations/app_en.ts b/LedOK/translations/app_en.ts index 2228255..a9727bc 100644 --- a/LedOK/translations/app_en.ts +++ b/LedOK/translations/app_en.ts @@ -1,72 +1,64 @@ - - AboutDlg - - - About - About - - ChangePasswordForm - + Old password Old password - + New password New password - + Repeat again Repeat again - + OK Ok - + Cancel Cancel - - - - - + + + + + Tip Tip - + Please input old password Please input old password - + Old password is wrong Old password is wrong - + Please enter a password with more than 6 characters Please enter a password with more than 6 characters - + The new password is not consistent in two times - + Password changed successfully Password changed successfully @@ -274,14 +266,14 @@ ControlPowerWidget - - + + Off - - + + On On @@ -311,32 +303,32 @@ - + IsScreenOn Read power status - + Power Configuration Power configuration - + Manual Manual - + Schedule Schedule - + Power Power - + Readback Readback @@ -880,82 +872,82 @@ CtrlAdvancedPanel - + Advanced Advanced - + Screen Width(pixel) Screen Width(pixel) - + Width Width - - + + Height Height + - + + + - - - - - + + + + - - - - + + Set Set - + Alias Alias - + Web Server Address: Web Server Address: - + www.m2mled.net - + www.ledaips.com - + https://www.taxihub.cn:2340 - + https://www.ledaips.com:2340 - + https://www.36taxi.com:2340 - + www.tlzxled.com @@ -965,443 +957,443 @@ - + Traffic screen settings - + Setting protocol ... - + Set protocol - + Getting protocol ... - + Get protocol - - + + Port - + Realtimer Server Address: Realtimer Server Address: - + Firmware Management - + update or uninstall - + Clear Clear - + Check Apk Check Apk - + Uninstall Uninstall - + Running check Running check - + Restart Restart - + Check Log Check Log - + Start LedSet4 Start LedSet4.0 (Apk Display2.0 and higher) - + Open ADB Open ADB debugging function - + Post Custom JSON Post Custom JSON - - - + + + + - - - + + Clear Program Clear Program - + www.ledokcloud.com/realtime - + Config Config - + Refresh Refresh - + Restore to default Restore to default - + Taxi top screen configuration Taxi top screen configuration - - + + Service:High Out of service:Low Service:High Out of service:Low - - + + Service:Low Out of service:High Service:Low Out of service:High - + Start LedSet3.0 configure LED module Start LedSet3.0 configure LED module (used by manufacturer's professionals) - + Binding *.ic account indentity voucher Binding *.ic account indentity voucher - + Rotate Rotate - + Min brightness Min brightness - - - + + + Readback Readback - + Send Send - + Max brightness Max brightness - - + + SetScreenSize Set Screen Size - - - - + + + + Success Success - + Compant ID: Company ID - + Compant ID Company ID - + InputWebServerAddressTip Please enter web server address - + InputCompanyIdTip Please enter company ID - + Do you want to modify webserveraddress and companyId? Are you sure you want to configure the server address and company ID? - - + + SetOnlineAddr Set Web server address - - + + ClearRealtimeServer Clear - - + + SetRealtimeServer Set realtimer address - - - - + + + + Tip Info Tip Info - - - + + + Can not find LedSet3.0.exe,down you need download and install it Can not find LedSet3.0.exe,down you need download and install it - - + + RestartAndroid Restart - - + + running running - - + + no running no running - + Check Apk Version Check Apk Version - - + + UninstallSoftware Uninstall - - + + Check apk running status - - + + OpenAdb Open ADB debugging function - + indentity voucher (*.ic) indentity voucher (*.ic) - - - - - + + + + + InvokeTaxiAppFunction Binding certificate - - + + AliIotSetting - + Software Version Info - + Package - + Version - - + + Package name is null - + Clearing Program - - - - + + + + Timeout Timeout - - - - + + + + Failed - + Getting Log + - - - - - - - - - - + + + + + + + + + Error Error - + Setting Timing Reboot - + Set Timing Reboot - + Getting Timing Reboot - + Get Timing Reboot - + totalResolution FPGA total resoltuion - + strCurDisplayResolution Cur display resolution - + File not exist - + Uploading - - + + Set Display Mode - - + + Get Display Mode - - + + Set Screen Offset - - + + Get Screen Offset - + Open file Failed Open file Failed @@ -1412,7 +1404,7 @@ - + Set Wallpaper @@ -1423,417 +1415,417 @@ - + System Update - + Getting MCU Version - - + + MCU Version - + Select File Select File - + Setting player background - - + + Set player background - + Clearing player background - - - - - - - - + + + + + + + + Clear player background - + Setting Baud Rate - + Set Baud Rate - + Getting Baud Rate - + Get Baud Rate - + Text is empty - + Json Parse Error - + Json isn't an Object - + Setting card work mode ... - + Set card work mode - + Getting card work mode ... - + Get card work mode - + Resolution Config - + Full screen - + Part - + Display Mode - + Screen Position - + Offset - + Hidden Settings - + Click right button to hide - - + + Update MCU - + Get MCU Version - + Baud Config - + Model - + Uart - + Baud + - - - - - + + + + Get - + Timing Reboot - + Protocol - + Server - + Client - - + + SetScreenRotation Set screen rotation - - + + SetMinBrightness Set min brightness value - - + + SetMaxBrightness Set maximum brightness value - - + + GetMinBrightness Get min brightness - + GetMaxBrightness Get maximum brightness - - + + Card work mode - - + + SetSpecialResolution Set Special Resolution - - + + GetSpecialResolution Get Special Resolution - - + + CleanDisplayScreenSize Restore to default relolution - - + + SetHighForBusy Set level for busy + - GetStateForBusy Get level of busy - + InputAliasTip Please input alias - - + + SetCardAlias Set alias - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + Tip Tip - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + NoSelectedController Please select screen first - + InputWidthTip Please enter the correct width pixel value - + InputHeightTip Please enter the correct height pixel value - + Password is error Password is error @@ -2308,213 +2300,204 @@ CtrlNetworkPanel - + Wire Enther(RJ45) Configuration Wire Enther(RJ45) Configuration - + DHCP - + Specify IP Specify IP - + IP Address IP Address - + Gateway Gateway - + DNS Address DNS Address - - - + + + Set Set - - - - + + + + Readback Readback - + WIFI Configuration WiFi Configuration - + WiFi Mode WiFi Mode - + Cellular Config Cellular Config - + Enable Cellular Data Enable Cellular Data - + Get cellular network status information Get cellular network status information - + Through the check status button Through the "check status" button, you can automatically match the country code MCC, and then select "operator" to get the corresponding APN information. - + Country ID(mcc): Country ID(mcc): - - + + Carrier Name Carrier Name - + APN(Required) APN(Required) - + Flight Mode Flight Mode - + WiFi name WiFi name - - - + + + Password Password - - + + Input password Input password - + Scan Scan - + Ap Mode AP - + OFF OFF - + ON ON - + AP name AP name - + Subnet mask Subnet mask - + Input ap name Input AP name - - - - - - - - - - - - + + + + + + + + + + + + Tip Tip - - - - - - - - - - - + + + + + + + + + + + NoSelectedController Please select screen first - - + + SetEthernet Set wire nether - - - - Attention Attention - + Please input IP address! Please input IP address! - - - Your IP Address is Invalid! - IP Address is invalid！ - Please input Mask address! @@ -2522,365 +2505,356 @@ - Your Mask Address is Invalid! - Mask Address is Invalid! - - - Please input Gateway address! Please input Gateway address! - - Your Gateway Address is Invalid! - Gateway Address is Invalid! - - - + Please input DNS address! Please input DNS address! - - Your DNS Address is Invalid! - DNS Address is Invalid! - - - - + + GetEthernet Get wire ethernet - + DHCP IP DHCP IP - + STATIC IP STATIC IP - - + + + ConfigurationWiFi Configuration WiFi - - + + IsPortableHotSpot Get AP or WiFi - + GetWifiList Scan WiFi list - - + + ConfigurationHotSpot Configuration AP HotSpot - + success success - + WifiName WifiName - + ApName Ap Name - - + + GetCurrentAPN Get Current Apn - + GetSIMStatus Get SIM Status - - + + SetAPN Set APN - + 状态: Status： - + + Error + Error + + + 未知 unknown - + 锁定状态，需要用户的PIN码解锁 Lock status, need user's pin code to unlock - + 锁定状态，需要用户的PUK码解锁 In the locked state, the PUK code of the user is required to be unlocked - + 锁定状态，需要网络的PIN码解锁 In the locked state, the PIN code of the user is required to be unlocked - + 就绪 be ready - + no checked sim card no checked sim card - + 国家码: MCC: - + 号码: number: - + 用户: User name: - + 信号: Signal: - + 信号正常 Signal OK - + 不在服务区 Not in service area - + 仅限紧急呼叫 Emergency call only - + 射频已经关闭 RF off - + 网络: Network type: - + 网络类型未知 unKnown - + GPRS网络 GPRS - + EDGE网络 EDGE - + UMTS网络 UMTS - + CDMA网络,IS95A 或 IS95B. CDM - + EVDO网络, revision 0. EVDO,revision 0. - + EVDO网络, revision A. EVDO,revision A. - + 1xRTT网络 1xRTT - + HSDPA网络 HSDPA - + HSUPA网络 HSUPA - + HSPA网络 HSPA - + 漫游: roam: - + Yes Yes - + No No - + 数据连接状态: Data connection status: - + 断开 OFF - + 正在连接 connecting - + 已连接 Connected - + 暂停 suspend - + 数据活动休眠状态: Data active sleep state: - + 活动，但无数据发送和接收 Active, but no data sent and received - + 活动，正在接收数据 Activity, receiving data - + 活动，正在发送数据 Activity, sending data - + 活动，正在接收和发送数据 Activity, receiving and sending data - + 休眠状态 Sleep state - + 信号强度: Signal strength: - + Set APN Info - + User - + Type - + Server - + Port - + Proxy - + MMS Port - + MMS Proxy - - + + SetSwitchSimData SetSwitchSimData - - + + ContrFlightMode Set flight mode - - + + GetFlightModeState Readback flight mode state @@ -3304,28 +3278,29 @@ Def - + Connection Timeout - - - - - + + + + + Device replied - + + - + Success Success - + Fail Fail @@ -3413,234 +3388,234 @@ DeviceItem - + GetScreenDetailInfo Get more detail info - + ReadbackPic Screenshot - + Input password Input password - + GetScreenshotFull readback screenshot - + cur brightness: Current Brightness: - + android version: Android Version: - + IMEI: - + HardWard Version: FPGA Version: - + MAX Brightness level: Brightness Level: - + Android OS Resolution: Android OS Resolution: - + Firmware Version: Firmware Version: - + Player Version: Player firmware version: - + Detail Info Detail Info - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + receive Receive - + AliIotSetting - - + + GetScreenStatus GetScreenStatus - - + + Status Status - + Tip Info Tip Info - + password is wrong password is wrong - + GetBrightness Get brightness - + brightness brightnenss - + SetAutoBrightnessTask Send brightness schedule table - + SetAutoVolumeTask Set volume schedule - + SetVolume Set Volume - + GetVolume Get Volume - + SetTimingScreenTask Set schedule task of screen power - + TestScreen Test screen - + SetOnlineAddr Set Web server address - + SetRealtimeServer Set realtimer address - + GetCurrentSensorBrightness Get Current Brightness - + Cur brightness Cur brightness - + Connect Connect - + timeout timeout - + Anycast Anycast - + volume Volume - + Success Success - + failed failed - - - - - - - - - - - - - + + + + + + + + + + + + + success success - + + - on ON - + + - off OFF @@ -3986,7 +3961,7 @@ - + T @@ -4036,17 +4011,17 @@ Text - + Play Properties - + Play Duration Play Duration - + s s @@ -4288,17 +4263,17 @@ Multiline - + Play Properties - + Play Duration Play Duration - + s s @@ -4959,17 +4934,17 @@ Text - + Play Properties - + Play Duration Play Duration - + s s @@ -5209,114 +5184,115 @@ MainWindow - + Language Language - + Help Help - - + + Check for updates Check for updates - - + + firmware manager Firmware management - - + + Software Config Software Config - - + + Info - - + + + About About - - + + Setting Setting - + Software Update Software Update - + CurVersion CurVersion - + Update Update - + LatestVersion: LatestVersion: - - + + Update log: Update log: - + The current version is already the latest version The current version is already the latest version - + Device Terminals - + Program Solutions - + Control Terminal Control - + GuangYinPin Lora screen - + Check card Detect - + Tip Info Tip Info - + RestoreLedCardIpByUdpTip This operation will fix all the control cards in the LAN that are not in the same network segment as the computer IP. Please be careful! @@ -5337,102 +5313,102 @@ PageEditor - + Zoom In Zoom In - + Zoom Out Zoom Out - + Original size Origianl Size - + Delete the secect media Delete the seleted media - + Clear all media Clear all media - + Move layer up Move layer up(shortcut key PgUp) - + Send backward Send backward(shortcut key PgDn) - + Bring to front Bring to front(shortcut key home) - + Move to the bottom layer Move to the bottom layer(shortcut key end) - + Fill the entire screen Fill the entire screen - + Fill the screen horizontally Fill the screen horizontally - + Fill the screen vertically Fill the screen vertically - + Align top Align up - + Center vertically Center vertically - + Bottom align Bottom up - + Align left Align left - + Center horizontally Center horizontally - + Align right Align right - + Tip Info Tip Info - + Clear all medias? @@ -5440,84 +5416,84 @@ PageListItem - + times Times - + Page name Program name - + New New - + Play times Play times - + Sources Repeat - + Audios - + Total Dur - - + + s s - + Select File Select File - + Duration - + Vol - + Valid Date Valid date - - + + Warning Warning - + Start Time can't be later than End Time - + End Time can't be earlier than Start Time - + Plan Plan @@ -5535,14 +5511,6 @@ Change Password - - PixbmpShowDialog - - - X - X - - PlayWin @@ -5564,12 +5532,12 @@ PlayerBackSendThread - + Open file failed Open file failed - + Read file failed Read file failed @@ -5590,47 +5558,47 @@ ProgCreateDlg - + Resolution Resolution - + Solution Information Solution Information - + Solution Name Solution Name - + Width Width - + Height Height - + Remarks Remarks - + 每段打折宽度 (用空格分隔) Each part width (split with space) - + OK Ok - + Cancel Cancel @@ -5638,200 +5606,200 @@ ProgEditorWin - + Save Save - - + + Save as Save as - + Setting Setting - + Text Text - + Photo Photo - + Video Video - + Gif Gif - + Clock Clock - + Analog Clock Analog Clock - + Environment Environmental Monitoring - + Web Web page - + MuliContentWindow Multi material window - + In this window, a plurality of different program materials can be added and played according to the order of joining the list; In this window, a plurality of different program materials can be added and played according to the order of joining the list - + Timer Timer - + Play - + Stop Stop - + Publish Publish - - - - + + + + Select File Select File - + program Program - + Add page Add page - + Copy page Copy page - + Delete page Delete page - - + + Tip Info Tip Info - + Are you sure you want to delete this program page? Are you sure you want to delete this program page? - + Move up Move up - + Move down Move down - + widget properties Widget properties - + Page properties Program properties - + Do you want to save the modifications? Do you want to save the modifications? - - + + Saving... Saving... - - + + Success Success - + Save failed Save failed - + Convertering Convertering - + Generate preview data Generate preview data - - + + Error Error - + Rename fail when saving - + Remove Recursively fail when saving - + Warning Warning @@ -5991,17 +5959,17 @@ ProgPortDlg - + Solution Name Solution Name - + Progress Progress - + Done Done @@ -6110,42 +6078,42 @@ SoftConfigDialog - + Software Config Software Config - + Video compress to Video compress to - + Video transcoding to Video transcoding to - + Text antialiasing Text antialiasing - + TextAntilaTip (Note: this option is suitable for screens with small spacing and large size. If this option is selected, the shadow on the edge of the text will be smooth; it is not recommended for small size screens and single and double color screens.) - + GuangYinPin Lora screen - + Width Split - + OK Ok @@ -6494,43 +6462,43 @@ UsbDetectDialog - + Usb upgrade program Usb upgrade program - + Password Password - + OK Ok - + Input password Input password + - Tip Tip - + No checked USB device No checked USB device - + please select usb device in list please select usb device in list - + Cancel Cancel @@ -6974,52 +6942,37 @@ wPlanItem - - Form - Form - - - - 1 - 1 - - - - Every week: - Every week: - - - + M M - + Tu Tu - + W W - + Th Th - + F F - + Sa Sa - + Su Su @@ -7058,22 +7011,22 @@ wUpgradeApkItem - + Input password Input password - + Error Error - + Tip Info Tip Info - + password is wrong password is wrong diff --git a/LedOK/translations/app_ja.ts b/LedOK/translations/app_ja.ts index 2efe21e..b9c3179 100644 --- a/LedOK/translations/app_ja.ts +++ b/LedOK/translations/app_ja.ts @@ -1,72 +1,64 @@ - - AboutDlg - - - About - 当ソフトウェアについて - - ChangePasswordForm - + Old password 古いパスワード - + New password 新しいパスワード - + Repeat again 再び繰り返す - + OK 確定 - + Cancel キャンセル - - - - - + + + + + Tip 提示 - + Please input old password 古いパスワードを入力してください - + Old password is wrong 古いパスワードが間違っている - + Please enter a password with more than 6 characters 6文字以上のパスワードを入力してください - + The new password is not consistent in two times 新しいパスワードは2回で一貫していません - + Password changed successfully パスワードが正常に変更 @@ -274,14 +266,14 @@ ControlPowerWidget - - + + Off 閉じる - - + + On 開く @@ -311,32 +303,32 @@ - + IsScreenOn スイッチ状態を読み出します - + Power Configuration スイッチパネル制御 - + Manual 手動 - + Schedule スケジュール - + Power 電源 - + Readback 読み戻し @@ -880,82 +872,82 @@ CtrlAdvancedPanel - + Advanced 上級パラメータ - + Screen Width(pixel) 画面幅(ピクセル) - + Width 幅 - - + + Height 高さ + - + + + - - - - - + + + + - - - - + + Set セット - + Alias 別名 - + Web Server Address: Webサーバのアドレス: - + www.m2mled.net - + www.ledaips.com - + https://www.taxihub.cn:2340 - + https://www.ledaips.com:2340 - + https://www.36taxi.com:2340 - + www.tlzxled.com @@ -965,443 +957,443 @@ - + Traffic screen settings - + Setting protocol ... - + Set protocol - + Getting protocol ... - + Get protocol - - + + Port ポート - + Realtimer Server Address: Realtimerアドレス: - + Firmware Management ファームウェア管理 - + update or uninstall 更新またはアンインストール - + Clear クリア - + Check Apk APKを検出 - + Uninstall アンマウント - + Running check 運転状態モニタ - + Restart 再起動 - + Check Log ログを見る - + Start LedSet4 - + Open ADB ADBデバッグ機能を開く - + Post Custom JSON Post Custom JSON - - - + + + + - - - + + Clear Program 番組をクリア - + www.ledokcloud.com/realtime - + Config の設定 - + Refresh 更新 - + Restore to default 標準の値を復元 - + Taxi top screen configuration タクシートップ画面の設定 - - + + Service:High Out of service:Low 客がいます：高 客がいません：低 - - + + Service:Low Out of service:High 客がいます：低 客がいません：高 - + Start LedSet3.0 configure LED module LedSet 3.0を使ってLEDモジュールを配置する（メーカーの専門家が使用する） - + Binding *.ic account indentity voucher テーピングtaxihubプラットフォームのユーザーID証明書 - + Rotate 回転 - + Min brightness 最低輝度 - - - + + + Readback 読み戻し - + Send 送信 - + Max brightness 最高輝度 - - + + SetScreenSize スクリーンのピクセルサイズを設定 - - - - + + + + Success 成功 - + Compant ID: 会社ID： - + Compant ID 会社ID - + InputWebServerAddressTip Webサーバのアドレスを入力してください - + InputCompanyIdTip 会社IDを入力してください - + Do you want to modify webserveraddress and companyId? 設定サーバアドレスと会社IDを確認しますか？ - - + + SetOnlineAddr ウェブサーバのアドレスを設定 - - + + ClearRealtimeServer クリア - - + + SetRealtimeServer RealTimerアドレスを設定 - - - - + + + + Tip Info ヒント - - - + + + Can not find LedSet3.0.exe,down you need download and install it LEDSET 3.0 . exeを見つけることができません。ダウンロードしてインストールする必要があります - - + + RestartAndroid 再起動 - - + + running 実行中 - - + + no running 実行されていません - + Check Apk Version チェック APK バージョン - - + + UninstallSoftware アンマウント - - + + Check apk running status APK運転状態監視 - - + + OpenAdb ADBデバッグ機能を開く - + indentity voucher (*.ic) 身分証明書(*.ic) - - - - - + + + + + InvokeTaxiAppFunction 証明書をバインド - - + + AliIotSetting - + Software Version Info - + Package - + Version バージョン - - + + Package name is null パッケージ名は空です - + Clearing Program プログラムクリア - - - - + + + + Timeout タイムアウト - - - - + + + + Failed 失敗 - + Getting Log ログを取得中 + - - - - - - - - - - + + + + + + + + + Error エラー - + Setting Timing Reboot スケジュール再起動を設定中 - + Set Timing Reboot スケジュール再起動の設定 - + Getting Timing Reboot スケジュール再起動を取得中 - + Get Timing Reboot スケジュール再起動の取得 - + totalResolution トータル解像度 - + strCurDisplayResolution 表示解像度 - + File not exist ファイルが存在しません - + Uploading アップロード中 - - + + Set Display Mode - - + + Get Display Mode - - + + Set Screen Offset - - + + Get Screen Offset - + Open file Failed ファイルのオープンに失敗しました @@ -1412,7 +1404,7 @@ - + Set Wallpaper @@ -1423,417 +1415,417 @@ - + System Update - + Getting MCU Version - - + + MCU Version - + Select File ファイルを選択 - + Setting player background - - + + Set player background - + Clearing player background - - - - - - - - + + + + + + + + Clear player background - + Setting Baud Rate - + Set Baud Rate - + Getting Baud Rate - + Get Baud Rate - + Text is empty - + Json Parse Error - + Json isn't an Object - + Setting card work mode ... - + Set card work mode - + Getting card work mode ... - + Get card work mode - + Resolution Config 解像度設定 - + Full screen フルスクリーン - + Part セクション - + Display Mode 表示モード - + Screen Position - + Offset - + Hidden Settings - + Click right button to hide - - + + Update MCU - + Get MCU Version - + Baud Config - + Model - + Uart - + Baud + - - - - - + + + + Get 得る - + Timing Reboot スケジュール再起動 - + Protocol プロトコル - + Server サービス - + Client クライアント - - + + SetScreenRotation 画面の回転を設定する - - + + SetMinBrightness 最小輝度値を設定します - - + + SetMaxBrightness 輝度最大値を設定 - - + + GetMinBrightness 輝度最小値を取得 - + GetMaxBrightness 輝度最大値を取得 - - + + Card work mode - - + + SetSpecialResolution 解像度を設定 - - + + GetSpecialResolution 読み込み解像度 - - + + CleanDisplayScreenSize デフォルトの解像度を復元 - - + + SetHighForBusy 客レベルの設定 + - GetStateForBusy ゲストレベルを取得 - + InputAliasTip エイリアスを入力してください - - + + SetCardAlias エイリアスの設定 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + Tip 提示 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + NoSelectedController 先に大きいスクリーンを選んでください - + InputWidthTip 正しい幅のピクセル値を入力してください - + InputHeightTip 正しい高さのピクセル値を入力してください - + Password is error パスワード @@ -2308,218 +2300,209 @@ CtrlNetworkPanel - + Wire Enther(RJ45) Configuration 有線ネットワークの設定 - + DHCP - + Specify IP 指定IP - + IP Address IPアドレス - + Gateway ゲートウェイ - + DNS Address DNSアドレス - - - + + + Set セット - - - - + + + + Readback 読み戻し - + WIFI Configuration WiFiの設定 - + WiFi Mode WiFi機能 - + Cellular Config セルラーデータ構成 - + Enable Cellular Data セルラーデータを有効にする - + Get cellular network status information セルラーネットワーク状態情報を取得する - + Through the check status button 「ステータスを取得」ボタンを使用すると、国コードに自動的に一致し、対応するAPN情報を取得するには「事業者」を選択します。 - + Set APN Info APN情報を設定する - + Country ID(mcc): 国号(mcc): - - + + Carrier Name 運営者 - + APN(Required) APN（必ず記入） - + Flight Mode 飛行モード - + WiFi name WiFiの名前 - - - + + + Password パスワード - - + + Input password パスワードを入力 - + Scan スキャン - + Ap Mode APエネルギー - + OFF オフ - + ON オン - + AP name AP名 - + Subnet mask サブネットマスク - + Input ap name APの名前を入力 - - - - - - - - - - - - + + + + + + + + + + + + Tip 提示 - - - - - - - - - - - + + + + + + + + + + + NoSelectedController 先に大きいスクリーンを選んでください - - + + SetEthernet 有線網を設置する - - - - Attention 注意 - + Please input IP address! IPアドレスを入力してください！ - - - Your IP Address is Invalid! - IPアドレスが無効です！ - Please input Mask address! @@ -2527,360 +2510,351 @@ - Your Mask Address is Invalid! - マスクアドレスが無効です! - - - Please input Gateway address! ゲートウェイのアドレスを入力してください! - - Your Gateway Address is Invalid! - ゲートウェイアドレスが無効です！ - - - + Please input DNS address! DNSアドレスを入力してください！ - - Your DNS Address is Invalid! - DNSアドレスを入力してください! - - - - + + GetEthernet 有線ネットワークの設定を取得 - + DHCP IP DHCP IP - + STATIC IP 静的IP - - + + + ConfigurationWiFi WiFiの設定 - - + + IsPortableHotSpot ホットスポットとWiFiモードの取得 - + GetWifiList スキャンWiFi - - + + ConfigurationHotSpot ホットスポットの設定 - + success 成功 - + WifiName Wifiの名前 - + ApName AP名前 - - + + GetCurrentAPN APN情報の取得 - + GetSIMStatus SIM状態を取得 - - + + SetAPN APNの設定 - + 状态: 状態: - + + Error + エラー + + + 未知 不明 - + 锁定状态，需要用户的PIN码解锁 ロック状態は、ユーザのPINコードのロック解除が必要です - + 锁定状态，需要用户的PUK码解锁 ロック状態は、ユーザのPUKコードのアンロックが必要です - + 锁定状态，需要网络的PIN码解锁 ロック状態は、ユーザのPINコードのアンロックが必要です - + 就绪 準備完了 - + no checked sim card simカードが検出されませんでした - + 国家码: 国号: - + 号码: 番号: - + 用户: ユーザ: - + 信号: 信号: - + 信号正常 信号が正常である - + 不在服务区 サービスエリアにはいません - + 仅限紧急呼叫 緊急呼び出しのみ - + 射频已经关闭 無線周波数はすでに閉鎖されました - + 网络: ネットワークタイプ: - + 网络类型未知 不明 - + GPRS网络 GPRS - + EDGE网络 EDGE - + UMTS网络 UMTS - + CDMA网络,IS95A 或 IS95B. CDM - + EVDO网络, revision 0. EVDO,revision 0. - + EVDO网络, revision A. EVDO,revision A. - + 1xRTT网络 1xRTT - + HSDPA网络 HSDPA - + HSUPA网络 HSUPA - + HSPA网络 HSPA - + 漫游: ローミング: - + Yes は - + No いいえ - + 数据连接状态: データ接続状態： - + 断开 切断 - + 正在连接 接続中 - + 已连接 接続済み - + 暂停 一時停止 - + 数据活动休眠状态: データアクティビティの休止状態: - + 活动，但无数据发送和接收 アクティブですが、データ送信と受信はありません - + 活动，正在接收数据 アクティブ、データ受信中 - + 活动，正在发送数据 イベント、データ送信中 - + 活动，正在接收和发送数据 イベント、データ受信と送信中 - + 休眠状态 スリープ状態 - + 信号强度: 信号の強度: - + User ユーザー - + Type タイプ - + Server サービス - + Port ポート - + Proxy プロキシ - + MMS Port MMS ポート - + MMS Proxy MMS プロキシ - - + + SetSwitchSimData 4G/5Gスイッチの設定 - - + + ContrFlightMode 飛行モードの設定 - - + + GetFlightModeState 飛行モード状態を取得 @@ -3304,28 +3278,29 @@ Def - + Connection Timeout 接続タイムアウト - - - - - + + + + + Device replied デバイス応答 - + + - + Success 成功 - + Fail 失敗 @@ -3413,234 +3388,234 @@ DeviceItem - + GetScreenDetailInfo 詳細 - + ReadbackPic 回読画面 - + Input password パスワードを入力 - + GetScreenshotFull 回読画面 - + cur brightness: 現在の明るさ: - + android version: Androidバージョン: - + IMEI: - + HardWard Version: FPGAバージョン： - + MAX Brightness level: 輝度レベル: - + Android OS Resolution: Androidの解像度: - + Firmware Version: ファームウェアバージョン: - + Player Version: プレーヤーファームウェアバージョン: - + Detail Info 詳細 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + receive 受信 - + AliIotSetting - - + + GetScreenStatus スクリーン状態を取得 - - + + Status 状態 - + Tip Info ヒント - + password is wrong パスワードが間違っている - + GetBrightness 輝度値を取得 - + brightness 明るさ - + SetAutoBrightnessTask 送信タイミング輝度表 - + SetAutoVolumeTask 設定タイミング音量表 - + SetVolume 音量調節 - + GetVolume 現在の音量を取得 - + SetTimingScreenTask 画面タイミングスイッチタスクの設定 - + TestScreen テスト画面 - + SetOnlineAddr ウェブサーバのアドレスを設定 - + SetRealtimeServer RealTimerアドレスを設定 - + GetCurrentSensorBrightness 現在の明るさを取得する - + Cur brightness カールの明るさ - + Connect 接続 - + timeout タイムアウト - + Anycast リクエスト - + volume 音量 - + Success 成功 - + failed 失敗 - - - - - - - - - - - - - + + + + + + + + + + + + + success 成功 - + + - on オン - + + - off オフ @@ -3985,7 +3960,7 @@ - + T @@ -4035,17 +4010,17 @@ テキスト - + Play Properties 再生方法 - + Play Duration 再生時間 - + s 秒 @@ -4287,17 +4262,17 @@ 複数行表示 - + Play Properties 再生方法 - + Play Duration 再生時間 - + s 秒 @@ -4958,17 +4933,17 @@ テキスト - + Play Properties 再生方法 - + Play Duration 再生時間 - + s 秒 @@ -5208,114 +5183,115 @@ MainWindow - + Language 言語 - + Help ヘルプ - - + + Check for updates アップデートをチェック - - + + firmware manager ファームウェア管理 - - + + Software Config ソフトウェアの設定 - - + + Info 情報 - - + + + About 当ソフトウェアについて - - + + Setting 設置 - + Software Update ソフトウェアの更新 - + CurVersion 現在のバージョン - + Update 更新 - + LatestVersion: 最新バージョン: - - + + Update log: 更新ログ: - + The current version is already the latest version すでに最新バージョンです。 - + Device 端末管理 - + Program コンテンツ管理 - + Control ターミナルコントロール - + GuangYinPin スクリーン - + Check card ワンタッチ修復 - + Tip Info ヒント - + RestoreLedCardIpByUdpTip この操作はLAN内のすべてのコンピュータIPと同じセグメントにないコントロールカードを固定IPに修正します。慎重に操作してください。 @@ -5336,102 +5312,102 @@ PageEditor - + Zoom In 拡大 - + Zoom Out 縮小 - + Original size オリジナル割合 - + Delete the secect media 選んで削除する - + Clear all media コンテンツをすべてクリアする - + Move layer up 前面にする（ショートカットキーPgUp） - + Send backward 背面にする（ショートカットキーPgDn） - + Bring to front 最前面にする(ショートカットキーHome) - + Move to the bottom layer 写真を最背面にする（ショートカットキーEnd） - + Fill the entire screen 全画面塗りつぶし - + Fill the screen horizontally 行塗りつぶし - + Fill the screen vertically 列塗りつぶし - + Align top 縦位置　上詰め - + Center vertically 縦位置　中央揃え - + Bottom align 縦位置　下詰め - + Align left 横位置　左詰め - + Center horizontally 横位置　中央揃え - + Align right 横位置　右詰め - + Tip Info ヒント - + Clear all medias? @@ -5439,84 +5415,84 @@ PageListItem - + times 回 - + Page name プログラム名 - + New 新規 - + Play times 再生回数 - + Sources Repeat ソースの繰り返し - + Audios オーディオ - + Total Dur 全期間 - - + + s 秒 - + Select File ファイルを選択 - + Duration 期間 - + Vol 音量 - + Valid Date 有効期間 - - + + Warning 警告 - + Start Time can't be later than End Time 開始時間は終了時間より後にようにしてください - + End Time can't be earlier than Start Time 終了時間は開始時間より遅いようにしてください - + Plan タイムスケジュール @@ -5534,14 +5510,6 @@ パスワード変更 - - PixbmpShowDialog - - - X - X - - PlayWin @@ -5563,12 +5531,12 @@ PlayerBackSendThread - + Open file failed ファイルのオープンに失敗しました - + Read file failed ファイルの読み込みに失敗しました @@ -5589,47 +5557,47 @@ ProgCreateDlg - + Resolution 解像度 - + Solution Information スケジュール情報 - + Solution Name リスト名 - + Width 幅 - + Height 高さ - + Remarks 備考 - + 每段打折宽度 (用空格分隔) - + OK 確定 - + Cancel キャンセル @@ -5637,200 +5605,200 @@ ProgEditorWin - + Save 保存 - - + + Save as 名前を付けて保存 - + Setting 設置 - + Text テキスト - + Photo 写真 - + Video ビデオ - + Gif アニメーション - + Clock デジタル時計 - + Analog Clock アナログ時計 - + Environment 環境モニタリング - + Web ウェブページ - + MuliContentWindow マルチ素材ウィンドウ - + In this window, a plurality of different program materials can be added and played according to the order of joining the list; このウィンドウには、複数の異なる番組素材を追加して、リストに追加した順に再生することができます - + Timer タイマー - + Play 再生 - + Stop 停止 - + Publish 転送 - - - - + + + + Select File ファイルを選択 - + program 番組リスト - + Add page ページを追加 - + Copy page コピーページ - + Delete page ページを削除 - - + + Tip Info ヒント - + Are you sure you want to delete this program page? 本当にこの番組ページを削除しますか？ - + Move up 前へ - + Move down 次頁 - + widget properties パッケージプロパティ - + Page properties プログラムのプロパティ - + Do you want to save the modifications? 変更された内容を保存してもよろしいですか? - - + + Saving... 保存中、少々お待ちください... - - + + Success 成功 - + Save failed 保存に失敗 - + Convertering データを整理する - + Generate preview data プレビューデータの生成 - - + + Error エラー - + Rename fail when saving - + Remove Recursively fail when saving - + Warning 警告 @@ -5990,17 +5958,17 @@ ProgPortDlg - + Solution Name リスト名 - + Progress 程度 - + Done 完了 @@ -6109,42 +6077,42 @@ SoftConfigDialog - + Software Config ソフトウェアの設定 - + Video compress to ビデオ圧縮 to - + Video transcoding to トランスコード to - + Text antialiasing 文字のアンチエイリアス - + TextAntilaTip （ヒント：小さい間隔の大きい画面に適しています。このオプションを有効にすると、文字の端に影がフォントのエッジの滑らかさに達します。小さいサイズのスクリーンと単色のスクリーンは使用を推奨しません） - + GuangYinPin スクリーン - + Width Split - + OK 確定 @@ -6493,43 +6461,43 @@ UsbDetectDialog - + Usb upgrade program Uディスク更新プログラム - + Password パスワード - + OK 確定 - + Input password パスワードを入力 + - Tip 提示 - + No checked USB device チェックUSBデバイス - + please select usb device in list リスト内のUSBデバイスを選択してください - + Cancel キャンセル @@ -6973,52 +6941,37 @@ wPlanItem - - Form - リフレッシュ - - - - 1 - 1 - - - - Every week: - 毎週: - - - + M 月 - + Tu 火 - + W 水 - + Th 木 - + F 金 - + Sa 土 - + Su 日 @@ -7057,22 +7010,22 @@ wUpgradeApkItem - + Input password パスワードを入力 - + Error エラー - + Tip Info ヒント - + password is wrong diff --git a/LedOK/translations/app_zh_CN.ts b/LedOK/translations/app_zh_CN.ts index 3284c38..3833a31 100644 --- a/LedOK/translations/app_zh_CN.ts +++ b/LedOK/translations/app_zh_CN.ts @@ -1,72 +1,64 @@ - - AboutDlg - - - About - 关于 - - ChangePasswordForm - + Old password 旧密码 - + New password 新密码 - + Repeat again 重复一遍 - + OK 确认 - + Cancel 取消 - - - - - + + + + + Tip 提示 - + Please input old password 请输入旧密码 - + Old password is wrong 旧密码错误 - + Please enter a password with more than 6 characters 请输入超过6个字符的密码 - + The new password is not consistent in two times 新密码两次不一致 - + Password changed successfully 密码更改成功 @@ -274,14 +266,14 @@ ControlPowerWidget - - + + Off 关 - - + + On 开 @@ -311,32 +303,32 @@ - + IsScreenOn 读取开关状态 - + Power Configuration 开关屏控制 - + Manual 手动 - + Schedule 定时 - + Power 电源 - + Readback 回读 @@ -880,82 +872,82 @@ CtrlAdvancedPanel - + Advanced 高级参数 - + Screen Width(pixel) 屏幕宽(像素) - + Width 宽 - - + + Height 高 + - + + + - - - - - + + + + - - - - + + Set 设置 - + Alias 别名 - + Web Server Address: Web服务器地址: - + www.m2mled.net - + www.ledaips.com - + https://www.taxihub.cn:2340 - + https://www.ledaips.com:2340 - + https://www.36taxi.com:2340 - + www.tlzxled.com @@ -965,443 +957,443 @@ 正在上传单片机 - + Traffic screen settings 交通屏设置 - + Setting protocol ... 正在设置协议 ... - + Set protocol 设置协议 - + Getting protocol ... 正在回读协议 ... - + Get protocol 回读协议 - - + + Port 端口 - + Realtimer Server Address: Realtimer地址: - + Firmware Management 固件管理 - + update or uninstall 更新或卸载 - + Clear 清空 - + Check Apk 检查Apk - + Uninstall 卸载 - + Running check 运行状态监测 - + Restart 重启 - + Check Log 查看日志 - + Start LedSet4 使用 LedSet4.0 配置LED模组（Apk Display2.0以上版本） - + Open ADB 打开ADB调试功能 - + Post Custom JSON Post Custom JSON - - - + + + + - - - + + Clear Program 清除节目 - + www.ledokcloud.com/realtime - + Config 配置 - + Refresh 刷新 - + Restore to default 恢复默认值 - + Taxi top screen configuration 车顶有无客电平配置 - - + + Service:High Out of service:Low 有客：高电平 无客：低电平 - - + + Service:Low Out of service:High 有客：低电平 无客：高电平 - + Start LedSet3.0 configure LED module 使用LedSet3.0配置LED模组（厂家专业人员使用） - + Binding *.ic account indentity voucher 绑定taxihub平台用户身份凭证 - + Rotate 旋转 - + Min brightness 最低亮度 - - - + + + Readback 回读 - + Send 发送 - + Max brightness 最高亮度 - - + + SetScreenSize 设置屏幕像素尺寸 - - - - + + + + Success 成功 - + Compant ID: 公司ID: - + Compant ID 公司ID - + InputWebServerAddressTip 请输入Web服务器地址 - + InputCompanyIdTip 请输入公司ID - + Do you want to modify webserveraddress and companyId? 是否确认配置服务器地址和公司ID？ - - + + SetOnlineAddr 设置web服务器地址 - - + + ClearRealtimeServer 清除 - - + + SetRealtimeServer 设置RealTimer地址 - - - - + + + + Tip Info 提示 - - - + + + Can not find LedSet3.0.exe,down you need download and install it 找不到LedSet3.0.exe，确认下载并安装 - - + + RestartAndroid 重启 - - + + running 正在运行 - - + + no running 没有运行 - + Check Apk Version 查询已安装apk版本 - - + + UninstallSoftware 卸载 - - + + Check apk running status 监测APK运行状态 - - + + OpenAdb 打开ADB调试功能 - + indentity voucher (*.ic) 身份凭证(*.ic) - - - - - + + + + + InvokeTaxiAppFunction 绑定证书 - - + + AliIotSetting - + Software Version Info 软件版本信息 - + Package 包名 - + Version 版本 - - + + Package name is null 包名为空 - + Clearing Program 正在清除节目 - - - - + + + + Timeout 超时 - - - - + + + + Failed 失败 - + Getting Log 正在获取日志 + - - - - - - - - - - + + + + + + + + + Error 错误 - + Setting Timing Reboot 正在设置定时重启 - + Set Timing Reboot 设置定时重启 - + Getting Timing Reboot 正在获取定时重启 - + Get Timing Reboot 获取定时重启 - + totalResolution 包括行场数的分辨率 - + strCurDisplayResolution 当前显示屏分辨率 - + File not exist 文件不存在 - + Uploading 正在上传 - - + + Set Display Mode 设置显示模式 - - + + Get Display Mode 获取显示模式 - - + + Set Screen Offset 设置屏幕偏移 - - + + Get Screen Offset 获取屏幕偏移 - + Open file Failed 文件打开失败 @@ -1412,7 +1404,7 @@ - + Set Wallpaper 设置系统桌面背景 @@ -1423,417 +1415,417 @@ - + System Update 系统升级 - + Getting MCU Version 正在获取单片机版本 - - + + MCU Version 单片机版本 - + Select File 选择文件 - + Setting player background 正在设置播放器背景 - - + + Set player background 设置播放器背景 - + Clearing player background 正在清除播放器背景 - - - - - - - - + + + + + + + + Clear player background 清除播放器背景 - + Setting Baud Rate 正在设置波特率 - + Set Baud Rate 设置波特率 - + Getting Baud Rate 正在获取波特率 - + Get Baud Rate 获取波特率 - + Text is empty 文本为空 - + Json Parse Error - + Json isn't an Object - + Setting card work mode ... 正在设置控制卡工作模式 ... - + Set card work mode 设置控制卡工作模式 - + Getting card work mode ... 正在回读控制卡工作模式 ... - + Get card work mode 回读控制卡工作模式 - + Resolution Config 分辨率配置 - + Full screen 全屏 - + Part 局部 - + Display Mode 显示模式 - + Screen Position 屏幕位置 - + Offset 偏移 - + Hidden Settings 隐藏的设置 - + Click right button to hide 点击右键隐藏 - - + + Update MCU 更新单片机 - + Get MCU Version 获取单片机版本 - + Baud Config 波特率配置 - + Model 设备型号 - + Uart 串口节点 - + Baud 波特率 + - - - - - + + + + Get 获取 - + Timing Reboot 定时重启 - + Protocol 协议 - + Server 服务端 - + Client 客户端 - - + + SetScreenRotation 设置屏幕旋转 - - + + SetMinBrightness 设置最小的亮度值 - - + + SetMaxBrightness 设置亮度最大值 - - + + GetMinBrightness 获取亮度最小值 - + GetMaxBrightness 获取亮度最大值 - - + + Card work mode 控制卡工作模式 - - + + SetSpecialResolution 设置分辨率 - - + + GetSpecialResolution 读取分辨率 - - + + CleanDisplayScreenSize 恢复默认分辨率 - - + + SetHighForBusy 设置有无客电平 + - GetStateForBusy 获取有无客电平 - + InputAliasTip 请输入别名 - - + + SetCardAlias 设置别名 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + Tip 提示 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + NoSelectedController 请先选择大屏幕 - + InputWidthTip 请输入正确的宽度像素值 - + InputHeightTip 请输入正确的高度像素值 - + Password is error 密码错误 @@ -2308,218 +2300,209 @@ CtrlNetworkPanel - + Wire Enther(RJ45) Configuration 有线网配置 - + DHCP - + Specify IP 指定IP - + IP Address IP地址 - + Gateway 网关 - + DNS Address DNS地址 - - - + + + Set 设置 - - - - + + + + Readback 回读 - + WIFI Configuration WiFi配置 - + WiFi Mode 使用WiFi - + Cellular Config 蜂窝数据配置 - + Enable Cellular Data 启用蜂窝数据 - + Get cellular network status information 获取蜂窝网络状态信息 - + Through the check status button 通过“获取状态”按钮可以自动匹配国家码，然后选择“运营商”可获取到相应的APN信息。 - + Set APN Info 设置APN信息 - + Country ID(mcc): 国家码(mcc): - - + + Carrier Name 运营商 - + APN(Required) APN(必填) - + Flight Mode 飞行模式 - + WiFi name WiFi名称 - - - + + + Password 密码 - - + + Input password 输入密码 - + Scan 扫描 - + Ap Mode 使用热点 - + OFF 关 - + ON 开 - + AP name 热点名称 - + Subnet mask 子网掩码 - + Input ap name 输入AP名称 - - - - - - - - - - - - + + + + + + + + + + + + Tip 提示 - - - - - - - - - - - + + + + + + + + + + + NoSelectedController 请先选择大屏幕 - - + + SetEthernet 设置有线网 - - - - Attention 注意 - + Please input IP address! 请输入IP地址！ - - - Your IP Address is Invalid! - IP地址无效！ - Please input Mask address! @@ -2527,360 +2510,351 @@ - Your Mask Address is Invalid! - 掩码地址无效! - - - Please input Gateway address! 请输入网关地址！ - - Your Gateway Address is Invalid! - 网关地址无效！ - - - + Please input DNS address! 请输入DNS地址！ - - Your DNS Address is Invalid! - DNS地址无效! - - - - + + GetEthernet 获取有线网配置 - + DHCP IP 动态DHCP IP - + STATIC IP 静态IP - - + + + ConfigurationWiFi 配置WiFi - - + + IsPortableHotSpot 获取热点和WiFi模式 - + GetWifiList 扫描WiFi - - + + ConfigurationHotSpot 配置热点 - + success 成功 - + WifiName Wifi名称 - + ApName 热点名称 - - + + GetCurrentAPN 获取APN信息 - + GetSIMStatus 获取SIM状态 - - + + SetAPN 设置APN - + 状态: 状态: - + + Error + 错误 + + + 未知 未知 - + 锁定状态，需要用户的PIN码解锁 锁定状态，需要用户的PIN码解锁 - + 锁定状态，需要用户的PUK码解锁 锁定状态，需要用户的PUK码解锁 - + 锁定状态，需要网络的PIN码解锁 锁定状态，需要网络的PIN码解锁 - + 就绪 就绪 - + no checked sim card 检测不到sim卡 - + 国家码: 国家码: - + 号码: 号码: - + 用户: 用户: - + 信号: 信号: - + 信号正常 信号正常 - + 不在服务区 不在服务区 - + 仅限紧急呼叫 仅限紧急呼叫 - + 射频已经关闭 射频已经关闭 - + 网络: 网络: - + 网络类型未知 未知 - + GPRS网络 GPRS - + EDGE网络 EDGE - + UMTS网络 UMTS - + CDMA网络,IS95A 或 IS95B. CDM - + EVDO网络, revision 0. EVDO,revision 0. - + EVDO网络, revision A. EVDO,revision A. - + 1xRTT网络 1xRTT - + HSDPA网络 HSDPA - + HSUPA网络 HSUPA - + HSPA网络 HSPA - + 漫游: 漫游: - + Yes 是 - + No 否 - + 数据连接状态: 数据连接状态: - + 断开 断开 - + 正在连接 正在连接 - + 已连接 已连接 - + 暂停 暂停 - + 数据活动休眠状态: 数据活动休眠状态: - + 活动，但无数据发送和接收 活动，但无数据发送和接收 - + 活动，正在接收数据 活动，正在接收数据 - + 活动，正在发送数据 活动，正在发送数据 - + 活动，正在接收和发送数据 活动，正在接收和发送数据 - + 休眠状态 休眠状态 - + 信号强度: - + User 用户 - + Type 类型 - + Server 服务端 - + Port 端口 - + Proxy 代理 - + MMS Port 彩信端口 - + MMS Proxy 彩信代理 - - + + SetSwitchSimData 设置4G/5G开关 - - + + ContrFlightMode 配置飞行模式 - - + + GetFlightModeState 获取飞行模式状态 @@ -3304,28 +3278,29 @@ Def - + Connection Timeout 连接超时 - - - - - + + + + + Device replied 设备回复 - + + - + Success 成功 - + Fail 失败 @@ -3413,234 +3388,234 @@ DeviceItem - + GetScreenDetailInfo 更多信息 - + ReadbackPic 回读画面 - + Input password 输入密码 - + GetScreenshotFull 回读画面 - + cur brightness: 当前亮度: - + android version: 安卓版本: - + IMEI: - + HardWard Version: FPGA版本: - + MAX Brightness level: 亮度等级: - + Android OS Resolution: 安卓分辨率: - + Firmware Version: 固件版本: - + Player Version: 播放器固件版本: - + Detail Info 详细信息 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + receive 接收 - + AliIotSetting - - + + GetScreenStatus 获取屏幕状态 - - + + Status 状态 - + Tip Info 提示 - + password is wrong 密码错误 - + GetBrightness 获取亮度值 - + brightness 亮度 - + SetAutoBrightnessTask 发送定时亮度表 - + SetAutoVolumeTask 配置定时音量表 - + SetVolume 音量调节 - + GetVolume 获取当前音量 - + SetTimingScreenTask 设置屏幕定时开关任务 - + TestScreen 测试屏幕 - + SetOnlineAddr 设置web服务器地址 - + SetRealtimeServer 设置RealTimer地址 - + GetCurrentSensorBrightness 获取当前亮度 - + Cur brightness 当前亮度 - + Connect 连接 - + timeout 超时 - + Anycast 点播 - + volume 音量 - + Success 成功 - + failed 失败 - - - - - - - - - - - - - + + + + + + + + + + + + + success 成功 - + + - on 开 - + + - off 关 @@ -3986,7 +3961,7 @@ - + T @@ -4036,17 +4011,17 @@ 文本 - + Play Properties 播放方式 - + Play Duration 播放时长 - + s 秒 @@ -4288,17 +4263,17 @@ 多行显示 - + Play Properties 播放方式 - + Play Duration 播放时长 - + s 秒 @@ -4959,17 +4934,17 @@ 文本 - + Play Properties 播放方式 - + Play Duration 播放时长 - + s 秒 @@ -5209,114 +5184,115 @@ MainWindow - + Language 语言 - + Help 帮助 - - + + Check for updates 检查更新 - - + + firmware manager 固件管理 - - + + Software Config 软件配置 - - + + Info 信息 - - + + + About 关于 - - + + Setting 设置 - + Software Update 软件更新 - + CurVersion 当前版本 - + Update 更新 - + LatestVersion: 最新版本: - - + + Update log: 更新日志: - + The current version is already the latest version 已经是最新的版本 - + Device 设备管理 - + Program 节目管理 - + Control 终端控制 - + GuangYinPin 光影屏 - + Check card 一键找卡 - + Tip Info 提示 - + RestoreLedCardIpByUdpTip 该操作会把局域网内的所有与计算机IP不在同一网段的控制卡修复成固定IP，请谨慎操作！ @@ -5337,102 +5313,102 @@ PageEditor - + Zoom In 放大 - + Zoom Out 缩小 - + Original size 原始比例 - + Delete the secect media 删除选中的媒体 - + Clear all media 清空所有媒体 - + Move layer up 向上一层(快捷键PgUp) - + Send backward 向下一层(快捷键PgDn) - + Bring to front 图层置顶(快捷键Home) - + Move to the bottom layer 图层置底(快捷键End) - + Fill the entire screen 全屏铺满 - + Fill the screen horizontally 水平铺满 - + Fill the screen vertically 垂直铺满 - + Align top 垂直靠顶 - + Center vertically 垂直居中 - + Bottom align 垂直靠底 - + Align left 水平靠左 - + Center horizontally 水平居中 - + Align right 水平靠右 - + Tip Info 提示 - + Clear all medias? 清除所有媒体？ @@ -5440,84 +5416,84 @@ PageListItem - + times 次 - + Page name 节目名称 - + New 新建 - + Play times 播放次数 - + Sources Repeat 素材循环 - + Audios 音频 - + Total Dur 总时长 - - + + s 秒 - + Select File 选择文件 - + Duration 时长 - + Vol 音量 - + Valid Date 有效日期 - - + + Warning 警告 - + Start Time can't be later than End Time 开始时间不能晚于结束时间 - + End Time can't be earlier than Start Time 结束时间不能早于开始时间 - + Plan 时间计划表 @@ -5535,14 +5511,6 @@ 修改密码 - - PixbmpShowDialog - - - X - X - - PlayWin @@ -5564,12 +5532,12 @@ PlayerBackSendThread - + Open file failed 文件读取失败 - + Read file failed 文件读取失败 @@ -5590,47 +5558,47 @@ ProgCreateDlg - + Resolution 分辨率 - + Solution Information 节目信息 - + Solution Name 节目名称 - + Width 宽 - + Height 高 - + Remarks 备注 - + 每段打折宽度 (用空格分隔) - + OK 确认 - + Cancel 取消 @@ -5638,200 +5606,200 @@ ProgEditorWin - + Save 保存 - - + + Save as 另存为 - + Setting 设置 - + Text 文本 - + Photo 图片 - + Video 视频 - + Gif 动画 - + Clock 数字时钟 - + Analog Clock 模拟时钟 - + Environment 环境监测 - + Web 网页 - + MuliContentWindow 多素材窗口 - + In this window, a plurality of different program materials can be added and played according to the order of joining the list; 该窗口中可以加入多个不同是节目素材，并按照加入列表的先后顺序播放 - + Timer 计时器 - + Play 播放 - + Stop 停止 - + Publish 发布 - - - - + + + + Select File 选择文件 - + program 节目列表 - + Add page 添加页面 - + Copy page 复制页面 - + Delete page 删除页面 - - + + Tip Info 提示 - + Are you sure you want to delete this program page? 确定要删除该节目页吗？ - + Move up 向上移动一个页面 - + Move down 向下移动一个页面 - + widget properties 组件属性 - + Page properties 节目属性 - + Do you want to save the modifications? 是否保存修改？ - - + + Saving... 正在保存... - - + + Success 成功 - + Save failed 保存失败 - + Convertering 整理数据中 - + Generate preview data 生成预览数据 - - + + Error 错误 - + Rename fail when saving 重命名文件夹失败 - + Remove Recursively fail when saving - + Warning 警告 @@ -5991,17 +5959,17 @@ ProgPortDlg - + Solution Name 节目名称 - + Progress 进度 - + Done 完成 @@ -6110,42 +6078,42 @@ SoftConfigDialog - + Software Config 软件配置 - + Video compress to 视频压缩成 - + Video transcoding to 视频转码成 - + Text antialiasing 文字反锯齿 - + TextAntilaTip （提示：该选项适合小间距大尺寸的屏幕，选中此项，文字边缘会有暗影已达到字体边缘光滑的效果；小尺寸屏幕和单双色屏幕不建议使用） - + GuangYinPin 光影屏 - + Width Split 超长屏打折 - + OK 确认 @@ -6494,43 +6462,43 @@ UsbDetectDialog - + Usb upgrade program U盘更新节目 - + Password 密码 - + OK 确认 - + Input password 输入密码 + - Tip 提示 - + No checked USB device 未检查USB设备 - + please select usb device in list 请在列表中选择usb设备 - + Cancel 取消 @@ -6974,52 +6942,37 @@ wPlanItem - - Form - Form - - - - 1 - 1 - - - - Every week: - 每周: - - - + M 一 - + Tu 二 - + W 三 - + Th 四 - + F 五 - + Sa 六 - + Su 日 @@ -7058,22 +7011,22 @@ wUpgradeApkItem - + Input password 输入密码 - + Error 错误 - + Tip Info 提示 - + password is wrong 密码错误 diff --git a/LedOK/translations/app_zh_TW.ts b/LedOK/translations/app_zh_TW.ts index e99ba53..d412d63 100644 --- a/LedOK/translations/app_zh_TW.ts +++ b/LedOK/translations/app_zh_TW.ts @@ -1,72 +1,64 @@ - - AboutDlg - - - About - 關於 - - ChangePasswordForm - + Old password 舊密碼 - + New password 新密碼 - + Repeat again 重複一遍 - + OK 確認 - + Cancel 取消 - - - - - + + + + + Tip 提示 - + Please input old password 請輸入舊密碼 - + Old password is wrong 舊密碼錯誤 - + Please enter a password with more than 6 characters 請輸入超過6個字元的密碼 - + The new password is not consistent in two times 新密碼兩次不一致 - + Password changed successfully 密碼更改成功 @@ -274,14 +266,14 @@ ControlPowerWidget - - + + Off 關 - - + + On 開 @@ -311,32 +303,32 @@ - + IsScreenOn 讀取開關狀態 - + Power Configuration 開關屏控制 - + Manual 手動 - + Schedule 定時 - + Power 電源 - + Readback 回讀 @@ -885,82 +877,82 @@ CtrlAdvancedPanel - + Advanced 高級參數 - + Screen Width(pixel) 螢幕寬(點數) - + Width 寬 - - + + Height 高 + - + + + - - - - - + + + + - - - - + + Set 設定 - + Alias 別名 - + Web Server Address: Web伺服器地址： - + www.m2mled.net - + www.ledaips.com - + https://www.taxihub.cn:2340 - + https://www.ledaips.com:2340 - + https://www.36taxi.com:2340 - + www.tlzxled.com @@ -970,490 +962,490 @@ 正在上傳單片機 - + Traffic screen settings 交通屏設定 - + Setting protocol ... 正在設定協定 - + Set protocol 設定協定 - + Getting protocol ... 正在回讀協定 ... - + Get protocol 回讀協定 - - + + Port 埠 - + Realtimer Server Address: Realtimer地址: - + Firmware Management 固件管理 - + update or uninstall 更新或卸載 - + Clear 清空 - + Check Apk 檢查Apk - + Uninstall 卸載 - + Running check 運行狀態監測 - + Restart 重啓 - + Check Log 查看日誌 - + Start LedSet4 - + Open ADB 打開ADB調試功能 - + Post Custom JSON Post Custom JSON - - - + + + + - - - + + Clear Program 清除節目 - + www.ledokcloud.com/realtime - + Config 配寘 - + Refresh 檢測 - + Restore to default 恢復預設值 - + Taxi top screen configuration 車頂有無客電平配寘 - - + + Service:High Out of service:Low 有客：高電平無客：低電平 - - + + Service:Low Out of service:High 有客：低電平 無客：高電平 - + Start LedSet3.0 configure LED module 使用LedSet3.0配寘LED模組（廠家專業人員使用） - + Binding *.ic account indentity voucher 綁定taxihub平臺用戶身份憑證 - + Rotate 旋轉 - + Min brightness 最低亮度 - - - + + + Readback 回讀 - + Send 發送 - + Max brightness 最高亮度 - - + + SetScreenSize 設定螢幕點數尺寸 - - - - + + + + Success 成功 - + Compant ID: 公司ID: - + Compant ID 公司ID - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + NoSelectedController 請先選擇大螢幕 - + InputWebServerAddressTip 請輸入Web伺服器地址 - + InputCompanyIdTip 請輸入公司ID - + Do you want to modify webserveraddress and companyId? 是否確認配寘伺服器地址和公司ID？ - - + + SetOnlineAddr 設定web伺服器地址 - - + + ClearRealtimeServer 清除 - - + + SetRealtimeServer 設定RealTimer地址 - - - - + + + + Tip Info 提示 - - - + + + Can not find LedSet3.0.exe,down you need download and install it 找不到LedSet3.0.exe，確認下載並安裝 - - + + RestartAndroid 重啓 - - + + running 正在運行 - - + + no running 沒有運行 - + Check Apk Version 査詢已安裝apk版本 - - + + UninstallSoftware 卸載 - - + + Check apk running status 監測APK運行狀態 - - + + OpenAdb 打開ADB調試功能 - + indentity voucher (*.ic) 身份憑證(*.ic) - - - - - + + + + + InvokeTaxiAppFunction 綁定證書 - - + + AliIotSetting - + Software Version Info 軟體版本資訊 - + Package 包名 - + Version 版本 - - + + Package name is null 包名為空 - + Clearing Program 正在清除節目 - - - - + + + + Timeout 超時 - - - - + + + + Failed 失敗 - + Getting Log 讀取日誌 + - - - - - - - - - - + + + + + + + + + Error 錯誤 - + Setting Timing Reboot 正在設定定時重啓 - + Set Timing Reboot 設定定時重啓 - + Getting Timing Reboot 正在獲取定時重啓 - + Get Timing Reboot 獲取定時重啓 - + totalResolution 行数を含む解像度 - + strCurDisplayResolution 當前顯示分辯率 - + File not exist 檔案不存在 - + Uploading 正在上傳 - - + + Set Display Mode 設定顯示模式 - - + + Get Display Mode 獲取顯示模式 - - + + Set Screen Offset 設定螢幕偏移 - - + + Get Screen Offset 獲取螢幕偏移 - + Open file Failed 檔案打開失敗 @@ -1464,7 +1456,7 @@ - + Set Wallpaper 設定系統桌面背景 @@ -1475,370 +1467,370 @@ - + System Update 系統升級 - + Getting MCU Version 正在獲取單片機版本 - - + + MCU Version 單片機版本 - + Select File 選擇檔案 - + Setting player background 正在設定播放機背景 - - + + Set player background 設定播放機背景 - + Clearing player background 正在清除播放機背景 - - - - - - - - + + + + + + + + Clear player background 清除播放機背景 - + Setting Baud Rate 正在設定串列傳輸速率 - + Set Baud Rate 設定串列傳輸速率 - + Getting Baud Rate 正在讀取串列傳輸速率 - + Get Baud Rate 讀取串列傳輸速率 - + Text is empty - + Json Parse Error - + Json isn't an Object - + Setting card work mode ... 正在設定控制卡工作模式 ... - + Set card work mode 設定控制卡工作模式 - + Getting card work mode ... 正在回讀控制卡工作模式 ... - + Get card work mode 回讀控制卡工作模式 - + Resolution Config 分辯率配寘 - + Full screen 全屏 - + Part 局部 - + Display Mode 顯示模式 - + Screen Position 螢幕位置 - + Offset 偏移 - + Hidden Settings 隱藏的設定 - + Click right button to hide 點擊右鍵隱藏 - - + + Update MCU 更新單片機 - + Get MCU Version 獲取單片機版本 - + Baud Config 串列傳輸速率配寘 - + Model 設備型號 - + Uart 串口節點 - + Baud 串列傳輸速率 + - - - - - + + + + Get 讀取 - + Timing Reboot 定時重啓 - + Protocol 協定 - + Server 服務端 - + Client 用戶端 - - + + SetScreenRotation 設定螢幕旋轉 - - + + SetMinBrightness 設定最小的亮度值 - - + + SetMaxBrightness 設定亮度最大值 - - + + GetMinBrightness 獲取亮度最小值 - + GetMaxBrightness 獲取亮度最大值 - - + + Card work mode 控制卡工作模式 - - + + SetSpecialResolution 設定分辯率 - - + + GetSpecialResolution 讀取分辯率 - - + + CleanDisplayScreenSize 恢復默認分辯率 - - + + SetHighForBusy 設定有無客電平 + - GetStateForBusy 獲取有無客電平 - + InputAliasTip 請輸入別名 - - + + SetCardAlias 設定別名 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + Tip 提示 - + InputWidthTip 請輸入正確的寬度點數值 - + InputHeightTip 請輸入正確的高度點數值 - + Password is error 密碼錯誤 @@ -2318,218 +2310,209 @@ CtrlNetworkPanel - + Wire Enther(RJ45) Configuration 有線網配寘 - + DHCP - + Specify IP 指定IP - + IP Address IP地址 - + Gateway 閘道 - + DNS Address DNS地址 - - - + + + Set 設定 - - - - + + + + Readback 回讀 - + WIFI Configuration WiFi配寘 - + WiFi Mode 使用WiFi - + Cellular Config 蜂窩數據配寘 - + Enable Cellular Data 啟用蜂窩數據 - + Get cellular network status information 獲取蜂窩網絡狀態資訊 - + Through the check status button 通過“獲取狀態”按鈕可以自動匹配國家碼，然後選擇“運營商”可獲取到相應的APN資訊。 - + Set APN Info 設定APN資訊 - + Country ID(mcc): 国家码(mcc):國家碼（mcc）： - - + + Carrier Name 運營商 - + APN(Required) APN（必填） - + Flight Mode 飛行模式 - + WiFi name WiFi名稱 - - - + + + Password 密碼 - - + + Input password 輸入密碼 - + Scan 掃描 - + Ap Mode 使用熱點 - + OFF 關 - + ON 開 - + AP name 熱點名稱 - + Subnet mask 子網路遮罩 - + Input ap name 輸入AP名稱 - - - - - - - - - - - - + + + + + + + + + + + + Tip 提示 - - - - - - - - - - - + + + + + + + + + + + NoSelectedController 請先選擇大螢幕 - - + + SetEthernet 設定有線網 - - - - Attention 注意 - + Please input IP address! 請輸入IP地址！ - - - Your IP Address is Invalid! - IP地址無效！ - Please input Mask address! @@ -2537,360 +2520,351 @@ - Your Mask Address is Invalid! - 遮罩地址無效！ - - - Please input Gateway address! 請輸入閘道地址！ - - Your Gateway Address is Invalid! - 閘道地址無效！ - - - + Please input DNS address! 請輸入DNS地址！ - - Your DNS Address is Invalid! - DNS地址無效！ - - - - + + GetEthernet 獲取有線網配寘 - + DHCP IP 動態DHCP IP - + STATIC IP 靜態IP - - + + + ConfigurationWiFi 配寘WiFi - - + + IsPortableHotSpot 獲取熱點和WiFi模式 - + GetWifiList 掃描WiFi - - + + ConfigurationHotSpot 配寘熱點 - + success 成功 - + WifiName Wifi名稱 - + ApName 熱點名稱 - - + + GetCurrentAPN 獲取APN資訊 - + GetSIMStatus 獲取SIM狀態 - - + + SetAPN 設定APN - + 状态: 狀態： - + + Error + 錯誤 + + + 未知 未知 - + 锁定状态，需要用户的PIN码解锁 鎖定狀態，需要用戶的PIN碼解鎖 - + 锁定状态，需要用户的PUK码解锁 鎖定狀態，需要用戶的PUK碼解鎖 - + 锁定状态，需要网络的PIN码解锁 鎖定狀態，需要網絡的PIN碼解鎖 - + 就绪 就緒 - + no checked sim card 檢測不到sim卡 - + 国家码: 國家碼： - + 号码: 號碼： - + 用户: 用戶： - + 信号: 信号: - + 信号正常 訊號正常 - + 不在服务区 不在服務區 - + 仅限紧急呼叫 僅限緊急呼叫 - + 射频已经关闭 射頻已經關閉 - + 网络: 網絡： - + 网络类型未知 未知 - + GPRS网络 GPRS - + EDGE网络 EDGE - + UMTS网络 UMTS - + CDMA网络,IS95A 或 IS95B. CDM - + EVDO网络, revision 0. EVDO,revision 0. - + EVDO网络, revision A. EVDO,revision A. - + 1xRTT网络 1xRTT - + HSDPA网络 HSDPA - + HSUPA网络 HSUPA - + HSPA网络 HSPA - + 漫游: 漫遊： - + Yes 是 - + No 否 - + 数据连接状态: 數據連接狀態： - + 断开 斷開 - + 正在连接 正在連接 - + 已连接 已連接 - + 暂停 暫停 - + 数据活动休眠状态: 數據活動休眠狀態： - + 活动，但无数据发送和接收 活動，但無數據發送和接收 - + 活动，正在接收数据 活動，正在接收數據 - + 活动，正在发送数据 活動，正在發送數據 - + 活动，正在接收和发送数据 活動，正在接收和發送數據 - + 休眠状态 休眠狀態 - + 信号强度: 信號強度： - + User 用戶 - + Type 型態 - + Server 服務端 - + Port 埠 - + Proxy 代理 - + MMS Port 彩信埠 - + MMS Proxy 彩信代理 - - + + SetSwitchSimData 設定4G/5G開關 - - + + ContrFlightMode 配寘飛行模式 - - + + GetFlightModeState 獲取飛行模式狀態 @@ -3314,28 +3288,29 @@ Def - + Connection Timeout 連接超時 - - - - - + + + + + Device replied 設備回復 - + + - + Success 成功 - + Fail 失敗 @@ -3423,234 +3398,234 @@ DeviceItem - + GetScreenDetailInfo 更多資訊 - + ReadbackPic 回讀畫面 - + Input password 輸入密碼 - + GetScreenshotFull 回讀畫面 - + cur brightness: 當前亮度： - + android version: 安卓版本： - + IMEI: - + HardWard Version: FPGA版本： - + MAX Brightness level: 亮度等級： - + Android OS Resolution: 安卓分辯率： - + Firmware Version: 固件版本： - + Player Version: 播放機固件版本： - + Detail Info 詳細資訊 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + receive 接收 - + AliIotSetting - - + + GetScreenStatus 獲取螢幕狀態 - - + + Status 狀態 - + Tip Info 提示 - + password is wrong 密碼錯誤 - + GetBrightness 獲取亮度值 - + brightness 亮度 - + SetAutoBrightnessTask 發送定時亮度錶 - + SetAutoVolumeTask 配寘定時音量表 - + SetVolume 音量調節 - + GetVolume 獲取當前音量 - + SetTimingScreenTask 設定螢幕定時開關任務 - + TestScreen 測試螢幕 - + SetOnlineAddr 設定web伺服器地址 - + SetRealtimeServer 設定RealTimer地址 - + GetCurrentSensorBrightness 獲取當前亮度 - + Cur brightness 當前亮度 - + Connect 連接 - + timeout 超時 - + Anycast 點播 - + volume 音量 - + Success 成功 - + failed 失敗 - - - - - - - - - - - - - + + + + + + + + + + + + + success 成功 - + + - on 開 - + + - off 關 @@ -3994,7 +3969,7 @@ - + T @@ -4044,17 +4019,17 @@ 文字 - + Play Properties 播放管道 - + Play Duration 播放時長 - + s 秒 @@ -4296,17 +4271,17 @@ 多行顯示 - + Play Properties 播放管道 - + Play Duration 播放時長 - + s 秒 @@ -4967,17 +4942,17 @@ 文字 - + Play Properties 播放管道 - + Play Duration 播放時長 - + s 秒 @@ -5217,114 +5192,115 @@ MainWindow - + Language 語言 - + Help 幫助 - - + + Check for updates 檢查更新 - - + + firmware manager 固件管理 - - + + Software Config 軟件配寘 - - + + Info 資訊 - - + + + About 關於 - - + + Setting 設定 - + Software Update 軟體更新 - + CurVersion 當前版本 - + Update 更新 - + LatestVersion: 最新版本： - - + + Update log: 更新日誌： - + The current version is already the latest version 已經是最新的版本 - + Device 設備管理 - + Program 節目管理 - + Control 終端控制 - + GuangYinPin 光影屏 - + Check card 一鍵找卡 - + Tip Info 提示 - + RestoreLedCardIpByUdpTip 該操作會把局域網內的所有與電腦IP不在同一網段的控制卡修復成固定IP，請謹慎操作！ @@ -5345,102 +5321,102 @@ PageEditor - + Zoom In 放大 - + Zoom Out 縮小 - + Original size 原始比例 - + Delete the secect media 删除選中的媒體 - + Clear all media 清空所有媒體 - + Move layer up 向上一層（快速鍵PgUp） - + Send backward 向下一層（快速鍵PgDn） - + Bring to front 圖層置頂（快速鍵Home） - + Move to the bottom layer 圖層置底（快速鍵End） - + Fill the entire screen 全屏鋪滿 - + Fill the screen horizontally 水准鋪滿 - + Fill the screen vertically 垂直鋪滿 - + Align top 垂直靠頂 - + Center vertically 垂直居中 - + Bottom align 垂直靠底 - + Align left 水准靠左 - + Center horizontally 水准居中 - + Align right 水准靠右 - + Tip Info 提示 - + Clear all medias? 清除所有媒體？ @@ -5448,84 +5424,84 @@ PageListItem - + times 次 - + Page name 節目名稱 - + New 新建 - + Play times 播放次數 - + Sources Repeat 素材迴圈 - + Audios 音訊 - + Total Dur 總時長 - - + + s 秒 - + Select File 選擇檔案 - + Duration 時長 - + Vol 音量 - + Valid Date 有效日期 - - + + Warning 警告 - + Start Time can't be later than End Time 開始時間不能晚於結束時間 - + End Time can't be earlier than Start Time 結束時間不能早於開始時間 - + Plan 時間計畫表 @@ -5543,14 +5519,6 @@ 修改密碼 - - PixbmpShowDialog - - - X - X - - PlayWin @@ -5572,12 +5540,12 @@ PlayerBackSendThread - + Open file failed 檔案打開失敗 - + Read file failed 檔案讀取失敗 @@ -5598,47 +5566,47 @@ ProgCreateDlg - + Resolution 分辯率 - + Solution Information 節目資訊 - + Solution Name 節目名稱 - + Width 寬 - + Height 高 - + Remarks 備註 - + 每段打折宽度 (用空格分隔) 每段讓利寬度（用空格分隔） - + OK 確認 - + Cancel 取消 @@ -5646,200 +5614,200 @@ ProgEditorWin - + Save 保存 - - + + Save as 另存為 - + Setting 設定 - + Text 文字 - + Photo 圖片 - + Video 視頻 - + Gif 動畫 - + Clock 數位時鐘 - + Analog Clock 圓形時鐘 - + Environment 環境監測 - + Web 網頁 - + MuliContentWindow 多素材視窗 - + In this window, a plurality of different program materials can be added and played according to the order of joining the list; 該視窗中可以加入多個不同是節目素材，並按照加入列表的先後順序播放 - + Timer 計時器 - + Play 播放 - + Stop 停止 - + Publish 發佈 - - - - + + + + Select File 選擇檔案 - + program 節目清單 - + Add page 添加頁面 - + Copy page 複製頁面 - + Delete page 删除頁面 - - + + Tip Info 提示 - + Are you sure you want to delete this program page? 確定要删除該節目頁嗎？ - + Move up 向上移動一個頁面 - + Move down 向下移動一個頁面 - + widget properties 組件内容 - + Page properties 節目内容 - + Do you want to save the modifications? 是否保存修改？ - - + + Saving... 正在保存… - - + + Success 成功 - + Save failed 保存失敗 - + Convertering 整理數據中 - + Generate preview data 生成預覽數據 - - + + Error 錯誤 - + Rename fail when saving - + Remove Recursively fail when saving - + Warning 警告 @@ -5999,17 +5967,17 @@ ProgPortDlg - + Solution Name 節目名稱 - + Progress 進度 - + Done 完成 @@ -6118,42 +6086,42 @@ SoftConfigDialog - + Software Config 軟件配寘 - + Video compress to 視頻壓縮成 - + Video transcoding to 視頻轉碼成 - + Text antialiasing 文字反鋸齒 - + TextAntilaTip （提示：該選項適合小間距大尺寸的螢幕，選中此項，文字邊緣會有暗影已達到字體邊緣光滑的效果；小尺寸螢幕和單雙色螢幕不建議使用） - + GuangYinPin 光影屏 - + Width Split 超長屏打折 - + OK 確認 @@ -6502,43 +6470,43 @@ UsbDetectDialog - + Usb upgrade program U盘更新节目 - + Password - + OK 確認 - + Input password 輸入密碼 + - Tip 提示 - + No checked USB device 未檢查USB設備 - + please select usb device in list 請在清單中選擇usb設備 - + Cancel 取消 @@ -6982,52 +6950,37 @@ wPlanItem - - Form - Form - - - - 1 - 1 - - - - Every week: - 每週： - - - + M 一 - + Tu 二 - + W 三 - + Th 四 - + F 五 - + Sa 六 - + Su 日 @@ -7066,22 +7019,22 @@ wUpgradeApkItem - + Input password 輸入密碼 - + Error 錯誤 - + Tip Info 提示 - + password is wrong 密碼錯誤