Index: sources/cloudsync/CloudSyncController.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r7e503c5459ec77a2816d6c7789da9b206cedbe8a --- sources/cloudsync/CloudSyncController.h (.../CloudSyncController.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/cloudsync/CloudSyncController.h (.../CloudSyncController.h) (revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a) @@ -100,6 +100,9 @@ eError_CredentialRemove , // the credential files sent to UI can't be removed. eError_CredentialEmpty , // the UI folder doesn't have credential files. + eError_TxCodeNoParam , // the received Tx Code not provided + eError_TxCodeEmpty , // the received Tx Code is empty + eError_OutFileEmpty , // Out file has changed from CS2UI but the content is empty. }; @@ -138,13 +141,16 @@ eMessageID_DeviceRegister = 1, // [ UI(1001) -> CS( ) ] Device Registration Request eMessageID_DeviceInfo = 2, // [ CS(2002) <-> UI(1002) ] Device information Request - eMessageID_CredentialsSave = 3, // [ CS(2003) -> UI(1003) ] Save Credentials Request + eMessageID_CredentialsSave = 3, // [ CS(2003) -> UI( ) ] Save Credentials Request eMessageID_CredentialsSend = 4, // [ CS(2004) <-> UI(1004) ] Send Credentials Request eMessageID_ResetFactory = 5, // [ CS(2005) <-> UI(1005) ] Reset Factory Request // Deployment eMessageID_DeviceState = 6, // [ CS(2006) <-> UI(1006) ] Device State Request // Tx Report eMessageID_TxReport = 7, // [ UI(1007) -> CS(2007) ] TxReport Notify + // Tx Code + eMessageID_TxCodeDisplay = 8, // [ CS(2008) -> UI( ) ] Display TxCode Request + // // Subject to change so has been commented out for now // @@ -157,6 +163,7 @@ QHash paramCount { { eMessageID_CredentialsSave , 3 }, + { eMessageID_TxCodeDisplay , 1 }, }; enum DeviceInfo_Enum { @@ -183,6 +190,7 @@ signals: void didInitComplete (); + void didTxCodeReceive (const QString &vTxCode); private: void initConnections(); @@ -233,6 +241,7 @@ bool testDeviceRegister (); // eMessageID_DeviceRegister // device state report + bool saveDeviceState (const QVariantList &vData); bool sendDeviceState (); // eMessageID_DeviceState // reset Factory @@ -242,4 +251,6 @@ bool sendCredentialsSave (const Message &vMessage); // eMessageID_SaveCredentials bool sendCredentialsSend (); // eMessageID_SendCredentials + bool sendTxCodeDisplay (const Message &vMessage); // eMessageID_TxCodeDisplay + };