下拉视图添加移动数据显示

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
index 378d445..e742f37 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-17 15:26:49
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-29 15:08:34
+ * @LastEditTime: 2024-07-16 14:55:16
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h
  */
 
@@ -95,10 +95,11 @@ namespace OHOS
         int GetSignalStrength(void);
         int CalculateSignalBars(int signalStrength);
         void UpdateSignalBarDisplay(int signalBars, bool state);
-        void UpdateBatteryPosition(int signalBars);
+        void UpdateBatteryPosition(bool state);
         void updateSignalDisplay();
         void UpdateCat1NoSignalisplay(bool state);
         void UpdateCat14GDisplay(bool state);
+        void UpdateCat1MobileDataDisplay(bool state);
 
         void PreLoadPullUpDownImageRes(void);
         void UnLoadPullUpDownImageRes(void);
@@ -124,6 +125,7 @@ namespace OHOS
         UIImageView *showSignalStrength[4]{nullptr};         // 信号强度
         UILabel *Singal_4{nullptr};                          // 4G图标
         UIImageView *NoSignal{nullptr};                      // 无信号
+        UIImageView *MobileData{nullptr};                    // 移动数据
 
         UIImageView *batteryimage = nullptr;
         UIBoxProgress *progress = nullptr;

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 fad5688..2f08ff2 100644 (file)
--- 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-07-04 21:12:04
+ * @LastEditTime: 2024-07-16 15:31:46
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
  */
 
@@ -94,6 +94,7 @@ namespace OHOS
     static constexpr uint16_t CONNECTSTATUS_IMG_H = 60;
 
     static constexpr const char *DROPDOWN_NOSIGNAL_IMAGE = "/user/res/dropdown/DROPDOWN_NOSIGNAL.bin";
+    static constexpr const char *DROPDOWN_MOBILE_DATA_IMAGE = "/user/res/dropdown/DROPDOWN_MOBILE_DATA.bin";
     static const int64_t COLOR_SIGNAL_ON = 0xffffffff;
     static const int64_t COLOR_SIGNAL_OFF = 0xff383838;
     static const int BATTERY_IMAGE_WIDTH = 48;
@@ -154,6 +155,12 @@ namespace OHOS
             delete Singal_4;
             Singal_4 = nullptr;
         }
+
+        if (MobileData != nullptr)
+        {
+            delete MobileData;
+            MobileData = nullptr;
+        }
     }
 
     // 清除所有与连接状态相关的视图组件
@@ -632,6 +639,19 @@ namespace OHOS
         NoSignal->SetVisible(false);
         group[DROPDOWNVIEW]->Add(NoSignal);
         /* -------------------------------------------------------------------------- */
+        MobileData = new UIImageView();
+        if (MobileData == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MobileData new fail");
+            return false;
+        }
+        MobileData->SetPosition(161, 180, 13, 15);
+        MobileData->SetAutoEnable(false);
+        MobileData->SetResizeMode(UIImageView::CENTER);
+        MobileData->SetSrc(DROPDOWN_MOBILE_DATA_IMAGE);
+        MobileData->SetVisible(false);
+        group[DROPDOWNVIEW]->Add(MobileData);
+        /* -------------------------------------------------------------------------- */
         // 定义一个结构体，用于存储 ImageView 的信息
         struct ImageViewInfo
         {
@@ -731,6 +751,7 @@ namespace OHOS
             UpdateCat1NoSignalisplay(true);
             UpdateCat14GDisplay(false);
             UpdateSignalBarDisplay(CalculateSignalBars(signal), false);
+            UpdateCat1MobileDataDisplay(false);
         }
         else if (cat1_powerOn == 1 && sim == 1)
         {
@@ -754,6 +775,7 @@ namespace OHOS
                 // 无信号，无4G图标 显示
                 // UpdateCat1NoSignalisplay(true);
                 UpdateCat14GDisplay(false);
+                UpdateCat1MobileDataDisplay(false);
                 // UpdateSignalBarDisplay(CalculateSignalBars(signal), false);
             }
             else
@@ -763,6 +785,7 @@ namespace OHOS
                     // 无信号，无4G图标 显示
                     //UpdateCat1NoSignalisplay(true);
                     UpdateCat14GDisplay(false);
+                    UpdateCat1MobileDataDisplay(false);
                     // UpdateSignalBarDisplay(CalculateSignalBars(signal), false);
                 }
                 else if (cat1_network_type == NETWORK_TYPE_4G)
@@ -770,6 +793,7 @@ namespace OHOS
                     // 有4G图标，正常显示信号
                     //UpdateCat1NoSignalisplay(false);
                     UpdateCat14GDisplay(true);
+                    UpdateCat1MobileDataDisplay(true);
                     // UpdateSignalBarDisplay(CalculateSignalBars(signal), true);
                 }
                 else
@@ -777,6 +801,7 @@ namespace OHOS
                     // 无4G图标，正常显示信号
                     //UpdateCat1NoSignalisplay(false);
                     UpdateCat14GDisplay(false);
+                    UpdateCat1MobileDataDisplay(true);
                     // UpdateSignalBarDisplay(CalculateSignalBars(signal), true);
                 }
             }
@@ -849,13 +874,24 @@ namespace OHOS
         {
             Singal_4->SetVisible(state);
         }
+        UpdateBatteryPosition(state);
+    }
+
+    /*更新移动数据图标显示*/
+    void PullUpDownView::UpdateCat1MobileDataDisplay(bool state)
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UpdateCat1MobileDataDisplay %d",state);
+        if (MobileData != nullptr)
+        {
+            MobileData->SetVisible(state);
+        }
     }
 
     // 更新电池位置
-    void PullUpDownView::UpdateBatteryPosition(int signalBars)
+    void PullUpDownView::UpdateBatteryPosition(bool state)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UpdateBatteryPosition");
-        if (signalBars == 99)
+        if (state == false)
         {
             batteryimage->SetPosition(209, 180, BATTERY_IMAGE_WIDTH, BATTERY_IMAGE_HEIGHT);
             progress->SetPosition(215, 186, PROGRESS_WIDTH, PROGRESS_HEIGHT);
@@ -874,7 +910,7 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UpdateSignalStrengthStatusAndBatteryPosition");
         updateSignalDisplay();
-        UpdateBatteryPosition(GetSignalStrength());
+        //UpdateBatteryPosition(GetSignalStrength());
     }
 
     // 下拉视图初始化

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_MOBILE_DATA.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_MOBILE_DATA.bin
new file mode 100644 (file)
index 0000000..bd270a9
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_MOBILE_DATA.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:918af4560a1fb31b88e7ba3e96a82a3865457cf4296da60d85a6d05040306ad9
+size 216