From: luozheng <1732036298@qq.com>
Date: Mon, 19 Feb 2024 07:06:15 +0000 (+0800)
Subject: 在屏幕与亮度视图中将“抬腕亮屏”修改成“4G能力开关”方便测试
X-Git-Tag: release_V1.2.70_20241020_135402~1298^2~25^2
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=84c362d2ec919e9ddda167e30c09ffb98dacbca3;p=mirrors%2FFD230.git

在屏幕与亮度视图中将“抬腕亮屏”修改成“4G能力开关”方便测试
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
index ab6470fc6..205e0ecf5 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
@@ -68,7 +68,8 @@ namespace OHOS
         bool ClickFunc(int16_t interface);
         void ChangeView(int16_t hideView, int16_t showView);
         UIScrollView *GetDisplayBrightnessScrollView(int16_t i);
-
+        UICheckBox::UICheckBoxState GetRaiseToBrightnessCheckBoxButtonState(void);
+        void SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState state);
     public:
         void OnStart() override;
         void OnSetUpView() override;
@@ -97,8 +98,9 @@ namespace OHOS
         UILabel *ScreenDurationLabel = nullptr;                // 亮屏时长标签
         UILabel *RaiseToBrightnessLabel = nullptr;             // 抬腕亮屏标签
         UIImageView *NextImage[2]{nullptr};
-        UIImageView *RaiseToBrightnessImage = nullptr; // 抬腕亮屏图片
-        UICheckBox *RaiseToBrightnessCheckBoxButton = nullptr;
+        UIImageView *RaiseToBrightnessImage = nullptr;         // 抬腕亮屏图片
+        UICheckBox *RaiseToBrightnessCheckBoxButton = nullptr; // 抬腕亮屏按钮
+        uint8_t state = UICheckBox::UICheckBoxState::MAX_STATUS_NUM;
         bool initViewStatus{false};
     };
 } // namespace OHOS
diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
index aa657b0fe..307b1a2f4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
@@ -3,7 +3,7 @@
 #include "graphic_math.h"
 #include "string.h"
 #include "displaybrightness/include/DisplayBrightnessPresenter.h"
-
+#include "cat1_ctl.h"
 namespace OHOS
 {
     // 当前Presenter属性实例化的内存指针
@@ -98,8 +98,27 @@ namespace OHOS
         return false;
     }
 
+    extern "C"
+    {
+        uint32_t uapi_cat1_power_on(uint32_t pwron);
+        uint32_t uapi_cat1_reset(uint32_t pwron);
+
+        void power_on_cat1(void)
+        {
+            uapi_cat1_power_on(1);
+            uapi_cat1_reset(0);
+        }
+
+        void power_off_cat1(void)
+        {
+            uapi_cat1_reset(1);
+            uapi_cat1_power_on(0);
+        }
+    }
+
     bool DisplayBrightnessPresenter::OnChange(UICheckBox::UICheckBoxState state)
     {
+#if 0
         switch (state)
         {
         case UICheckBox::SELECTED:
@@ -112,6 +131,21 @@ namespace OHOS
             break;
         }
         return true;
+#endif
+        switch (state)
+        {
+        case UICheckBox::SELECTED:
+            power_on_cat1();
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "4g Capability Is Enabled");
+            break;
+        case UICheckBox::UNSELECTED:
+            power_off_cat1();
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "4g Capability Is Disabled");
+            break;
+        default:
+            break;
+        }
+        return true;
     }
 
     bool ScreenDurationRadiobuttonOnChangeListener::isRadioButtonSelected(int index)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
index 6f3e44cba..9b43e5bfc 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
@@ -58,6 +58,13 @@ namespace OHOS
             delete RaiseToBrightnessImage;
             RaiseToBrightnessImage = nullptr;
 
+            state = GetRaiseToBrightnessCheckBoxButtonState();
+            if (state == UICheckBox::UICheckBoxState::SELECTED)
+            {
+                //PlayersModel::GetInstance()->SetPlayButtonState(true);
+                //SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState::SELECTED);
+            }
+
             delete RaiseToBrightnessCheckBoxButton;
             RaiseToBrightnessCheckBoxButton = nullptr;
 
@@ -223,7 +230,8 @@ namespace OHOS
         }
         /* -------------------------------------------------------------------------- */
         labelconfig.top = 393;
-        labelconfig.text = "抬腕亮屏";
+        // labelconfig.text = "抬腕亮屏";
+        labelconfig.text = "4G能力开关";
         RaiseToBrightnessLabel = SetUpLabel(labelconfig);
         if (RaiseToBrightnessLabel == nullptr)
         {
@@ -358,6 +366,29 @@ namespace OHOS
         initViewStatus = true;
     }
 
+    /// @brief 获取抬腕亮屏按钮状态
+    /// @param  void
+    /// @return 获取此复选框的状态。
+    UICheckBox::UICheckBoxState DisplayBrightnessView::GetRaiseToBrightnessCheckBoxButtonState(void)
+    {
+        return RaiseToBrightnessCheckBoxButton->GetState();
+    }
+
+    /// @brief 设置抬腕亮屏按钮状态
+    /// @param state
+    void DisplayBrightnessView::SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState state)
+    {
+        if (RaiseToBrightnessCheckBoxButton == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::SetPlayerButtonState playerButton NULL");
+            return;
+        }
+        return RaiseToBrightnessCheckBoxButton->SetState(state);
+    }
+
+    /// @brief 获取显示与亮度视图中的scrollView
+    /// @param i 第几个scrollView
+    /// @return 第几个scrollView的指针
     UIScrollView *DisplayBrightnessView::GetDisplayBrightnessScrollView(int16_t i)
     {
         if (DisplayBrightnessScrollView[i] == nullptr)