From 8bbe0fefbd72ddb5190593706fd44840bd2a7daf Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Wed, 31 Jul 2024 16:42:19 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=85=8D?= =?utf8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/fd230app/CMakeLists.txt | 13 +++++----- .../bloodoxygen/include/BloodOxygenModel.h | 16 +++++------- .../bloodoxygen/src/BloodOxygenModel.cpp | 9 ++----- .../bloodoxygen/src/BloodResultPresenter.cpp | 16 +++++++++++- .../bloodoxygen/src/BloodResultView.cpp | 6 ++--- .../nativeui/main/src/MainPresenterSample.cpp | 13 ++++++++-- .../training_card/include/TraingCardView.h | 6 ++--- .../training_card/src/TraingCardPresenter.cpp | 14 +++++++--- .../watchQRcode/src/WatchQRCodeView.cpp | 2 +- .../fd230/fs/user/res/font/en.lang | Bin 10453 -> 10002 bytes .../fd230/fs/user/res/font/ja.lang | Bin 7374 -> 0 bytes .../fs/user/res/font/ui_resource_string.h | 24 +++--------------- .../fd230/fs/user/res/font/zh.lang | Bin 9447 -> 9093 bytes .../peripheral/config/include/ConfigModel.h | 2 +- 14 files changed, 64 insertions(+), 57 deletions(-) delete mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 0e958a8db..c78c61374 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -167,6 +167,13 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckInvalidView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckInvalidPresenter.cpp + #HeartCheck + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartResultView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartResultPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartModel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartDetectionView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartDetectionPresenter.cpp + #BloodCheck ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodResultView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -236,12 +243,6 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/activity/src/ActivityPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/activity/src/ActivityModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartRateView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartModel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartBandoffView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartCheckView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartResultView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/alarm/src/AlarmClockModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/alarm/src/MainAlarmView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/alarm/src/AlarmConfigView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h index 6482f820d..e43dcd1e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-07-31 10:38:26 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h + */ #ifndef BLOOD_OXYGEN_MODEL_H #define BLOOD_OXYGEN_MODEL_H @@ -36,10 +42,7 @@ namespace OHOS uint32_t GetCheckTime(); void SetCheckTime(uint32_t time); - void SetWearStatus(int32_t wear); - bool GetWearStatus(); - void SetResult(BloodResult result); BloodResult GetResult(); @@ -52,12 +55,7 @@ namespace OHOS void ReInit(); private: - bool OxygenView; - bool BandoffView; - bool CheckView; - bool ResultView; - bool CheckStatus; - bool wearStatus; + uint16_t displayspo2; uint16_t currentspo2; uint32_t timestamp_ms; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index 86bc49572..f72d9fe21 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -68,11 +68,6 @@ namespace OHOS } } - bool BloodOxygenModel::GetWearStatus() - { - return wearStatus; - } - uint16_t BloodOxygenModel::GetSPO2data() { return currentspo2; @@ -104,7 +99,7 @@ namespace OHOS // 开始检测 void BloodOxygenModel::Blood_Start() { - currentspo2 = 0; + displayspo2 = 0; SetResult(BloodResult::NOT_TESTED); // 成功检测 // 进行初始化操作 if (!sensorstate) @@ -204,7 +199,7 @@ namespace OHOS void BloodOxygenModel::SetWearStatus(int32_t wear) { // 设置佩戴状态 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodOxygenModel Weartest::%d", wear); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodOxygenModel Weartest::%d", wear); // 计数更新 if (wear_ != 1 && wear != 1) diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp index 47186319d..8fdce5bc6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -37,6 +37,9 @@ #include "power_display_service.h" #include "custom_utils.h" #include "cywee_service.h" +#include "battery_hal.h" + +#include"heart_blood/health_service/health_service.h" #define BLOODKEYABLE 1 namespace OHOS @@ -124,7 +127,18 @@ namespace OHOS { if (strcmp(view.GetViewId(), CLICK_BLOOD) == 0) { - NativeAbility::GetInstance().EnterSlice(VIEW_BLOODOXY_CHECK, TransitionType::TRANSITION_ZOOM); + // 如果正在充电进入提醒界面 + if (get_charge_stat()) + { + HealthState highHealthState; + highHealthState.checkType = CHARGE; + HealthService::GetInstance()->SetHealthCurrent(highHealthState); + NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_ZOOM); + } + else + { + NativeAbility::GetInstance().EnterSlice(VIEW_BLOOD_CHECK, TransitionType::TRANSITION_ZOOM); + } } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPresenter::OnClick"); return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp index 752474848..1cb3e4da4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp @@ -1,7 +1,7 @@ /*** * @Date: 2024-04-15 10:55:58 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-30 16:39:56 + * @LastEditTime: 2024-07-31 14:36:25 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp */ @@ -106,9 +106,9 @@ namespace OHOS /*初始化title*/ InitLabelExt(titleLabel, 83, 50, 300, 35, "title", STR_BLOOD, DEFAULT_VECTOR_FONT_FILENAME, 30); /*初始化血氧值label*/ - InitUILabel(bloodLabel, 83, 22, 300, 300, "bloodtext", "--", DEFAULT_VECTOR_FONT_FILENAME, 120); + InitUILabel(bloodLabel, 83, 32, 300, 300, "bloodtext", "--", DEFAULT_VECTOR_FONT_FILENAME, 140); /*初始化检测时间*/ - InitLabelExt(timeLabel, 53, 260, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(timeLabel, 53, 270, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); timeLabel->SetRollSpeed(70); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index da7cec537..0c38bbfe3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -30,6 +30,8 @@ #include "traing/training_card/include/Training_CardView.h" #include "dnotdisturb/include/DnotDisturbModel.h" #include "weather/include/WeatherModel.h" +#include "heart_blood/health_service/health_service.h" + #if USE_OFFLINE_DIAL #include "DialViewGroup.h" #endif @@ -44,7 +46,7 @@ namespace OHOS {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB}, // 勿扰 {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE}, // 省电模式 {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE}, // 查找手机 - {MAIN_CLICK_BLOOD, VIEW_BLOODOXY_CHECK}, // 血氧检查 + {MAIN_CLICK_BLOOD, VIEW_BLOOD_CHECK}, // 血氧检查 {MAIN_CLICK_SETCARD, VIEW_ADD_CARD}, // 卡片管理 }; @@ -161,8 +163,15 @@ namespace OHOS { MainModel::GetInstance().SetFromSetCardView(true); MainModel::GetInstance().SetFromCardId(BLOODOXGEN); + // 如果正在充电进入提醒界面 + if (get_charge_stat()) + { + HealthState highHealthState; + highHealthState.checkType = CHARGE; + HealthService::GetInstance()->SetHealthCurrent(highHealthState); + NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_ZOOM); + } } - // 如果勿扰模式是开启状态，在下拉界面点击勿扰快捷入口会关闭勿扰模式不进入勿扰视图 if (g_jumpView[curViewId] == VIEW_DNOTDISTURB && DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled() == true) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h index 68070a034..fb8ef2c21 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h @@ -55,9 +55,9 @@ namespace OHOS }; enum PopupType { - EndPopup, - GetTagPopup, - HeartPopup, + EndPopup, // 结束训练弹窗 + GetTagPopup, // 达到训练目标弹窗 + HeartPopup, // 达到最高心率弹窗 }; class TraingCardPresenter; class TrainingControlView; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index e4085cde7..a1c11e640 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -237,6 +237,7 @@ namespace OHOS // 定义点击事件映射 static const std::unordered_map> actionMap = { + // 暂停按键 {BUTTONSTOP, [&]() { auto currentState = TraingModel::GetInstance()->GetSportState(); @@ -249,26 +250,31 @@ namespace OHOS handleContinueState(); } }}, + // 结束按键 {BUTTONEND, [&]() { ControlSensor(ExerciseState::Pause); TraingCardView::GetInstance()->SetPopupViewStatus(EndPopup, true); TraingCardView::GetInstance()->RefreshEndView(); }}, + // 确定结束 {BUTTONEXIT, [&]() { handleEndState(); }}, + // 返回 {BUTTONBACK, [&]() { ControlSensor(ExerciseState::Continue); TraingCardView::GetInstance()->SetPopupViewStatus(EndPopup, false); }}, + // 确定达到目标 {BUTTONWINOK, [&]() { TraingCardView::GetInstance()->SetPopupViewStatus(GetTagPopup, false); TraingCardView::GetInstance()->GetAnimator()->Stop(); }}, + // 确定心率提醒 {BUTTONNOTE, [&]() { TraingCardView::GetInstance()->SetPopupViewStatus(HeartPopup, false); @@ -301,14 +307,14 @@ namespace OHOS { // 设置目标:在非运动情况下设置 [单指令，执行后退出] TraingModel::GetInstance()->SetSportTag(static_cast(cmd->sportTagType), cmd->sportTag); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetSportTag is succeed!\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetSportTag is succeed!\r\n"); return true; } break; case SENDDATA: TraingModel::GetInstance()->SendLiveData(); // 发送实时数据 [单指令，执行后退出] - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SendLiveData is succeed!\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SendLiveData is succeed!\r\n"); return true; default: break; @@ -338,10 +344,10 @@ namespace OHOS } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); ExerciseState cmdState = static_cast(cmd->controlmd); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ExerciseState::End [%d]\r\n", cmdState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ExerciseState::End [%d]\r\n", cmdState); switch (cmdState) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp index 02f000086..9f1d7ee64 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -2,7 +2,7 @@ #include "watchQRcode/include/WatchQRCodeView.h" #include "wearable_log.h" #include "custom_utils.h" -#include "language/font/ui_resource_string.h" +#include "ui_resource_string.h" #include "iostream" #include "string" namespace OHOS diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index 2068b3a77789a9809fdeb9474c625a81a332e2a8..9de9fec9da72950aa4c18153a5b81d37c864e73c 100644 GIT binary patch delta 214 zcmcZ_ILS|RmDloDsd)@2;O<6IN%kmvSq6q6AZ`ZYDM0Ka$G{K@#Cbqm3B;{HycCEJ z1MyiPz6-?9fcPyCGsrVAC;+h)5ZeQ>ClLDqaTpNC%Wpoxt}837pz&bm#77N_&NMu3 zZ35Aanw!6>@G#kB=4LWDXC#)m2ZVs=qV&wXbOz_rqN3EilAKC~WT=piLQ1|uUVe!} SX>qDTN@_`Ja!F=>9s>Y>3OTm` delta 668 zcmY+>L2DC16bJB!mmuh|2a(oi6uhK25k#pZDJ>CdSE?B3X?FK*cF63^GCN6FJVbAv z`w_f&t@NayK)k9Kzk>7wc=NxT#?rtKhS{0_dv9{`;@8WKd!M$Ri=`{S^UoW%I?LWB z(K9IFJv`nb8o)7R;Nb*L;VXQHAMhK_;pQEp2hf8@@C1f1hAF&-cW??{;3xcr>rB*T zx=l~9IED=7@Dct%=kD2u&i3ZnxBEA)Ek_3<8s;kON3ZC}=u|j3uJTz(-NN$D&gG_; z*tyVb^+&v?3TzfnTln%MH=Q8c9K)W*6iFA3JyO%`=vt%lv%hf814ok84x(Yh$u)k3RgmKWXZx~6AdC>xqCQZW*mMw%WGIlP#|PW~@3Ql_+7hX!A>nka4As35)> z*Gp+sf(OM&g+nBb0-Bbh!j=kc!8gham*O+$3p@*t$2dBdLTu>qA{X5C?LQKf4@gX$ ZPjPNtRji7Qv@fkn6>FnIO^1Wm^be%S!4?1j diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang deleted file mode 100644 index 3532e338d2520eaaa2fb77c8796aca8d6658293e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7374 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 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 920b223a4..02262a6ad 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -485,30 +485,14 @@ enum UIResourceTextId : uint16_t { STR_AIMODES_WENXINYIYAN = 472, STR_AIMODES_KIMI = 473, STR_AIMODES_CHATGPT = 474, - STR_SLIDE_TO_SHUTDOWN = 475, - STR_SLIDE_TO_REBOOT = 476, - STR_AI_FAMILY_MEALS = 477, - STR_CHAT = 478, - STR_PCY4GC_OR_AS = 479, - STR_API_KEYS = 480, - STR_PGTTAF = 481, - STR_DAFBS = 482, - STR_OPENAI_API_KEYS = 483, - STR_KHBB = 484, - STR_GTAS = 485, - STR_DYWTDAK = 486, - STR_CONNECTING = 487, - STR_CONNECTION_FAIL = 488, - STR_PTALORTM = 489, - STR_MOTION_DETECTION_NOTE = 490, - STR_PE4GC = 491, - STR_OBU_MESSAGE = 492, - STR_MAX_ID = 493, + STR_CHARGE = 475, + STR_CHARGE_NOTE = 476, + STR_MAX_ID = 477, }; // UIResourceTextId enum FontLanguageId : uint8_t { - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index 9e273d90e33010f82a20f4bb00b8131190d6cd1f..82dc2cf0904934c696c756003064c28113a2860e 100644 GIT binary patch delta 224 zcmaFv+3GGT-Q=EDmBD}l?rs#7WRLnK$-uxa#lYYU#KA!P0Ek}#@ed$om1bZN0%C0- zwgX~6AdUv&Y#=TI;(8#S3dDDu?NN+yD{zOt-Y|gr4kJ`+iT)i}l-|cJF_(cmMM#E1oTGc(%2h0RSo{QiT8j delta 580 zcmY+=&r2Io5C`z-DgS^X@dw0{mwFMwiwLQOu+WkmA_#>-4?;kYf`Zh8Sqw4T{IF?2 zX`5(_ZtNa(R~vtzCh=S-J@nR_#?IT9gROWilzul!BVG8gJ8$2cH#1S6t#sZEnc0O9 z{rB7)bh=&PYd6s?JnSYKh0pK}uHYy9hK?Sh0T_YD5QJwCf<;I`2J)c8E|lR5e1}W; z1Fl}8E*OO;@Vu9LXdWLK$ipst1y>)DyRW3Vez;4K{_2CU@>HSm(2F@=AV}i;EyoRx zmPGE%Gd9+W>#-E4EhqLW9*!Dp9*e>;v2`k~b&}SJ*j7cpIP8-b8)Bs>v^8%aAkC^> zG07WHJkwLJW}R&u)%bOat15m|P0e8o>)}{UT^~f`Robbs(mL*cIW>bz+gbSJlZ_h9 z5A79^Jrt=eC;PwDt)t?d#pxZpU`kVGZL|Jfzdy6L%{il4ZJ3&G)(_-i(J9k5(C!K^ zr_i^wR?$xL4q+5{BSB8HM+w&U#gf6r3P;{Fa%E*9IXNjW(iq^ca