From 3650cdca3eaf0f51f82064d3fb6902c9eb5e5274 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Fri, 23 Aug 2024 10:38:51 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E4=B8=8B=E6=8B=89=E4=BF=A1?=
 =?utf8?q?=E5=8F=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?utf8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/main/src/PullUpDownView.cpp      | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
index 74a243edb..37d1ae048 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-26 18:14:24
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-22 17:53:56
+ * @LastEditTime: 2024-08-23 10:37:57
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
  */
 
@@ -708,10 +708,19 @@ namespace OHOS
                     {
                         if (showSignalStrength[i] != nullptr)
                         {
-                            showSignalStrength[i]->SetX(x + 10);
+                            if (i != 0)
+                            {
+                                showSignalStrength[i]->SetX(showSignalStrength[i - 1]->GetX() + 10);
+                                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "showSignalStrength[%d]", showSignalStrength[i]->GetX());
+                            }
+                            else
+                            {
+                                showSignalStrength[i]->SetX(x);
+                            }
                         }
                     }
-                    batteryimage->SetX(showSignalStrength[3]->GetX() + signalWidth + spacing);
+                    batteryimage->SetX(showSignalStrength[3]->GetX() + spacing);
+                    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "showSignalStrength[%d]", batteryimage->GetX());
                     progress->SetX(batteryimage->GetX() + 7);
                 }
                 else // 有 4G
@@ -722,26 +731,34 @@ namespace OHOS
                     {
                         if (showSignalStrength[i] != nullptr)
                         {
-                            showSignalStrength[i]->SetX(x + 10);
+                            if (i != 0)
+                            {
+                                showSignalStrength[i]->SetX(showSignalStrength[i - 1]->GetX() + 10);
+                                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "showSignalStrength[%d]", showSignalStrength[i]->GetX());
+                            }
+                            else
+                            {
+                                showSignalStrength[i]->SetX(x);
+                            }
                         }
                     }
-                    Singal_4->SetX(showSignalStrength[3]->GetX() + signalWidth + spacing);
-                    if (hdVisible) // 无 HD
+                    Singal_4->SetX(showSignalStrength[3]->GetX() + spacing);
+                    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "showSignalStrength[%d]", batteryimage->GetX());
+                    if (hdVisible) // 有 HD
                     {
                         HD->SetX(Singal_4->GetX() + Singal_4->GetWidth() + spacing);
                         batteryimage->SetX(HD->GetX() + HD->GetWidth() + spacing);
                         progress->SetX(batteryimage->GetX() + 7);
                     }
-                    else // 有 HD
+                    else // 无 HD
                     {
                         batteryimage->SetX(Singal_4->GetX() + Singal_4->GetWidth() + spacing);
                         progress->SetX(batteryimage->GetX() + 7);
                     }
-
-                    if (mobileDataVisible) // 如果有移动数据图标，设置其位置
-                    {
-                        MobileData->SetX(showSignalStrength[0]->GetX());
-                    }
+                }
+                if (mobileDataVisible) // 如果有移动数据图标，设置其位置
+                {
+                    MobileData->SetX(showSignalStrength[0]->GetX());
                 }
             }
             // 使相关组件无效化以触发重绘
-- 
2.17.1