diff --git a/examples/TaoQuickShow/Qml/main.qml b/examples/TaoQuickShow/Qml/main.qml index 4ed0a91..23f9de8 100644 --- a/examples/TaoQuickShow/Qml/main.qml +++ b/examples/TaoQuickShow/Qml/main.qml @@ -8,8 +8,6 @@ Item { height: 900 Component.onCompleted: { appInfo.splashShow = false; - trans.loadFolder(appPath + "/Trans") - componentsMgr.loadFolder(contentsPath) } Splash { id: splash diff --git a/examples/TaoQuickShow/Src/ComponentsManager.cpp b/examples/TaoQuickShow/Src/ComponentsManager.cpp index 0e2192a..928ced6 100644 --- a/examples/TaoQuickShow/Src/ComponentsManager.cpp +++ b/examples/TaoQuickShow/Src/ComponentsManager.cpp @@ -63,6 +63,7 @@ void ComponentsMgr::beforeUiReady(QQmlContext* ctx) void ComponentsMgr::afterUiReady() { + loadFolder(contentsPath); } const QJsonArray& ComponentsMgr::comps() const diff --git a/examples/TaoQuickShow/Src/TaoFramework.cpp b/examples/TaoQuickShow/Src/TaoFramework.cpp index abdadc1..5ee62c2 100644 --- a/examples/TaoQuickShow/Src/TaoFramework.cpp +++ b/examples/TaoQuickShow/Src/TaoFramework.cpp @@ -1,5 +1,11 @@ #include "TaoFramework.h" #include +TaoFramework *TaoFramework::instance() +{ + static TaoFramework framework; + return &framework; +} + TaoFramework::~TaoFramework() { uninit(); diff --git a/examples/TaoQuickShow/Src/TaoFramework.h b/examples/TaoQuickShow/Src/TaoFramework.h index a81f96c..9882a8a 100644 --- a/examples/TaoQuickShow/Src/TaoFramework.h +++ b/examples/TaoQuickShow/Src/TaoFramework.h @@ -6,13 +6,9 @@ class QQmlContext; class QQuickView; class TaoFramework { public: - static TaoFramework* instance() - { - static TaoFramework framework; - return &framework; - } - ~TaoFramework(); + static TaoFramework* instance(); + ~TaoFramework(); public: //初始化 void init(); diff --git a/examples/TaoQuickShow/Src/Trans.cpp b/examples/TaoQuickShow/Src/Trans.cpp index 4a2f616..5310d70 100644 --- a/examples/TaoQuickShow/Src/Trans.cpp +++ b/examples/TaoQuickShow/Src/Trans.cpp @@ -3,6 +3,7 @@ #include #include #include +#include const static auto cEnglisthStr = QStringLiteral("English"); const static auto cChineseStr = QStringLiteral("简体中文"); Trans::Trans(QObject* parent) @@ -18,13 +19,16 @@ void Trans::beforeUiReady(QQmlContext* ctx) ctx->setContextProperty("trans", this); } -void Trans::afterUiReady() {} +void Trans::afterUiReady() +{ + loadFolder(qApp->applicationDirPath() + "/Trans"); +} void Trans::loadFolder(const QString& folder) { QDir dir(folder); auto infos = dir.entryInfoList({ "language_*.json" }, QDir::Files); - QStringList paths; +// QStringList paths; QString lang; for (auto info : infos) { // paths.append(info.absoluteFilePath()); diff --git a/examples/TaoQuickShow/Src/main.cpp b/examples/TaoQuickShow/Src/main.cpp index 795e146..b78d72a 100644 --- a/examples/TaoQuickShow/Src/main.cpp +++ b/examples/TaoQuickShow/Src/main.cpp @@ -22,8 +22,8 @@ int main(int argc, char** argv) { prepareApp(); QGuiApplication app(argc, argv); - qWarning() << "appPath" << app.applicationDirPath(); Logger::initLog(); + qWarning() << "appPath" << app.applicationDirPath(); TaoView view;