From: Caisking <3449750381@qq.com> Date: Wed, 17 Apr 2024 13:18:19 +0000 (+0800) Subject: 消除魔法数,接口改成类 X-Git-Tag: release_V1.2.70_20241020_135402~1174^2~1 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=189e0e8ca0ce02bf83358e8437cae233f30f9e69;p=mirrors%2FFD230.git 消除魔法数,接口改成类 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h index 2ae9821d1..7b68636fe 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h @@ -49,6 +49,8 @@ namespace OHOS void ModifiesTime(); void RefreshData(); // 更新数据 + bool send_sport_cmd(uint32 cmd); + private: // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; bool OnClick(UIView &view, const ClickEvent &event) override; 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 619ad9508..a6961a654 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 @@ -15,6 +15,7 @@ #include extern "C" void do_cywee_service_check_msg(int cmd, int data[]); +#define MAXSPORTID 176 extern "C" { @@ -258,10 +259,10 @@ namespace OHOS } return true; } - - bool send_sport_cmd(uint32 cmd) + + bool TraingCardPresenter::send_sport_cmd(uint32 cmd) { - if (cmd > 177 || cmd < 0) + if (cmd > MAXSPORTID || cmd < 0) { WEARABLE_LOGE("send_sport_cmd", "Invalid cmd value: %d", cmd); return false;