From 8bff5f07415286e6c13ae63d6798085255a113ac Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 22 May 2025 09:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BF=A1=E5=8F=B7=E5=BC=BA?= =?UTF-8?q?=E5=BA=A6=E5=B9=B6=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 10 +++++++--- app/src/main/cpp/PhoneDevice.h | 1 - .../main/java/com/xypower/mpapp/MicroPhotoService.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 5d12158b..2e1f76e5 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -824,7 +824,7 @@ bool CPhoneDevice::SelfTest(std::string& result) } result += "4G信号强度："; - result += std::to_string(m_signalLevel); + result += std::to_string(m_signalLevel & 0xFF); result += ITEM_SEP; result += "网络接口："; @@ -1067,7 +1067,11 @@ bool CPhoneDevice::QuerySystemProperties(std::map& pro } else if ((it->first == (PROP_SIGNAL_4G)) || (it->first == (PROP_SIGNAL_2G)) || (it->first == (PROP_SIGNAL_LEVEL))) { - it->second = std::to_string(m_signalLevel); + it->second = std::to_string((m_signalLevel & 0xFF)); + } + else if (it->first == (PROP_SIGNAL_STRENGTH)) + { + it->second = std::to_string((m_signalLevel >> 8)); } else if ((it->first == (PROP_MOBILE_FLOW_TX)) || (it->first == (PROP_MOBILE_FLOW_RX))) { @@ -4323,7 +4327,7 @@ void CPhoneDevice::UpdateSignalLevel(int signalLevel) { m_signalLevel = signalLevel; m_signalLevelUpdateTime = time(NULL); - XYLOG(XYLOG_SEVERITY_DEBUG, "Signal Level Updated: %d", signalLevel); + XYLOG(XYLOG_SEVERITY_DEBUG, "Signal Level Updated: %d, SS=%d", signalLevel & 0xFF, (signalLevel >> 8)); } void CPhoneDevice::UpdateSimcard(const std::string& simcard) diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index 261ebe8b..a7f3254c 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -286,7 +286,6 @@ protected: std::string GetFileName() const; - bool SendBroadcastMessage(std::string action, int value); // bool MatchCaptureSizeRequest(ACameraManager *cameraManager, const char *selectedCameraId, unsigned int width, unsigned int height, uint32_t cameraOrientation_, diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index 2d1fc637..906b617c 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -1619,7 +1619,7 @@ public class MicroPhotoService extends Service { SignalStrength ss = telephonyManager.getSignalStrength(); if (ss != null) { - return ss.getLevel(); + return (ss.getGsmSignalStrength() << 24) | (ss.getLevel() & 0xFF); } } catch (Exception ex) { }