From cd198bd7cf9d912eed150e8b948f1ef2632bdf54 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 5 Nov 2025 11:41:50 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E4=BF=A1=E5=8F=B7=E6=A0=BC?= =?utf8?q?=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98=EF=BC=8C272=EF=BC=8C230?= =?utf8?q?=EF=BC=8Cn9=20=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/main/src/PullUpDownView.cpp | 18 +++++++---- .../nativeui/main/src/PullUpDownView.cpp | 31 +++++++++---------- .../nativeui/main/src/PullUpDownView.cpp | 18 +++++++---- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp index a9af2171c..c14626b63 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp @@ -668,8 +668,8 @@ namespace OHOS if (signal == SIGNAL_NO_SIGNAL) // 计算信号强度 { // 无信号UI显示 - // UpdateCat1NoSignalisplay(true); - // UpdateCat14GDisplay(false); + UpdateCat1NoSignalisplay(true); + UpdateCat14GDisplay(false); UpdateSignalBarDisplay(CalculateSignalBars(signal), false); } else @@ -683,7 +683,10 @@ namespace OHOS if (network_on == 0) { // 无信号，无4G图标 显示 - // UpdateCat1NoSignalisplay(true); + if (signal == SIGNAL_NO_SIGNAL) + { + UpdateCat1NoSignalisplay(true); + } UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(false); // UpdateSignalBarDisplay(CalculateSignalBars(signal), false); @@ -693,7 +696,10 @@ namespace OHOS if (cat1_network_type == NETWORK_TYPE_NO_NETWORK) { // 无信号，无4G图标 显示 - // UpdateCat1NoSignalisplay(true); + if (signal == SIGNAL_NO_SIGNAL) + { + UpdateCat1NoSignalisplay(true); + } UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(false); // UpdateSignalBarDisplay(CalculateSignalBars(signal), false); @@ -701,7 +707,7 @@ namespace OHOS else if (cat1_network_type == NETWORK_TYPE_4G) { // 有4G图标，正常显示信号 - // UpdateCat1NoSignalisplay(false); + UpdateCat1NoSignalisplay(false); UpdateCat14GDisplay(true); UpdateCat1MobileDataDisplay(true); // UpdateSignalBarDisplay(CalculateSignalBars(signal), true); @@ -709,7 +715,7 @@ namespace OHOS else { // 无4G图标，正常显示信号 - // UpdateCat1NoSignalisplay(false); + UpdateCat1NoSignalisplay(false); UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(true); // UpdateSignalBarDisplay(CalculateSignalBars(signal), true); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp index f23f70460..c14626b63 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/PullUpDownView.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-26 18:14:24 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-10-31 21:25:27 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2025-02-06 09:59:53 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp */ @@ -593,12 +593,7 @@ namespace OHOS int PullUpDownView::GetSignalStrength(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::GetSignalStrength"); - - int SignalStrength = 0; - #ifdef SUPPORT_CAT1_SERVICE - SignalStrength = uapi_dev_runtime_get_cat1_signal(); // 信号强度 - #endif - + int SignalStrength = uapi_dev_runtime_get_cat1_signal(); // 信号强度 return CalculateSignalBars(SignalStrength); } @@ -645,7 +640,6 @@ namespace OHOS // 函数用于更新信号显示的UI void PullUpDownView::updateSignalDisplay() { - #ifdef SUPPORT_CAT1_SERVICE int sim = uapi_dev_runtime_get_cat1_simstat(); int cat1_powerOn = uapi_dev_runtime_get_cat1_powerstat(); int signal = uapi_dev_runtime_get_cat1_signal(); @@ -674,8 +668,8 @@ namespace OHOS if (signal == SIGNAL_NO_SIGNAL) // 计算信号强度 { // 无信号UI显示 - // UpdateCat1NoSignalisplay(true); - // UpdateCat14GDisplay(false); + UpdateCat1NoSignalisplay(true); + UpdateCat14GDisplay(false); UpdateSignalBarDisplay(CalculateSignalBars(signal), false); } else @@ -689,7 +683,10 @@ namespace OHOS if (network_on == 0) { // 无信号，无4G图标 显示 - // UpdateCat1NoSignalisplay(true); + if (signal == SIGNAL_NO_SIGNAL) + { + UpdateCat1NoSignalisplay(true); + } UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(false); // UpdateSignalBarDisplay(CalculateSignalBars(signal), false); @@ -699,7 +696,10 @@ namespace OHOS if (cat1_network_type == NETWORK_TYPE_NO_NETWORK) { // 无信号，无4G图标 显示 - // UpdateCat1NoSignalisplay(true); + if (signal == SIGNAL_NO_SIGNAL) + { + UpdateCat1NoSignalisplay(true); + } UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(false); // UpdateSignalBarDisplay(CalculateSignalBars(signal), false); @@ -707,7 +707,7 @@ namespace OHOS else if (cat1_network_type == NETWORK_TYPE_4G) { // 有4G图标，正常显示信号 - // UpdateCat1NoSignalisplay(false); + UpdateCat1NoSignalisplay(false); UpdateCat14GDisplay(true); UpdateCat1MobileDataDisplay(true); // UpdateSignalBarDisplay(CalculateSignalBars(signal), true); @@ -715,7 +715,7 @@ namespace OHOS else { // 无4G图标，正常显示信号 - // UpdateCat1NoSignalisplay(false); + UpdateCat1NoSignalisplay(false); UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(true); // UpdateSignalBarDisplay(CalculateSignalBars(signal), true); @@ -727,7 +727,6 @@ namespace OHOS { DropDownCardPage1::GetInstance()->Refresh4GState(); } - #endif } // 更新信号强度显示 void PullUpDownView::UpdateSignalBarDisplay(int signalBars, bool state) diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp index a9af2171c..c14626b63 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp @@ -668,8 +668,8 @@ namespace OHOS if (signal == SIGNAL_NO_SIGNAL) // 计算信号强度 { // 无信号UI显示 - // UpdateCat1NoSignalisplay(true); - // UpdateCat14GDisplay(false); + UpdateCat1NoSignalisplay(true); + UpdateCat14GDisplay(false); UpdateSignalBarDisplay(CalculateSignalBars(signal), false); } else @@ -683,7 +683,10 @@ namespace OHOS if (network_on == 0) { // 无信号，无4G图标 显示 - // UpdateCat1NoSignalisplay(true); + if (signal == SIGNAL_NO_SIGNAL) + { + UpdateCat1NoSignalisplay(true); + } UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(false); // UpdateSignalBarDisplay(CalculateSignalBars(signal), false); @@ -693,7 +696,10 @@ namespace OHOS if (cat1_network_type == NETWORK_TYPE_NO_NETWORK) { // 无信号，无4G图标 显示 - // UpdateCat1NoSignalisplay(true); + if (signal == SIGNAL_NO_SIGNAL) + { + UpdateCat1NoSignalisplay(true); + } UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(false); // UpdateSignalBarDisplay(CalculateSignalBars(signal), false); @@ -701,7 +707,7 @@ namespace OHOS else if (cat1_network_type == NETWORK_TYPE_4G) { // 有4G图标，正常显示信号 - // UpdateCat1NoSignalisplay(false); + UpdateCat1NoSignalisplay(false); UpdateCat14GDisplay(true); UpdateCat1MobileDataDisplay(true); // UpdateSignalBarDisplay(CalculateSignalBars(signal), true); @@ -709,7 +715,7 @@ namespace OHOS else { // 无4G图标，正常显示信号 - // UpdateCat1NoSignalisplay(false); + UpdateCat1NoSignalisplay(false); UpdateCat14GDisplay(false); UpdateCat1MobileDataDisplay(true); // UpdateSignalBarDisplay(CalculateSignalBars(signal), true); -- 2.17.1