From b62d2acfb8566b8068a5eb706c3960fbd9f6767f Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Thu, 29 Feb 2024 16:06:44 +0800 Subject: [PATCH] =?utf8?q?=E8=93=9D=E7=89=99=E7=95=8C=E9=9D=A2=EF=BC=9A?= =?utf8?q?=E5=88=A9=E7=94=A8ConfigModel=E7=B1=BB=E4=BF=9D=E5=AD=98?= =?utf8?q?=E8=93=9D=E7=89=99=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E7=8A=B6?= =?utf8?q?=E6=80=81=20=E6=98=BE=E7=A4=BA=E4=B8=8E=E4=BA=AE=E5=BA=A6?= =?utf8?q?=E7=95=8C=E9=9D=A2=EF=BC=9A=E4=BF=9D=E5=AD=98=E8=AE=BE=E7=BD=AE?= =?utf8?q?=E7=9A=84=E4=BA=AE=E5=BA=A6=E5=80=BC=EF=BC=8C=E4=BA=AE=E5=B1=8F?= =?utf8?q?=E6=97=B6=E9=95=BF=20=E5=BF=AB=E9=80=9F=E8=AE=BF=E9=97=AE?= =?utf8?q?=E7=95=8C=E9=9D=A2=EF=BC=9A=E4=BF=9D=E5=AD=98=E7=94=A8=E6=88=B7?= =?utf8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=BF=AB=E9=80=9F=E8=AE=BF=E9=97=AEa?= =?utf8?q?pp?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../classicbluetooth/include/ClassicBlueToothModel.h | 2 +- .../classicbluetooth/src/ClassicBlueToothModel.cpp | 6 +++++- .../classicbluetooth/src/ClassicBlueToothView.cpp | 6 ++++++ .../wearable/fd230app/nativeui/config/ConfigModel.json | 6 +++++- .../fd230app/nativeui/config/include/ConfigModel.h | 9 +++++---- .../displaybrightness/include/DisplayBrightnessModel.h | 1 + .../displaybrightness/src/BrightnessControlView.cpp | 1 + .../displaybrightness/src/DisplayBrightnessModel.cpp | 3 ++- .../displaybrightness/src/ScreenDurationView.cpp | 1 + .../secondaryfunction/include/SecondaryFunctionModel.h | 5 +++-- .../nativeui/secondaryfunction/src/QuickAccessView.cpp | 2 ++ .../secondaryfunction/src/SecondaryFunctionModel.cpp | 7 +++++++ .../fd230/fs/user/res/ConfigModel/ConfigModel.json | 6 +++++- 13 files changed, 44 insertions(+), 11 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h index 7201aae94..c62dfd4e8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h @@ -2,7 +2,7 @@ #define CLASSIC_BLUETOOTH_MODEL_H #include "wearable_log.h" - +#include "config/include/ConfigModel.h" namespace OHOS { class ClassicBlueToothModel diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothModel.cpp index 85ef8b67e..849e455b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothModel.cpp @@ -3,7 +3,11 @@ namespace OHOS { - ClassicBlueToothModel::ClassicBlueToothModel() {} + ClassicBlueToothModel::ClassicBlueToothModel() + { + ConfigModel *p_ConfigModel = ConfigModel::GetInstance(); + TradionalBlueToothToggleButtonState = (p_ConfigModel->ReadJsonData(p_ConfigModel->GetcJSON(), "TradionalBlueToothToggleButtonState")); + } ClassicBlueToothModel::~ClassicBlueToothModel() {} diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp index e1e0ec766..cdfe2ad27 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp @@ -34,6 +34,12 @@ namespace OHOS if (state == true) { ClassicBlueToothModel::GetInstance()->MarkTradionalBlueToothToggleButtonStatus(true); + ConfigModel::GetInstance()->WriteJsonData(ConfigModel::GetInstance()->GetcJSON(), "TradionalBlueToothToggleButtonState", true); + } + else + { + ClassicBlueToothModel::GetInstance()->MarkTradionalBlueToothToggleButtonStatus(false); + ConfigModel::GetInstance()->WriteJsonData(ConfigModel::GetInstance()->GetcJSON(), "TradionalBlueToothToggleButtonState", false); } delete Title; diff --git a/code/sdk/application/wearable/fd230app/nativeui/config/ConfigModel.json b/code/sdk/application/wearable/fd230app/nativeui/config/ConfigModel.json index 7897dae37..e92562c9a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/config/ConfigModel.json +++ b/code/sdk/application/wearable/fd230app/nativeui/config/ConfigModel.json @@ -1,3 +1,7 @@ { - "RaiseToBrightnessCheckBoxButtonState":true + "RaiseToBrightnessCheckBoxButtonState": false, + "ScreenBrightnessValue": 255, + "ScreenDurationRadioButtonSlectValue": 1, + "TradionalBlueToothToggleButtonState": false, + "HeartRateOrBloodOxygenQuickAccessSwitch": 0 } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h index ce53ac09a..bfbc50891 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h @@ -83,7 +83,7 @@ namespace OHOS } cJSON *data_obj = cJSON_CreateNull(); - if constexpr (std::is_same::value || std::is_same::value || std::is_same::value) + if constexpr (std::is_same::value || std::is_same::value || std::is_same::value) { data_obj = cJSON_CreateNumber(static_cast(data)); } @@ -110,15 +110,16 @@ namespace OHOS FILE *file = fopen(filePath.c_str(), "wb"); if (file) { - //fputs(jsonString, file); - fwrite(jsonString, 1, strlen(jsonString), file); // 将 JSON 字符串写入文件 + fputs(jsonString, file); + //fwrite(jsonString, 1, strlen(jsonString), file); // 将 JSON 字符串写入文件 fclose(file); } free(jsonString); } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Open JSON filePath fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "jsonString is nullptr"); + return; } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h index 82e0b5437..505890e6d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h @@ -1,6 +1,7 @@ #ifndef DISPLAY_BRIGHTNESS_MODEL_H_ #define DISPLAY_BRIGHTNESS_MODEL_H_ +#include "config/include/ConfigModel.h" namespace OHOS { class DisplayBrightnessModel diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp index d400d0be8..491717b6e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp @@ -31,6 +31,7 @@ namespace OHOS unsigned char value = BrightnessControlViewSlider->GetValue(); DisplayBrightnessModel::GetInstance()->KeepScreenBrightnessValues(value); + ConfigModel::GetInstance()->WriteJsonData(ConfigModel::GetInstance()->GetcJSON(),"ScreenBrightnessValue",value); delete BrightnessControlViewSlider; BrightnessControlViewSlider = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp index ec7b5ff41..d0121fc72 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp @@ -1,6 +1,5 @@ #include "displaybrightness/include/DisplayBrightnessModel.h" #include "displaybrightness/include/DisplayBrightnessPresenter.h" -#include "config/include/ConfigModel.h" #include "wearable_log.h" namespace OHOS { @@ -9,6 +8,8 @@ namespace OHOS { ConfigModel *p_ConfigModel = ConfigModel::GetInstance(); RaiseToBrightnessCheckBoxButtonState = p_ConfigModel->ReadJsonData(p_ConfigModel->GetcJSON(), "RaiseToBrightnessCheckBoxButtonState"); + ScreenBrightnessValue = static_cast(p_ConfigModel->ReadJsonData(p_ConfigModel->GetcJSON(), "ScreenBrightnessValue")); + ScreenDurationRadioButtonSlectValue = static_cast(p_ConfigModel->ReadJsonData(p_ConfigModel->GetcJSON(), "ScreenDurationRadioButtonSlectValue")); } DisplayBrightnessModel::~DisplayBrightnessModel() {} diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp index 845a5e569..8306da8df 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -40,6 +40,7 @@ namespace OHOS } } DisplayBrightnessModel::GetInstance()->KeepScreenDurationRadioButtonSlectStatus(i); + ConfigModel::GetInstance()->WriteJsonData(ConfigModel::GetInstance()->GetcJSON(),"ScreenDurationRadioButtonSlectValue",i); delete ScreenDurationTitleLabel; ScreenDurationTitleLabel = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h index 0fa58978c..1bcb73203 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h @@ -1,6 +1,7 @@ #ifndef SECONDARY_FUNCTION_MODEL_H #define SECONDARY_FUNCTION_MODEL_H +#include "config/include/ConfigModel.h" namespace OHOS { class SecondaryFunctionModel @@ -11,8 +12,8 @@ namespace OHOS bool HeartRateOrBloodOxygenQuickAccessRadioButtonSelectStateInit(void); bool GetHeartRateOrBloodOxygenQuickAccessSwitch(void); private: - SecondaryFunctionModel() {} - ~SecondaryFunctionModel() {} + SecondaryFunctionModel(); + ~SecondaryFunctionModel(); SecondaryFunctionModel(const SecondaryFunctionModel &); SecondaryFunctionModel &operator=(const SecondaryFunctionModel &); diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/QuickAccessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/QuickAccessView.cpp index fc6fffd55..47122fe3a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/QuickAccessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/QuickAccessView.cpp @@ -40,10 +40,12 @@ namespace OHOS if (QuickAccessRadioButton[0]->GetState() == UICheckBox::SELECTED) { SecondaryFunctionModel::GetInstance()->KeepHeartRateOrBloodOxygenQuickAccessRadioButtonSelectState(0); + ConfigModel::GetInstance()->WriteJsonData(ConfigModel::GetInstance()->GetcJSON(), "HeartRateOrBloodOxygenQuickAccessSwitch", 0); } else if (QuickAccessRadioButton[1]->GetState() == UICheckBox::SELECTED) { SecondaryFunctionModel::GetInstance()->KeepHeartRateOrBloodOxygenQuickAccessRadioButtonSelectState(1); + ConfigModel::GetInstance()->WriteJsonData(ConfigModel::GetInstance()->GetcJSON(), "HeartRateOrBloodOxygenQuickAccessSwitch", 1); } // 循环删除 UIImageView 和 UIRadioButton指针数组 diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionModel.cpp index 6fb72ee05..5c558be6f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionModel.cpp @@ -5,6 +5,13 @@ namespace OHOS { + SecondaryFunctionModel::SecondaryFunctionModel() + { + ConfigModel *p_ConfigModel = ConfigModel::GetInstance(); + HeartRateOrBloodOxygenQuickAccessSwitch = (p_ConfigModel->ReadJsonData(p_ConfigModel->GetcJSON(), "HeartRateOrBloodOxygenQuickAccessSwitch")); + } + SecondaryFunctionModel::~SecondaryFunctionModel() {} + SecondaryFunctionModel *SecondaryFunctionModel::GetInstance(void) { static SecondaryFunctionModel instacne; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ConfigModel/ConfigModel.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ConfigModel/ConfigModel.json index 7897dae37..e92562c9a 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ConfigModel/ConfigModel.json +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ConfigModel/ConfigModel.json @@ -1,3 +1,7 @@ { - "RaiseToBrightnessCheckBoxButtonState":true + "RaiseToBrightnessCheckBoxButtonState": false, + "ScreenBrightnessValue": 255, + "ScreenDurationRadioButtonSlectValue": 1, + "TradionalBlueToothToggleButtonState": false, + "HeartRateOrBloodOxygenQuickAccessSwitch": 0 } \ No newline at end of file -- 2.17.1