在屏幕与亮度视图中将“抬腕亮屏”修改成“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 ab6470f..205e0ec 100644 (file)
--- 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);\r
         void ChangeView(int16_t hideView, int16_t showView);\r
         UIScrollView *GetDisplayBrightnessScrollView(int16_t i);\r
-\r
+        UICheckBox::UICheckBoxState GetRaiseToBrightnessCheckBoxButtonState(void);\r
+        void SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState state);\r
     public:\r
         void OnStart() override;\r
         void OnSetUpView() override;\r
@@ -97,8 +98,9 @@ namespace OHOS
         UILabel *ScreenDurationLabel = nullptr;                // 亮屏时长标签\r
         UILabel *RaiseToBrightnessLabel = nullptr;             // 抬腕亮屏标签\r
         UIImageView *NextImage[2]{nullptr};\r
-        UIImageView *RaiseToBrightnessImage = nullptr; // 抬腕亮屏图片\r
-        UICheckBox *RaiseToBrightnessCheckBoxButton = nullptr;\r
+        UIImageView *RaiseToBrightnessImage = nullptr;         // 抬腕亮屏图片\r
+        UICheckBox *RaiseToBrightnessCheckBoxButton = nullptr; // 抬腕亮屏按钮\r
+        uint8_t state = UICheckBox::UICheckBoxState::MAX_STATUS_NUM;\r
         bool initViewStatus{false};\r
     };\r
 } // namespace OHOS\r

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 aa657b0..307b1a2 100644 (file)
--- 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"\r
 #include "string.h"\r
 #include "displaybrightness/include/DisplayBrightnessPresenter.h"\r
-\r
+#include "cat1_ctl.h"\r
 namespace OHOS\r
 {\r
     // 当前Presenter属性实例化的内存指针\r
@@ -98,8 +98,27 @@ namespace OHOS
         return false;\r
     }\r
 \r
+    extern "C"\r
+    {\r
+        uint32_t uapi_cat1_power_on(uint32_t pwron);\r
+        uint32_t uapi_cat1_reset(uint32_t pwron);\r
+\r
+        void power_on_cat1(void)\r
+        {\r
+            uapi_cat1_power_on(1);\r
+            uapi_cat1_reset(0);\r
+        }\r
+\r
+        void power_off_cat1(void)\r
+        {\r
+            uapi_cat1_reset(1);\r
+            uapi_cat1_power_on(0);\r
+        }\r
+    }\r
+\r
     bool DisplayBrightnessPresenter::OnChange(UICheckBox::UICheckBoxState state)\r
     {\r
+#if 0\r
         switch (state)\r
         {\r
         case UICheckBox::SELECTED:\r
@@ -112,6 +131,21 @@ namespace OHOS
             break;\r
         }\r
         return true;\r
+#endif\r
+        switch (state)\r
+        {\r
+        case UICheckBox::SELECTED:\r
+            power_on_cat1();\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "4g Capability Is Enabled");\r
+            break;\r
+        case UICheckBox::UNSELECTED:\r
+            power_off_cat1();\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "4g Capability Is Disabled");\r
+            break;\r
+        default:\r
+            break;\r
+        }\r
+        return true;\r
     }\r
 \r
     bool ScreenDurationRadiobuttonOnChangeListener::isRadioButtonSelected(int index)\r

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 6f3e44c..9b43e5b 100644 (file)
--- 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;\r
             RaiseToBrightnessImage = nullptr;\r
 \r
+            state = GetRaiseToBrightnessCheckBoxButtonState();\r
+            if (state == UICheckBox::UICheckBoxState::SELECTED)\r
+            {\r
+                //PlayersModel::GetInstance()->SetPlayButtonState(true);\r
+                //SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState::SELECTED);\r
+            }\r
+\r
             delete RaiseToBrightnessCheckBoxButton;\r
             RaiseToBrightnessCheckBoxButton = nullptr;\r
 \r
@@ -223,7 +230,8 @@ namespace OHOS
         }\r
         /* -------------------------------------------------------------------------- */\r
         labelconfig.top = 393;\r
-        labelconfig.text = "抬腕亮屏";\r
+        // labelconfig.text = "抬腕亮屏";\r
+        labelconfig.text = "4G能力开关";\r
         RaiseToBrightnessLabel = SetUpLabel(labelconfig);\r
         if (RaiseToBrightnessLabel == nullptr)\r
         {\r
@@ -358,6 +366,29 @@ namespace OHOS
         initViewStatus = true;\r
     }\r
 \r
+    /// @brief 获取抬腕亮屏按钮状态\r
+    /// @param  void\r
+    /// @return 获取此复选框的状态。\r
+    UICheckBox::UICheckBoxState DisplayBrightnessView::GetRaiseToBrightnessCheckBoxButtonState(void)\r
+    {\r
+        return RaiseToBrightnessCheckBoxButton->GetState();\r
+    }\r
+\r
+    /// @brief 设置抬腕亮屏按钮状态\r
+    /// @param state\r
+    void DisplayBrightnessView::SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState state)\r
+    {\r
+        if (RaiseToBrightnessCheckBoxButton == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::SetPlayerButtonState playerButton NULL");\r
+            return;\r
+        }\r
+        return RaiseToBrightnessCheckBoxButton->SetState(state);\r
+    }\r
+\r
+    /// @brief 获取显示与亮度视图中的scrollView\r
+    /// @param i 第几个scrollView\r
+    /// @return 第几个scrollView的指针\r
     UIScrollView *DisplayBrightnessView::GetDisplayBrightnessScrollView(int16_t i)\r
     {\r
         if (DisplayBrightnessScrollView[i] == nullptr)\r