IMEI信息获取的实现优化

app/src/main/cpp/MicroPhoto.cpp

@@ -315,6 +315,7 @@ Java_com_xypower_mpapp_MicroPhotoService_init(
     CPhoneDevice* device = new CPhoneDevice(vm, pThis, appPathStr, NETID_UNSET, versionCode);
     device->SetListener(pTerminal);
     device->UpdateSignalLevel(signalLevel);
+    device->UpdateSimcard(simcardStr);
 
     pTerminal->InitServerInfo(appPathStr, cmdidStr, ipStr, port, udpOrTcp, encryptData);
     // pTerminal->SetPacketSize(1 * 1024);	// 1K

app/src/main/cpp/PhoneDevice.cpp

@@ -375,10 +375,17 @@ bool CPhoneDevice::QuerySystemProperties(std::map<std::string, std::string>& pro
             it->second = value;
         }
         else if (it->first == PROP_IMEI)
+        {
+            if (m_simcard.empty())
             {
                 __system_property_get("phone.imei", value);
                 it->second = value;
             }
+            else
+            {
+                it->second = m_simcard;
+            }
+        }
         else if (it->first == PROP_OPERATION_TEMP)
         {
             it->second = QueryCpuTemperature();
@@ -1427,3 +1434,8 @@ void CPhoneDevice::UpdateSignalLevel(int signalLevel)
     m_signalLevel = signalLevel;
     m_signalLevelUpdateTime = time(NULL);
 }
+
+void CPhoneDevice::UpdateSimcard(const std::string& simcard)
+{
+    m_simcard = simcard;
+}

app/src/main/cpp/PhoneDevice.h

@@ -202,6 +202,7 @@ public:
 	void UpdatePosition(double lon, double lat, double radius, time_t ts);
 	bool OnVideoReady(bool result, const char* path, unsigned int photoId);
 	void UpdateSignalLevel(int signalLevel);
+	void UpdateSimcard(const std::string& simcard);
 
 protected:
 
@@ -298,6 +299,8 @@ protected:
 	int m_signalLevel;
 	time_t m_signalLevelUpdateTime;
 
+	std::string m_simcard;
+
 };