Merge branch 'dev'

VelsonWang · Jul 3, 2022 · 55b7ba3 · 55b7ba3
2 parents 5e1ebb8 + 38c2b7c
commit 55b7ba3
Show file tree

Hide file tree

Showing 418 changed files with 1,308 additions and 51,229 deletions.
diff --git a/HmiFuncDesigner/ProjectManager/Pages/designer/form/qdesignerformhost.cpp b/HmiFuncDesigner/ProjectManager/Pages/designer/form/qdesignerformhost.cpp
@@ -13,7 +13,6 @@
 #include <QLayout>
 #include <QPainter>
 #include <QStringList>
-#include <QUuid>
 #include <QDebug>
 
 QDesignerFormHost::QDesignerFormHost(QAbstractHost *host, QWidget *parent):

diff --git a/HmiFuncDesigner/ProjectManager/Pages/designer/form/qnewpagedialog.cpp b/HmiFuncDesigner/ProjectManager/Pages/designer/form/qnewpagedialog.cpp
@@ -10,7 +10,6 @@
 #include "../../../libs/core/undocommand/qpropertychangedundocommand.h"
 #include "../../../libs/shared/property/qabstractproperty.h"
 #include <QVBoxLayout>
-#include <QUuid>
 
 QNewPageDialog::QNewPageDialog(QUndoStack *stack, QWidget *parent):
     QDialog(parent),
@@ -64,9 +63,9 @@ void QNewPageDialog::ok(QAbstractHost *host)
     QList<QAbstractHost*> list;
     list.append(host);
     while(list.size() > 0) {
-        QAbstractHost* h = list.takeFirst();
-        h->setID(QUuid::createUuid().toString());
-        list += h->getChildren();
+        QAbstractHost* pHostObj = list.takeFirst();
+        pHostObj->setID(QString::number(pHostObj->allocID()));
+        list += pHostObj->getChildren();
     }
     host->setDefault();
     int index = core->getPageManager()->getPages().size();

diff --git a/HmiFuncDesigner/libs/shared/host/qabstracthost.cpp b/HmiFuncDesigner/libs/shared/host/qabstracthost.cpp
@@ -12,7 +12,6 @@
 #include <QPaintEvent>
 #include <QContextMenuEvent>
 #include <QTimer>
-#include <QUuid>
 #include <QMetaMethod>
 #include <QScriptEngine>
 

diff --git a/HmiFuncDesignerBin/bin/SysVarList.odb b/HmiFuncDesignerBin/bin/SysVarList.odb
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <tags application_version="V1.0.0">
-    <tag offset="0" offset2="0" addr="AutoAlloc" addr2="" type="uint16" dev="SYSTEM" group="" id="1" name="year" remark="年" unit="" writeable="0"/>
-    <tag offset="0" offset2="0" addr="AutoAlloc" addr2="" type="uint16" dev="SYSTEM" group="" id="2" name="month" remark="月" unit="" writeable="0"/>
-    <tag offset="0" offset2="0" addr="AutoAlloc" addr2="" type="uint16" dev="SYSTEM" group="" id="3" name="day" remark="日" unit="" writeable="0"/>
-    <tag offset="0" offset2="0" addr="AutoAlloc" addr2="" type="uint16" dev="SYSTEM" group="" id="4" name="hour" remark="时" unit="" writeable="0"/>
-    <tag offset="0" offset2="0" addr="AutoAlloc" addr2="" type="uint16" dev="SYSTEM" group="" id="5" name="minute" remark="分" unit="" writeable="0"/>
-    <tag offset="0" offset2="0" addr="AutoAlloc" addr2="" type="uint16" dev="SYSTEM" group="" id="6" name="second" remark="秒" unit="" writeable="0"/>
+    <tag addr="AutoAlloc" addr2="" dev="SYSTEM" group="" id="1" name="year" offset="0" offset2="0" remark="年" type="uint16" unit="" writeable="0"/>
+    <tag addr="AutoAlloc" addr2="" dev="SYSTEM" group="" id="2" name="month" offset="0" offset2="0" remark="月" type="uint16" unit="" writeable="0"/>
+    <tag addr="AutoAlloc" addr2="" dev="SYSTEM" group="" id="3" name="day" offset="0" offset2="0" remark="日" type="uint16" unit="" writeable="0"/>
+    <tag addr="AutoAlloc" addr2="" dev="SYSTEM" group="" id="4" name="hour" offset="0" offset2="0" remark="时" type="uint16" unit="" writeable="0"/>
+    <tag addr="AutoAlloc" addr2="" dev="SYSTEM" group="" id="5" name="minute" offset="0" offset2="0" remark="分" type="uint16" unit="" writeable="0"/>
+    <tag addr="AutoAlloc" addr2="" dev="SYSTEM" group="" id="6" name="second" offset="0" offset2="0" remark="秒" type="uint16" unit="" writeable="0"/>
 </tags>
diff --git a/HmiRunTime/HmiRunTime.pri b/HmiRunTime/HmiRunTime.pri
@@ -99,21 +99,9 @@ osx {
 }
 
 INCLUDEPATH += \
-    $$IDE_SOURCE_TREE/HmiRunTimeData \
-    $$IDE_SOURCE_TREE/HmiRunTimeData/HmiRunTimeData/Public \
-    $$IDE_SOURCE_TREE/HmiRunTimeData/HmiRunTimeData/Port \
-    $$IDE_SOURCE_TREE/HmiRunTimeData/HmiRunTimeData/Tag \
-    $$IDE_SOURCE_TREE/HmiRunTimeData/Vendors/Public \
-    $$IDE_SOURCE_TREE/HmiRunTimeData/Vendors/IVendorPlugin \
     $$IDE_SOURCE_TREE/libs/Utils \
     $$IDE_SOURCE_TREE/libs/edncrypt \
-    $$IDE_SOURCE_TREE/libs/qtsingleapplication \
-    $$IDE_SOURCE_TREE/libs/qtpropertybrowser/src \
-    $$IDE_SOURCE_TREE/libs/core \
-    $$IDE_SOURCE_TREE/libs/shared \
-    $$IDE_SOURCE_TREE/libs/shared/projdata \
-    $$IDE_SOURCE_TREE/libs/gradienteditor \
-    $$IDE_SOURCE_TREE/libs/running
+    $$IDE_SOURCE_TREE/libs/qtsingleapplication
 
 
 QTC_PLUGIN_DIRS_FROM_ENVIRONMENT = $$(QTC_PLUGIN_DIRS)
@@ -208,7 +196,6 @@ for(ever) {
     }
     QTC_LIB_DEPENDS = $$unique(QTC_LIB_DEPENDS)
     QTC_LIB_DEPENDS -= $$unique(done_libs)
-
 }
 
 
diff --git a/HmiRunTime/HmiRunTime/HmiRunTime/HmiRunTime.pro b/HmiRunTime/HmiRunTime/HmiRunTime/HmiRunTime.pro
@@ -2,7 +2,6 @@ QT += core
 QT += gui
 QT += widgets
 QT += network
-QT += script
 QT += sql
 QT += xml
 
@@ -28,9 +27,6 @@ CONFIG += C++11
 
 QMAKE_CXXFLAGS += -std=c++11
 
-# 开启SOAP服务
-#DEFINES += USE_SOAP_SERVICE
-
 #去除UNICODE字符编码
 DEFINES -= UNICODE
 
@@ -41,7 +37,6 @@ INCLUDEPATH += \
     qextserial \
     Public \
     Event \
-    Script \
     Log \
     Socket \
     Service \
@@ -54,12 +49,8 @@ INCLUDEPATH += \
     $$LIBRARY_SRC_PATH/HmiRunTime/Public \
     $$LIBRARY_SRC_PATH/HmiRunTime/Vendors/IVendorPlugin \
     $$LIBRARY_SRC_PATH/libs/edncrypt \
-    $$LIBRARY_SRC_PATH/libs/core \
     $$LIBRARY_SRC_PATH/libs/Utils \
-    $$LIBRARY_SRC_PATH/libs/gradienteditor \
-    $$LIBRARY_SRC_PATH/libs/qtsingleapplication \
-    $$LIBRARY_SRC_PATH/libs/running \
-    $$LIBRARY_SRC_PATH/libs/shared
+    $$LIBRARY_SRC_PATH/libs/qtsingleapplication
 
 LIB_SUFFIX=""
 CONFIG(debug, debug|release) { #debug
@@ -68,13 +59,6 @@ CONFIG(debug, debug|release) { #debug
     }
 }
 
-#LIBS += -L$$LINK_LIBRARY_PATH -ledncrypt$${LIB_SUFFIX}
-#LIBS += -L$$LINK_LIBRARY_PATH -lDrawUtils$${LIB_SUFFIX}
-#LIBS += -L$$LINK_LIBRARY_PATH -lProjectDataUtils$${LIB_SUFFIX}
-
-LIBS += -L$$LINK_LIBRARY_PATH -lcore
-LIBS += -L$$LINK_LIBRARY_PATH -lshared
-LIBS += -L$$LINK_LIBRARY_PATH -lrunning
 LIBS += -L$$LINK_LIBRARY_PATH -lUtils$${LIB_SUFFIX}
 
 win32 {
@@ -83,8 +67,7 @@ win32 {
 
 }
 
-include(../../HttpServer/HttpServer.pri)
-#include(../../SOAP/server/SOAPServer.pri)
+include(shared/shared.pri)
 
 SOURCES += \
     Function.cpp \