Ver código fonte

ZJZGJ_v1.2.1-1 20240711舱端代码,录屏功能前端集成,录屏已可用

mawenlei 4 meses atrás
pai
commit
5b5a1b296c

+ 6 - 1
ZjQt/Qt/components/LoginPage.qml

@@ -443,7 +443,12 @@ Rectangle {
                 height: 50
                 color: pressed ? textClickedColor : mainAppColor
                 text: "登 录"
-                onClicked: loginUser(loginUsername.text, loginPassword.text)
+                onClicked:{
+                            
+                            loginUser(loginUsername.text, loginPassword.text)                            
+                            readThread.open("desktop")
+                            
+                          }
             }
         }
     }

+ 34 - 12
ZjQt/Qt/debug/moc_readthread.cpp

@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_ReadThread_t {
-    const uint offsetsAndSize[14];
-    char stringdata0[56];
+    const uint offsetsAndSize[24];
+    char stringdata0[84];
 };
 #define QT_MOC_LITERAL(ofs, len) \
     uint(offsetof(qt_meta_stringdata_ReadThread_t, stringdata0) + ofs), len 
@@ -35,11 +35,17 @@ QT_MOC_LITERAL(23, 0), // ""
 QT_MOC_LITERAL(24, 5), // "image"
 QT_MOC_LITERAL(30, 9), // "playState"
 QT_MOC_LITERAL(40, 9), // "PlayState"
-QT_MOC_LITERAL(50, 5) // "state"
+QT_MOC_LITERAL(50, 5), // "state"
+QT_MOC_LITERAL(56, 7), // "setPath"
+QT_MOC_LITERAL(64, 4), // "path"
+QT_MOC_LITERAL(69, 4), // "open"
+QT_MOC_LITERAL(74, 3), // "url"
+QT_MOC_LITERAL(78, 5) // "close"
 
     },
     "ReadThread\0updateImage\0\0image\0playState\0"
-    "PlayState\0state"
+    "PlayState\0state\0setPath\0path\0open\0url\0"
+    "close"
 };
 #undef QT_MOC_LITERAL
 
@@ -49,7 +55,7 @@ static const uint qt_meta_data_ReadThread[] = {
       10,       // revision
        0,       // classname
        0,    0, // classinfo
-       2,   14, // methods
+       6,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -57,13 +63,25 @@ static const uint qt_meta_data_ReadThread[] = {
        2,       // signalCount
 
  // signals: name, argc, parameters, tag, flags, initial metatype offsets
-       1,    1,   26,    2, 0x06,    1 /* Public */,
-       4,    1,   29,    2, 0x06,    3 /* Public */,
+       1,    1,   50,    2, 0x06,    1 /* Public */,
+       4,    1,   53,    2, 0x06,    3 /* Public */,
+
+ // methods: name, argc, parameters, tag, flags, initial metatype offsets
+       7,    1,   56,    2, 0x02,    5 /* Public */,
+       9,    1,   59,    2, 0x02,    7 /* Public */,
+       9,    0,   62,    2, 0x22,    9 /* Public | MethodCloned */,
+      11,    0,   63,    2, 0x02,   10 /* Public */,
 
  // signals: parameters
     QMetaType::Void, QMetaType::QImage,    3,
     QMetaType::Void, 0x80000000 | 5,    6,
 
+ // methods: parameters
+    QMetaType::Void, QMetaType::QString,    8,
+    QMetaType::Void, QMetaType::QString,   10,
+    QMetaType::Void,
+    QMetaType::Void,
+
        0        // eod
 };
 
@@ -75,6 +93,10 @@ void ReadThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         switch (_id) {
         case 0: _t->updateImage((*reinterpret_cast< std::add_pointer_t<QImage>>(_a[1]))); break;
         case 1: _t->playState((*reinterpret_cast< std::add_pointer_t<PlayState>>(_a[1]))); break;
+        case 2: _t->setPath((*reinterpret_cast< std::add_pointer_t<QString>>(_a[1]))); break;
+        case 3: _t->open((*reinterpret_cast< std::add_pointer_t<QString>>(_a[1]))); break;
+        case 4: _t->open(); break;
+        case 5: _t->close(); break;
         default: ;
         }
     } else if (_c == QMetaObject::IndexOfMethod) {
@@ -105,7 +127,7 @@ const QMetaObject ReadThread::staticMetaObject = { {
 qt_incomplete_metaTypeArray<qt_meta_stringdata_ReadThread_t
 , QtPrivate::TypeAndForceComplete<ReadThread, std::true_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<const QImage &, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<PlayState, std::false_type>
 
-
+, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<const QString &, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<const QString &, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>
 
 >,
     nullptr
@@ -131,13 +153,13 @@ int ReadThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 2)
+        if (_id < 6)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 2;
+        _id -= 6;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 2)
+        if (_id < 6)
             *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType();
-        _id -= 2;
+        _id -= 6;
     }
     return _id;
 }

+ 279 - 272
ZjQt/Qt/debug/qrc_qml.cpp

@@ -8,128 +8,133 @@
 
 static const unsigned char qt_resource_data[] = {
   // C:/Users/admin/Desktop/ZJPro/ZjQt/Qt/main.qml
-  0x0,0x0,0x7,0x71,
+  0x0,0x0,0x7,0xc9,
   0x0,
-  0x0,0x1d,0x41,0x78,0x9c,0xed,0x59,0x5b,0x6f,0x13,0x47,0x14,0x7e,0x8f,0x94,0xff,
-  0xb0,0x32,0xf,0x5c,0x4a,0xd6,0xce,0x85,0x0,0x91,0x10,0x22,0x29,0x14,0x44,0x52,
-  0x1c,0x12,0xc1,0x3,0x42,0xd5,0xd8,0x3b,0x76,0x46,0xac,0x77,0x96,0xdd,0x71,0x12,
-  0xd3,0x46,0xa,0xa2,0x85,0x4,0x8,0x69,0xb,0xb4,0x94,0xab,0xa0,0x14,0x10,0xa8,
-  0x1,0xa,0x82,0x90,0x10,0xfa,0x67,0xbc,0xb6,0xf3,0xc4,0x5f,0xe8,0x99,0x9d,0x5d,
-  0x7b,0x2f,0xe3,0x38,0xb4,0xe5,0x9,0xce,0x43,0xb2,0x9e,0xf9,0xce,0x99,0xd9,0x73,
-  0xbe,0x39,0x33,0x67,0x96,0x14,0x4c,0x6a,0x31,0x65,0x98,0xd,0x17,0x49,0xf6,0x44,
-  0x7b,0x1b,0x9,0xfd,0x56,0x7,0x51,0x89,0x16,0x99,0x1d,0x6b,0x1f,0xa0,0x6,0xb3,
-  0xa8,0x1e,0xec,0xf8,0x12,0x31,0x74,0x84,0xd8,0x45,0xa4,0x93,0x53,0x88,0x11,0x6a,
-  0x28,0x9d,0x6a,0x57,0xbd,0x3f,0x91,0xa5,0xf0,0x60,0x60,0x83,0xd9,0x89,0xf6,0xb6,
-  0xf6,0xb6,0x3,0xc,0x17,0x94,0x6f,0xdb,0xdb,0x14,0x10,0xa2,0xf5,0x29,0x16,0xa5,
-  0x8c,0xb7,0x89,0x96,0x9,0xa2,0xb1,0xb1,0x3e,0xa5,0x73,0x67,0x57,0x4a,0x34,0x8c,
-  0x61,0x92,0x1f,0x63,0xd0,0x92,0xda,0x91,0xe2,0xea,0xbc,0xcd,0xb4,0xa8,0x89,0x2d,
-  0x56,0x52,0x6c,0x66,0x11,0x23,0xaf,0x30,0x3c,0xc9,0x46,0x9,0xd3,0x71,0x9f,0xb2,
-  0xb1,0xf2,0xe6,0x46,0xe5,0xf9,0x9d,0xd5,0x9f,0xef,0xad,0x5e,0x3e,0xbd,0x7a,0xeb,
-  0x76,0xed,0xe1,0xd9,0xda,0xeb,0x5b,0xb5,0xbf,0x6f,0x56,0x1f,0x5d,0xa8,0x5c,0x9e,
-  0xab,0x5c,0x7a,0x58,0x7d,0xb1,0x5c,0x5d,0xbe,0xb3,0x51,0x6e,0xa9,0x80,0x88,0x31,
-  0xa,0xd6,0x6,0xa8,0x4e,0x2d,0xb0,0xb6,0xa1,0x6b,0x67,0xa6,0x37,0x97,0x59,0x3,
-  0xbd,0xc7,0x34,0xd7,0x7,0xe6,0x93,0x1c,0xd0,0xc1,0x85,0x58,0xab,0x2b,0x6c,0x47,
-  0x5a,0x4f,0x2e,0xb7,0x96,0x2,0x47,0x7e,0x65,0x61,0x6c,0x70,0x78,0x2a,0xb5,0xf,
-  0x24,0xa,0xcf,0x72,0x8c,0x62,0x52,0xb3,0x68,0xf6,0xe7,0x5d,0x85,0xbd,0x16,0x58,
-  0x4f,0x6c,0xc8,0xf4,0xf4,0x24,0x5a,0x62,0x8f,0x22,0xcb,0xe0,0xe0,0xdc,0xf6,0x8c,
-  0xd6,0x8d,0x5b,0xe3,0xf,0x1d,0xe4,0x68,0xf1,0xa6,0x6b,0xa0,0x3,0x4e,0x4,0xdb,
-  0xae,0x24,0xfc,0xf0,0xed,0x3,0xa,0xd,0x52,0xa4,0x61,0xcb,0xe7,0x81,0xcf,0x5,
-  0x60,0x50,0x6,0x65,0x50,0xa3,0xd1,0xa6,0x45,0x2b,0xb,0x61,0x4d,0x9c,0xb4,0xb2,
-  0x7d,0xc9,0x6,0x93,0x92,0x39,0xb0,0x91,0xdc,0x23,0xe0,0x1d,0xe9,0xe2,0xfe,0x22,
-  0x19,0x25,0x1d,0xfd,0x54,0xd7,0x54,0xc6,0x72,0xde,0xbc,0xa6,0x5a,0xf,0xc8,0xcd,
-  0xa0,0x9,0x6c,0xd3,0x2,0x5e,0xef,0xa0,0x1,0x95,0x8e,0x9,0x9c,0xe1,0x3f,0x3f,
-  0x6c,0x4c,0x8d,0xe4,0x19,0xd2,0x79,0xff,0xff,0x3c,0x64,0x9a,0x3b,0x3e,0x3a,0x9a,
-  0x1b,0x8d,0x46,0x53,0x3d,0x56,0xe0,0x6a,0x64,0xf3,0xde,0x21,0x6c,0xdb,0x28,0xf,
-  0x63,0x17,0xc4,0x83,0xca,0x79,0xb7,0x96,0x82,0x17,0x56,0x8f,0x14,0xaa,0x1b,0x74,
-  0x7f,0xa,0x5c,0x32,0x28,0x7b,0x22,0x6f,0xd1,0xa2,0x1,0xa3,0x1f,0xc6,0x59,0x86,
-  0x8c,0xbc,0x8e,0x83,0xd3,0xa,0x4d,0xad,0x3f,0x1f,0xe9,0x28,0x98,0xb0,0x48,0x8,
-  0x3b,0x2a,0x12,0x81,0x9f,0x1d,0x54,0x37,0x31,0xc8,0xa1,0xfb,0xbd,0x14,0xd1,0x9b,
-  0x6a,0xf4,0x4f,0x35,0x1e,0x4b,0x7d,0xca,0xa6,0xba,0x19,0x91,0x4e,0x94,0xe,0x0,
-  0x6f,0x6e,0x40,0xa,0x54,0x43,0x7a,0x9f,0xc2,0xac,0x62,0x80,0x6,0x39,0x9a,0x2d,
-  0xda,0xd1,0xc6,0xac,0x4e,0x6d,0x9c,0xa6,0x30,0x2e,0x98,0x75,0x1d,0xae,0xe,0xf0,
-  0xa6,0x43,0x46,0xda,0x2,0xff,0x1d,0x82,0x94,0x49,0xb4,0x0,0x9e,0xaf,0x3,0xd9,
-  0xbb,0x7b,0xce,0xe,0x77,0x20,0x23,0x3b,0x46,0x2d,0x5b,0xcd,0x42,0xe8,0xb1,0x75,
-  0x0,0xd6,0xa5,0x89,0x2c,0x1c,0xe4,0x89,0x98,0x17,0x84,0xdf,0xa4,0xc4,0x60,0x23,
-  0xe4,0x14,0xc4,0xad,0xb3,0x2b,0xdc,0x9f,0xd,0xc4,0xa7,0xbe,0xc,0x25,0x26,0x72,
-  0xa8,0x40,0x74,0x78,0x8b,0x8d,0xab,0xcb,0x3f,0x95,0x57,0x2e,0x6f,0x94,0x3a,0x8f,
-  0x1a,0x87,0x4c,0x6c,0x60,0x3f,0x5a,0xee,0xbb,0xaa,0x36,0x43,0x16,0xdb,0xb4,0x39,
-  0x42,0x3f,0x9b,0xe4,0xd,0xa4,0x2b,0x27,0xb,0xfa,0x88,0xfb,0x34,0x84,0x26,0x8f,
-  0x12,0x43,0xa3,0x13,0xf2,0x6e,0xd8,0x4e,0x98,0xaf,0x9a,0x4c,0x3a,0x37,0x1f,0xd,
-  0xf,0xd,0x96,0x17,0xff,0x74,0x16,0xae,0x97,0xdf,0xcc,0x96,0x97,0xce,0x96,0x17,
-  0xa7,0xcb,0x8b,0x8f,0xab,0xe7,0x5f,0x55,0xa6,0x4f,0x57,0x6e,0x2e,0xbd,0x7f,0x3b,
-  0x33,0xc2,0x10,0xc3,0xca,0x10,0xca,0x8e,0x11,0x3,0xbf,0x7f,0x3b,0xbb,0xb5,0xf2,
-  0x74,0xbe,0xe,0x59,0x3d,0xb3,0x52,0xb9,0x39,0x2b,0x94,0x9c,0xe7,0xb7,0x2b,0xd3,
-  0xf,0x2b,0x37,0x5e,0x56,0xae,0xbc,0x1,0xbd,0xb4,0x47,0xe1,0x81,0x31,0xa0,0x22,
-  0xb6,0x41,0xf3,0xfd,0xdb,0x8b,0xce,0xcc,0x59,0x67,0xe6,0x49,0xf5,0xca,0xa3,0xf2,
-  0xd2,0xa5,0xda,0xc2,0xbb,0xea,0xca,0x82,0x89,0xc,0xac,0x1f,0x21,0x78,0xa2,0x7a,
-  0xfd,0xfb,0xf2,0xe2,0xdc,0xea,0xf4,0x7c,0xe5,0xda,0x25,0x67,0xe9,0x81,0x37,0x7d,
-  0x3e,0x38,0x2c,0x50,0x1d,0xd6,0x34,0x64,0xe7,0x44,0xa0,0x15,0x48,0x72,0xac,0xe1,
-  0x31,0xf7,0x5d,0xea,0x30,0x31,0xb9,0xf2,0xe2,0x5,0x18,0xb2,0xd9,0x0,0xb5,0x7b,
-  0x4f,0xc4,0xc,0xca,0x8b,0x4b,0x29,0x3e,0xb5,0xb9,0x17,0xce,0xc2,0x45,0xe7,0x87,
-  0x47,0x2,0xd1,0x30,0x2d,0x1c,0x10,0x61,0x93,0x81,0xa,0xf1,0x79,0xf9,0x12,0x79,
-  0xf5,0xa8,0x2e,0x17,0x88,0x65,0x1e,0x33,0x4e,0x35,0x6f,0x76,0x71,0x8,0x35,0x11,
-  0x2c,0x33,0xa0,0x4a,0x2a,0xdc,0x17,0xe0,0xc9,0xd4,0x56,0x99,0x7,0xb0,0xf6,0xc1,
-  0xe,0xe8,0xc,0x3a,0xa0,0xe,0x5a,0xbf,0xf,0x60,0xc8,0x8f,0xea,0x82,0xce,0xe6,
-  0x2e,0x10,0x8f,0xc7,0x5d,0x52,0xfb,0xcc,0xe,0x9e,0x76,0xb8,0xb8,0x79,0x2f,0x3e,
-  0x4c,0xec,0xd8,0xc3,0x25,0x7c,0xf4,0xf1,0x5b,0xc7,0x89,0x4d,0x32,0xfc,0xa8,0x13,
-  0x4e,0x4c,0x93,0xa1,0xe8,0x88,0x58,0x35,0x7e,0x7f,0x49,0x90,0x4e,0xf3,0xb2,0x44,
-  0xe4,0x26,0x34,0xd1,0x1d,0xee,0xac,0x8f,0x93,0x43,0xba,0x1d,0x49,0x54,0xd2,0x7c,
-  0xe9,0xcd,0x62,0x93,0xc8,0x59,0x22,0x61,0x43,0xa2,0x75,0xff,0x6f,0x56,0x92,0x4a,
-  0x24,0x4d,0x95,0x1a,0xd0,0x7a,0x52,0x16,0xf,0x12,0xb0,0x24,0xed,0x7e,0x4d,0xf7,
-  0x14,0x19,0x75,0x13,0xd2,0x9a,0x3b,0xc8,0xb6,0x54,0x4a,0xde,0xef,0x6f,0x1b,0xdd,
-  0xa9,0x90,0xab,0xb8,0xc8,0xb2,0x36,0x17,0xbe,0x35,0x2,0xcf,0x6a,0x4f,0xff,0xa8,
-  0xbd,0x7c,0xe0,0xcc,0xbf,0x76,0x5e,0xff,0x55,0xfd,0x6d,0xd9,0x59,0xb9,0xa,0xa4,
-  0x85,0x3,0xa6,0xb3,0x34,0xef,0x3c,0x3b,0x5b,0x3b,0xf7,0xd8,0x39,0xf,0x6b,0x77,
-  0xda,0x39,0xb7,0x94,0x88,0xdb,0x88,0xa6,0xef,0xae,0x9e,0x26,0x18,0x3f,0x3f,0x7b,
-  0x87,0x22,0x95,0x93,0x3c,0xe,0xf5,0xb2,0x7d,0xf0,0x28,0x1a,0x7,0xf9,0x1b,0xb,
-  0xfc,0x21,0xa7,0xf8,0x61,0x42,0x1f,0x70,0xb7,0x18,0x7f,0x83,0x89,0x75,0xc4,0x4d,
-  0x70,0xea,0x47,0x3d,0x39,0x15,0xf5,0x5b,0x63,0xb7,0x90,0x38,0xcf,0x8d,0x21,0xec,
-  0x8,0xa3,0xa4,0x80,0xad,0xf0,0x1e,0x12,0x30,0x28,0xb5,0xdd,0x9c,0xbe,0xee,0x5a,
-  0xfa,0x4c,0xdf,0xf,0xa2,0x6f,0xf5,0xee,0x42,0x6d,0xe1,0xbe,0x20,0xa8,0xf3,0xe3,
-  0xaf,0xbb,0x3f,0x31,0x92,0x1e,0xa6,0x13,0x32,0xe7,0xf8,0xd9,0x36,0x14,0xd4,0x8f,
-  0x35,0xcb,0xae,0x78,0xd0,0xb8,0xc,0xf4,0x17,0x19,0x83,0xfa,0x59,0x32,0x3d,0x2e,
-  0x6e,0xbe,0x86,0x9,0x60,0xbd,0x9f,0x19,0x72,0x8,0xf,0xb1,0xcf,0x8c,0x6d,0x29,
-  0x39,0x86,0x7,0xce,0xc7,0xa4,0x54,0x49,0x64,0xb9,0xf8,0x3b,0x52,0x33,0x23,0x63,
-  0x2d,0x6,0xf1,0x4f,0xa1,0xfc,0x54,0x8c,0x35,0x65,0x77,0xac,0xfe,0x55,0x5a,0xf1,
-  0xc1,0x7f,0x1d,0x60,0xac,0x33,0xff,0x4b,0xe5,0xd5,0x8c,0x84,0xa7,0x5c,0xa8,0xe1,
-  0x99,0xd,0x65,0x3,0xd5,0x4b,0x0,0xca,0x2e,0x59,0x6,0xe0,0x12,0x23,0x6,0x17,
-  0x9b,0xef,0xf3,0x46,0x5e,0xbc,0xd7,0xbf,0xa,0xd0,0x49,0x38,0xd7,0xa,0xd4,0xa7,
-  0x14,0xa1,0xa6,0xdb,0x1d,0x97,0x40,0x84,0x9a,0x38,0x8e,0xcb,0x38,0x14,0x4e,0x54,
-  0x54,0xc,0xaa,0x9b,0x30,0xa3,0xbb,0x43,0x50,0xea,0x5,0x5d,0xa8,0x9e,0x68,0xa6,
-  0x31,0x25,0x8d,0x7e,0x93,0x9f,0x21,0x5e,0xa4,0x39,0xa3,0xc4,0xa4,0x64,0xdb,0x8f,
-  0x5d,0xcc,0xa4,0x63,0x65,0x9c,0xb4,0x70,0xe4,0x72,0x10,0x97,0x6c,0x15,0x1b,0x8,
-  0x68,0xa9,0x35,0xed,0xa7,0xc6,0x5e,0x3b,0x8b,0x4c,0x9c,0x16,0x71,0x91,0xba,0x4c,
-  0xce,0xf3,0xb8,0xc1,0xc8,0x4b,0xe,0xf8,0xf7,0xa,0x30,0x8,0x7f,0xd6,0x31,0x6b,
-  0x32,0x0,0x32,0xcd,0x21,0xaa,0x61,0x5d,0xb5,0x90,0x86,0xac,0x4e,0x30,0xe,0xfb,
-  0x90,0x84,0x47,0x61,0x5c,0x17,0xe0,0x5a,0x82,0xba,0xd7,0x3,0xea,0x59,0xf,0x68,
-  0xdb,0x7a,0x40,0xbd,0xeb,0x1,0x6d,0x5f,0xf,0x68,0x47,0xb,0x90,0xc9,0x2f,0xed,
-  0x5a,0xd8,0xc1,0x48,0x2b,0xb5,0xc0,0xe4,0x8a,0x58,0x1f,0xc4,0xe3,0x58,0xdf,0xd5,
-  0xdb,0xdb,0xbb,0x6,0x8e,0x14,0x8a,0x93,0xad,0x21,0xa5,0x16,0x10,0x6c,0xe4,0xa1,
-  0x98,0x1e,0xc5,0x5,0xa8,0x91,0x10,0x2b,0x5a,0xb8,0x5,0x5e,0x27,0x39,0x96,0x26,
-  0x3a,0x65,0x2e,0x3d,0x1,0x3f,0x82,0xd,0x9b,0x5a,0xdf,0xec,0x93,0xd1,0x2f,0xa4,
-  0x99,0xa1,0xb4,0xb0,0x87,0x5f,0x5,0xf9,0x1a,0xad,0x18,0x1b,0x5a,0x87,0xcd,0x97,
-  0x60,0x20,0x6d,0x84,0x3b,0xeb,0x37,0x57,0x70,0x8a,0x51,0x26,0xc,0xed,0x80,0xa1,
-  0xe1,0xc9,0x58,0xd,0xdb,0xa4,0x9c,0xe2,0xe2,0x25,0xd8,0xee,0x1d,0x3d,0x11,0x1d,
-  0x79,0x61,0xc6,0x5,0x4a,0xdf,0x4b,0x77,0xaa,0xb3,0x33,0xb1,0x63,0x65,0xb8,0xb2,
-  0xf3,0xa0,0xcf,0xe7,0x9d,0x37,0x57,0xab,0xf,0x97,0xa1,0x5c,0xa8,0x3d,0x3b,0x53,
-  0xb9,0xfa,0xb2,0xbc,0x32,0x7,0x55,0x70,0x14,0xe7,0xa9,0x7f,0xd1,0x1b,0xcd,0xe4,
-  0x8d,0x2e,0x99,0xf9,0xca,0xdd,0xdf,0xc1,0x5e,0xe5,0xda,0xbb,0xea,0xfd,0x25,0x89,
-  0x5e,0xaa,0xa3,0x33,0x76,0xb6,0x4c,0x26,0xab,0xa7,0x9f,0x36,0xd7,0x8,0xb7,0x31,
-  0x71,0xe3,0x7e,0xd2,0x1e,0xb5,0x36,0x25,0xf6,0x97,0xc0,0xd7,0xae,0x33,0x61,0x77,
-  0xb4,0x70,0x81,0x42,0x91,0x9e,0x15,0x9f,0xa,0x94,0x91,0x92,0xd,0x99,0x3a,0x11,
-  0xc9,0xcd,0x39,0x1d,0xe5,0x21,0x4b,0xe,0x33,0xd5,0x8b,0xed,0x77,0xfc,0x79,0x9f,
-  0x5,0x7,0x48,0x1d,0xa8,0x25,0x1a,0xf7,0x93,0xe8,0xed,0x97,0x9d,0x15,0xb7,0xe1,
-  0x80,0x5,0x6a,0xc1,0xb6,0xe2,0x7e,0x71,0x50,0x45,0xb3,0x7d,0xcc,0x8f,0xf3,0xf1,
-  0xb0,0xd6,0x10,0xec,0x63,0x3e,0x85,0x22,0x49,0x31,0xb9,0xe5,0x73,0x92,0xfc,0x9c,
-  0x24,0xff,0x6b,0x92,0x9c,0xda,0x92,0xc,0x65,0x2e,0xef,0x9f,0x78,0x70,0x2b,0xde,
-  0xe8,0x2d,0x90,0x6d,0xea,0xc8,0x1e,0x1b,0x71,0x79,0x1b,0x29,0x3,0x9,0xaf,0x1b,
-  0xc6,0x79,0x89,0xda,0x19,0x22,0x14,0x35,0x46,0x2d,0x92,0xcf,0x63,0x4b,0x42,0xc8,
-  0xa0,0x39,0xf1,0xdd,0x41,0x25,0xfc,0x7c,0xb4,0xe6,0x31,0x58,0xa2,0x24,0xbe,0x44,
-  0x0,0x3c,0x11,0x39,0xcc,0xc5,0x4f,0x5c,0xf5,0xb,0xde,0xe8,0xb1,0xab,0xe,0x75,
-  0xaf,0x47,0xb9,0xad,0xd8,0xcd,0x5c,0xd4,0x45,0xf2,0x4f,0x25,0xf1,0xf9,0x35,0xfa,
-  0x9b,0x7e,0x32,0x19,0x9,0x28,0xf1,0xc9,0x26,0x82,0xe,0x74,0xad,0xac,0xed,0x3d,
-  0xc9,0x1d,0x77,0x78,0xc6,0x8a,0xd2,0xde,0x6,0xff,0xfe,0x1,0xa2,0xa3,0xd,0x14,
-  
+  0x0,0x1f,0x28,0x78,0x9c,0xed,0x59,0x5b,0x6f,0x1b,0x45,0x14,0x7e,0xaf,0xd4,0xff,
+  0xb0,0x32,0xf,0x4d,0x81,0xac,0x9d,0x34,0x4d,0x4b,0x24,0x84,0x1a,0x43,0x69,0x45,
+  0x43,0x5d,0x12,0xd1,0x7,0x84,0xd0,0x78,0x77,0x6c,0x8f,0x58,0xcf,0x6c,0x77,0xc7,
+  0x4d,0x5c,0x88,0x94,0xa,0x28,0x29,0xd0,0x6,0x28,0xe5,0x5a,0xa8,0xb8,0xb6,0x2,
+  0x91,0x52,0xa8,0x68,0x9a,0x34,0xf0,0x67,0xbc,0xb6,0xf3,0xd4,0xbf,0xc0,0x99,0x9d,
+  0x5d,0x7b,0x2f,0xb3,0xb6,0xb,0xf4,0xa9,0x3d,0xf,0xc9,0x7a,0xe6,0x3b,0x67,0x66,
+  0xcf,0xf9,0xe6,0x9c,0x99,0x59,0x52,0xb7,0x99,0xc3,0xb5,0x13,0xfc,0x44,0x83,0x18,
+  0xaf,0xef,0xde,0x45,0x62,0xbf,0xf5,0x63,0xa8,0xc9,0x1a,0xdc,0x4d,0xb5,0x17,0x19,
+  0xe5,0xe,0xb3,0xa2,0x1d,0xcf,0x22,0x8e,0x5e,0x26,0x6e,0x3,0x59,0xe4,0xc,0xe2,
+  0x84,0x51,0x6d,0x42,0x9f,0xec,0xf5,0xe7,0xc,0x6,0xf,0x14,0x53,0xee,0xe6,0x76,
+  0xef,0xda,0xbd,0xeb,0x28,0xc7,0x75,0xed,0x8d,0xdd,0xbb,0x34,0x10,0x62,0xce,0x68,
+  0xe,0x63,0x5c,0xb4,0xc9,0x96,0x45,0x62,0xf2,0xda,0x8c,0x36,0xf1,0xd4,0x64,0x41,
+  0x36,0xd4,0x30,0xa9,0xd6,0x38,0xb4,0x14,0xe,0x16,0x84,0xba,0x68,0xb3,0x1d,0x66,
+  0x63,0x87,0x37,0x35,0x97,0x3b,0x84,0x56,0x35,0x8e,0x97,0xf8,0x2,0xe1,0x16,0x9e,
+  0xd1,0xf6,0xb4,0xef,0x7c,0xd5,0xbe,0x79,0x75,0xe7,0xe3,0xef,0x76,0x2e,0x9d,0xdd,
+  0xf9,0xfa,0x9b,0xee,0xb5,0x73,0xdd,0xdb,0x5f,0x77,0xff,0xbe,0xd2,0xb9,0xfe,0x7e,
+  0xfb,0xd2,0x85,0xf6,0xc5,0x6b,0x9d,0x3f,0xb6,0x3a,0x5b,0x57,0xf7,0xa8,0x2d,0xd5,
+  0x11,0xa1,0xb,0x60,0xad,0xc8,0x2c,0xe6,0x80,0xb5,0xc7,0x26,0x9f,0x2a,0x4f,0x57,
+  0xca,0x3,0xd0,0x87,0x6c,0x7b,0x34,0xb0,0x98,0x64,0xd1,0x2,0x17,0x62,0xb3,0xa7,
+  0x70,0x0,0x99,0x53,0x95,0xca,0x20,0x5,0x81,0x7c,0xde,0xc1,0x98,0xa,0x78,0xa1,
+  0x70,0x18,0x24,0x9,0x37,0x4,0x46,0xb3,0x99,0xdd,0xb0,0x67,0xab,0xbe,0xc2,0x73,
+  0xe,0x58,0xcf,0x3d,0x56,0x9e,0x9a,0xca,0xd,0xc5,0x9e,0x44,0xe,0x15,0xe0,0xca,
+  0x81,0xb2,0xb9,0xf,0xf,0xc7,0x1f,0x7f,0x41,0xa0,0xe5,0x9b,0xe,0x40,0x47,0x9c,
+  0x8,0xb6,0x7d,0xc9,0x85,0xe1,0x3b,0xc,0x14,0x3a,0xc6,0x90,0x89,0x9d,0x90,0x7,
+  0x21,0x17,0x80,0x41,0x65,0x54,0x46,0xfd,0x46,0x97,0x35,0x1c,0x3,0xc2,0x9a,0x3b,
+  0xe5,0x18,0x33,0xf9,0x3e,0x93,0xf2,0x15,0xb0,0x91,0x3f,0x24,0xe1,0xe3,0xa5,0xc6,
+  0x91,0x6,0x59,0x20,0xe3,0xb3,0xcc,0x32,0x75,0xce,0x2b,0xc1,0xbc,0x96,0x87,0xf,
+  0x28,0xcc,0xa0,0x45,0xec,0xb2,0x3a,0x1e,0x75,0xd0,0x88,0xca,0xf8,0x22,0x2e,0x8b,
+  0x9f,0xf7,0x37,0xa6,0x49,0xaa,0x1c,0x59,0xa2,0xff,0x7f,0x1e,0xb2,0x24,0x1c,0x9f,
+  0x1c,0xcd,0x8f,0x46,0xbf,0xa9,0x17,0x2b,0x70,0x35,0x72,0x45,0xef,0x1c,0x76,0x5d,
+  0x54,0x85,0xb1,0xeb,0xf2,0x41,0x17,0xbc,0x1b,0xa4,0x10,0x84,0x35,0x20,0x85,0xee,
+  0x7,0x3d,0x9c,0x82,0x90,0x32,0x32,0x5e,0xaf,0x3a,0xac,0x41,0x61,0xf4,0x97,0xb0,
+  0xc1,0x11,0xad,0x5a,0x38,0x3a,0xad,0xd8,0xd4,0x66,0xab,0x89,0x8e,0xba,0xd,0x8b,
+  0x84,0xf0,0x93,0x32,0x11,0x84,0xd9,0x41,0xf7,0x13,0x83,0x1a,0x7a,0x24,0x48,0x11,
+  0xd3,0x85,0x7e,0xff,0x72,0xff,0xb1,0x39,0xa3,0x8d,0xf5,0xcc,0xc8,0x74,0xa2,0x8d,
+  0x3,0x78,0x6f,0x1f,0x52,0x67,0x26,0xb2,0x66,0x34,0xee,0x34,0x22,0x34,0xa8,0x30,
+  0xa3,0xe1,0x26,0x1b,0xd,0x8b,0xb9,0xb8,0xc4,0x60,0x5c,0x30,0xeb,0x3b,0x5c,0x2f,
+  0x8a,0xa6,0xe3,0xb4,0xe4,0x80,0xff,0x8e,0x43,0xca,0x24,0x66,0x4,0x2f,0xd6,0x81,
+  0xea,0xdd,0x3,0x67,0xc7,0x3b,0x10,0x35,0x6a,0xcc,0x71,0x75,0x3,0x42,0x8f,0x9d,
+  0xa3,0xb0,0x2e,0x6d,0xe4,0xe0,0x28,0x4f,0xe4,0xbc,0x20,0xfc,0x36,0x23,0x94,0xcf,
+  0x93,0x33,0x10,0xb7,0x89,0xc9,0x78,0xbf,0x11,0x89,0x4f,0x6f,0x19,0x2a,0x4c,0x54,
+  0x50,0x9d,0x58,0xf0,0x16,0x7b,0x76,0xb6,0x3e,0x6a,0x6d,0x5f,0xda,0xa3,0x74,0x1e,
+  0xa3,0xc7,0x6d,0x4c,0x71,0x18,0x2d,0xff,0x5d,0x75,0x97,0x23,0x87,0x8f,0xed,0x4d,
+  0xd0,0xcf,0x25,0x55,0x8a,0x2c,0xed,0x54,0xdd,0x9a,0xf7,0x9f,0xe6,0xd0,0xd2,0x49,
+  0x42,0x4d,0xb6,0xa8,0xee,0x86,0x72,0xc2,0x43,0xd5,0x7c,0xde,0xbb,0x72,0xfd,0xc4,
+  0xdc,0xb1,0xd6,0xc6,0xaf,0xde,0xfa,0x97,0xad,0x3b,0xe7,0x5b,0x9b,0xe7,0x5a,0x1b,
+  0x2b,0xad,0x8d,0x9f,0x3b,0xef,0xfd,0xd9,0x5e,0x39,0xdb,0xbe,0xb2,0x79,0xef,0xee,
+  0xea,0x3c,0x47,0x1c,0x6b,0x73,0xc8,0xa8,0x11,0x8a,0xef,0xdd,0x3d,0xff,0x64,0xfb,
+  0xc6,0x5a,0xf,0xb2,0xf3,0xd6,0x76,0xfb,0xca,0x79,0xa9,0xe4,0xdd,0xfc,0xa6,0xbd,
+  0x72,0xad,0xfd,0xd5,0xad,0xf6,0x27,0x77,0x40,0xaf,0x14,0x50,0xb8,0x58,0x3,0x2a,
+  0x62,0x17,0x34,0xef,0xdd,0xfd,0xc0,0x5b,0x3d,0xe7,0xad,0xfe,0xd2,0xf9,0xe4,0x7a,
+  0x6b,0xf3,0x62,0x77,0xfd,0xaf,0xce,0xf6,0xba,0x8d,0x28,0xb6,0x5e,0x26,0x78,0xb1,
+  0xf3,0xe5,0xdb,0xad,0x8d,0xb,0x3b,0x2b,0x6b,0xed,0xcf,0x2f,0x7a,0x9b,0x3f,0x5,
+  0xd3,0x17,0x83,0xc3,0x2,0xb5,0x60,0x4d,0x43,0x76,0xce,0x45,0x5a,0x81,0x24,0xaf,
+  0xf4,0x3d,0xe6,0xbf,0x4b,0xf,0x26,0x27,0xd7,0xda,0x78,0x1f,0x86,0xcc,0x1a,0xa0,
+  0xfb,0xdd,0x2f,0x72,0x6,0xad,0x8d,0xcd,0x82,0x98,0xda,0x85,0x3f,0xbc,0xf5,0xf,
+  0xbc,0x77,0xae,0x4b,0x44,0xdf,0xb4,0x74,0x40,0x82,0x4d,0x14,0xd5,0xd3,0xf3,0xa,
+  0x25,0xf1,0xea,0x49,0x5d,0x21,0x10,0xcb,0x2a,0xe6,0x82,0x6a,0xc1,0xec,0xd2,0x10,
+  0x66,0x23,0x58,0x66,0x40,0x95,0x42,0xbc,0x2f,0xc2,0x93,0xe5,0x27,0x55,0x1e,0xc0,
+  0xe6,0x7d,0x3b,0x60,0x22,0xea,0x80,0x1e,0x68,0x74,0x1f,0xc0,0x90,0xf,0xd4,0x5,
+  0x13,0xd9,0x2e,0x90,0x8f,0xaf,0xfa,0xa4,0xe,0x99,0x1d,0xdd,0xed,0x8,0xf1,0xf3,
+  0x5e,0x7a,0x98,0xd4,0xb6,0x47,0x48,0x7c,0xeb,0x13,0xb6,0x9e,0x26,0x2e,0x29,0x8b,
+  0xad,0x4e,0x3c,0x31,0x2d,0xc5,0xa2,0x23,0x63,0xd5,0xff,0xfd,0x2c,0x41,0x16,0xab,
+  0xaa,0x12,0x91,0x9f,0xd0,0x64,0x77,0xbc,0xb3,0x37,0x4e,0x5,0x59,0x6e,0x22,0x51,
+  0x29,0xf3,0x65,0x30,0x8b,0x31,0x99,0xb3,0x64,0xc2,0x86,0x44,0xeb,0xff,0xdf,0xab,
+  0xe5,0xb5,0x44,0x9a,0x6a,0xf6,0xa1,0xbd,0xa4,0x2c,0x1f,0x14,0x60,0x45,0xda,0x7d,
+  0x91,0x1d,0x6a,0x70,0xe6,0x27,0xa4,0x81,0x15,0x64,0x7f,0xa1,0xa0,0xee,0xf,0xcb,
+  0xc6,0xbe,0x42,0xcc,0x55,0x42,0x54,0x59,0x5b,0x88,0x28,0x8d,0xc0,0xb3,0xee,0x8d,
+  0x1f,0xbb,0xb7,0x7e,0xf2,0xd6,0x6e,0x7b,0xb7,0x7f,0xef,0x7c,0xb1,0xe5,0x6d,0x5f,
+  0x6,0xd2,0xc2,0x6,0xd3,0xdb,0x5c,0xf3,0x7e,0x3b,0xd7,0x7d,0xf7,0x67,0xef,0x3d,
+  0x58,0xbb,0x2b,0xde,0xbb,0x9b,0xb9,0xb4,0x8d,0x64,0xfa,0x9e,0x9c,0xca,0xc0,0x84,
+  0xf9,0x39,0xd8,0x14,0xe9,0x82,0xe4,0x69,0x68,0x90,0xed,0xa3,0x5b,0xd1,0x34,0x28,
+  0x2c,0x2c,0xf0,0x87,0x9c,0x11,0x9b,0x9,0xab,0xe8,0x97,0x98,0xb0,0xc0,0xa4,0x3a,
+  0xd2,0x26,0x4,0xf5,0x93,0x9e,0x5c,0x4e,0xfa,0xad,0x5f,0x2d,0x14,0xce,0xf3,0x63,
+  0x8,0x15,0x61,0x81,0xd4,0xb1,0x13,0xaf,0x21,0x11,0x83,0x4a,0xdb,0xd9,0xf4,0xf5,
+  0xd7,0xd2,0x23,0xfa,0xde,0x17,0x7d,0x3b,0xdf,0xae,0x77,0xd7,0x7f,0x90,0x4,0xf5,
+  0x3e,0xfc,0xec,0x99,0x87,0x8c,0xa4,0x2f,0xb1,0x45,0x95,0x73,0xc2,0x6c,0x1b,0xb,
+  0xea,0x83,0x9a,0xe5,0x64,0x3a,0x68,0x42,0x8a,0xb3,0xd,0xce,0xe1,0xfc,0xac,0x98,
+  0x9e,0x10,0x3f,0x5f,0xc3,0x4,0xb0,0x35,0xcb,0xa9,0x1a,0x22,0x42,0x1c,0x32,0x63,
+  0x7f,0x41,0x8d,0x11,0x81,0xb,0x31,0x5,0x5d,0x11,0x59,0x21,0x61,0x45,0xca,0x32,
+  0x52,0x1b,0x32,0x48,0xb8,0xb,0x15,0xbb,0x62,0x6c,0x6a,0xcf,0xa4,0xce,0xbf,0xda,
+  0x30,0x3e,0x84,0xaf,0x3,0x8c,0xf5,0xd6,0x3e,0x6d,0xff,0xb9,0xaa,0xe0,0xa9,0x10,
+  0x46,0x3,0xb3,0xb1,0x6c,0xa0,0x7,0x9,0x40,0x7b,0x5a,0x66,0x0,0x85,0xa2,0xda,
+  0x5c,0xba,0x35,0xc5,0x20,0x21,0xae,0xd8,0x10,0xd0,0xaa,0x74,0xc0,0xbf,0x8a,0xe4,
+  0x29,0xd8,0x0,0x4b,0xd4,0xc3,0x14,0xca,0xcc,0xba,0x28,0x24,0x12,0xca,0xc,0xc7,
+  0x9,0x71,0x30,0x32,0x17,0x6a,0xe2,0xaf,0xee,0x27,0xd6,0x64,0x15,0x89,0x4a,0x3e,
+  0x1f,0x41,0x2f,0x22,0x92,0x2a,0x39,0xc3,0xe4,0xfe,0xd0,0xd9,0x1a,0xcb,0x4a,0x5e,
+  0x65,0xfc,0x8c,0x31,0xae,0x24,0x48,0x2d,0x4f,0x52,0xaa,0xa,0xe8,0x36,0xca,0xa5,
+  0xd4,0x49,0x52,0x79,0x76,0x15,0xf2,0x2,0x6e,0xba,0x3a,0xa6,0x8,0x56,0x86,0x99,
+  0xd9,0xcf,0xe8,0x73,0xae,0x81,0x6c,0x5c,0x92,0x11,0x57,0x6,0x43,0xbd,0xd4,0xd2,
+  0x6,0x13,0x2f,0x59,0xc,0xaf,0x36,0x60,0x10,0xf1,0x6c,0x61,0x9e,0x31,0x0,0xb2,
+  0xed,0x39,0x66,0x62,0x4b,0x77,0x90,0x89,0x9c,0x9,0x30,0xe,0xa5,0x50,0xc1,0xd0,
+  0x38,0x6e,0x12,0x70,0x43,0x41,0xfb,0x46,0x1,0x4d,0x8d,0x2,0xda,0x3f,0xa,0x68,
+  0x7a,0x14,0xd0,0x81,0x51,0x40,0x7,0x87,0x80,0x6c,0x71,0x6f,0x38,0xc4,0xe,0x2c,
+  0x84,0xe6,0x10,0x4c,0xa5,0x81,0xad,0x63,0xf8,0x34,0xb6,0x9e,0x9e,0x9e,0x9e,0x1e,
+  0x80,0x23,0xf5,0xc6,0xd2,0x70,0x48,0x73,0x8,0x4,0xd3,0x2a,0x9c,0xe7,0x17,0x70,
+  0x1d,0x8e,0x69,0x88,0x37,0x1c,0x3c,0x4,0x6f,0x91,0xa,0x2f,0x11,0x8b,0x71,0x9f,
+  0x9e,0x80,0x9f,0xc7,0xd4,0x65,0xce,0x6b,0x87,0x55,0xf4,0x8b,0x69,0x96,0x19,0xab,
+  0x1f,0x12,0xb7,0x51,0xa1,0xc6,0x30,0xc6,0xc6,0xd6,0x61,0x91,0x51,0x8a,0xd,0x71,
+  0xbf,0x9d,0x3e,0x44,0x86,0x27,0xc8,0x7e,0xb2,0xc9,0xce,0x1b,0x8c,0x96,0x2c,0xd4,
+  0xf4,0xcf,0xb1,0x33,0x3,0xb2,0x1c,0xa9,0x8c,0x61,0x6a,0xee,0x1d,0x80,0x80,0x57,
+  0x82,0xd5,0x33,0xd2,0x98,0xa7,0x89,0x89,0x99,0xcc,0x21,0x61,0xce,0xcc,0x40,0xe,
+  0x48,0xbb,0xe1,0x1d,0x5a,0xec,0xa,0x27,0x3b,0x9f,0x26,0xd3,0x5b,0xd4,0xb6,0xff,
+  0xa3,0xff,0x33,0x3b,0xbb,0x45,0x26,0x1e,0xef,0xec,0xdd,0x4b,0xc2,0x1e,0x55,0x5b,
+  0xa4,0xe6,0x51,0x6a,0xe2,0xa5,0xd4,0xd,0x45,0xc6,0x61,0x59,0x48,0x50,0x15,0xf7,
+  0x1d,0x9c,0x4a,0xe8,0xa8,0x8f,0xdd,0x42,0xf2,0x79,0xef,0xe2,0xd5,0xce,0xf9,0xd5,
+  0xd4,0xa1,0x21,0x7e,0x6e,0xf,0xa0,0x37,0xd7,0xbc,0x3b,0x97,0x3b,0xd7,0xb6,0xe0,
+  0x30,0xd8,0xfd,0xed,0xad,0xf6,0xe5,0x5b,0xad,0xed,0xb,0x9d,0xed,0xf5,0x24,0x2e,
+  0x50,0x7f,0x62,0x3a,0x59,0x7e,0xfb,0x5d,0x2a,0xf3,0xed,0x6f,0xbf,0x7,0x7b,0xed,
+  0xcf,0xff,0xea,0xfc,0xb0,0xa9,0xd0,0x2b,0x8c,0x4f,0xa4,0x4e,0xe,0xf9,0x7c,0xe7,
+  0xec,0x8d,0x6c,0x8d,0x78,0x1b,0x97,0xdf,0x53,0x4e,0xb9,0xb,0xce,0x58,0xee,0x48,
+  0x13,0x7c,0xed,0x3b,0x13,0xb6,0x34,0xe,0xae,0x33,0xa0,0x9d,0x21,0x3f,0x4,0x69,
+  0xf3,0x4d,0x17,0x48,0x91,0x4b,0xd0,0xa0,0x62,0xa1,0x2a,0x14,0xa0,0x13,0x5c,0xf,
+  0x62,0xfb,0xa6,0x78,0x3e,0xec,0xc0,0xf1,0xc0,0x82,0x55,0x2b,0x1b,0x8f,0x90,0xe4,
+  0xdd,0xa6,0x6b,0xc8,0x6f,0x1d,0x80,0x85,0x55,0xb,0x7b,0x1,0xff,0x7b,0x92,0x2e,
+  0x9b,0xdd,0x57,0xc2,0x38,0xbf,0x1a,0xd7,0x9a,0x83,0xcd,0x47,0x48,0xa1,0x4,0xeb,
+  0xf2,0x8f,0x3f,0xaa,0x3f,0x8f,0xea,0xcf,0x7f,0xad,0x3f,0xcb,0x8f,0xe7,0xc3,0xc7,
+  0x68,0xe,0x93,0xcf,0xbd,0x22,0xe1,0x5f,0x6c,0x24,0x2f,0xfb,0x5c,0xdb,0x42,0x6e,
+  0x6d,0xde,0x27,0x70,0xe2,0xb4,0x4f,0xc4,0xf1,0xf0,0xb4,0xb8,0x89,0x98,0x88,0x31,
+  0x8b,0xd1,0x5,0x87,0x54,0xab,0xd8,0x51,0x30,0x33,0x6a,0x4e,0x7e,0x5e,0xd2,0x89,
+  0xc8,0xc9,0x89,0xd3,0xce,0x50,0x25,0xf9,0xc1,0x9,0xe0,0xb9,0xc4,0x56,0x3c,0x9d,
+  0xe5,0x7b,0xf7,0xf8,0xc9,0x54,0xdf,0x83,0xfa,0xb7,0xe0,0xc2,0x56,0xea,0x2,0x76,
+  0x39,0xe1,0x22,0xf5,0x17,0xb1,0xf4,0xfc,0xfa,0xfd,0x99,0x5f,0xc6,0xe6,0x23,0x4a,
+  0x62,0xb2,0xb9,0xa8,0x3,0x7d,0x2b,0x83,0xbd,0xa7,0xf8,0x94,0x11,0x9f,0xb1,0x88,
+  0x35,0xfc,0xfb,0x7,0x26,0x63,0x63,0x11,
     // C:/Users/admin/Desktop/ZJPro/ZjQt/Qt/sound/lightLPlaySound.wav
   0x0,0x15,0x10,0x2c,
   0x52,
@@ -427980,9 +427985,9 @@ static const unsigned char qt_resource_data[] = {
   0x6c,0x69,0x63,0x6b,0x65,0x64,0x28,0x29,0xd,0xa,0x20,0x20,0x20,0x20,0x7d,0xd,
   0xa,0x7d,0xd,0xa,
     // C:/Users/admin/Desktop/ZJPro/ZjQt/Qt/components/LoginPage.qml
-  0x0,0x0,0x8,0x59,
+  0x0,0x0,0x8,0x75,
   0x0,
-  0x0,0x49,0xe1,0x78,0x9c,0xed,0x5b,0x4f,0x6f,0xdb,0x36,0x14,0xbf,0x7,0xc8,0x77,
+  0x0,0x4a,0xac,0x78,0x9c,0xed,0x5b,0x4f,0x6f,0xdb,0x36,0x14,0xbf,0x7,0xc8,0x77,
   0xd0,0xbc,0x43,0x92,0x2e,0x91,0xed,0xa4,0x69,0x17,0x77,0xd9,0x90,0xb8,0x4d,0x9b,
   0x35,0xe9,0xd2,0x26,0x6d,0xb7,0x75,0xc5,0x40,0x5b,0xb4,0xc3,0x45,0x16,0x55,0x8a,
   0x4a,0x9a,0x16,0x39,0xed,0x54,0xa0,0xa7,0x1,0x3d,0xf4,0xb0,0xcb,0x3e,0x40,0x7,
@@ -428114,8 +428119,10 @@ static const unsigned char qt_resource_data[] = {
   0x58,0x44,0xf7,0x31,0x7,0xec,0xd1,0x51,0x7d,0xcd,0x94,0x7c,0xdd,0x70,0xd6,0xcf,
   0xbf,0xfa,0x5b,0x93,0x1b,0x7e,0x52,0x24,0x20,0xa,0x48,0xd2,0xf,0xd7,0xc1,0x4b,
   0xf0,0x46,0xde,0x37,0xf,0xfd,0x17,0xae,0x4f,0x5f,0xbe,0x36,0xde,0xbe,0x79,0x21,
-  0x81,0x5,0xb1,0xf0,0x3f,0xe6,0xc7,0x52,0x31,0xff,0xe8,0xff,0x1d,0x94,0x4c,0x4f,
-  0x89,0xbf,0xff,0x1,0xc5,0x37,0x9d,0x54,
+  0x81,0x5,0xc3,0xf0,0x9f,0xb3,0xc6,0xf4,0xb5,0x23,0x7f,0x68,0x75,0xf6,0xa1,0x18,
+  0x46,0x2,0xff,0x2,0x37,0xa9,0x8b,0x9d,0xd9,0x8a,0x85,0xbd,0x3,0xe1,0x4,0xb2,
+  0xaf,0xab,0x8a,0xf6,0x9a,0xf5,0xed,0xd4,0xdf,0x41,0xc9,0xf4,0x94,0xf8,0xfb,0x1f,
+  0x9,0x9c,0xbc,0xc2,
     // C:/Users/admin/Desktop/ZJPro/ZjQt/Qt/components/CustomLoading.qml
   0x0,0x0,0x3,0x9e,
   0x0,
@@ -1024844,444 +1024851,444 @@ static const unsigned char qt_resource_struct[] = {
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
   // :/main.qml
   0x0,0x0,0x0,0x2c,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
-0x0,0x0,0x1,0x8f,0xa9,0x48,0x87,0x7b,
+0x0,0x0,0x1,0x90,0xa1,0x46,0x31,0x31,
   // :/components/font
   0x0,0x0,0x12,0xde,0x0,0x2,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x12,
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
   // :/components/LoginPage.qml
-  0x0,0x0,0x11,0xf4,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x61,0x94,
-0x0,0x0,0x1,0x8f,0xa3,0xfe,0xc,0xb8,
+  0x0,0x0,0x11,0xf4,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x61,0xec,
+0x0,0x0,0x1,0x90,0xa1,0xb,0xaf,0x32,
   // :/components/backend.js
-  0x0,0x0,0x12,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x6d,0x93,
+  0x0,0x0,0x12,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x6e,0x7,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0x9b,
   // :/components/PanelWindow.qml
-  0x0,0x0,0x12,0xec,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0xa2,0x92,
+  0x0,0x0,0x12,0xec,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0xa3,0x6,
 0x0,0x0,0x1,0x90,0x72,0x3,0x7a,0x3d,
   // :/components/CustomLoading.qml
-  0x0,0x0,0x12,0x14,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x69,0xf1,
+  0x0,0x0,0x12,0x14,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x6a,0x65,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0x99,
   // :/components/CarPage.qml
-  0x0,0x0,0x12,0x7e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x77,0x79,
+  0x0,0x0,0x12,0x7e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x77,0xed,
 0x0,0x0,0x1,0x8f,0xfb,0xf8,0x93,0x2a,
   // :/components/SplashScreen.qml
-  0x0,0x0,0x13,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0xd2,0xd5,
+  0x0,0x0,0x13,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0xd3,0x49,
 0x0,0x0,0x1,0x8f,0xa4,0x79,0x2f,0xac,
   // :/components/BusyIndicator.qml
-  0x0,0x0,0x12,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x71,0x30,
+  0x0,0x0,0x12,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x71,0xa4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0x98,
   // :/components/MainWindow.qml
-  0x0,0x0,0x12,0xbc,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x88,0x6b,
+  0x0,0x0,0x12,0xbc,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x88,0xdf,
 0x0,0x0,0x1,0x8f,0x9e,0xee,0xb6,0xb1,
   // :/components/CButton.qml
-  0x0,0x0,0x11,0xd8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x5e,0x1b,
+  0x0,0x0,0x11,0xd8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x5e,0x73,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0x98,
   // :/components/WorkPage.qml
-  0x0,0x0,0x13,0x10,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0xcc,0x4a,
+  0x0,0x0,0x13,0x10,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0xcc,0xbe,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0x9b,
   // :/components/SubWindow.qml
-  0x0,0x0,0x13,0x54,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0xd9,0x39,
+  0x0,0x0,0x13,0x54,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0xd9,0xad,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0x9a,
   // :/components/DetailPage.qml
-  0x0,0x0,0x12,0x9a,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x7c,0x32,
+  0x0,0x0,0x12,0x9a,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x68,0x7c,0xa6,
 0x0,0x0,0x1,0x90,0x80,0x74,0x9f,0x7,
   // :/components/font/DS-DIGIB.TTF
-  0x0,0x0,0x13,0xa8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6b,0x6b,0xdc,
+  0x0,0x0,0x13,0xa8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6b,0x6c,0x50,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0xee,
   // :/components/font/fontawesome-webfont.ttf
-  0x0,0x0,0x13,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0xe5,0x2c,
+  0x0,0x0,0x13,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0xe5,0xa0,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0xf0,
   // :/components/font/Alibaba-PuHuiTi-Bold.ttf
-  0x0,0x0,0x13,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6b,0xcd,0x20,
+  0x0,0x0,0x13,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6b,0xcd,0x94,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x97,0xee,
   // :/images/right_light1.png
-  0x0,0x0,0xe,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xd2,0xfe,
+  0x0,0x0,0xe,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xd3,0x56,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/backlight1.png
-  0x0,0x0,0xd,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x52,0xd5,
+  0x0,0x0,0xd,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x53,0x2d,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xef,
   // :/images/right_r_yellow.png
-  0x0,0x0,0x7,0x16,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0xfc,0xb7,
+  0x0,0x0,0x7,0x16,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0xfd,0xf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/buzzer.png
-  0x0,0x0,0x2,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xbd,0x4a,
+  0x0,0x0,0x2,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xbd,0xa2,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/circle_green1.png
-  0x0,0x0,0xa,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xbc,0x58,
+  0x0,0x0,0xa,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xbc,0xb0,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf5,
   // :/images/boomAngle.png
-  0x0,0x0,0xb,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xba,0x57,
+  0x0,0x0,0xb,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xba,0xaf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/gripperHeight.png
-  0x0,0x0,0xc,0xc2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x4b,0x2d,
+  0x0,0x0,0xc,0xc2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x4b,0x85,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/middle_camera1.png
-  0x0,0x0,0x7,0xf8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0xf2,0xaf,
+  0x0,0x0,0x7,0xf8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0xf3,0x7,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfc,
   // :/images/gear_21.png
-  0x0,0x0,0x10,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x59,0x7f,
+  0x0,0x0,0x10,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x59,0xd7,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/frontToggle.png
-  0x0,0x0,0x7,0x66,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0x58,0xa6,
+  0x0,0x0,0x7,0x66,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0x58,0xfe,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf6,
   // :/images/gear_11.png
-  0x0,0x0,0x6,0x98,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x65,0xef,
+  0x0,0x0,0x6,0x98,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x66,0x47,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/radar_car_G2.png
-  0x0,0x0,0x5,0x7a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x88,0x67,
+  0x0,0x0,0x5,0x7a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x88,0xbf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/radar_car_G4.png
-  0x0,0x0,0x10,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xd3,0x82,
+  0x0,0x0,0x10,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xd3,0xda,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/radar_car_G3.png
-  0x0,0x0,0x11,0x70,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x19,0xe2,
+  0x0,0x0,0x11,0x70,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x1a,0x3a,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/radar_car_G5.png
-  0x0,0x0,0x4,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4e,0x96,0xf6,
+  0x0,0x0,0x4,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4e,0x97,0x4e,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/radar_car_G1.png
-  0x0,0x0,0xb,0xbc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xa7,0x6c,
+  0x0,0x0,0xb,0xbc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xa7,0xc4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/radar_car_G6.png
-  0x0,0x0,0x4,0xb4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4e,0xa9,0xbf,
+  0x0,0x0,0x4,0xb4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4e,0xaa,0x17,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/radar_car_G8.png
-  0x0,0x0,0x1,0xa6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xf6,0xf8,
+  0x0,0x0,0x1,0xa6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xf7,0x50,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xff,
   // :/images/radar_car_G7.png
-  0x0,0x0,0x1,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x2c,0x8c,
+  0x0,0x0,0x1,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x2c,0xe4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xff,
   // :/images/right_f_red.png
-  0x0,0x0,0xc,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xbd,0xc1,
+  0x0,0x0,0xc,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xbe,0x19,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/right_r_red.png
-  0x0,0x0,0x4,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x28,0x4d,
+  0x0,0x0,0x4,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x28,0xa5,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/front_red.png
-  0x0,0x0,0x11,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0xf7,0xf2,
+  0x0,0x0,0x11,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0xf8,0x4a,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf6,
   // :/images/faulty.png
-  0x0,0x0,0x6,0xdc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x78,0x89,
+  0x0,0x0,0x6,0xdc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x78,0xe1,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf6,
   // :/images/frontlight1.png
-  0x0,0x0,0xe,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xcb,0xe8,
+  0x0,0x0,0xe,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xcc,0x40,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/right_camera.png
-  0x0,0x0,0x9,0xd0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xa0,0xe3,
+  0x0,0x0,0x9,0xd0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xa1,0x3b,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x3,
   // :/images/left_light1.png
-  0x0,0x0,0x3,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4c,0xeb,0x6f,
+  0x0,0x0,0x3,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4c,0xeb,0xc7,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/images/sideV_left.png
-  0x0,0x0,0x5,0xa0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x9b,0xee,
+  0x0,0x0,0x5,0xa0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x9c,0x46,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x6,
   // :/images/banner.png
-  0x0,0x0,0xd,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0x79,0xd8,
+  0x0,0x0,0xd,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0x7a,0x30,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf0,
   // :/images/panel_camera.png
-  0x0,0x0,0x6,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x45,0xbc,
+  0x0,0x0,0x6,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x46,0x14,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfd,
   // :/images/interlock.png
-  0x0,0x0,0x8,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x57,0x62,0x50,
+  0x0,0x0,0x8,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x57,0x62,0xa8,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/radar_car_R2.png
-  0x0,0x0,0xd,0xa6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0x66,0xb2,
+  0x0,0x0,0xd,0xa6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0x67,0xa,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/radar_car_R4.png
-  0x0,0x0,0x3,0xb6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x2,0xa0,
+  0x0,0x0,0x3,0xb6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x2,0xf8,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/radar_car_R3.png
-  0x0,0x0,0xc,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x18,0xa7,
+  0x0,0x0,0xc,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x18,0xff,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/car11.png
-  0x0,0x0,0x11,0x14,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x8a,0xe4,
+  0x0,0x0,0x11,0x14,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x8b,0x3c,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf3,
   // :/images/radar_car_R5.png
-  0x0,0x0,0xa,0xe0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x3f,0x8c,
+  0x0,0x0,0xa,0xe0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x3f,0xe4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/radar_car_R0.png
-  0x0,0x0,0x7,0x40,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x53,0xe,0x39,
+  0x0,0x0,0x7,0x40,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x53,0xe,0x91,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xff,
   // :/images/radar_car_R1.png
-  0x0,0x0,0x3,0xdc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x15,0x71,
+  0x0,0x0,0x3,0xdc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x15,0xc9,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xff,
   // :/images/radar_car_R6.png
-  0x0,0x0,0xa,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xd4,0x5f,
+  0x0,0x0,0xa,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xd4,0xb7,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/radar_car_R8.png
-  0x0,0x0,0xa,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xc1,0x66,
+  0x0,0x0,0xa,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xc1,0xbe,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/radar_car_R7.png
-  0x0,0x0,0x7,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0xda,0xf1,
+  0x0,0x0,0x7,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0xdb,0x49,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x0,
   // :/images/safetyvalves.png
-  0x0,0x0,0x1,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xb8,0x7b,
+  0x0,0x0,0x1,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xb8,0xd3,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/backToggle.png
-  0x0,0x0,0xf,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xb9,0x88,
+  0x0,0x0,0xf,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xb9,0xe0,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xef,
   // :/images/backward.png
-  0x0,0x0,0x8,0x6c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x71,0x36,
+  0x0,0x0,0x8,0x6c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x71,0x8e,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf0,
   // :/images/gear_d1.png
-  0x0,0x0,0xa,0x36,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xbd,0x42,
+  0x0,0x0,0xa,0x36,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xbd,0x9a,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/bottom_red.png
-  0x0,0x0,0x10,0xd0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x71,0xd8,
+  0x0,0x0,0x10,0xd0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x72,0x30,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/radar_car_Y2.png
-  0x0,0x0,0xe,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xe3,0xcf,
+  0x0,0x0,0xe,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xe4,0x27,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x1,
   // :/images/radar_car_Y4.png
-  0x0,0x0,0x10,0xaa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x5e,0x9e,
+  0x0,0x0,0x10,0xaa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x5e,0xf6,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x2,
   // :/images/radar_car_Y3.png
-  0x0,0x0,0xf,0x24,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xf6,0xb8,
+  0x0,0x0,0xf,0x24,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xf7,0x10,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x1,
   // :/images/radar_car_Y5.png
-  0x0,0x0,0xc,0x4e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x5,0xf1,
+  0x0,0x0,0xc,0x4e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x6,0x49,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x2,
   // :/images/radar_car_Y0.png
-  0x0,0x0,0xe,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xe3,0x4c,
+  0x0,0x0,0xe,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xe3,0xa4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x1,
   // :/images/radar_car_Y1.png
-  0x0,0x0,0x2,0xd8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xaa,0x67,
+  0x0,0x0,0x2,0xd8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xaa,0xbf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x1,
   // :/images/radar_car_Y6.png
-  0x0,0x0,0x8,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x2e,0xa4,
+  0x0,0x0,0x8,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x2e,0xfc,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x2,
   // :/images/radar_car_Y8.png
-  0x0,0x0,0xd,0xe6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xbf,0xcf,
+  0x0,0x0,0xd,0xe6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xc0,0x27,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x2,
   // :/images/radar_car_Y7.png
-  0x0,0x0,0x1,0x32,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xa5,0x2e,
+  0x0,0x0,0x1,0x32,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xa5,0x86,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x2,
   // :/images/right_light.png
-  0x0,0x0,0xc,0xea,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x4d,0xea,
+  0x0,0x0,0xc,0xea,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x4e,0x42,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/pumpPressure.png
-  0x0,0x0,0x7,0xd2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0xed,0xec,
+  0x0,0x0,0x7,0xd2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0xee,0x44,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfd,
   // :/images/carSpeed.png
-  0x0,0x0,0xd,0x88,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0xcf,0x22,
+  0x0,0x0,0xd,0x88,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0xcf,0x7a,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf4,
   // :/images/bg.png
-  0x0,0x0,0x8,0xec,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0xa8,0x70,
+  0x0,0x0,0x8,0xec,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0xa8,0xc8,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf0,
   // :/images/gear_r1.png
-  0x0,0x0,0x1,0x16,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xa0,0x30,
+  0x0,0x0,0x1,0x16,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xa0,0x88,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/keyboard.png
-  0x0,0x0,0xb,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x71,0x17,
+  0x0,0x0,0xb,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x71,0x6f,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf9,
   // :/images/wiper.png
-  0x0,0x0,0x9,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xb6,0x1c,
+  0x0,0x0,0x9,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xb6,0x74,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x8,
   // :/images/gear_n1.png
-  0x0,0x0,0xf,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xa2,0xf5,
+  0x0,0x0,0xf,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xa3,0x4d,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/sideUp_right1.png
-  0x0,0x0,0xc,0x26,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xcb,0xb2,
+  0x0,0x0,0xc,0x26,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5b,0xcc,0xa,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x5,
   // :/images/right_f_yellow.png
-  0x0,0x0,0x9,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x67,0xcd,
+  0x0,0x0,0x9,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x68,0x25,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/sideUp_right2.png
-  0x0,0x0,0x1,0x7e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xbb,0xdf,
+  0x0,0x0,0x1,0x7e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0xbc,0x37,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x6,
   // :/images/waterTemperature.png
-  0x0,0x0,0x2,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x7b,0x7c,
+  0x0,0x0,0x2,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x7b,0xd4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x8,
   // :/images/front_green.png
-  0x0,0x0,0x2,0x40,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x65,0x2f,
+  0x0,0x0,0x2,0x40,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x65,0x87,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf6,
   // :/images/engineSpeed.png
-  0x0,0x0,0x4,0xda,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4e,0xbd,0x26,
+  0x0,0x0,0x4,0xda,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4e,0xbd,0x7e,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf6,
   // :/images/fuelLevel.png
-  0x0,0x0,0x5,0x3e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x7c,0x79,
+  0x0,0x0,0x5,0x3e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x7c,0xd1,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/left_camera.png
-  0x0,0x0,0x11,0x4c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x4,0xfc,
+  0x0,0x0,0x11,0x4c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x5,0x54,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf9,
   // :/images/middle_camera.png
-  0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0x66,0xc9,
+  0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x48,0x67,0x21,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfc,
   // :/images/gear_2.png
-  0x0,0x0,0xe,0x54,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xde,0x55,
+  0x0,0x0,0xe,0x54,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xde,0xad,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/gear_4.png
-  0x0,0x0,0x4,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x4e,0xf6,
+  0x0,0x0,0x4,0xfe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x4f,0x4e,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/gear_3.png
-  0x0,0x0,0xa,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x20,0x96,
+  0x0,0x0,0xa,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x20,0xee,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/sideV_left1.png
-  0x0,0x0,0x8,0x48,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x41,0xa3,
+  0x0,0x0,0x8,0x48,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x41,0xfb,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x6,
   // :/images/gear_1.png
-  0x0,0x0,0x6,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x3b,0x37,
+  0x0,0x0,0x6,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x3b,0x8f,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/front_yellow.png
-  0x0,0x0,0x5,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x6c,0x3f,
+  0x0,0x0,0x5,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x6c,0x97,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf6,
   // :/images/car1.png
-  0x0,0x0,0x10,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xe6,0x4a,
+  0x0,0x0,0x10,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xe6,0xa2,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf3,
   // :/images/car2.png
-  0x0,0x0,0xd,0x30,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x59,0x51,
+  0x0,0x0,0xd,0x30,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x59,0xa9,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf4,
   // :/images/car3.png
-  0x0,0x0,0x6,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0xd9,0x4d,
+  0x0,0x0,0x6,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0xd9,0xa5,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf4,
   // :/images/gear_d.png
-  0x0,0x0,0xd,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0xca,0xff,
+  0x0,0x0,0xd,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0xcb,0x57,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/gear_r.png
-  0x0,0x0,0x3,0x9c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4c,0xfd,0xab,
+  0x0,0x0,0x3,0x9c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4c,0xfe,0x3,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/gear_n.png
-  0x0,0x0,0x10,0x38,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xce,0xe5,
+  0x0,0x0,0x10,0x38,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xcf,0x3d,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/sideUp_right.png
-  0x0,0x0,0x11,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x38,0xc,
+  0x0,0x0,0x11,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x38,0x64,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x5,
   // :/images/sideV_right.png
-  0x0,0x0,0x2,0x1c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x3f,0x87,
+  0x0,0x0,0x2,0x1c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x3f,0xdf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x6,
   // :/images/sideUp_left1.png
-  0x0,0x0,0x8,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x80,0x3a,
+  0x0,0x0,0x8,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x80,0x92,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x5,
   // :/images/radar_car.png
-  0x0,0x0,0x4,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x4c,0x40,
+  0x0,0x0,0x4,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x4c,0x98,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfe,
   // :/images/left_f_yellow.png
-  0x0,0x0,0xe,0xd6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xd2,0x6c,
+  0x0,0x0,0xe,0xd6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0xd2,0xc4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/images/sideDown_right.png
-  0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xa,0x0,
+  0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xa,0x58,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x5,
   // :/images/oilTemperature.png
-  0x0,0x0,0xb,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x64,0xaa,
+  0x0,0x0,0xb,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x65,0x2,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfd,
   // :/images/pointer.png
-  0x0,0x0,0x3,0x80,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4c,0xf0,0x73,
+  0x0,0x0,0x3,0x80,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4c,0xf0,0xcb,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfd,
   // :/images/left_light.png
-  0x0,0x0,0x4,0x4c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x47,0x51,
+  0x0,0x0,0x4,0x4c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x47,0xa9,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/images/bg4k.png
-  0x0,0x0,0x6,0x82,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x51,0x83,
+  0x0,0x0,0x6,0x82,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x51,0xdb,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/waitConnect.png
-  0x0,0x0,0xf,0x88,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0x2e,0xa3,
+  0x0,0x0,0xf,0x88,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0x2e,0xfb,
 0x0,0x0,0x1,0x8c,0xaa,0x7f,0x3a,0x90,
   // :/images/sideV_right1.png
-  0x0,0x0,0x2,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x7e,0x7d,
+  0x0,0x0,0x2,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x7e,0xd5,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x6,
   // :/images/handleGear.png
-  0x0,0x0,0x8,0x8a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x76,0x13,
+  0x0,0x0,0x8,0x8a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x76,0x6b,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf8,
   // :/images/caution2.png
-  0x0,0x0,0xe,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0x2d,0x22,
+  0x0,0x0,0xe,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x60,0x2d,0x7a,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf5,
   // :/images/amplitude.png
-  0x0,0x0,0x2,0x64,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x76,0xb1,
+  0x0,0x0,0x2,0x64,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x77,0x9,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xef,
   // :/images/carStop.png
-  0x0,0x0,0x11,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x2c,0x87,
+  0x0,0x0,0x11,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x68,0x2c,0xdf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf5,
   // :/images/stickAngle.png
-  0x0,0x0,0x5,0xc2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0xc5,0xa,
+  0x0,0x0,0x5,0xc2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0xc5,0x62,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x8,
   // :/images/login_bg.png
-  0x0,0x0,0x9,0x1e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x57,0x65,0x5a,
+  0x0,0x0,0x9,0x1e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x57,0x65,0xb2,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfb,
   // :/images/side_view.png
-  0x0,0x0,0x3,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xe7,0x9,
+  0x0,0x0,0x3,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xe7,0x61,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x7,
   // :/images/powerLeg.png
-  0x0,0x0,0xf,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x61,0x9,0xac,
+  0x0,0x0,0xf,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x61,0xa,0x4,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfd,
   // :/images/wiper1.png
-  0x0,0x0,0x8,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x79,0xd0,
+  0x0,0x0,0x8,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x56,0x7a,0x28,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x8,
   // :/images/buzzer1.png
-  0x0,0x0,0x5,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x80,0x9a,
+  0x0,0x0,0x5,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x80,0xf2,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/sideDown_left.png
-  0x0,0x0,0xc,0x9a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x2b,0x52,
+  0x0,0x0,0xc,0x9a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0x2b,0xaa,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x5,
   // :/images/emergency.png
-  0x0,0x0,0xb,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x69,0xb2,
+  0x0,0x0,0xb,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x6a,0xa,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf5,
   // :/images/main_left.png
-  0x0,0x0,0x6,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x7d,0xd2,
+  0x0,0x0,0x6,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x7e,0x2a,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfb,
   // :/images/left_camera1.png
-  0x0,0x0,0xb,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x74,0x21,
+  0x0,0x0,0xb,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x74,0x79,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf9,
   // :/images/backlight.png
-  0x0,0x0,0x6,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x3f,0x78,
+  0x0,0x0,0x6,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x51,0x3f,0xd0,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xef,
   // :/images/right_camera1.png
-  0x0,0x0,0xa,0x9e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xe7,0x7e,
+  0x0,0x0,0xa,0x9e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0xe7,0xd6,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x3,
   // :/images/panel_camera1.png
-  0x0,0x0,0xd,0x46,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0xc6,0x28,
+  0x0,0x0,0xd,0x46,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5c,0xc6,0x80,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfd,
   // :/images/emergency1.png
-  0x0,0x0,0x9,0xae,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x99,0x4,
+  0x0,0x0,0x9,0xae,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x99,0x5c,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf5,
   // :/images/bottom_green.png
-  0x0,0x0,0x4,0x26,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x36,0x3e,
+  0x0,0x0,0x4,0x26,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4d,0x36,0x96,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/main_right.png
-  0x0,0x0,0x7,0x8a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0x5b,0x67,
+  0x0,0x0,0x7,0x8a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x54,0x5b,0xbf,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfc,
   // :/images/left_r_yellow.png
-  0x0,0x0,0x5,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0xc7,0xea,
+  0x0,0x0,0x5,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0xc8,0x42,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/images/sideUp_left.png
-  0x0,0x0,0x3,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xc4,0x95,
+  0x0,0x0,0x3,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xc4,0xed,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x5,
   // :/images/bottom_yellow.png
-  0x0,0x0,0x6,0xb4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x6a,0x37,
+  0x0,0x0,0x6,0xb4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x52,0x6a,0x8f,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf1,
   // :/images/right_r_green.png
-  0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xbc,0x99,
+  0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xbc,0xf1,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x4,
   // :/images/rear_view.png
-  0x0,0x0,0xf,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x61,0xd,0xbf,
+  0x0,0x0,0xf,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x61,0xe,0x17,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x3,
   // :/images/left_r_red.png
-  0x0,0x0,0x9,0x8c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x8b,0x3a,
+  0x0,0x0,0x9,0x8c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x8b,0x92,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/images/left_f_red.png
-  0x0,0x0,0x10,0xf2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x7d,0x1a,
+  0x0,0x0,0x10,0xf2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x67,0x7d,0x72,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/images/right_f_green.png
-  0x0,0x0,0xb,0x6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x52,0x5e,
+  0x0,0x0,0xb,0x6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5a,0x52,0xb6,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9a,0x3,
   // :/images/left_f_green.png
-  0x0,0x0,0x9,0x66,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x79,0x4f,
+  0x0,0x0,0x9,0x66,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x58,0x79,0xa7,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf9,
   // :/images/frontlight.png
-  0x0,0x0,0xe,0x32,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xd7,0xff,
+  0x0,0x0,0xe,0x32,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5e,0xd8,0x57,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xf7,
   // :/images/left_r_green.png
-  0x0,0x0,0xf,0xc8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xa7,0x9d,
+  0x0,0x0,0xf,0xc8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x62,0xa7,0xf5,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x99,0xfa,
   // :/sound/gearRPlaySound.wav
-  0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xa6,0x99,
+  0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xa6,0xf1,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9c,0x20,
   // :/sound/lightLPlaySound.wav
-  0x0,0x0,0x0,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x7,0x75,
+  0x0,0x0,0x0,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x7,0xcd,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9c,0x28,
   // :/sound/lightRPlaySound.wav
-  0x0,0x0,0x0,0x98,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x15,0x46,0x69,
+  0x0,0x0,0x0,0x98,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x15,0x46,0xc1,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9c,0x31,
   // :/sound/beep-1.wav
-  0x0,0x0,0x0,0x7e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x15,0x17,0xa5,
+  0x0,0x0,0x0,0x7e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x15,0x17,0xfd,
 0x0,0x0,0x1,0x8e,0xea,0x0,0x9c,0xc,
 
 };

+ 4 - 0
ZjQt/Qt/main.cpp

@@ -6,6 +6,7 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QtCore/QDir>
+#include"readthread.h"
  
 #include <QtQml/QQmlEngine>
 #include <QtQuick>
@@ -120,6 +121,9 @@ int main(int argc, char *argv[]) {
 
   AppModel* appModel = new AppModel(_notify, _control,object);
   viewer.rootContext()->setContextProperty("appModel", appModel);
+
+  ReadThread* readThread = new ReadThread();
+  viewer.rootContext()->setContextProperty("readThread", readThread);
   
   //在QML中触发最大化窗口的信号时,显示窗口
   QObject::connect(item, SIGNAL(qmlSignalMaxWindow()), &viewer, SLOT(show()));

+ 19 - 5
ZjQt/Qt/main.qml

@@ -148,7 +148,8 @@ Item {
                     height: 50
                     color: pressed ? textClickedColor : mainAppColor
                     text: "取消"
-                    onClicked: panelDialog.visible = false
+                    onClicked: panelDialog.visible = false                   
+                    
                 }
 
                 spacing: 50
@@ -162,8 +163,10 @@ Item {
                     color: pressed ? textClickedColor : mainAppColor
                     text: "退出"
                     onClicked: {
-                        videoWindow.close()
-                        rootItem.qmlSignalQuit()
+                        readThread.close()
+                        //readThread.wait()
+                                            
+                                                
                     }
                 }
             }
@@ -196,6 +199,17 @@ Item {
             }
         }
 
+        Connections {
+             target: readThread
+                        onPlayState:{
+                        if(end){
+                        delete readThread
+                        videoWindow.close()                       
+                        rootItem.qmlSignalQuit()
+                      }
+            }  
+        }  
+
         Window {
             id: videoWindow
             property int wndIndex: 0
@@ -231,8 +245,8 @@ Item {
                 appModel.imux=666
                 appModel.imuy=666
                 appModel.engineTemperature=666
-            }*/
-        }
+            }*/        
+        } 
     }
 
     Timer {

+ 4 - 0
ZjQt/Qt/readthread.cpp

@@ -8,6 +8,7 @@
 #include <qimage.h>
 #include <QFileInfo>
 #include <QMessageBox>
+#include <qstandardpaths.h>
 
 ReadThread::ReadThread(QObject *parent) : QThread(parent)
 {
@@ -86,6 +87,8 @@ void  sleepMsec(int msec)
 
 void ReadThread::run()
 {
+    m_path = QString("%1/%2.mp4").arg(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation))
+        .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH-mm-ss"));
     if(m_path.isEmpty()) return;
 
     bool ret = m_videoDecode->open(m_url);         // 打开网络流时会比较慢,如果放到Ui线程会卡
@@ -128,4 +131,5 @@ void ReadThread::run()
     m_videoDecode->close();
     m_videoCodec->close();
     emit playState(end);
+ 
 }

+ 4 - 4
ZjQt/Qt/readthread.h

@@ -28,9 +28,9 @@ public:
     explicit ReadThread(QObject *parent = nullptr);
     ~ReadThread() override;
 
-    void setPath(const QString& path);
-    void open(const QString& url = QString());  // 打开视频
-    void close();                               // 关闭视频
+    Q_INVOKABLE void setPath(const QString& path);
+    Q_INVOKABLE void open(const QString& url = QString());  // 打开视频
+    Q_INVOKABLE void close();                               // 关闭视频
     const QString& url();                       // 获取打开的视频地址
 
 protected:
@@ -38,7 +38,7 @@ protected:
 
 signals:
     void updateImage(const QImage& image);      // 将读取到的视频图像发送出去
-    void playState(PlayState state);            // 视频播放状态发送改变时触发
+    Q_INVOKABLE void playState(PlayState state);            // 视频播放状态发送改变时触发
 
 private:
     VideoDecode* m_videoDecode = nullptr;       // 视频解码类

BIN
ZjQt/Run/EgoDLL.dll


BIN
ZjQt/webrtcinterop/lib/debug/webrtcinterop.lib