From 8ae5af13e93435ac6e15912448c41ded9fbf223f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= Date: Thu, 22 Apr 2021 21:20:36 +0800 Subject: [PATCH] add image demo --- doric-Qt/doric/demo/DoricDemoBridge.cpp | 11 +++++++---- doric-Qt/doric/qml.qrc | 1 + doric-Qt/doric/resources/main.qml | 12 +++++++----- doric-Qt/doric/shader/DoricViewNode.h | 1 + 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/doric-Qt/doric/demo/DoricDemoBridge.cpp b/doric-Qt/doric/demo/DoricDemoBridge.cpp index a9b7de07..f130710b 100644 --- a/doric-Qt/doric/demo/DoricDemoBridge.cpp +++ b/doric-Qt/doric/demo/DoricDemoBridge.cpp @@ -20,18 +20,21 @@ void DoricDemoBridge::navigate(QVariant route) { name = "Gobang.js"; break; case 2: - name = "LayoutDemo.js"; + name = "ImageDemo.js"; break; case 3: - name = "ModalDemo.js"; + name = "LayoutDemo.js"; break; case 4: - name = "PopoverDemo.js"; + name = "ModalDemo.js"; break; case 5: - name = "SimpleDemo.js"; + name = "PopoverDemo.js"; break; case 6: + name = "SimpleDemo.js"; + break; + case 7: name = "Snake.js"; break; } diff --git a/doric-Qt/doric/qml.qrc b/doric-Qt/doric/qml.qrc index 1268a674..fb555ed6 100644 --- a/doric-Qt/doric/qml.qrc +++ b/doric-Qt/doric/qml.qrc @@ -10,6 +10,7 @@ ../../doric-demo/bundle/src/Counter.js ../../doric-demo/bundle/src/Gobang.js + ../../doric-demo/bundle/src/ImageDemo.js ../../doric-demo/bundle/src/LayoutDemo.js ../../doric-demo/bundle/src/ModalDemo.js ../../doric-demo/bundle/src/PopoverDemo.js diff --git a/doric-Qt/doric/resources/main.qml b/doric-Qt/doric/resources/main.qml index c9498d21..44390387 100644 --- a/doric-Qt/doric/resources/main.qml +++ b/doric-Qt/doric/resources/main.qml @@ -15,7 +15,7 @@ ApplicationWindow { ListView { width: parent.width - model: 7 + model: 8 delegate: Rectangle { Column { anchors.centerIn: parent @@ -27,14 +27,16 @@ ApplicationWindow { case 1: return "Gobang.js" case 2: - return "LayoutDemo.js" + return "ImageDemo.js" case 3: - return "ModalDemo.js" + return "LayoutDemo.js" case 4: - return "PopoverDemo.js" + return "ModalDemo.js" case 5: - return "SimpleDemo.js" + return "PopoverDemo.js" case 6: + return "SimpleDemo.js" + case 7: return "Snake.js" } } diff --git a/doric-Qt/doric/shader/DoricViewNode.h b/doric-Qt/doric/shader/DoricViewNode.h index fbf75021..58453c84 100644 --- a/doric-Qt/doric/shader/DoricViewNode.h +++ b/doric-Qt/doric/shader/DoricViewNode.h @@ -52,6 +52,7 @@ public: castNode->mType = type; return castNode; } else { + qCritical() << "DoricViewNode create error: " + type; return nullptr; } }