From: hcj_ <1224667075@qq.com> Date: Wed, 8 May 2024 14:57:49 +0000 (+0800) Subject: 合并冲突 X-Git-Tag: release_V1.2.70_20241020_135402~1113^2~11 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6e3032de079d31e96938b4dc42a3895fcf59d97d;p=mirrors%2FFD230.git 合并冲突 --- 6e3032de079d31e96938b4dc42a3895fcf59d97d diff --cc code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h index 8e05cdb68,b0d9c404a..887572d0f --- a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h @@@ -87,21 -82,19 +82,11 @@@ namespace OHO CONFIFMOFEL_ITEM_DRINK_START,//提醒开始时间 int类型 前16位小时,后16位分钟 CONFIFMOFEL_ITEM_DRINK_END,//提醒结束时间 int类型 前16位小时,后16位分钟 CONFIGMODEL_ITEM_DRINK_FREQ,//提醒频率 0:30分钟1:1小时2:2小时 3:3小时 - -- //睡眠提醒相关 -- CONFIFMOFEL_ITEM_SLEEP, //开关 -- CONFIFMOFEL_ITEM_SLEEP_BEDTIME,//就寝时间 -- CONFIFMOFEL_ITEM_SLEEP_GET_UP,//起床时间 CONFIFMOFEL_ITEM_SLEEP_REMIND,//提前20分钟提醒开关 - CONFIGMODEL_ITEM_MAX, } ; struct configmodel_item{ -- ConfigDataType type; -- const char* itemname; -- char *defaultValue; -- }; const char* get_config_name(ConfigItem item)