修复代码合并错误

8 months ago · 1a61d5bbf9
parent 7c3be5a99a
commit 1a61d5bbf9
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@ -3022,7 +3022,7 @@ void CPhoneDevice::UpdateSimcard(const std::string& simcard)
    m_simcard = simcard;
 }

-int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceTail, SENSOR_PARAM *sensorParam)
+int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceTail, SENSOR_PARAM sensorParam)
 {
    Collect_sensor_data();		//15s
    Data_DEF airt;