Diff: DeviceInfo.cpp

Revision:

108:f1ee3e1eb126

Parent:

97:ea056f6be2e8

Child:

117:5de54f09f754

--- a/DeviceInfo.cpp	Wed May 13 12:12:55 2015 +0000
+++ b/DeviceInfo.cpp	Wed May 13 13:03:20 2015 +0000
@@ -3,63 +3,29 @@
 #include "DeviceInfo.h"
 #include "logging.h"
 
-DeviceInfo::DeviceInfo(MDMParser::DevStatus& devStatus)
-{
-    *_cellId = '\0';
-    memcpy(&_devStatus, &devStatus, sizeof(MDMParser::DevStatus));
-    memset(&_netStatus, 0, sizeof(MDMParser::NetStatus));
-    memset(&_signalQuality, 0, sizeof(DeviceInfo::SignalQuality));
-}
-
-const char * DeviceInfo::imsi()
-{
-    return _devStatus.imsi;
-}
-
-const char * DeviceInfo::imei()
-{
-    return _devStatus.imei;
-}
+extern MDMSerial *pMdm;
 
 const char * DeviceInfo::cellId()
 {
-    if (!refreshNetStatus())
+    if (!pMdm->checkNetStatus(&_netStatus)) {
         return NULL;
-
+    }
     if (snprintf(_cellId, sizeof(_cellId), "%X", _netStatus.ci) < 1)
         return NULL;
     return _cellId;
 }
 
-const char * DeviceInfo::iccid()
-{
-    return _devStatus.ccid;
-}
-
-DeviceInfo::SignalQuality * DeviceInfo::signalQuality(bool realTime)
+DeviceInfo::SignalQuality* DeviceInfo::signalQuality(bool realTime)
 {
     if (!realTime && _signalQuality.rssi)
         return &_signalQuality;
 
     memset(&_signalQuality, 0, sizeof(DeviceInfo::SignalQuality));
-    if (!refreshNetStatus()) {
-        aError("Can not refresh network status!\r\n");
+    if (!pMdm->checkNetStatus(&_netStatus)) {
+        aError("Check network status!\n");
         return NULL;
     }
-    
-//    if ((_netStatus.rssi == 0) || (_netStatus.ber == 0)) {
-//        aWarning("Network status is unavailable!\r\n");
-//        aDebug("RSSI: %d dBm, BER: %d%%\r\n", _netStatus.rssi, _netStatus.ber);
-//        return NULL;
-//    }
-
     _signalQuality.rssi = _netStatus.rssi;
     _signalQuality.ber = _netStatus.ber;
     return &_signalQuality;
-}
-
-bool DeviceInfo::refreshNetStatus()
-{
-    extern MDMSerial *pMdm;
-    return pMdm->checkNetStatus(&_netStatus);
-}
+}
\ No newline at end of file