diff --git a/LedOK/LedOK Express.pro b/LedOK/LedOK Express.pro index f7f83b8..48d0017 100644 --- a/LedOK/LedOK Express.pro +++ b/LedOK/LedOK Express.pro @@ -25,7 +25,7 @@ CONFIG += embed_translations # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -VERSION = 1.5.0 +VERSION = 1.5.1 DEFINES += APP_VERSION=\\\"$$VERSION\\\" msvc { contains(QT_ARCH, i386) { diff --git a/LedOK/device/upgradeapkdialog.cpp b/LedOK/device/upgradeapkdialog.cpp index a4e9d15..14bedee 100644 --- a/LedOK/device/upgradeapkdialog.cpp +++ b/LedOK/device/upgradeapkdialog.cpp @@ -232,7 +232,7 @@ UpgradeApkDialog::UpgradeApkDialog(QWidget *parent) : QDialog(parent) { if(isApk || ! json["hasProgress"].toBool()) { item->isUpdating = false; item->setResult(tr("Install Success"), Qt::darkGreen); - if(isApk) item->OnCheckSoftVersions(); + if(isApk) item->OnCheckSoftVersions(1); else item->OnCheckFpgaVersions(); } else { sendProgress(item); @@ -427,7 +427,7 @@ UpgradeApkDialog::UpgradeApkDialog(QWidget *parent) : QDialog(parent) { } if(isEmpty) for(int rr=0; rritem(rr); - item->setHidden(! (item->text("xixunplayer").contains(text) + item->setHidden(! (item->text("playerVer").contains(text) || item->text("cardsystem").contains(text) || item->text("starter").contains(text) || item->text("taxiapp").contains(text) @@ -449,7 +449,7 @@ UpgradeApkDialog::UpgradeApkDialog(QWidget *parent) : QDialog(parent) { table->addCol("encrypt", tr("Security"), 40); table->addCol("progress", tr("Progress"), 100); table->addCol("remarks", tr("State"), 200, QHeaderView::Stretch); - table->addCol("xixunplayer", "xixunplayer", 70); + table->addCol("playerVer", "XixunPlayer", 70); table->addCol("cardsystem", "cardsystem", 70); table->addCol("starter", "starter", 70); table->addCol("taxiapp", "taxiapp", 70); @@ -504,7 +504,7 @@ void UpgradeApkDialog::sendProgress(UpdateApkItem *item) { if(progre >= 100) { item->isUpdating = false; item->fdProgress->setValue(100); - item->setResult(tr("Install Success"), Qt::darkGreen); + item->setResult("FPGA "+tr("Install Success"), Qt::darkGreen); item->OnCheckFpgaVersions(); } else if(progre == -1) { item->isUpdating = false; @@ -536,47 +536,45 @@ void UpdateApkItem::OnCheckFpgaVersions() { auto reply = NetReq("http://"+text("ip")+":2016/settings").timeout(60000).post(json); ConnReply(reply, fdProgress) [=] { if(treeWidget()==0) return; - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); - if(! err.isEmpty()) { - return; - } + JValue json; + auto err = errStrWithJson(reply, &json); + if(! err.isEmpty()) return; QString strBuf; - auto vers = json["versions"].toArray(); - for(int i=0; imCard.HardVersion = strBuf; - } + if(item) item->mCard.HardVersion = strBuf; }); } -void UpdateApkItem::OnCheckSoftVersions() { +void UpdateApkItem::OnCheckSoftVersions(int repeat) { QJsonObject json; json.insert("_id", "CheckSoftVersions"); json.insert("_type", "CheckSoftVersions"); auto reply = NetReq("http://"+text("ip")+":2016/settings").timeout(60000).post(json); ConnReply(reply, fdProgress) [=] { if(treeWidget()==0) return; - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); - if(! err.isEmpty()) { - return; - } - auto apps = json["apps"].toArray(); - foreach(QJsonValue app, apps) { - QString packageName = app["packageName"].toString(); - QString verName = app["versionName"].toString(); - if(packageName=="com.xixun.xixunplayer") setText("xixunplayer", verName); - else if(packageName=="com.xixun.joey.cardsystem") setText("cardsystem", verName); - else if(packageName=="net.sysolution.starter") setText("starter", verName); - else if(packageName=="net.sysolution.taxiapp") setText("taxiapp", verName); - else if(packageName=="com.xixun.display") setText("displayer", verName); - else if(packageName=="com.xixun.xy.conn") setText("connection", verName); - else if(packageName=="com.xixun.xy.update") setText("update", verName); + JValue json; + auto err = errStrWithJson(reply, &json); + if(! err.isEmpty()) return; + QString playerVer; + auto apps = json["apps"]; + for(auto &app : apps) { + auto packageName = app["packageName"].toStr(); + if(packageName=="com.xixun.xixunplayer") playerVer = app["versionName"].toStr(); + else if(packageName=="com.xixun.joey.cardsystem") setText("cardsystem", app["versionName"].toStr()); + else if(packageName=="net.sysolution.starter") setText("starter", app["versionName"].toStr()); + else if(packageName=="net.sysolution.taxiapp") setText("taxiapp", app["versionName"].toStr()); + else if(packageName=="com.xixun.display") setText("displayer", app["versionName"].toStr()); + else if(packageName=="com.xixun.xy.conn") setText("connection", app["versionName"].toStr()); + else if(packageName=="com.xixun.xy.update") setText("update", app["versionName"].toStr()); } + setText("playerVer", playerVer); + auto item = findItem(text("id")); + if(item) item->mCard.playerVer = playerVer; + if(playerVer.isEmpty() && repeat) OnCheckSoftVersions(repeat-1); }); } diff --git a/LedOK/device/upgradeapkdialog.h b/LedOK/device/upgradeapkdialog.h index a74911c..3203c67 100644 --- a/LedOK/device/upgradeapkdialog.h +++ b/LedOK/device/upgradeapkdialog.h @@ -27,7 +27,7 @@ public: setToolTip(remarks, tip); setForeground(remarks, color); } - void OnCheckSoftVersions(); + void OnCheckSoftVersions(int = 0); void OnCheckFpgaVersions(); QLabel *fdOnline; diff --git a/LedOK/devicepanel.cpp b/LedOK/devicepanel.cpp index bb810ab..f8c4bd0 100644 --- a/LedOK/devicepanel.cpp +++ b/LedOK/devicepanel.cpp @@ -506,15 +506,15 @@ void DevicePanel::init(DeviceItem *item) { json.insert("_type", "GetBuildInformation"); auto reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); ConnReply(reply, item) [=] { - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); + JValue json; + auto err = errStrWithJson(reply, &json); if(! err.isEmpty()) return; item->mCard.BrightnessLevel = json["BrightnessLevel"].toInt(); - item->mCard.FirmwareVersion = json["FirmwareVersion"].toString(); - item->mCard.HardVersion = json["HardVersion"].toString(); - item->mCard.ScreenResolution = json["ScreenResolution"].toString(); - item->mCard.IMEI = json["IMEI"].toString(); - auto androidVersion = json["AndroidVersion"].toString(); + item->mCard.FirmwareVersion = json["FirmwareVersion"].toStr(); + item->mCard.HardVersion = json["HardVersion"].toStr(); + item->mCard.ScreenResolution = json["ScreenResolution"].toStr(); + item->mCard.IMEI = json["IMEI"].toStr(); + auto androidVersion = json["AndroidVersion"].toStr(); if(! androidVersion.isEmpty()) item->mCard.androidVersion = androidVersion; }); @@ -524,8 +524,8 @@ void DevicePanel::init(DeviceItem *item) { json.insert("_type", "GetScreenSize"); reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); ConnReply(reply, item) [=] { - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); + JValue json; + auto err = errStrWithJson(reply, &json); if(! err.isEmpty()) return; item->mCard.mWidth = json["width"].toInt(); item->mCard.mHeight = json["height"].toInt(); @@ -538,8 +538,8 @@ void DevicePanel::init(DeviceItem *item) { json.insert("_type", "GetBrightness"); reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); ConnReply(reply, item) [=] { - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); + JValue json; + auto err = errStrWithJson(reply, &json); if(! err.isEmpty()) return; item->mCard.bright = json["brightnessPercentage"].toInt(-1); if(item->mCard.bright==-1) item->mCard.bright = qRound(json["brightness"].toInt() * 100.0 / item->mCard.BrightnessLevel); @@ -550,8 +550,8 @@ void DevicePanel::init(DeviceItem *item) { json.insert("_type", "IsScreenOn"); reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); ConnReply(reply, item) [=] { - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); + JValue json; + auto err = errStrWithJson(reply, &json); if(! err.isEmpty()) return; item->mCard.isScreenOn = json["on"].toBool(); item->setForeground("power"**mDeviceTable, item->mCard.isScreenOn ? Qt::green : Qt::red); @@ -562,10 +562,10 @@ void DevicePanel::init(DeviceItem *item) { json.insert("_type", "GetCardAlias"); reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); ConnReply(reply, item) [=] { - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); + JValue json; + auto err = errStrWithJson(reply, &json); if(! err.isEmpty()) return; - item->mCard.alias = QString::fromUtf8(QByteArray::fromBase64(json["alias"].toString().toLatin1())); + item->mCard.alias = QString::fromUtf8(QByteArray::fromBase64(json["alias"].toStr().toLatin1())); item->setText("alias", item->mCard.alias); }); @@ -574,8 +574,8 @@ void DevicePanel::init(DeviceItem *item) { json.insert("_type", "HasControllerPassword"); reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); ConnReply(reply, item) [=] { - QJsonDocument json; - QString err = checkReplyForJson(reply, &json); + JValue json; + auto err = errStrWithJson(reply, &json); if(! err.isEmpty()) return; item->mCard.hasPassword = json["result"].toBool(); if(item->mCard.hasPassword) {//加过密 @@ -583,6 +583,21 @@ void DevicePanel::init(DeviceItem *item) { item->btnUnlock->setIcon(QIcon(item->mCard.isLocked ? ":/res/Lock.png" : ":/res/UnLock.png")); } else item->btnUnlock->hide(); }); + + json = QJsonObject(); + json.insert("_id", "CheckSoftVersions"); + json.insert("_type", "CheckSoftVersions"); + reply = NetReq("http://"+item->mCard.ip+":2016/settings").timeout(120000).post(json); + ConnReply(reply, item) [=] { + JValue json; + auto err = errStrWithJson(reply, &json); + if(! err.isEmpty()) return; + auto apps = json["apps"]; + for(auto &app : apps) if(app["packageName"].toStr().contains("xixunplayer")) { + item->mCard.playerVer = app["versionName"].toStr(); + return; + } + }); } ImgDlg::ImgDlg(const QByteArray &data, QWidget *parent) : QDialog(parent) { diff --git a/LedOK/globaldefine.cpp b/LedOK/globaldefine.cpp index 3df1a0b..ff0198c 100644 --- a/LedOK/globaldefine.cpp +++ b/LedOK/globaldefine.cpp @@ -45,6 +45,21 @@ QString checkReply(QNetworkReply *reply, QJsonDocument *outJson) { } return ""; } +QString errStrWithJson(QNetworkReply *reply, JValue *outJson, QByteArray *outData) { + auto err = errStr(reply); + auto data = reply->readAll(); + if(outData) *outData = data; + if(! err.isEmpty()) { + if(! data.isEmpty()) err = err+"\n"+QCoreApplication::translate("Def","Device replied")+": "+data; + return err; + } + QString error; + auto json = JFrom(data, &error); + if(! error.isEmpty()) return "JSON Error: "+error+"\n"+QCoreApplication::translate("Def","Device replied")+": "+data; + if(! json["success"].toBool()) return QCoreApplication::translate("Def","Fail")+". "+QCoreApplication::translate("Def","Device replied")+": "+data; + if(outJson) *outJson = json; + return ""; +} QString checkReplyForJson(QNetworkReply *reply, QJsonDocument *outJson, QByteArray *outData) { auto err = errStr(reply); auto data = reply->readAll(); diff --git a/LedOK/globaldefine.h b/LedOK/globaldefine.h index efdde51..e27b7d8 100644 --- a/LedOK/globaldefine.h +++ b/LedOK/globaldefine.h @@ -1,20 +1,22 @@ #ifndef GLOBALDEFINE_H #define GLOBALDEFINE_H +#include "gutil/qjson.h" #include #include struct LedCard { QString id; QString ip; - int mWidth{0}; - int mHeight{0}; - int bright{100}; - int BrightnessLevel{255}; + int mWidth = 0; + int mHeight = 0; + int bright = 100; + int BrightnessLevel = 255; QString FirmwareVersion; QString HardVersion = "0000"; QString ScreenResolution; QString androidVersion; + QString playerVer; QString alias; QString IMEI; bool hasPassword{false}; @@ -87,6 +89,7 @@ inline int verCompare(const QString& a, const QString& b) { } QString checkReply(QNetworkReply *, QJsonDocument * = 0); +QString errStrWithJson(QNetworkReply *, JValue * = 0, QByteArray * = 0); QString checkReplyForJson(QNetworkReply *, QJsonDocument * = 0, QByteArray * = 0); QString checkReplyForJson(QNetworkReply *, QString errField); diff --git a/LedOK/program/sendprogramdialog.cpp b/LedOK/program/sendprogramdialog.cpp index a61ccd9..bed5079 100644 --- a/LedOK/program/sendprogramdialog.cpp +++ b/LedOK/program/sendprogramdialog.cpp @@ -35,6 +35,13 @@ SendProgramDialog::SendProgramDialog(QString progName, QWidget *parent) : QDialo int sentCnt = 0; SendProgramItem *item; auto remarks = "remarks"**table; + for(int rr=0; rrtopLevelItem(rr))->isHidden() && item->checkState("id") == Qt::Checked && ! item->isSending) { + auto playerVer = item->text("playerVer"); + if(! playerVer.isEmpty() && playerVer[0]>='a' && playerVer[0]<='z') { + if(QMessageBox::No == QMessageBox::question(this, tr("Info"), tr("Some player versions are too low and may not be compatible. It's recommended to update the player to 2.0. Or download the old version %1 from website").arg("LedOK Express 1.4.1")+"
\n"+tr("Do you want to continue?"))) return; + break; + } + } for(int rr=0; rrtopLevelItem(rr))->isHidden() && item->checkState("id") == Qt::Checked && ! item->isSending) { if(item->btnUnlock && item->isLocked) { item->setResult(tr("This screen is encrypted"), Qt::red); @@ -101,6 +108,7 @@ SendProgramDialog::SendProgramDialog(QString progName, QWidget *parent) : QDialo end: item->setText("ip", card.ip); item->setText("alias", card.alias); + item->setText("playerVer", card.playerVer); item->setText("size", QString("%1 x %2").arg(card.mWidth).arg(card.mHeight)); item->fdOnline->setPixmap({card.isOnline ? ":/res/online.png" : ":/res/offline.png"}); if(! card.hasPassword) { @@ -176,6 +184,7 @@ SendProgramDialog::SendProgramDialog(QString progName, QWidget *parent) : QDialo table->addCol("ip", "IP", 100); table->addCol("size", tr("Screen Size"), 80).alignC(), table->addCol("alias", tr("Alias"), 120); + table->addCol("playerVer", "Player Ver", 70); table->addCol("encrypt", tr("Security"), 40); table->addCol("progress", tr("Progress"), 120); table->addCol("remarks", tr("Remarks"), QHeaderView::Stretch); diff --git a/LedOK/ts/app_en.ts b/LedOK/ts/app_en.ts index b9cc4f6..3cad429 100644 --- a/LedOK/ts/app_en.ts +++ b/LedOK/ts/app_en.ts @@ -56,156 +56,156 @@ CtrlAdvancedPanel - + Advanced Advanced - + Screen Width(pixel) Screen Width(pixel) - + Width Width - - + + Height Height - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + Set Set - + Alias Alias - + Web Server Address: Web Server Address: - + MCU Uploading - + Setting - + Traffic screen settings - + Setting protocol ... - + Set protocol - + Getting protocol ... - + Get protocol - - + + Port - + Realtime 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 @@ -215,71 +215,71 @@ - + Clear Program Clear Program - + 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 - + Binding *.ic account indentity voucher Binding *.ic account indentity voucher - + Rotate Rotate - + Min brightness Min brightness - - - + + + Readback Readback - + Send Send - + Max brightness Max brightness @@ -291,20 +291,20 @@ - - - - + + + + Success Success - + Compant ID: Company ID - + Compant ID Company ID @@ -362,28 +362,28 @@ - - + + OpenAdb Open ADB debugging function - + indentity voucher (*.ic) indentity voucher (*.ic) - - - - - + + + + + InvokeTaxiAppFunction Binding certificate - - + + AliIotSetting @@ -414,74 +414,74 @@ - - + + 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 @@ -493,7 +493,7 @@ - + Get Player State @@ -504,373 +504,373 @@ - - + + Cannot Open File - + Uploading - + Update Update - - + + Set Display Mode - - + + Get Display Mode - - + + Set Screen Offset - - + + Get Screen Offset - + Open file Failed Open file Failed - + Setting Wallpaper - - + + Set Wallpaper - + System Updating - - + + System Update - + Getting MCU Version - - + + MCU Version - + Select File Select File - + Setting player background - - + + Set player background - + Clearing player background - - - + + + + - - - + + Clear player background - - + + GetScreenRotation Get Screen Rotation - - - + + + Charging Station - + Setting Baud Rate - + Set Baud Rate - + Getting Baud Rate - + Get Baud Rate - - + + Text is empty - - + + Json Parse Error - - + + Json isn't an Object - + Info - + Setting card work mode ... - + Set card work mode - + Getting card work mode ... - + Get card work mode - + Input password Input password - + Change Password Change Password - + Get Receive Card Num - + 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 @@ -901,65 +901,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tip Tip @@ -976,47 +976,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NoSelectedController Please select screen first @@ -1031,7 +1031,7 @@ Please enter the correct height pixel value - + Password is error Password is error @@ -3063,24 +3063,28 @@ - - - + + + + + + Device replied - + - + Success Success - + + Fail Fail @@ -3357,94 +3361,94 @@ EAClock - + Basic Properties Basic properties - + Time Zone Time Zone - + Custom Dial Custom Dial - + Select Select - + Select Dail file Select dial file - + Hour Mark Hour Scale - - + + Circular Circle - - + + Rectangle Rectangle - + Number Number - + Min Mark Minute Scale - + Color - + Length - + Width Width - + Hour Hand - + Min Hand - + Sec Hand - + Show - + Text Text @@ -3452,253 +3456,253 @@ EBase - + Area Area(px) - + X X - + Y Y - + W W - + H H - + Border Border - - - - + + + + None None - - + + Effect Effect - + Rotate Rotate - + Blink Blink - + Speed Speed - + Slow Slow - + Moderate Moderate - + Fast Fast - + Play Time - + Start - - - - + + + + s - + Duration - + Entry - - - - Random - - - - - - Expand horizontal - - - - - - Expand vertical - - - Expand to left + Random - Expand to top + Expand horizontal - Expand to right + Expand vertical - Expand to bottom + Expand to left - Zoom in + + Expand to top - Zoom in from left-top + + Expand to right - Zoom in from right-top + + Expand to bottom - Zoom in from right-bottom + Zoom in - Zoom in from left-bottom + Zoom in from left-top - - Rotate zoom + Zoom in from right-top - - Rotate zoom reverse + Zoom in from right-bottom - Fade in + Zoom in from left-bottom - Move to left + Rotate zoom - Move to top + Rotate zoom reverse - - Move to right + Fade in + Move to left + + + + + + Move to top + + + + + + Move to right + + + + + Move to bottom - - + + Dur - + Exit - + Zoom out - + Zoom out to left-top - + Zoom out to right-top - + Zoom out to right-bottom - + Zoom out to left-bottom - + Fade out @@ -4296,44 +4300,44 @@ EVideo - + Basic Properties Basic properties - + File File - + Play Properties - + Select File Select File - + Play Times Play Times - + Video Transcoding - - + + Video Transcoding Progress - - + + Error Error @@ -4382,67 +4386,67 @@ GenTmpThread - + MON MON - + TUE TUE - + WED WED - + THU THU - + FRI FRI - + SAT SAT - + SUN SUN - + AM AM - + PM PM - + day Days - + hour Hours - + min Mins - + sec Secs @@ -4450,7 +4454,7 @@ ImgDlg - + Screenshot @@ -4924,17 +4928,17 @@ PlayWin - + Move to Top Left Move to Top Left - + Set Position - + Close Close @@ -4942,12 +4946,12 @@ PlayerBackSendThread - + Open file failed Open file failed - + Read file failed Read file failed @@ -5370,7 +5374,7 @@ QObject - + Setting up the LedOK Express... Setting up the LedOK Express... @@ -5380,7 +5384,7 @@ Input password - + Error Error @@ -5450,72 +5454,87 @@ - + Refresh Refresh - + Alias - + Online Online - + Screen Size Screen Size - + Security encryption - + Progress Progress - + Remarks Remarks - + This screen is encrypted This screen is encrypted - + + Info + + + + + Some player versions are too low and may not be compatible. It's recommended to update the player to 2.0. Or download the old version %1 from website + + + + + Do you want to continue? + + + + Waiting - + Input password Input password - + VerifyPassword Verify Password - + Tip Info Tip Info - + password is wrong password is wrong - + All ALL diff --git a/LedOK/ts/app_ja.ts b/LedOK/ts/app_ja.ts index 2965428..68dd45b 100644 --- a/LedOK/ts/app_ja.ts +++ b/LedOK/ts/app_ja.ts @@ -56,151 +56,151 @@ CtrlAdvancedPanel - + Advanced 上級パラメータ - + Screen Width(pixel) 画面幅(ピクセル) - + Width 幅 - - + + Height 高さ - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + Set セット - + Alias 別名 - + Web Server Address: Webサーバのアドレス: - + MCU Uploading - + Setting - + Traffic screen settings - + Setting protocol ... - + Set protocol - + Getting protocol ... - + Get protocol - - + + Port ポート - + 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 @@ -210,76 +210,76 @@ - + Clear Program 番組をクリア - + Config の設定 - + Refresh 更新 - + Restore to default 標準の値を復元 - + Taxi top screen configuration タクシートップ画面の設定 - - + + Service:High Out of service:Low 客がいます：高 客がいません：低 - - + + Service:Low Out of service:High 客がいます：低 客がいません：高 - + Binding *.ic account indentity voucher テーピングtaxihubプラットフォームのユーザーID証明書 - + Rotate 回転 - + Realtime Address: - + Min brightness 最低輝度 - - - + + + Readback 読み戻し - + Send 送信 - + Max brightness 最高輝度 @@ -291,20 +291,20 @@ - - - - + + + + Success 成功 - + Compant ID: 会社ID： - + Compant ID 会社ID @@ -362,28 +362,28 @@ APK運転状態監視 - - + + OpenAdb ADBデバッグ機能を開く - + indentity voucher (*.ic) 身分証明書(*.ic) - - - - - + + + + + InvokeTaxiAppFunction 証明書をバインド - - + + AliIotSetting @@ -414,74 +414,74 @@ プログラムクリア - - + + Timeout タイムアウト - - + + Failed 失敗 - + Getting Log ログを取得中 - - - - - - - - - - - + + + + + + + + + + + Error エラー - + Setting Timing Reboot スケジュール再起動を設定中 - + Set Timing Reboot スケジュール再起動の設定 - + Getting Timing Reboot スケジュール再起動を取得中 - + Get Timing Reboot スケジュール再起動の取得 - + totalResolution トータル解像度 - + strCurDisplayResolution 表示解像度 - - + + File not exist ファイルが存在しません @@ -493,7 +493,7 @@ - + Get Player State プレーヤーの状態の取得 @@ -504,373 +504,373 @@ プレーヤーの状態 - - + + Cannot Open File ファイルのオープンに失敗しました - + Uploading アップロード中 - + Update 更新 - - + + Set Display Mode - - + + Get Display Mode - - + + Set Screen Offset - - + + Get Screen Offset - + Open file Failed ファイルのオープンに失敗しました - + Setting Wallpaper - - + + Set Wallpaper - + System Updating - - + + System Update - + Getting MCU Version - - + + MCU Version - + Select File ファイルを選択 - + Setting player background - - + + Set player background - + Clearing player background - - - + + + + - - - + + Clear player background - - + + GetScreenRotation 画面回転の取得 - - - + + + Charging Station じゅうでんぐい - + Setting Baud Rate - + Set Baud Rate - + Getting Baud Rate - + Get Baud Rate - - + + Text is empty - - + + Json Parse Error - - + + Json isn't an Object - + Info 情報 - + Setting card work mode ... - + Set card work mode - + Getting card work mode ... - + Get card work mode - + Input password パスワードを入力 - + Change Password パスワード変更 - + Get Receive Card Num 受信カード数の取得 - + 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 ゲストレベルを取得 @@ -901,65 +901,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tip 提示 @@ -976,47 +976,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NoSelectedController 先に大きいスクリーンを選んでください @@ -1031,7 +1031,7 @@ 正しい高さのピクセル値を入力してください - + Password is error パスワード @@ -3063,24 +3063,28 @@ - - - + + + + + + Device replied デバイス応答 - + - + Success 成功 - + + Fail 失敗 @@ -3356,94 +3360,94 @@ EAClock - + Basic Properties 基本的な属性 - + Time Zone タイムゾーン - + Custom Dial ユーザー定義の文字盤 - + Select 選択 - + Select Dail file 文字盤の画像を選択 - + Hour Mark 時間目盛り - - + + Circular 円形 - - + + Rectangle 矩形 - + Number デジタル - + Min Mark 分目盛り - + Color カラー - + Length 長さ - + Width 幅 - + Hour Hand 時針 - + Min Hand 分針 - + Sec Hand 秒針 - + Show 表示 - + Text テキスト @@ -3451,253 +3455,253 @@ EBase - + Area 領域(px) - + X X - + Y Y - + W W - + H H - + Border ボーダー - - - - + + + + None なし - - + + Effect 特効 - + Rotate 回転 - + Blink きらめき - + Speed スピード - + Slow 遅い - + Moderate 中 - + Fast 速い - + Play Time 再生時間 - + Start スタート - - - - + + + + s 秒 - + Duration 期間 - + Entry 入場する - - + + Random ランダム - - + + Expand horizontal 水平展開 - - + + Expand vertical 垂直展開 - - + + Expand to left 左に展開 - - + + Expand to top 上へ展開 - - + + Expand to right 右に展開 - - + + Expand to bottom 下へ展開 - + Zoom in 拡大 - + Zoom in from left-top 左上から拡大 - + Zoom in from right-top 右上から拡大 - + Zoom in from right-bottom 右下から拡大 - + Zoom in from left-bottom 左下から拡大 - - + + Rotate zoom 回転拡大 - - + + Rotate zoom reverse 逆回転拡大 - + Fade in フェードイン - - + + Move to left 左に移動 - - + + Move to top 上へ移動 - - + + Move to right 右に移動 - - + + Move to bottom 下へ移動 - - + + Dur 時間 - + Exit 出場する - + Zoom out 縮小 - + Zoom out to left-top 左上に縮小 - + Zoom out to right-top 右上に縮小 - + Zoom out to right-bottom 右下に縮小 - + Zoom out to left-bottom 左下に縮小 - + Fade out フェードアウト @@ -4295,44 +4299,44 @@ EVideo - + Basic Properties 基本的な属性 - + File ファイル - + Play Properties 再生方法 - + Select File ファイルを選択 - + Play Times 再生回数 - + Video Transcoding - - + + Video Transcoding Progress ビデオ変換の進歩 - - + + Error エラー @@ -4381,67 +4385,67 @@ GenTmpThread - + MON 月曜日 - + TUE 火曜日 - + WED 水曜日 - + THU 木曜日 - + FRI 金曜日 - + SAT 土曜日 - + SUN 日曜日 - + AM 午前 - + PM 午後 - + day 日 - + hour 時 - + min 分 - + sec 秒 @@ -4449,7 +4453,7 @@ ImgDlg - + Screenshot スクリーンショット @@ -4923,17 +4927,17 @@ PlayWin - + Move to Top Left 左上隅に移動 - + Set Position 設定位置 - + Close 閉じる @@ -4941,12 +4945,12 @@ PlayerBackSendThread - + Open file failed ファイルのオープンに失敗しました - + Read file failed ファイルの読み込みに失敗しました @@ -5369,7 +5373,7 @@ QObject - + Setting up the LedOK Express... 初期化LedOK Express… @@ -5379,7 +5383,7 @@ パスワードを入力 - + Error エラー @@ -5449,72 +5453,87 @@ - + Refresh 更新 - + Alias 別名 - + Online オンライン中 - + Screen Size スクリーンサイズ - + Security 暗号化 - + Progress 程度 - + Remarks 備考 - + This screen is encrypted スクリーンは暗号化されています - + + Info + 情報 + + + + Some player versions are too low and may not be compatible. It's recommended to update the player to 2.0. Or download the old version %1 from website + プレーヤーのバージョンが低すぎて、互換性のない問題がある可能性があります。プレーヤーを2.0に更新することをお勧めします。またはWebサイトから旧バージョンの %1 をダウンロードする + + + + Do you want to continue? + 続行しますか？ + + + Waiting 待機中 - + Input password パスワードを入力 - + VerifyPassword パスワードの検証 - + Tip Info ヒント - + password is wrong パスワードエラー - + All トータル diff --git a/LedOK/ts/app_pt.ts b/LedOK/ts/app_pt.ts index 91758fc..16ea685 100644 --- a/LedOK/ts/app_pt.ts +++ b/LedOK/ts/app_pt.ts @@ -56,161 +56,161 @@ CtrlAdvancedPanel - + Advanced Avançado - + Screen Width(pixel) Largura do display(pixel) - + Width Largura - - + + Height Altura - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + Set Config - + Alias Apelido - + Web Server Address: Endereço do Web Server: - + MCU Uploading - + Setting - + Getting Baud Rate - + Traffic screen settings - + Setting protocol ... - + Set protocol - + Getting protocol ... - + Get protocol - - + + Port - + Model - + Realtime Address: Servidor de Realtime: - + update or uninstall - + Clear Limpar - + Check Apk Conferi Apk - + Uninstall Desinstalar - + Running check Conferir - + Restart Reiniciar - + Check Log Conferir Log - + Start LedSet4 Iniciar LedSet4.0 (Apk Display2.0 and higher) - + Open ADB Abri ADB debug - + Post Custom JSON Publicar JSON @@ -220,71 +220,71 @@ - + Clear Program Limpar Programa - + Config Config - + Refresh Atualizar - + Restore to default Restaurar padrão - + Taxi top screen configuration Taxi top screen configuration - - + + Service:High Out of service:Low Service:Altura fora do pardão:Diminuir - - + + Service:Low Out of service:High Service:Altura fora do padrão:Aumentar - + Binding *.ic account indentity voucher Vincular *.identificação da conta - + Rotate Rotacionar - + Min brightness Brilho minimo - - - + + + Readback Ler - + Send Enviar - + Max brightness Brilho Maximo @@ -296,20 +296,20 @@ - - - - + + + + Success Successo - + Compant ID: ID da empresa - + Compant ID ID da empresa @@ -367,28 +367,28 @@ Checar status do APK - - + + OpenAdb Abrir o debug - + indentity voucher (*.ic) Comprovante de ID (*.ic) - - - - - + + + + + InvokeTaxiAppFunction Vincular certificado - - + + AliIotSetting @@ -419,38 +419,38 @@ - - + + Timeout Tempo esgotado - - + + Failed Falhou - + Getting Log Obtendo log - - - - - - - - - - - + + + + + + + + + + + Error Erro @@ -468,409 +468,409 @@ - + Get Player State - + Setting Timing Reboot Config tempo de reiniciar - + Set Timing Reboot Config tempo de reiniciar - + Getting Timing Reboot Config tempo de reiniciar - + Get Timing Reboot Obtendo tempo de reinicialização - - + + Get Display Mode - - + + Set Screen Offset - + totalResolution Resolução total de FPGA - + strCurDisplayResolution Resolução do display - - + + File not exist Arquivo não encontrado - - + + Cannot Open File Não pode abrir arquivo - + Uploading Atualizando - + Update Atualizar - - + + Set Display Mode Config Display - - + + Get Screen Offset Obter display Offset - + Open file Failed Falaha em abrir - + Setting Wallpaper Config plano fundo - - + + Set Wallpaper Config plano fundo - + System Updating Atualizando - - + + System Update Sistema atualizado - + Getting MCU Version Obtendo versão - - + + MCU Version Verão de MCU - + Select File Arquivo selecionado - + Setting player background Config plano de fundo - - + + Set player background Config plano de fundo - + Clearing player background Apagar plano de fundo - - - + + + + - - - + + Clear player background Apagar plano de fundo - - + + GetScreenRotation Rotação do display - - - + + + Charging Station - + Setting Baud Rate Config Baud Rate - + Set Baud Rate Config Baud Rate - + Get Baud Rate Config Baud Rate - - + + Text is empty Testo em branco - - + + Json Parse Error Erro Json - - + + Json isn't an Object - + Info Info - + Setting card work mode ... - + Set card work mode - + Getting card work mode ... - + Get card work mode - + Input password Entre com a senha - + Change Password Troque a senha - + Get Receive Card Num Obter o número de cartões receptores - + Resolution Config Config de resolução - + Full screen Full screen - + Part Parte - + Display Mode Modo do display - + Screen Position Posição da tela - + Offset Offset - + Hidden Settings Esconder Config - + Click right button to hide Clique com o botão direito para esconder - - + + Update MCU - + Get MCU Version Versão de MCU - + Baud Config Config Baudrate - + Uart Uart - + Baud Baud - - - - - - - - + + + + + + + + Get Obter - + Firmware Management - + Timing Reboot Reiniciando - + Protocol Protocolo - + Server Servidor - + Client Cliente - - + + SetScreenRotation Config a rotação do display - - + + SetMinBrightness Config brilho minimo - - + + SetMaxBrightness Config brilho maximo - - + + GetMinBrightness Obter bilho - - + + GetMaxBrightness Obter brilho - - + + Card work mode - - + + SetSpecialResolution Config resolução especial - - + + GetSpecialResolution Ler resolução especial - - + + CleanDisplayScreenSize Restaurar resolução - - + + SetHighForBusy Set level for busy - - + + GetStateForBusy Get level of busy @@ -901,65 +901,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tip Dica @@ -976,47 +976,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NoSelectedController Selecionar o display @@ -1031,7 +1031,7 @@ Entre com a correta altura - + Password is error Senha esta errada @@ -3063,24 +3063,28 @@ - - - + + + + + + Device replied Equipamento replicado - + - + Success Successo - + + Fail Falhou @@ -3357,94 +3361,94 @@ EAClock - + Basic Properties Propriedade basica - + Time Zone Fuso horário - + Custom Dial Customizar - + Select Selecionar - + Select Dail file Selecionar dial - + Hour Mark Escala de hora - - + + Circular Circulo - - + + Rectangle Retangulo - + Number Numero - + Min Mark Escala de minuto - + Color Cores - + Length Comprimento - + Width Largura - + Hour Hand Ponteiro hora - + Min Hand Ponteiro min - + Sec Hand Ponteiro seg - + Show Apresentar - + Text Texto @@ -3452,253 +3456,253 @@ EBase - + Area Area(px) - + X X - + Y Y - + W L - + H A - + Border Borda - - - - + + + + None None - - + + Effect Efeito - + Rotate Rotacionar - + Blink Piscar - + Speed Velocidade - + Slow Devagar - + Moderate Moderado - + Fast Rapido - + Play Time - + Start - - - - + + + + s s - + Duration Duração - + Entry - - - - Random - - - - - - Expand horizontal - - - - - - Expand vertical - - - Expand to left + Random - Expand to top + Expand horizontal - Expand to right + Expand vertical - Expand to bottom + Expand to left - Zoom in + + Expand to top - Zoom in from left-top + + Expand to right - Zoom in from right-top + + Expand to bottom - Zoom in from right-bottom + Zoom in - Zoom in from left-bottom + Zoom in from left-top - - Rotate zoom + Zoom in from right-top - - Rotate zoom reverse + Zoom in from right-bottom - Fade in + Zoom in from left-bottom - Move to left + Rotate zoom - Move to top + Rotate zoom reverse - - Move to right + Fade in + Move to left + + + + + + Move to top + + + + + + Move to right + + + + + Move to bottom Mover para baixo - - + + Dur - + Exit - + Zoom out - + Zoom out to left-top - + Zoom out to right-top - + Zoom out to right-bottom - + Zoom out to left-bottom - + Fade out @@ -3827,14 +3831,6 @@ Multiline Multilinha - - Play Duration - Duração - - - s - s - EEnviron @@ -3984,18 +3980,6 @@ Back Color Cor fundo - - Play Properties - Propriedades - - - Play Duration - Duração - - - s - s - EGif @@ -4014,22 +3998,6 @@ Select File Selecionar arq. - - Play Properties - Propriedades - - - Play Duration - Duração - - - s - s - - - Play Times - Repetições - EMultiWin @@ -4127,70 +4095,6 @@ Image Read Error Erro ao ler iamgem - - Play Duration - Duração - - - s - s - - - Enter Style - Efeito de entrada - - - None - None - - - Moving to left - Mover esuqerda - - - Moving to right - Mover direita - - - Moving to top - Mover para cima - - - Move to bottom - Mover para baixo - - - Zoom In - ZOOM_IN - - - Zoom In to left_bottom - ZOOM_IN_esquerda_inferior - - - Zoom In to left_top - ZOOM_IN_esquerda superior - - - Zoom In to right_top - ZOOM_IN_direita superior - - - Zoom In to right bottom - ZOOM_IN_direita inferior - - - Rotate to right - Rotacionar_para_direita - - - Rotate to left - Rotacionar_para_esquerda - - - Enter Duration - Duração do efeito - Images (*.png *.jpg *.jpeg *.bmp) @@ -4274,30 +4178,6 @@ Static Estático - - Play Duration - Duração - - - Duration/Page - Duração/Pagina - - - Effect time - Duração do efeito - - - Tip Info - Info - - - Effect time cannot be longer than duration time - O tempo de efeito não pode ser mais longo que a duração - - - s - s - Text Color @@ -4308,34 +4188,6 @@ Colorful Text Texto colorido - - Entrance Effect - Efeito de entrada - - - no - Não - - - random - Aleatório - - - right to left - Da direita para esquerda - - - bottom to top - De baixo para cima - - - left to right - Da esquerda para direita - - - top to bottom - De cima para baixo - Head-Tail Spacing @@ -4444,64 +4296,48 @@ Text Texto - - Play Duration - Duração - - - s - s - EVideo - + Basic Properties Propriedades - + File Arquivo - + Play Properties - Play Duration - Tempo duração - - - + Select File Selecionar arquivo - s - s - - - + Play Times Repetições - + Video Transcoding Transcodificação de video - - + + Video Transcoding Progress Processando - - + + Error Erro @@ -4523,14 +4359,6 @@ Basic Properties Propriedades - - Play Duration - Duração - - - s - s - EleTimer @@ -4558,67 +4386,67 @@ GenTmpThread - + MON Seg - + TUE Ter - + WED Qua - + THU Qui - + FRI Sex - + SAT Sab - + SUN Dom - + AM AM - + PM PM - + day Dias - + hour Horas - + min Mins - + sec Segs @@ -4626,7 +4454,7 @@ ImgDlg - + Screenshot Captura da tela @@ -5100,17 +4928,17 @@ PlayWin - + Move to Top Left Mover superior esquerdo - + Set Position Config posição - + Close Fechar @@ -5118,12 +4946,12 @@ PlayerBackSendThread - + Open file failed Abrir aqrquivo - + Read file failed Ler arquivo @@ -5546,7 +5374,7 @@ QObject - + Setting up the LedOK Express... Configurando... @@ -5556,7 +5384,7 @@ Digite a senha - + Error Erro @@ -5626,72 +5454,87 @@ Sucesso - + + Info + Info + + + + Some player versions are too low and may not be compatible. It's recommended to update the player to 2.0. Or download the old version %1 from website + Algumas versões do jogador são muito baixas e podem não ser compatíveis É Recomendado para atualizar o jogador para 2.0 Ou baixe a versão antiga %1 do site + + + + Do you want to continue? + Continuar? + + + Refresh Atualizar - + Online Online - + Screen Size Tamanho do display - + Alias Apelido - + Security Encriptado - + Progress Progresso - + Remarks Observações - + This screen is encrypted Este display esta encriptado - + Waiting À espera - + Input password Digite a senha - + VerifyPassword Verifique a senha - + Tip Info Info - + password is wrong A senha esta errada - + All Todos diff --git a/LedOK/ts/app_zh_CN.ts b/LedOK/ts/app_zh_CN.ts index 5b53516..da0a4d8 100644 --- a/LedOK/ts/app_zh_CN.ts +++ b/LedOK/ts/app_zh_CN.ts @@ -56,156 +56,156 @@ CtrlAdvancedPanel - + Advanced 高级设置 - + Screen Width(pixel) 屏幕宽(像素) - + Width 宽 - - + + Height 高 - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + Set 设置 - + Alias 别名 - + Web Server Address: Web服务器地址: - + MCU Uploading 正在上传单片机 - + Setting 正在设置 - + Traffic screen settings 交通屏设置 - + Setting protocol ... 正在设置协议 ... - + Set protocol 设置协议 - + Getting protocol ... 正在回读协议 ... - + Get protocol 回读协议 - - + + Port 端口 - + Realtime Address: Realtime 地址: - + 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 @@ -215,71 +215,71 @@ - + Clear Program 清除节目 - + Config 配置 - + Refresh 刷新 - + Restore to default 恢复默认值 - + Taxi top screen configuration 车顶有无客电平配置 - - + + Service:High Out of service:Low 有客：高电平 无客：低电平 - - + + Service:Low Out of service:High 有客：低电平 无客：高电平 - + Binding *.ic account indentity voucher 绑定taxihub平台用户身份凭证 - + Rotate 旋转 - + Min brightness 最低亮度 - - - + + + Readback 回读 - + Send 发送 - + Max brightness 最高亮度 @@ -291,20 +291,20 @@ - - - - + + + + Success 成功 - + Compant ID: 公司ID: - + Compant ID 公司ID @@ -362,28 +362,28 @@ 监测APK运行状态 - - + + OpenAdb 打开ADB调试功能 - + indentity voucher (*.ic) 身份凭证(*.ic) - - - - - + + + + + InvokeTaxiAppFunction 绑定证书 - - + + AliIotSetting @@ -414,74 +414,74 @@ 正在清除节目 - - + + Timeout 超时 - - + + Failed 失败 - + Getting Log 正在获取日志 - - - - - - - - - - - + + + + + + + + + + + Error 错误 - + Setting Timing Reboot 正在设置定时重启 - + Set Timing Reboot 设置定时重启 - + Getting Timing Reboot 正在获取定时重启 - + Get Timing Reboot 获取定时重启 - + totalResolution 包括行场数的分辨率 - + strCurDisplayResolution 当前显示屏分辨率 - - + + File not exist 文件不存在 @@ -493,7 +493,7 @@ - + Get Player State 获取播放器状态 @@ -504,373 +504,373 @@ 播放器状态 - - + + Cannot Open File 文件打开失败 - + Uploading 正在上传 - + Update 更新 - - + + Set Display Mode 设置显示模式 - - + + Get Display Mode 获取显示模式 - - + + Set Screen Offset 设置屏幕偏移 - - + + Get Screen Offset 获取屏幕偏移 - + Open file Failed 文件打开失败 - + Setting Wallpaper 正在设置系统桌面背景 - - + + Set Wallpaper 设置系统桌面背景 - + System Updating 系统升级中 - - + + System Update 系统升级 - + Getting MCU Version 正在获取单片机版本 - - + + MCU Version 单片机版本 - + Select File 选择文件 - + Setting player background 正在设置播放器背景 - - + + Set player background 设置播放器背景 - + Clearing player background 正在清除播放器背景 - - - + + + + - - - + + Clear player background 清除播放器背景 - - + + GetScreenRotation 获取屏幕旋转 - - - + + + Charging Station 充电桩 - + Setting Baud Rate 正在设置波特率 - + Set Baud Rate 设置波特率 - + Getting Baud Rate 正在获取波特率 - + Get Baud Rate 获取波特率 - - + + Text is empty 文本为空 - - + + Json Parse Error - - + + Json isn't an Object - + Info 信息 - + Setting card work mode ... 正在设置控制卡工作模式 ... - + Set card work mode 设置控制卡工作模式 - + Getting card work mode ... 正在回读控制卡工作模式 ... - + Get card work mode 回读控制卡工作模式 - + Input password 输入密码 - + Change Password 修改密码 - + Get Receive Card Num 获取接收卡数量 - + 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 获取有无客电平 @@ -901,65 +901,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tip 提示 @@ -976,47 +976,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NoSelectedController 请先选择大屏幕 @@ -1031,7 +1031,7 @@ 请输入正确的高度像素值 - + Password is error 密码错误 @@ -3063,24 +3063,28 @@ - - - + + + + + + Device replied 设备回复 - + - + Success 成功 - + + Fail 失败 @@ -3357,94 +3361,94 @@ EAClock - + Basic Properties 基本属性 - + Time Zone 时区 - + Custom Dial 自定义表盘 - + Select 选择 - + Select Dail file 选择表盘图片 - + Hour Mark 时标 - - + + Circular 圆形 - - + + Rectangle 矩形 - + Number 数字 - + Min Mark 分标 - + Color 颜色 - + Length 长 - + Width 宽 - + Hour Hand 时针 - + Min Hand 分针 - + Sec Hand 秒针 - + Show 显示 - + Text 文本 @@ -3452,253 +3456,253 @@ EBase - + Area 区域(px) - + X 左 - + Y 上 - + W 宽 - + H 高 - + Border 边框 - - - - + + + + None 无 - - + + Effect 特效 - + Rotate 旋转 - + Blink 闪烁 - + Speed 速度 - + Slow 慢 - + Moderate 中 - + Fast 快 - + Play Time 播放时间 - + Start 开始 - - - - + + + + s 秒 - + Duration 时长 - + Entry 入场 - - + + Random 随机 - - + + Expand horizontal 水平展开 - - + + Expand vertical 垂直展开 - - + + Expand to left 向左展开 - - + + Expand to top 向上展开 - - + + Expand to right 向右展开 - - + + Expand to bottom 向下展开 - + Zoom in 放大 - + Zoom in from left-top 从左上角放大 - + Zoom in from right-top 从右上角放大 - + Zoom in from right-bottom 从右下角放大 - + Zoom in from left-bottom 从左下角放大 - - + + Rotate zoom 旋转放大 - - + + Rotate zoom reverse 反向旋转放大 - + Fade in 淡入 - - + + Move to left 向左移动 - - + + Move to top 向上移动 - - + + Move to right 向右移动 - - + + Move to bottom 向下移动 - - + + Dur 时长 - + Exit 出场 - + Zoom out 缩小 - + Zoom out to left-top 向左上角缩小 - + Zoom out to right-top 向右上角缩小 - + Zoom out to right-bottom 向右下角缩小 - + Zoom out to left-bottom 向左下角缩小 - + Fade out 淡出 @@ -4296,44 +4300,44 @@ EVideo - + Basic Properties 基本属性 - + File 文件 - + Play Properties 播放方式 - + Select File 选择文件 - + Play Times 播放次数 - + Video Transcoding 视频转码 - - + + Video Transcoding Progress 视频转码进度 - - + + Error 错误 @@ -4382,67 +4386,67 @@ GenTmpThread - + MON 星期一 - + TUE 星期二 - + WED 星期三 - + THU 星期四 - + FRI 星期五 - + SAT 星期六 - + SUN 星期日 - + AM 上午 - + PM 下午 - + day 天 - + hour 时 - + min 分 - + sec 秒 @@ -4450,7 +4454,7 @@ ImgDlg - + Screenshot 屏幕截图 @@ -4924,17 +4928,17 @@ PlayWin - + Move to Top Left 移动到左上角 - + Set Position 设置位置 - + Close 关闭 @@ -4942,12 +4946,12 @@ PlayerBackSendThread - + Open file failed 文件读取失败 - + Read file failed 文件读取失败 @@ -5370,7 +5374,7 @@ QObject - + Setting up the LedOK Express... 初始化LedOK Express... @@ -5380,7 +5384,7 @@ 输入密码 - + Error 错误 @@ -5450,72 +5454,87 @@ - + Refresh 刷新 - + Alias 别名 - + Online 在线 - + Screen Size 屏幕像素 - + Security 加密 - + Progress 进度 - + Remarks 备注 - + This screen is encrypted 屏幕已加密 - + + Info + 信息 + + + + Some player versions are too low and may not be compatible. It's recommended to update the player to 2.0. Or download the old version %1 from website + 有播放器版本过低，可能存在不兼容问题。建议更新播放器到2.0。或从官网下载旧版本 %1 + + + + Do you want to continue? + 是否继续？ + + + Waiting 等待中 - + Input password 输入密码 - + VerifyPassword 验证密码 - + Tip Info 提示 - + password is wrong 密码错误 - + All 总数 diff --git a/LedOK/ts/app_zh_TW.ts b/LedOK/ts/app_zh_TW.ts index 00f1572..216cdd1 100644 --- a/LedOK/ts/app_zh_TW.ts +++ b/LedOK/ts/app_zh_TW.ts @@ -56,156 +56,156 @@ CtrlAdvancedPanel - + Advanced 高級設定 - + Screen Width(pixel) 螢幕寬(點數) - + Width 寬 - - + + Height 高 - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + Set 設定 - + Alias 別名 - + Web Server Address: Web伺服器地址： - + MCU Uploading 正在上傳單片機 - + Setting 正在設定 - + Traffic screen settings 交通屏設定 - + Setting protocol ... 正在設定協定 - + Set protocol 設定協定 - + Getting protocol ... 正在回讀協定 ... - + Get protocol 回讀協定 - - + + Port 埠 - + Realtime Address: Realtime 地址: - + 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 @@ -215,71 +215,71 @@ - + Clear Program 清除節目 - + Config 配寘 - + Refresh 檢測 - + Restore to default 恢復預設值 - + Taxi top screen configuration 車頂有無客電平配寘 - - + + Service:High Out of service:Low 有客：高電平無客：低電平 - - + + Service:Low Out of service:High 有客：低電平 無客：高電平 - + Binding *.ic account indentity voucher 綁定taxihub平臺用戶身份憑證 - + Rotate 旋轉 - + Min brightness 最低亮度 - - - + + + Readback 回讀 - + Send 發送 - + Max brightness 最高亮度 @@ -291,20 +291,20 @@ - - - - + + + + Success 成功 - + Compant ID: 公司ID: - + Compant ID 公司ID @@ -321,47 +321,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NoSelectedController 請先選擇大螢幕 @@ -419,28 +419,28 @@ 監測APK運行狀態 - - + + OpenAdb 打開ADB調試功能 - + indentity voucher (*.ic) 身份憑證(*.ic) - - - - - + + + + + InvokeTaxiAppFunction 綁定證書 - - + + AliIotSetting @@ -471,74 +471,74 @@ 正在清除節目 - - + + Timeout 超時 - - + + Failed 失敗 - + Getting Log 讀取日誌 - - - - - - - - - - - + + + + + + + + + + + Error 錯誤 - + Setting Timing Reboot 正在設定定時重啓 - + Set Timing Reboot 設定定時重啓 - + Getting Timing Reboot 正在獲取定時重啓 - + Get Timing Reboot 獲取定時重啓 - + totalResolution 行数を含む解像度 - + strCurDisplayResolution 當前顯示分辯率 - - + + File not exist 檔案不存在 @@ -550,7 +550,7 @@ - + Get Player State 獲取播放機狀態 @@ -561,373 +561,373 @@ 播放機狀態 - - + + Cannot Open File 檔案打開失敗 - + Uploading 正在上傳 - + Update 更新 - - + + Set Display Mode 設定顯示模式 - - + + Get Display Mode 獲取顯示模式 - - + + Set Screen Offset 設定螢幕偏移 - - + + Get Screen Offset 獲取螢幕偏移 - + Open file Failed 檔案打開失敗 - + Setting Wallpaper 正在設定系統桌面背景 - - + + Set Wallpaper 設定系統桌面背景 - + System Updating 系統升級中 - - + + System Update 系統升級 - + Getting MCU Version 正在獲取單片機版本 - - + + MCU Version 單片機版本 - + Select File 選擇檔案 - + Setting player background 正在設定播放機背景 - - + + Set player background 設定播放機背景 - + Clearing player background 正在清除播放機背景 - - - + + + + - - - + + Clear player background 清除播放機背景 - - + + GetScreenRotation 獲取荧幕旋轉 - - - + + + Charging Station 充電樁 - + Setting Baud Rate 正在設定串列傳輸速率 - + Set Baud Rate 設定串列傳輸速率 - + Getting Baud Rate 正在讀取串列傳輸速率 - + Get Baud Rate 讀取串列傳輸速率 - - + + Text is empty - - + + Json Parse Error - - + + Json isn't an Object - + Info 資訊 - + Setting card work mode ... 正在設定控制卡工作模式 ... - + Set card work mode 設定控制卡工作模式 - + Getting card work mode ... 正在回讀控制卡工作模式 ... - + Get card work mode 回讀控制卡工作模式 - + Input password 輸入密碼 - + Change Password 修改密碼 - + Get Receive Card Num 獲取接收卡數量 - + 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 獲取有無客電平 @@ -958,65 +958,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tip 提示 @@ -1031,7 +1031,7 @@ 請輸入正確的高度點數值 - + Password is error 密碼錯誤 @@ -3068,24 +3068,28 @@ - - - + + + + + + Device replied 設備回復 - + - + Success 成功 - + + Fail 失敗 @@ -3360,94 +3364,94 @@ EAClock - + Basic Properties 基本屬性 - + Time Zone 時區 - + Custom Dial 自定義錶盤 - + Select 選擇 - + Select Dail file 選擇錶盤圖片 - + Hour Mark 時標 - - + + Circular 圓形 - - + + Rectangle 矩形 - + Number 數位 - + Min Mark 分標 - + Color 顏色 - + Length 長 - + Width 寬 - + Hour Hand 時針 - + Min Hand 分針 - + Sec Hand 分針 - + Show 顯示 - + Text 文字 @@ -3455,253 +3459,253 @@ EBase - + Area 區域（px） - + X 左 - + Y 上 - + W 寬 - + H 高 - + Border 邊框 - - - - + + + + None 無 - - + + Effect 特效 - + Rotate 旋轉 - + Blink 閃爍 - + Speed 速度 - + Slow 慢 - + Moderate 中 - + Fast 快 - + Play Time 播放時間 - + Start 開始 - - - - + + + + s 秒 - + Duration 時長 - + Entry 入場 - - + + Random 隨機 - - + + Expand horizontal 水平展開 - - + + Expand vertical 垂直展開 - - + + Expand to left 向左展開 - - + + Expand to top 向上展開 - - + + Expand to right 向右展開 - - + + Expand to bottom 向下展開 - + Zoom in 放大 - + Zoom in from left-top 從左上角放大 - + Zoom in from right-top 從右上角放大 - + Zoom in from right-bottom 從右下角放大 - + Zoom in from left-bottom 從左下角放大 - - + + Rotate zoom 旋轉放大 - - + + Rotate zoom reverse 反向旋轉放大 - + Fade in 淡入 - - + + Move to left 向左移動 - - + + Move to top 向上移動 - - + + Move to right 向右移動 - - + + Move to bottom 向下移動 - - + + Dur 時長 - + Exit 出場 - + Zoom out 縮小 - + Zoom out to left-top 向左上角縮小 - + Zoom out to right-top 向右上角縮小 - + Zoom out to right-bottom 向右下角縮小 - + Zoom out to left-bottom 向左下角縮小 - + Fade out 淡出 @@ -4299,44 +4303,44 @@ EVideo - + Basic Properties 基本屬性 - + File 檔案 - + Play Properties 播放管道 - + Select File 選擇檔案 - + Play Times 播放次數 - + Video Transcoding - - + + Video Transcoding Progress 視頻轉碼進度 - - + + Error 錯誤 @@ -4385,67 +4389,67 @@ GenTmpThread - + MON 星期一 - + TUE 星期二 - + WED 星期三 - + THU 星期四 - + FRI 星期五 - + SAT 星期六 - + SUN 星期日 - + AM 上午 - + PM 下午 - + day 天 - + hour 時 - + min 分 - + sec 秒 @@ -4453,7 +4457,7 @@ ImgDlg - + Screenshot 螢幕截圖 @@ -4927,17 +4931,17 @@ PlayWin - + Move to Top Left 移動到左上角 - + Set Position 設定位置 - + Close 關閉 @@ -4945,12 +4949,12 @@ PlayerBackSendThread - + Open file failed 檔案打開失敗 - + Read file failed 檔案讀取失敗 @@ -5373,7 +5377,7 @@ QObject - + Setting up the LedOK Express... 初始化LedOK Express… @@ -5383,7 +5387,7 @@ 輸入密碼 - + Error 錯誤 @@ -5453,72 +5457,87 @@ - + Refresh 檢測 - + Alias 別名 - + Online 線上 - + Screen Size 螢幕點數 - + Security 加密 - + Progress 進度 - + Remarks 備註 - + This screen is encrypted 螢幕已加密 - + + Info + 資訊 + + + + Some player versions are too low and may not be compatible. It's recommended to update the player to 2.0. Or download the old version %1 from website + 有播放機版本過低，可能存在不相容問題。建議更新播放機到2.0。 或從官網下載舊版本%1 + + + + Do you want to continue? + 是否繼續？ + + + Waiting 等待中 - + Input password 輸入密碼 - + VerifyPassword 驗證密碼 - + Tip Info 提示 - + password is wrong 密碼錯誤 - + All 總數