From: penglei <1624952103@qq.com> Date: Wed, 5 Nov 2025 02:24:49 +0000 (+0800) Subject: 优化cat1宏控制 X-Git-Tag: V1.0.9_20251128_194606_LN~113 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9f036fff014100f7a209df07c5023928c7816285;p=mirrors%2FFD230.git 优化cat1宏控制 --- diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp index 13f724d4e..505d062ce 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp @@ -135,7 +135,7 @@ namespace OHOS bool OtaModel::HasNetwork() const { int networkStatus = 0; -#ifdef SUPPORT_CAT1_SERVICE +#if defined(SUPPORT_CAT1_SERVICE) || defined(SUPPORT_PPP_SERVICE) // 检查网络连接状态 networkStatus = uapi_dev_runtime_get_cat1_networkstat(); #endif @@ -411,7 +411,7 @@ namespace OHOS int OtaModel::GetSignalStrength() { int sig = 0; -#ifdef SUPPORT_CAT1_SERVICE +#if defined(SUPPORT_CAT1_SERVICE) || defined(SUPPORT_PPP_SERVICE) sig = uapi_dev_runtime_get_cat1_signal(); #endif return sig; diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp index 8fc0d46bf..5476a2a44 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp @@ -1828,7 +1828,7 @@ bool previousHasNetwork = m_hasNetwork; // 从底层API获取最新的网络状态信息 - #ifdef SUPPORT_CAT1_SERVICE + #if defined(SUPPORT_CAT1_SERVICE) || defined(SUPPORT_PPP_SERVICE) m_simStatus = uapi_dev_runtime_get_cat1_simstat(); // SIM卡状态 m_cat1PowerStatus = uapi_dev_runtime_get_cat1_powerstat(); // CAT1电源状态 m_signalStrength = uapi_dev_runtime_get_cat1_signal(); // 信号强度 diff --git a/code/sdk/zhihui/utils/custom_runtime.h b/code/sdk/zhihui/utils/custom_runtime.h index f6d5893fa..7217d995e 100644 --- a/code/sdk/zhihui/utils/custom_runtime.h +++ b/code/sdk/zhihui/utils/custom_runtime.h @@ -181,7 +181,7 @@ void uapi_dev_runtime_set_shutting_down_status(uint8_t status); uint8_t uapi_dev_runtime_get_shutting_down_status(void); -#ifdef SUPPORT_CAT1_SERVICE +#if defined(SUPPORT_CAT1_SERVICE) || defined(SUPPORT_PPP_SERVICE) /***************************************cat1 runtime 变量设置获取函数**************************************************/