Moved sources to subdirs in project

Add sprinkler device

Sources/VoipSMS/SMSDevice.cpp

@@ -0,0 +1,223 @@
+#include "SMSDevice.h"
+#include "ProtocolDefs.h"
+#include <QBuffer>
+#include "Contact.h"
+
+CSMSDevice::CSMSDevice(int Address, CAbstractNetworkCommIF *NetworkInterface, CVoipMsSMSClient *VoipMsIFPtr):
+    CNetworkDevice(ID_SMS_CLIENT,Address,NetworkInterface)
+{
+    mStatusRequestsCount = 0;
+    mVoipMsInterfaceHandle = VoipMsIFPtr;
+    mStatusRequestTimer = new QTimer;
+    mStatusRequestTimer->setInterval(ETHERNET_NETWORK_STATUS_TIMEOUT);
+    mStatusRequestTimer->setSingleShot(true);
+    connect(mStatusRequestTimer,SIGNAL(timeout()),this,SLOT(StatusReqTimerExpired()));
+   // mStatusRequestTimer->start();
+}
+
+CSMSDevice::~CSMSDevice()
+{
+    delete mStatusRequestTimer;
+}
+
+int CSMSDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, int MessageID, int DataSize, QByteArray Data)
+{
+
+    Q_UNUSED(DeviceID)
+//    Q_UNUSED(DeviceAddress)
+//    Q_UNUSED(MessageID)
+    Q_UNUSED(DataSize)
+    Q_UNUSED(Data)
+
+
+    mStatusRequestTimer->stop();
+
+    if(DeviceAddress != GetDeviceAddress())
+    {
+        return RET_ERROR;
+    }
+
+    switch(MessageID)
+    {
+        case SMS_CLIENT_DEVICE_ACK:
+        {
+            break;
+        }
+        case SMS_CLIENT_DEVICE_STATUS_RESPONSE:
+        {
+           // mStatusRequestTimer->start();
+            DeviceStatusReceived();
+            break;
+        }
+        case SMS_CLIENT_DEVICE_DID_INFO_REQUEST:
+        {
+            QByteArray FrameData;
+            QBuffer FrameBuffer(&FrameData);
+            FrameBuffer.open(QIODevice::ReadWrite);
+            QDataStream *FrameDataStrm = new QDataStream(&FrameBuffer);
+          //  QDataStream *FrameDataStrm = new QDataStream(&FrameData,QIODevice::ReadWrite);
+
+            QString DID = mVoipMsInterfaceHandle->GetDefaultDID();
+            *FrameDataStrm << DID;
+
+            FrameBuffer.seek(0);
+            mNetworkInterfacePtr->SendNetworkMessage(mDeviceID,mDeviceAddress,SMS_CLIENT_DEVICE_DID_INFO_RESPONSE,FrameData.size(),FrameData);
+            delete FrameDataStrm;
+
+            break;
+        }
+        case SMS_CLIENT_DEVICE_GET_ALL_MSG_REQUEST:
+        {
+            QByteArray FrameData;
+            QBuffer FrameBuffer(&FrameData);
+            FrameBuffer.open(QIODevice::ReadWrite);
+            QDataStream *FrameDataStrm = new QDataStream(&FrameBuffer);
+
+            QList<CSMSMessage> *SMSList = mVoipMsInterfaceHandle->GetSMSList();
+            *FrameDataStrm << SMSList->size();
+            for(int i = 0; i < SMSList->size(); i++)
+            {
+                *FrameDataStrm << SMSList->at(i);
+            }
+
+            FrameBuffer.seek(0);
+            mNetworkInterfacePtr->SendNetworkMessage(mDeviceID,mDeviceAddress,SMS_CLIENT_DEVICE_GET_ALL_MSG_RESPONSE,FrameData.size(),FrameData);
+
+            FrameBuffer.close();
+            delete FrameDataStrm;
+
+            break;
+        }
+        case SMS_CLIENT_DEVICE_SEND_SMS_REQUEST:
+        {
+//            QBuffer FrameBuffer(&Data);
+//            FrameBuffer.open(QIODevice::ReadWrite);
+            QDataStream *FrameDataStrm = new QDataStream(Data);
+
+            qint32 NbMsgs;
+            *FrameDataStrm >> NbMsgs;
+            if(NbMsgs > 0)
+            {
+
+                QList<CSMSMessage> SMSList;
+                for(int i = 0; i < NbMsgs; i++)
+                {
+                    CSMSMessage NewMessage;
+                    *FrameDataStrm >> NewMessage;
+                    SMSList.append(NewMessage);
+                }
+                mVoipMsInterfaceHandle->SendSMS(&SMSList);
+
+            }
+
+      //      FrameBuffer.close();
+            delete FrameDataStrm;
+
+            break;
+
+        }
+        case SMS_CLIENT_DEVICE_GET_CONTACTS_REQUEST:
+        {
+            QByteArray FrameData;
+            QBuffer FrameBuffer(&FrameData);
+            FrameBuffer.open(QIODevice::ReadWrite);
+            QDataStream *FrameDataStrm = new QDataStream(&FrameBuffer);
+
+            QList<CContact> *ContactsList = mContactRepositoryHandle->GetContacts();
+            *FrameDataStrm << ContactsList->size();
+            for(int i = 0; i < ContactsList->size(); i++)
+            {
+                *FrameDataStrm << ContactsList->at(i);
+            }
+
+            FrameBuffer.seek(0);
+            mNetworkInterfacePtr->SendNetworkMessage(mDeviceID,mDeviceAddress,SMS_CLIENT_DEVICE_GET_CONTACTS_RESPONSE,FrameData.size(),FrameData);
+
+            FrameBuffer.close();
+            delete FrameDataStrm;
+
+            break;
+
+        }
+        case SMS_CLIENT_DEVICE_STATUS_REQUEST:
+        case SMS_CLIENT_DEVICE_DID_INFO_RESPONSE:
+        case SMS_CLIENT_DEVICE_NEW_MSG_NOTIFICATION:
+        case SMS_CLIENT_DEVICE_GET_ALL_MSG_RESPONSE:
+        case SMS_CLIENT_DEVICE_GET_CONTACTS_RESPONSE:
+        default:
+        {
+            qDebug("SMSDevice Rx invalid MSG %d",MessageID);
+            break;
+        }
+
+    }
+    mIsOnline = true;
+    mStatusRequestTimer->start();
+    mStatusRequestsCount = 0;
+    return RET_OK;
+}
+
+void CSMSDevice::RequestStatus()
+{
+    mNetworkInterfacePtr->SendNetworkMessage(mDeviceID,mDeviceAddress,SMS_CLIENT_DEVICE_STATUS_REQUEST,0,QByteArray());
+}
+
+void CSMSDevice::SendSMSSentAck(bool Ack)
+{
+    QByteArray FrameData;
+    QBuffer FrameBuffer(&FrameData);
+    FrameBuffer.open(QIODevice::ReadWrite);
+    QDataStream *FrameDataStrm = new QDataStream(&FrameBuffer);
+
+    qint32 ACKData = 0;
+    if(Ack)
+    {
+        ACKData = 1;
+    }
+    *FrameDataStrm << ACKData;
+
+    mNetworkInterfacePtr->SendNetworkMessage(mDeviceID,mDeviceAddress,SMS_CLIENT_DEVICE_SEND_SMS_ACK,FrameData.size(),FrameData);
+
+
+    FrameBuffer.close();
+    delete FrameDataStrm;
+}
+
+void CSMSDevice::SendNewSMSReceived(QList<CSMSMessage> NewMessages)
+{
+    QByteArray FrameData;
+    QBuffer FrameBuffer(&FrameData);
+    FrameBuffer.open(QIODevice::ReadWrite);
+    QDataStream *FrameDataStrm = new QDataStream(&FrameBuffer);
+
+   // QList<CSMSMessage> *SMSList = mVoipMsInterfaceHandle->GetSMSList();
+    *FrameDataStrm << NewMessages.size();
+    for(int i = 0; i < NewMessages.size(); i++)
+    {
+        *FrameDataStrm << NewMessages.at(i);
+    }
+
+    FrameBuffer.seek(0);
+    mNetworkInterfacePtr->SendNetworkMessage(mDeviceID,mDeviceAddress,SMS_CLIENT_DEVICE_NEW_MSG_NOTIFICATION,FrameData.size(),FrameData);
+
+    FrameBuffer.close();
+    delete FrameDataStrm;
+}
+
+void CSMSDevice::StatusReqTimerExpired()
+{
+    if(++mStatusRequestsCount > 3)
+    {
+        mIsOnline = false;
+        qDebug("SMS Device offline,Address: %d",mDeviceAddress);
+    }
+    RequestStatus();
+    mStatusRequestTimer->start();
+}
+
+void CSMSDevice::DeviceStatusReceived()
+{
+
+    mStatusRequestsCount = 0;
+    mStatusRequestTimer->start();
+}

Sources/VoipSMS/SMSDevice.h

@@ -0,0 +1,37 @@
+#ifndef CSMSDEVICE_H
+#define CSMSDEVICE_H
+
+#include "GlobalDefine.h"
+#include "NetworkDevice.h"
+#include "VoipMsSMSClient.h"
+#include "ContactRepository.h"
+#include <QObject>
+
+
+class CSMSDevice: public QObject, CNetworkDevice
+{
+    Q_OBJECT
+public:
+    CSMSDevice(int Address, CAbstractNetworkCommIF *NetworkInterface, CVoipMsSMSClient *VoipMsIFPtr);
+    virtual ~CSMSDevice();
+
+    //CAbstractNetworkDevice implementation
+    virtual int NewDeviceFrameReceived(int DeviceID, int DeviceAddress, int MessageID, int DataSize, QByteArray Data);
+
+    CVoipMsSMSClient *mVoipMsInterfaceHandle;
+    CContactRepository *mContactRepositoryHandle;
+    QTimer *mStatusRequestTimer;
+    int mStatusRequestsCount;
+
+    void SendNewSMSReceived(QList<CSMSMessage> NewMessages);
+    void DeviceStatusReceived();
+
+private:
+    void RequestStatus();
+    void SendSMSSentAck(bool Ack);
+public slots:
+    void StatusReqTimerExpired();
+
+};
+
+#endif // CSMSDEVICE_H

Sources/VoipSMS/VoipMsSMSClient.cpp

@@ -6,6 +6,7 @@
 #include <QDateTime>
 #include <QStringList>
 #include "MasterCtrl.h"
+#include <QDebug>
 
 CVoipMsSMSClient::CVoipMsSMSClient()
 {
@@ -137,6 +138,7 @@ int CVoipMsSMSClient::DownloadNewSMS()
 int CVoipMsSMSClient::CheckForNewSMS()
 {
    // qDebug("Check new SMS");
+    qDebug() << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") << ":" << "Check New SMS";
     if(mSMSMessagesList.isEmpty() == true)
     {
         return RET_ERROR;
@@ -207,6 +209,11 @@ void CVoipMsSMSClient::VoipServerReplyFinished(QNetworkReply *NetworkReply)
         {
             SendSMSAckReceived(false);
         }
+        else
+        {
+            //Restart timer...
+            StartSMSCheckTimer();
+        }
     }
     Reply.clear();
 }
@@ -357,6 +364,7 @@ unsigned int CVoipMsSMSClient::SMSReceived(QJsonArray *SMSArray)
         else
         {
             mSMSMessagesList.append(NewMessages);
+            StartSMSCheckTimer();
         }
 
 
@@ -395,6 +403,7 @@ unsigned int CVoipMsSMSClient::SMSReceived(QJsonArray *SMSArray)
     else
     {
         qDebug("No SMS to download in this period.");
+        StartSMSCheckTimer();
     }
 
     return RET_OK;