feat: add server notify

This commit is contained in:
semenov
2025-01-09 12:59:10 +03:00
parent 78e8ecbde6
commit 65a0dca9bf
34 changed files with 979 additions and 380 deletions

View File

@@ -8,9 +8,11 @@ DataParser::DataParser(QObject *parent) :
}
}
void DataParser::initialize(RecognizeSystem *recognizeSystem)
void DataParser::initialize(RecognizeSystem *recognizeSystem,NotifyController *notifyController)
{
this->recognizeSystem = recognizeSystem;
this->notifyController = notifyController;
connect(this,&DataParser::sigNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection);
}
void DataParser::createFileDataList(QList<FileData> fileDataList,QString filename)
@@ -411,6 +413,11 @@ void DataParser::xmlParser(QByteArray array)
{
emit recognizeSystem->sigStartCompare();
}
if (value == "BASEDELETETRY")
{
emit sigNotify("Нельзя удалять базовую версию");
}
}
}
}

View File

@@ -14,6 +14,7 @@
#include <Core/tools.h>
class RecognizeSystem;
class NotifyController;
class DataParser : public QObject
{
@@ -22,7 +23,7 @@ class DataParser : public QObject
public:
explicit DataParser(QObject *parent = 0);
void initialize(RecognizeSystem *recognizeSystem);
void initialize(RecognizeSystem *recognizeSystem,NotifyController *notifyController);
~DataParser();
ServerSettings* getServerSettings();
void createServerSettings(ServerSettings* serverSettings);
@@ -37,6 +38,9 @@ public:
void xmlParser(QByteArray array);
void changeVersion(QString versionName);
signals:
void sigNotify(QString notify);
public slots:
QByteArray xmlAnswer_notify(QString code);
@@ -46,6 +50,7 @@ private:
const QString XMLAutoStartProperty = "AutoStart=\"";
ClientAutorization *authPassCache;
RecognizeSystem *recognizeSystem;
NotifyController *notifyController;
};

15
Core/notifycontroller.cpp Normal file
View File

@@ -0,0 +1,15 @@
#include "notifycontroller.h"
NotifyController::NotifyController(QObject *parent) : QObject(parent)
{
}
void NotifyController::showWarning(QString text)
{
QMessageBox warning;
warning.setText(text);
warning.setIcon(QMessageBox::Warning);
warning.setWindowTitle(tr("Ошибка"));
warning.exec();
}

18
Core/notifycontroller.h Normal file
View File

@@ -0,0 +1,18 @@
#ifndef NOTIFYCONTROLLER_H
#define NOTIFYCONTROLLER_H
#include <QObject>
#include <QMessageBox>
class NotifyController : public QObject
{
Q_OBJECT
public:
explicit NotifyController(QObject *parent = nullptr);
void showWarning(QString text);
signals:
};
#endif // NOTIFYCONTROLLER_H

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -18,6 +18,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
Core/notifycontroller.cpp \
Core/sendsystem.cpp \
Core/versioncontainer.cpp \
Core\updatecontroller.cpp \
@@ -41,7 +42,7 @@ SOURCES += \
Widgets\versionselectwidget.cpp
HEADERS += \
Core/streamingversiondata.h \
Core/notifycontroller.h \
Core/versioncontainer.h \
Core\sendsystem.h \
Core\updatecontroller.h \
@@ -52,6 +53,7 @@ HEADERS += \
Core\tcpclient.h\
Core\tools.h\
Core\hashcomparer.h \
Data/streamingversiondata.h \
Data\FileData.h\
Data\Datas.h \
UI/resourcemanager.h \

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-12-27T17:58:30. -->
<!-- Written by QtCreator 4.11.1, 2024-12-28T10:52:37. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

View File

@@ -1,201 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<FileDataList>
<FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Plugins" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Plugins/x86_64" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/Browsers" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Resources" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/mconfig" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/Browsers" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Temp" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/D3D12" Hash="FOLDER"/>
<FileData Path="/Application" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/Browsers" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.NVIDIAModule.dll" Hash="0dde1799779f99200903622ecf279b4b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ParticleSystemModule.dll" Hash="fb86ca13989f7357917cb8fad2bc9571"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TerrainModule.dll" Hash="3f4b1cca251fc0e4ac8ee5855c21c829"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.PerformanceReportingModule.dll" Hash="76ea7a15db5d193ffd90ac126ecdf573"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.MarshallingModule.dll" Hash="4be2900caf53c5a77e14d40d26804016"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.MultiplayerModule.dll" Hash="3821d1940fef8c2fd2bc09f8cdc50b7b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.Physics2DModule.dll" Hash="c2e6a62916ad3207cdc8daf42e033d37"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.PhysicsModule.dll" Hash="b3d8e6427893f8ed1c6717e8bc8480eb"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ProfilerModule.dll" Hash="f1f4d1ee69bff46452fba519b3a0c90b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.PropertiesModule.dll" Hash="dff0bf609e5e116146f3139297a8cf55"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll" Hash="b3c3f7cf1d76fbf5cb72d06b48fadce8"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ScreenCaptureModule.dll" Hash="512a77e433577d2aea66bbf774b26e68"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.SharedInternalsModule.dll" Hash="b5dfed05ba23999348fb41a3946a8c60"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.SpriteMaskModule.dll" Hash="d35600c344dda3162201ee876109dfa2"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.SpriteShapeModule.dll" Hash="c1da3125886675c29f911186ba57c77f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.StreamingModule.dll" Hash="3c1a919df199410b6d97d3233c2ae8af"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.SubstanceModule.dll" Hash="5654a4342f349a828d1e42100bd5b069"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.SubsystemsModule.dll" Hash="bd7ad5e02272b6cffc6ac3c9f64a5d00"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.CommandStateObserverModule.dll" Hash="55957ff738edeb5fb2723f625112d4d3"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.GraphToolsFoundationModule.dll" Hash="b2c7eea97fa9ee185d6be4dbccbaad68"/>
<FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ContentLoadModule.dll" Hash="eedc3dcf14a3ce65072b84335b54b758"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.CoreModule.dll" Hash="7352cddb3575dbbcca53a8fa9568fe6f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.CrashReportingModule.dll" Hash="ea3c9f6c8098cf864e3353697a32ff65"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.DirectorModule.dll" Hash="87d7f67b284b7e5748bb8cc4c645662c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.dll" Hash="8ffa9dfdffe9c31b96856f5be0f839e4"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.DSPGraphModule.dll" Hash="347a60da7e315fbfeca71360aa69169b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.GameCenterModule.dll" Hash="ceb426370ca4ccd14de6d2bf86b143c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.GIModule.dll" Hash="2918d57cd975b218d0d5a94a0e6c386a"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.LocalizationModule.dll" Hash="ecc911c3f4fb74ef6fe9d756e3d18408"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.GridModule.dll" Hash="3cb34eb625d4fabbbefed7563619f854"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.HierarchyCoreModule.dll" Hash="4f1dfca0153c6cda61b749cf04b864d4"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.HotReloadModule.dll" Hash="f1c6fd8ef2ec0c3a607b148bcd87038d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ImageConversionModule.dll" Hash="102bfdba9d7a2b1f876c7dd9ff0fd440"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.IMGUIModule.dll" Hash="c9fc2dcdf69f5c081ee1d809715624f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.InputForUIModule.dll" Hash="2c6253ae2586b692d55140e38fc3e242"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.InputLegacyModule.dll" Hash="a9a370555a93c547284b2e8a27945bc5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.InputModule.dll" Hash="cf38dc062b4d1218628488ee5cbbdd5d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.JSONSerializeModule.dll" Hash="0b294a1c0dca9e8180f122ba7ac942dc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Resources/unity default resources" Hash="510aeddf6e1cb415533ad2b13937f0bd"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.VehiclesModule.dll" Hash="74065cdf5a92f299a5197a7cf2505725"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.VFXModule.dll" Hash="ae89bc0a52ba6cfeea7261e330bc972b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.VideoModule.dll" Hash="c00f0cfb424ad22ecf90a1f5d6f5bd2b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.VirtualTexturingModule.dll" Hash="a68ac0d470b2de4b492e6c0d9b88e9de"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.VRModule.dll" Hash="1943a6b4296e967056f48f34e7cc10b3"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.WindModule.dll" Hash="4cb40be94a81fac1bb759d28e6dcd381"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.XRModule.dll" Hash="635e638a237f3b28a661c6cf4a18046a"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Plugins/x86_64/lib_burst_generated.dll" Hash="375c0178aa8479470b8edc2d613952eb"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Plugins/x86_64/pdfrenderer.dll" Hash="bb9613277346c4b3bf0ea29a44c903e9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll" Hash="3e9d46adb7d36d390783d7917dd043b8"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Resources/unity_builtin_extra" Hash="4ec578ed51d7dd617c9245fc406c1fc2"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/resources.assets" Hash="aa1503fcf0cca3c176162ed3d985eca3"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/resources.assets.resS" Hash="415d6f432a82d14f862a7fc1897ab50e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/RuntimeInitializeOnLoads.json" Hash="83105c603c8d7bddcfda9da2264655cf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="a58dcde58175e502b6d824eec6fbeadc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Temp/UserData.xml" Hash="18352e1f88c92ef90c42bfe2b1ee0395"/>
<FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityAnalyticsCommonModule.dll" Hash="35cc2a3004f37694740edc9394bc05bf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TextCoreFontEngineModule.dll" Hash="f02c97fc1dc7cee24efb7a161761cad7"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TextCoreTextEngineModule.dll" Hash="211586ac1307e75b04944ae69602d439"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TextRenderingModule.dll" Hash="7c4b7a99c671f612956c8d9a8b059d3d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TilemapModule.dll" Hash="680c311a782c27b84939de1109387abf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TLSModule.dll" Hash="f5e69a25d7e5711f9d96c6d72ebef3a6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UI.dll" Hash="c5ff0bd048336c6e10704e5bf0151e05"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UIElementsModule.dll" Hash="edb209860d38406902f38078afb09dc4"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UIModule.dll" Hash="6dc8c0bd62247ae98f3ab47b58dbe79b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UmbraModule.dll" Hash="9e9645956824b3d24d0a5c721ebedfcc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.TerrainPhysicsModule.dll" Hash="2d87f1c8ac3b32158d0c8751989c97f7"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityAnalyticsModule.dll" Hash="07396be9516ddff18c7f49ba9ed9d5c2"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityConnectModule.dll" Hash="c2b0504f4621a92e91d5ed5e79017295"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityCurlModule.dll" Hash="92203292162a4a4ea627f41e2032855d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityTestProtocolModule.dll" Hash="f7995ec8be70852443cefdf2b9ec8a4e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll" Hash="57d96c793a720456cc5ebc45d0b6f4e1"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll" Hash="8490f076ba120cb60dab94932adff771"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityWebRequestModule.dll" Hash="f033891c341f917838a1ae9caa9c73e8"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll" Hash="fe6a04ff44a2f53a27331ca4834211e3"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/IngameDebugConsole.Runtime.dll" Hash="a4fe401fad24f2fd7e3f79ac875e23b0"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/mconfig/config.xml" Hash="f34b330f20dce1bdcce9058fca287099"/>
<FileData Path="/Application/RRJLoader/RRJ.exe" Hash="d8d1ae60ce447c51879c27f15dde7195"/>
<FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64/lib_burst_generated.txt" Hash="650c0d607ca669ffeea19b214480e92f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/app.info" Hash="40abc32f793ac28bdd0bfa15c090595d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/boot.config" Hash="ca3a74f3879bf531b83ef01faa24c4dc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers" Hash="741e2c93a6d362e9f67c1db3206fec0b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers.assets" Hash="4487c33f4272a4900326138859f8daa1"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers.assets.resS" Hash="cc481c35e79b509dcd950c6adf2346ce"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/level0" Hash="65b76c3483f64609f9be534f2cf161c7"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Assembly-CSharp.dll" Hash="78a73a19a3e5be228d67744b3ea91fa7"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/config" Hash="67611b783439b35abfe05a97413bba46"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Mono.Security.dll" Hash="dbd7e99a9ac5352fd4febaa5a7660e09"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/mscorlib.dll" Hash="9c0f93ea22eb12021728a1effe48ccad"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/netstandard.dll" Hash="c61967ebe7f07f6a5a1b3f91842bbc3c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.ComponentModel.Composition.dll" Hash="9a5463df5469541750cca835743414c1"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Configuration.dll" Hash="ea06fc126f0f0e6a9d44e089469b7653"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Core.dll" Hash="5df5fd16437d20f41e58f8db73b42b47"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Data.DataSetExtensions.dll" Hash="48ff393c9b420ade92a47c8cded8df57"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Data.dll" Hash="83260b81a7f2c359842ae712cf8403a5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.dll" Hash="97151f7e52d13119d4b7fc147c01dcd7"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/DefaultWsdlHelpGenerator.aspx" Hash="f7be9f1841ff92f9d4040aed832e0c79"/>
<FileData Path="/Application/RRJLoader/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser" Hash="0d831c1264b5b32a39fa347de368fe48"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx" Hash="f7be9f1841ff92f9d4040aed832e0c79"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/machine.config" Hash="5b791b8493c4e9a55d8c5ee522ce1cef"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/settings.map" Hash="22c818a23169e12bd3c8587b6394c731"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/web.config" Hash="dc6dd6d8d1fc74e76c84b0b38dc6b1e3"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser" Hash="0d831c1264b5b32a39fa347de368fe48"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Drawing.dll" Hash="e9a4ee8d28124309d5068758ae9cf29a"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/machine.config" Hash="32bf879734966ef6659d914a217691e0"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/settings.map" Hash="ba17ade8a8e3ee221377534c8136f617"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/web.config" Hash="d081581e16b06480a5aaef8cdfb305ab"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser" Hash="0d831c1264b5b32a39fa347de368fe48"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/DefaultWsdlHelpGenerator.aspx" Hash="f7be9f1841ff92f9d4040aed832e0c79"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/machine.config" Hash="25ff1ec49e3ac9285bd943cf036bd813"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/settings.map" Hash="ba17ade8a8e3ee221377534c8136f617"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/web.config" Hash="5075af18fe1d2b5f9555d5cc68029814"/>
<FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/browscap.ini" Hash="378be809df7d15aac75a175693e25fbb"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.VisualScripting.State.dll" Hash="0a778b955b1a2df7397f338386070323"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.RenderPipelines.Core.ShaderLibrary.dll" Hash="b5f27626025df2464cc3216bfb349ff6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.RenderPipelines.HighDefinition.Config.Runtime.dll" Hash="4232e384bb18cf0b470748f16a451077"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.RenderPipelines.HighDefinition.Runtime.dll" Hash="8bbfd57cd933a13dccc7796a2a76bd6f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll" Hash="bb8e7c89045af4b8e7886720e5dc2474"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.TextMeshPro.dll" Hash="a944c0a16abff15b71bf7c220de5bcbd"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Timeline.dll" Hash="9d32cd828350ca76224a61f9cf98211c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.VisualEffectGraph.Runtime.dll" Hash="ddd586575079cc22739a5e5e49d18a77"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.VisualScripting.Antlr3.Runtime.dll" Hash="62a6ef88ac683a13104417515323896b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.VisualScripting.Core.dll" Hash="de557512eb1a4da119ef4b7cdf0de9ea"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.VisualScripting.Flow.dll" Hash="6078b460cb8803b87f89410f2fdef9f2"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.RenderPipelines.Core.Runtime.Shared.dll" Hash="ebbeac963fbf7bb908ab0aa5d698c350"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.AccessibilityModule.dll" Hash="bf51e59da996c816b7d3944d9d235ca3"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.AIModule.dll" Hash="245cfae2b9eaee92e87eae662d3b8ca5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.AndroidJNIModule.dll" Hash="19aba924468d523bd6ab0af1977ce553"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.AnimationModule.dll" Hash="5301e420d7216e0376b2ae6771836a08"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ARModule.dll" Hash="5007e1920fd5f556be659d873b07f1a4"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.AssetBundleModule.dll" Hash="5c3168c646fb035e811a09fd4de30759"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.AudioModule.dll" Hash="12b91b4940b3418061837bc12e7d7050"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ClothModule.dll" Hash="6ca3c4a421c921526e07950998a89ee9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ClusterInputModule.dll" Hash="9ed9069d73075969a156f89851e58d4c"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Transactions.dll" Hash="6191fb6d054e9f0910f42730230d7e5b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.EnterpriseServices.dll" Hash="ce5f01bef57e504e6bcba5136f6cac3f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.IO.Compression.dll" Hash="968bf6f5309660610233bf75b21584c1"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.IO.Compression.FileSystem.dll" Hash="941b52daf342862624349b9cec0cb4a9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Net.Http.dll" Hash="dab4d77c5675bd94394baa2c45e4a311"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Numerics.dll" Hash="73cd840f06347a172cdc8764564c6361"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Runtime.dll" Hash="77d74adcdea84d53a1fbe89e79737c1e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Runtime.Serialization.dll" Hash="4ef33c922491087198e413279a709791"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Security.dll" Hash="c3030222a71dad399344f8067dd36299"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.ServiceModel.Internals.dll" Hash="0b563b4cf046e3e484669ce10ce3bfa1"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/UnityEngine.ClusterRendererModule.dll" Hash="525752cc5b0c1d39c49ec4ac50a4101b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Xml.dll" Hash="6fed4a1385091135fcc224bda4f83222"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/System.Xml.Linq.dll" Hash="f59d549bdb4b3310647d344446958c3d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Burst.dll" Hash="3d93246db4e4fa4e519fa15ff5ee3ff4"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Burst.Unsafe.dll" Hash="129351e9879a83262ea92a4a45aacc46"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Collections.dll" Hash="a50a4892d0eb50ba7aa1ec6b86b9338d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Collections.LowLevel.ILSupport.dll" Hash="a28c546a9e048223b6899d2856ef6c11"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Mathematics.dll" Hash="88db1f1b78092627dd59ba7098212fb9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.Rendering.LightTransport.Runtime.dll" Hash="39b58780871edbbe50c43180e940dec5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Unity.RenderPipelines.Core.Runtime.dll" Hash="b7f1b29575e39edb80529f80dbe96b51"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Minimize.wav" Hash="8fb59dad02c94ebc63590b14f4d1de2e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
</FileDataList>

View File

@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<?xml version="1.0" encoding="UTF-8"?>
<ServerSettingsContainer>
<ServerSettings Language="RUS" Address="192.168.100.241" AutoStart="0" Port="6000"/>
<ServerSettings Address="192.168.100.241" Port="6000" Language="RUS" AutoStart="0"/>
<VersionData Version="base"/>
</ServerSettingsContainer>

View File

@@ -1,17 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<FileDataList>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_end.wav" Hash="e83345df81f1e577bb53766875efc31d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Menu Command.wav" Hash="822b4c37ce07436e2192785f3274386f"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Minimize.wav" Hash="8fb59dad02c94ebc63590b14f4d1de2e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
</FileDataList>
<FileDataList/>

View File

@@ -46,11 +46,11 @@ void UpdateNotifyWidget::showWithFill()
void UpdateNotifyWidget::on_loadToServerButton_clicked()
{
if(versionContainer->getServerVersion() == baseNamePackage)
{
showWarning("В базовую версию загрузка невозможна!");
return;
}
// if(versionContainer->getServerVersion() == baseNamePackage)
// {
// showWarning("В базовую версию загрузка невозможна!");
// return;
// }
mainWindow->loadToServer();
}
@@ -65,15 +65,6 @@ void UpdateNotifyWidget::on_startWithCurrentChangesButton_clicked()
mainWindow->startUnityClient();
}
void UpdateNotifyWidget::showWarning(QString text)
{
QMessageBox warning;
warning.setText(text);
warning.setIcon(QMessageBox::Warning);
warning.setWindowTitle(tr("Ошибка"));
warning.exec();
}
UpdateNotifyWidget::~UpdateNotifyWidget()
{
delete ui;

View File

@@ -42,7 +42,6 @@ private:
MainWindow *mainWindow;
VersionContainer *versionContainer;
int currentLoadingCount;
void showWarning(QString text);
};
#endif // UPDATENOTIFYWIDGET_H

View File

@@ -12,11 +12,12 @@ VersionSelectWidget::VersionSelectWidget(QWidget *parent) :
ui->setupUi(this);
}
void VersionSelectWidget::initialize(SendSystem *sendSystem,VersionContainer *versionContainer)
void VersionSelectWidget::initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController)
{
connect(this,&VersionSelectWidget::sigSendSwitchVersion,sendSystem,&SendSystem::sendChangeVersion,Qt::AutoConnection);
connect(this,&VersionSelectWidget::sigSendCopyVersion,sendSystem,&SendSystem::sendCopyVersion,Qt::AutoConnection);
connect(this,&VersionSelectWidget::sigSendDeleteVersion,sendSystem,&SendSystem::sendDeleteVersion,Qt::AutoConnection);
connect(this,&VersionSelectWidget::sigSendNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection);
this->versionContainer = versionContainer;
hide();
}
@@ -62,7 +63,7 @@ void VersionSelectWidget::sendCopyEmit(QString newName)
if (selectedVersion == nullptr)
{
showWarning(tr("Версия не выбрана"));
sigSendNotify(tr("Версия не выбрана"));
return;
}
@@ -70,7 +71,7 @@ void VersionSelectWidget::sendCopyEmit(QString newName)
if (matchIndex > 0)
{
showWarning(tr("Версия с таким именем уже существует"));
sigSendNotify(tr("Версия с таким именем уже существует"));
return;
}
@@ -82,21 +83,21 @@ void VersionSelectWidget::on_DeleteVersionButton_clicked()
{
if (selectedVersion == nullptr)
{
showWarning(tr("Версия не выбрана"));
sigSendNotify(tr("Версия не выбрана"));
return;
}
if (selectedVersion->getViewName() == baseNamePackage)
{
showWarning(tr("Нельзя удалить базовый пакет"));
return;
}
// if (selectedVersion->getViewName() == baseNamePackage)
// {
// showWarning(tr("Нельзя удалить базовый пакет"));
// return;
// }
if (selectedVersion->getViewName() == versionContainer->getServerVersion())
{
showWarning(tr("Нельзя удалить активную версию"));
return;
}
// if (selectedVersion->getViewName() == versionContainer->getServerVersion())
// {
// showWarning(tr("Нельзя удалить активную версию"));
// return;
// }
emit sigSendDeleteVersion(selectedVersion);
}
@@ -104,7 +105,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked()
{
if (selectedVersion == nullptr)
{
showWarning(tr("Версия не выбрана"));
sigSendNotify(tr("Версия не выбрана"));
return;
}
@@ -113,14 +114,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked()
emit sigSendSwitchVersion(selectedVersion);
}
void VersionSelectWidget::showWarning(QString text)
{
QMessageBox warning;
warning.setText(text);
warning.setIcon(QMessageBox::Warning);
warning.setWindowTitle(tr("Ошибка"));
warning.exec();
}
VersionSelectWidget::~VersionSelectWidget()
{

View File

@@ -19,10 +19,9 @@ class VersionSelectWidget : public QWidget
public:
explicit VersionSelectWidget(QWidget *parent = nullptr);
void initialize(SendSystem *sendSystem,VersionContainer *versionContainer);
void initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController);
void fillView(QList<StreamingVersionData*> *serverData);
void sendCopyEmit(QString newName);
void showWarning(QString text);
~VersionSelectWidget();
private slots:
@@ -35,12 +34,14 @@ signals:
void sigSendDeleteVersion(StreamingVersionData *streaming);
void sigSendSwitchVersion(StreamingVersionData *selectVersion);
void sigSendCopyVersion(QString versionPair);
void sigSendNotify(QString message);
private:
Ui::VersionSelectWidget *ui;
SendSystem *sendSystem;
QList<StreamingVersionData*> *serverDataList;
VersionContainer *versionContainer;
NotifyController *notifyController;
StreamingVersionData *selectedVersion;
};

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_DataParser_t {
QByteArrayData data[4];
char stringdata0[34];
QByteArrayData data[6];
char stringdata0[51];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -33,12 +33,15 @@ struct qt_meta_stringdata_DataParser_t {
static const qt_meta_stringdata_DataParser_t qt_meta_stringdata_DataParser = {
{
QT_MOC_LITERAL(0, 0, 10), // "DataParser"
QT_MOC_LITERAL(1, 11, 16), // "xmlAnswer_notify"
QT_MOC_LITERAL(2, 28, 0), // ""
QT_MOC_LITERAL(3, 29, 4) // "code"
QT_MOC_LITERAL(1, 11, 9), // "sigNotify"
QT_MOC_LITERAL(2, 21, 0), // ""
QT_MOC_LITERAL(3, 22, 6), // "notify"
QT_MOC_LITERAL(4, 29, 16), // "xmlAnswer_notify"
QT_MOC_LITERAL(5, 46, 4) // "code"
},
"DataParser\0xmlAnswer_notify\0\0code"
"DataParser\0sigNotify\0\0notify\0"
"xmlAnswer_notify\0code"
};
#undef QT_MOC_LITERAL
@@ -48,18 +51,24 @@ static const uint qt_meta_data_DataParser[] = {
8, // revision
0, // classname
0, 0, // classinfo
1, 14, // methods
2, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
1, // signalCount
// signals: name, argc, parameters, tag, flags
1, 1, 24, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags
1, 1, 19, 2, 0x0a /* Public */,
4, 1, 27, 2, 0x0a /* Public */,
// signals: parameters
QMetaType::Void, QMetaType::QString, 3,
// slots: parameters
QMetaType::QByteArray, QMetaType::QString, 3,
QMetaType::QByteArray, QMetaType::QString, 5,
0 // eod
};
@@ -70,10 +79,20 @@ void DataParser::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
auto *_t = static_cast<DataParser *>(_o);
Q_UNUSED(_t)
switch (_id) {
case 0: { QByteArray _r = _t->xmlAnswer_notify((*reinterpret_cast< QString(*)>(_a[1])));
case 0: _t->sigNotify((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 1: { QByteArray _r = _t->xmlAnswer_notify((*reinterpret_cast< QString(*)>(_a[1])));
if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break;
default: ;
}
} else if (_c == QMetaObject::IndexOfMethod) {
int *result = reinterpret_cast<int *>(_a[0]);
{
using _t = void (DataParser::*)(QString );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&DataParser::sigNotify)) {
*result = 0;
return;
}
}
}
}
@@ -106,15 +125,22 @@ int DataParser::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 1)
if (_id < 2)
qt_static_metacall(this, _c, _id, _a);
_id -= 1;
_id -= 2;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 1)
if (_id < 2)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 1;
_id -= 2;
}
return _id;
}
// SIGNAL 0
void DataParser::sigNotify(QString _t1)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 0, _a);
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,95 @@
/****************************************************************************
** Meta object code from reading C++ file 'notifycontroller.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include <memory>
#include "../Core/notifycontroller.h"
#include <QtCore/qbytearray.h>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'notifycontroller.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_NotifyController_t {
QByteArrayData data[1];
char stringdata0[17];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
qptrdiff(offsetof(qt_meta_stringdata_NotifyController_t, stringdata0) + ofs \
- idx * sizeof(QByteArrayData)) \
)
static const qt_meta_stringdata_NotifyController_t qt_meta_stringdata_NotifyController = {
{
QT_MOC_LITERAL(0, 0, 16) // "NotifyController"
},
"NotifyController"
};
#undef QT_MOC_LITERAL
static const uint qt_meta_data_NotifyController[] = {
// content:
8, // revision
0, // classname
0, 0, // classinfo
0, 0, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
0 // eod
};
void NotifyController::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}
QT_INIT_METAOBJECT const QMetaObject NotifyController::staticMetaObject = { {
QMetaObject::SuperData::link<QObject::staticMetaObject>(),
qt_meta_stringdata_NotifyController.data,
qt_meta_data_NotifyController,
qt_static_metacall,
nullptr,
nullptr
} };
const QMetaObject *NotifyController::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *NotifyController::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_NotifyController.stringdata0))
return static_cast<void*>(this);
return QObject::qt_metacast(_clname);
}
int NotifyController::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QObject::qt_metacall(_c, _id, _a);
return _id;
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE

Binary file not shown.

Binary file not shown.

View File

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_VersionSelectWidget_t {
QByteArrayData data[15];
char stringdata0[296];
QByteArrayData data[17];
char stringdata0[318];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -41,18 +41,21 @@ QT_MOC_LITERAL(5, 74, 20), // "sigSendSwitchVersion"
QT_MOC_LITERAL(6, 95, 13), // "selectVersion"
QT_MOC_LITERAL(7, 109, 18), // "sigSendCopyVersion"
QT_MOC_LITERAL(8, 128, 11), // "versionPair"
QT_MOC_LITERAL(9, 140, 32), // "on_verListView_itemDoubleClicked"
QT_MOC_LITERAL(10, 173, 16), // "QListWidgetItem*"
QT_MOC_LITERAL(11, 190, 4), // "item"
QT_MOC_LITERAL(12, 195, 32), // "on_createDuplicateButton_clicked"
QT_MOC_LITERAL(13, 228, 30), // "on_DeleteVersionButton_clicked"
QT_MOC_LITERAL(14, 259, 36) // "on_switchServerVersionButton_..."
QT_MOC_LITERAL(9, 140, 13), // "sigSendNotify"
QT_MOC_LITERAL(10, 154, 7), // "message"
QT_MOC_LITERAL(11, 162, 32), // "on_verListView_itemDoubleClicked"
QT_MOC_LITERAL(12, 195, 16), // "QListWidgetItem*"
QT_MOC_LITERAL(13, 212, 4), // "item"
QT_MOC_LITERAL(14, 217, 32), // "on_createDuplicateButton_clicked"
QT_MOC_LITERAL(15, 250, 30), // "on_DeleteVersionButton_clicked"
QT_MOC_LITERAL(16, 281, 36) // "on_switchServerVersionButton_..."
},
"VersionSelectWidget\0sigSendDeleteVersion\0"
"\0StreamingVersionData*\0streaming\0"
"sigSendSwitchVersion\0selectVersion\0"
"sigSendCopyVersion\0versionPair\0"
"sigSendNotify\0message\0"
"on_verListView_itemDoubleClicked\0"
"QListWidgetItem*\0item\0"
"on_createDuplicateButton_clicked\0"
@@ -67,31 +70,33 @@ static const uint qt_meta_data_VersionSelectWidget[] = {
8, // revision
0, // classname
0, 0, // classinfo
7, 14, // methods
8, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
3, // signalCount
4, // signalCount
// signals: name, argc, parameters, tag, flags
1, 1, 49, 2, 0x06 /* Public */,
5, 1, 52, 2, 0x06 /* Public */,
7, 1, 55, 2, 0x06 /* Public */,
1, 1, 54, 2, 0x06 /* Public */,
5, 1, 57, 2, 0x06 /* Public */,
7, 1, 60, 2, 0x06 /* Public */,
9, 1, 63, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags
9, 1, 58, 2, 0x08 /* Private */,
12, 0, 61, 2, 0x08 /* Private */,
13, 0, 62, 2, 0x08 /* Private */,
14, 0, 63, 2, 0x08 /* Private */,
11, 1, 66, 2, 0x08 /* Private */,
14, 0, 69, 2, 0x08 /* Private */,
15, 0, 70, 2, 0x08 /* Private */,
16, 0, 71, 2, 0x08 /* Private */,
// signals: parameters
QMetaType::Void, 0x80000000 | 3, 4,
QMetaType::Void, 0x80000000 | 3, 6,
QMetaType::Void, QMetaType::QString, 8,
QMetaType::Void, QMetaType::QString, 10,
// slots: parameters
QMetaType::Void, 0x80000000 | 10, 11,
QMetaType::Void, 0x80000000 | 12, 13,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
@@ -108,10 +113,11 @@ void VersionSelectWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
case 0: _t->sigSendDeleteVersion((*reinterpret_cast< StreamingVersionData*(*)>(_a[1]))); break;
case 1: _t->sigSendSwitchVersion((*reinterpret_cast< StreamingVersionData*(*)>(_a[1]))); break;
case 2: _t->sigSendCopyVersion((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 3: _t->on_verListView_itemDoubleClicked((*reinterpret_cast< QListWidgetItem*(*)>(_a[1]))); break;
case 4: _t->on_createDuplicateButton_clicked(); break;
case 5: _t->on_DeleteVersionButton_clicked(); break;
case 6: _t->on_switchServerVersionButton_clicked(); break;
case 3: _t->sigSendNotify((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 4: _t->on_verListView_itemDoubleClicked((*reinterpret_cast< QListWidgetItem*(*)>(_a[1]))); break;
case 5: _t->on_createDuplicateButton_clicked(); break;
case 6: _t->on_DeleteVersionButton_clicked(); break;
case 7: _t->on_switchServerVersionButton_clicked(); break;
default: ;
}
} else if (_c == QMetaObject::IndexOfMethod) {
@@ -137,6 +143,13 @@ void VersionSelectWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
return;
}
}
{
using _t = void (VersionSelectWidget::*)(QString );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&VersionSelectWidget::sigSendNotify)) {
*result = 3;
return;
}
}
}
}
@@ -169,13 +182,13 @@ int VersionSelectWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 7)
if (_id < 8)
qt_static_metacall(this, _c, _id, _a);
_id -= 7;
_id -= 8;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 7)
if (_id < 8)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 7;
_id -= 8;
}
return _id;
}
@@ -200,5 +213,12 @@ void VersionSelectWidget::sigSendCopyVersion(QString _t1)
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 2, _a);
}
// SIGNAL 3
void VersionSelectWidget::sigSendNotify(QString _t1)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 3, _a);
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE

Binary file not shown.

Binary file not shown.

BIN
debug/notifycontroller.o Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -18,44 +18,11 @@ MainWindow::MainWindow(QWidget *parent)
setWindowFlag(Qt::FramelessWindowHint);
}
void MainWindow::initialize()
{
createObjects();
loadStaticData();
bindConnection();
updateWidget->initialize(this,versionContainer);
entryWidget->initialize(this);
versionSelectWidget->initialize(sendSystem,versionContainer);
hashComparer->initialize(this,versionContainer);
updateController->initialize(this,versionContainer);
sendSystem->initialize(this,dataParser);
dataParser->initialize(recognizeSystem);
recognizeSystem->initialize(updateController,dataParser,this,hashComparer,client,versionContainer);
resourceManager->painting();
commonButtonGroupWidget->initialize(this,externalExecuter,sendSystem,client);
commonButtonGroupWidget->show();
setUpUi();
emit sigCalculateHash();
emit sigInitializeClient(this,recognizeSystem,externalExecuter,sendSystem,workerThread);
screenChecker->check();
emit sigSetConnect(dataParser->getServerSettings(),workerThread);
checkAppAvailable();
//post
}
void MainWindow::createObjects()
{
updateWidget = new UpdateNotifyWidget;
updateWidget->setParent(this);
commonButtonGroupWidget = new CommonButtonGroupWidget;
entryWidget = new EntryWidget;
@@ -73,9 +40,13 @@ void MainWindow::createObjects()
client = new TCPClient;
client->moveToThread(workerThread);
notifyController = new NotifyController;
notifyController->setParent(this);
dataParser = new DataParser;
dataParser->moveToThread(workerThread);
sendSystem = new SendSystem;
sendSystem->moveToThread(workerThread);
@@ -100,6 +71,43 @@ void MainWindow::createObjects()
timer = new QTimer;
}
void MainWindow::initialize()
{
createObjects();
loadStaticData();
bindConnection();
updateWidget->initialize(this,versionContainer);
entryWidget->initialize(this);
versionSelectWidget->initialize(sendSystem,versionContainer,notifyController);
hashComparer->initialize(this,versionContainer);
updateController->initialize(this,versionContainer);
sendSystem->initialize(this,dataParser);
dataParser->initialize(recognizeSystem,notifyController);
recognizeSystem->initialize(updateController,dataParser,this,hashComparer,client,versionContainer);
resourceManager->painting();
commonButtonGroupWidget->initialize(this,externalExecuter,sendSystem,client);
commonButtonGroupWidget->show();
setUpUi();
emit sigCalculateHash();
emit sigInitializeClient(this,recognizeSystem,externalExecuter,sendSystem,workerThread);
screenChecker->check();
emit sigSetConnect(dataParser->getServerSettings(),workerThread);
checkAppAvailable();
//post
}
void MainWindow::bindConnection()
{
connect(timer,&QTimer::timeout,this,&MainWindow::slotDisableNotify);
@@ -154,7 +162,7 @@ void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount,quint64
if(fileCount > 0)
{
result = tr("Доступно обновление: ") + Tools::convertFileSize(size);
result += tr("Количество файлов: ") + QString::number(fileCount);
//result += tr("Количество файлов: ") + QString::number(fileCount);
}
else
{
@@ -559,6 +567,8 @@ void MainWindow::activateLoadingAnimation(bool flag)
}
}
MainWindow::~MainWindow()
{
workerThread->quit();

View File

@@ -12,6 +12,7 @@
#include <Core/sendsystem.h>
#include <Core/hashcomparer.h>
#include <Core/versioncontainer.h>
#include <Core/notifycontroller.h>
#include <Data/Datas.h>
#include <Widgets/commonbuttongroupwidget.h>
#include <Widgets/entrywidget.h>
@@ -59,6 +60,7 @@ public:
void disableUnsaveButton(bool flag);
void activateLoadingAnimation(bool flag);
void showWarning(QString text);
signals:
void sigInitializeClient(MainWindow* mainWindow,
RecognizeSystem *recognizeSystem,
@@ -122,6 +124,8 @@ private:
HashComparer *hashComparer;
VersionContainer *versionContainer;
ResourceManager *resourceManager;
NotifyController *notifyController;
QThread *workerThread;
QThread *animationThread;
QTimer *timer;

View File

@@ -1,3 +1,4 @@
debug/notifycontroller.o
debug/sendsystem.o
debug/versioncontainer.o
debug/updatecontroller.o
@@ -20,6 +21,7 @@ debug/newversionwidget.o
debug/updatenotifywidget.o
debug/versionselectwidget.o
debug/qrc_resources.o
debug/moc_notifycontroller.o
debug/moc_versioncontainer.o
debug/moc_sendsystem.o
debug/moc_updatecontroller.o

View File

@@ -1,3 +1,4 @@
release/notifycontroller.o
release/sendsystem.o
release/versioncontainer.o
release/updatecontroller.o
@@ -20,6 +21,7 @@ release/newversionwidget.o
release/updatenotifywidget.o
release/versionselectwidget.o
release/qrc_resources.o
release/moc_notifycontroller.o
release/moc_versioncontainer.o
release/moc_sendsystem.o
release/moc_updatecontroller.o