Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/Chinese.txt
index 2042bd6,2042bd6..0000000
deleted file mode 100644,100644
--- 1/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/Chinese.txt
--- 2/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/Chinese.txt
+++ /dev/null
@@@ -1,238 -1,238 +1,0 @@@
--Ò»°ã¶ÍÁ¶
--×ÔÓÉѵÁ·
--¼¡Á¦ÑµÁ·
--·ÉÂÖ³µ/ÊÒÄÚ½¡Éí³µ
--̤²½»ú
--Âþ²½»ú
--HIIT/¸ßÇ¿¶È¼äЪѵÁ·
--½¡Éí
--ÍÅÌå²Ù
--è¤çì
--è¤çìèʽ
--è¤çìţʽ
--è¤çìÑÛ¾µÉßʽ
--è¤çìÓ¢ÐÛʽ1
--è¤çìÓ¢ÐÛʽ2
--è¤çìÓ¢ÐÛʽ3
--è¤çì¹öÂÖ
--ÊÒÍâ×ß·
--ÊÒÍâÅܲ½
--ÊÒÄÚ×ß·
--ÊÒÄÚÅܲ½
--ÊÒÍâÆïÐÐ
--ÌøÉþ
--ƤÀ­Ìá˹
--»ìºÏ½¡Éí
--¹¦ÄÜÐÔѵÁ·
--ÌåÄÜѵÁ·
--õÌÈ­µÀ/ÌßÈ­
--È­»÷
--×ÔÓɲ«»÷
--¿ÕÊÖµÀ
--»÷½£
--ºËÐÄѵÁ·
--È­»÷ÓÐÑõ
--½£µÀ
--µ¥¸Ü
--Ë«¸Ü
--Ñ­»·ÑµÁ·
--ÓÐÑõÔ˶¯
--½¡ÃÀ²Ù
--P90X
--ºøÁåѵÁ·
--×ۺϸñ¶·
--ÅÀÂ¥ÌÝ»ú
--¾ÙÖØ
--Barre
--ÊÖÂÖ
--Ìﾶ
--½ÇÁ¦
--ÉíÐÄÔ˶¯
--ÈáÈí²Ù
--»ìºÍÓÐÑõ
--´«Í³¼¡Á¦ÑµÁ·
--½»²æѵÁ·
--Ìå²Ù
--½×ÌÝѵÁ·
--ÍÖÔ²»ú
--»®´¬»ú
--Ò»°ãÎ赸
--¶ÇƤÎè
--¾ôÊ¿Îè
--À­¶¡Îè
--°ÅÀÙ
--½ÖÎè
--¹ã³¡Îè
--×ð°Í
--Éç½»Îè
--Ìß̤Îè
--Ò»°ãÐÝÏÐÔ˶¯
--»¬ÂÖÁï±ù
--ÎäÊõ
--Ì«¼«È­
--ºôÀ­È¦
--·ÉÅÌ
--·ÉïÚ
--Éä¼ý
--ÆïÂí
--¶ÔÕ½ÓÎÏ·
--·Å·çóÝ
--°ÎºÓ
--íFía
--ÅÀÂ¥ÌÝ
--ÕÏ°­Èü
--µöÓã
--´òÁÔ
--»¬°å³µ
--»¬ÏèÉ¡
--ÍŶӾº¼¼
--½¡ÉíµçÍæ
--½¡ÐÐ
--ÂíÊõÔ˶¯
--ÍæÀÖ
--Ò»°ãÇòÀàÔ˶¯
--ÓðëÇò
--ƹÅÒÇò
--ÍøÇò
--ײÇò
--±£ÁäÇò
--ÅÅÇò
--ë¦×ÓÇò
--ÊÖÇò
--°ôÇò
--ÀÝÇò
--°åÇò
--ÃÀʽéÏé­Çò
--ɳ̲×ãÇò
--ɳ̲ÅÅÇò
--é³Çò
--Çú¹÷Çò
--Ӣʽ±ÚÇò
--ÌÙÇò
--¶ã±ÜÇò
--ÀºÇò
--×ãÇò
--¸ß¶û·òÇò
--ÂíÇò
--ÃÀʽ±ÚÇò
--ӢʽéÏé­Çò
--ÃÅÇò
--Æ¥¿ËÇò
--´ü¹÷Çò
--Ò»°ãË®Éϻ
--·«´¬
--³åÀË
--·ºÖÛ
--»®ÁúÖÛ
--Çáͧ
--Èüͧ
--Ë®ÉÏĦÍгµ
--Á¢½°³åÀË
--DZˮ
--ÌøË®
--»¬ÏèÉ¡³åÀË
--³åÀË»¬Ë®
--Ë®Çò
--·ç·«³åÀË
--ƯÁ÷»î¶¯
--Ë®Öн¡Éí
--Ë®ÉÏÔ˶¯
--»§ÍâÓÎÓ¾
--ÊÒÄÚÓÎÓ¾
--ÓÎÓ¾_×ÔÓÉʽ
--ÓÎÓ¾_ÍÜʽ
--ÓÎÓ¾_Ñöʽ
--ÓÎÓ¾_µûʽ
--Ò»°ã±ùÉÏÔ˶¯
--Áï±ù
--±ùÇò
--±ùʯºø/±ùºø
--Ñ©ÉÏĦÍгµ
--Ñ©ÇÁ
--¶¬¼¾Á½Ïî
--Ô½Ò°»¬Ñ©
--»¬Ñ©
--µ¥°å»¬Ñ©/»¬Ñ©°å
--ѩЬ½¡ÐÐ
--Ñ©µØÔ˶¯
--Ò»°ã¼«ÏÞÔ˶¯
--»¬°å
--ÅÊÑÒ
--¸ß¿Õµ¯Ìø/±Ä¼«»î¶¯
--ÅÜ¿á
--BMX
--¶¨ÏòÔ½Ò°
--ÌøÉ¡
--Èü³µ
--ÌúÈËÈýÏîÔ˶¯
--³ËµçÌÝ
--³ËÊÖ·öÌÝ
--×öÔ°ÒÕ
--×ö¼ÒÎñ
--ÔÚ³µÀï
--Ú¤Ïë
--¾²Ö¹
--Çãб
--×øÂÖÒÎÒƶ¯
--½¡ÉíÀà
--ÇòÀà
--Ë®ÉÏÔ˶¯
--Î赸Àà
--¼«ÏÞÔ˶¯
--±ùÉÏÔ˶¯
--ÐÝÏÐÔ˶¯
--ÆäËû
--Î赸Ô˶¯
--ÇòÀàÔ˶¯
--ÆäËûÔ˶¯
--½¡ÉíÔ˶¯
--ѵÁ·
--¿ìËÙѵÁ·
--ÉèÖÃÄ¿±ê >
--ʱ³¤
--ʱ³¤É趨
--·ÖÖÓ
--¿¨Â·Àï
--¿¨Â·ÀïÉ趨
--ǧ¿¨
--¾àÀë
--¾àÀëÉ趨
--Ã×
--¹«Àï
--²½Êý
--²½ÊýÉ趨
--²½
--ÐÄÂÊ
--ƽ¾ùÐÄÂÊ
--´Î/·Ö
--ƽ¾ùÐÄÂÊ(´Î/·Ö)
--ÖÐ
--½ÏµÍÇ¿¶È
--ÖеÈÇ¿¶È
--¸ßµÈÇ¿¶È
--³¬¸ßÇ¿¶È
--ѵÁ·Ç¿¶È
--ѵÁ·Ç¿¶ÈÓÃÓÚÅжÏÊÇ·ñѵÁ·²»×ã»òÕßѵÁ·Ì«¹ý£¬µ½µ×ʹÐÄÂÊÔö¼Ó¶àÉÙµÄÔ˶¯Ç¿¶È²ÅÊÇ×îºÏÊʵġ£
--¸ÃÇ¿¶ÈÇø¼äÊǶÔÓ¦°ÐÐÄÂÊ£¨ÓɸöÈË»ù±¾×ÊÁϼÆËãµÃ³ö£©Ç¿ÈõµÄʵʱ״̬ÏÔʾ£¬ÓÐÖúÓÚÌá¸ßѵÁ·ÖÊÁ¿
--ѵÁ·×´Ì¬´ú±íµÄÒâÒå
--ÈÈÉíÔ˶¯
--ȼ֬Çø
--ÌáÉýÐķλúÄÜ
--רҵÔ˶¯Ô±
--×¢£º¸ÃѵÁ·Ç¿¶È²¢·ÇרҵÔ˶¯ÆÀ¹À£¬Êý¾Ý½ö¹©²Î¿¼
--ѵÁ·ÖÐ
--ÔÝͣѵÁ·
--½áÊø
--ÔÝÍ£
--¼ÌÐø
--Ä¿±êÒÑ´ï³É
--Íê³ÉÄ¿±ê
--È·¶¨
--×¢Òâ
--µ±Ç°Ô˶¯Á¿Ì«Ð¡£¬ÎÞ·¨¼Ç¼ ÊÇ·ñ½áÊøÔ˶¯
--½áÊøÔ˶¯
--ÊÇ·ñ½áÊø±¾´ÎÔ˶¯
--Ä¿±êÍê³É¶È
--ѵÁ·Ê±³¤
--¹Ø±Õ
--¸ü¶à

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
index dea0dbf,0285deb..db04de8
--- 1/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
--- 2/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
@@@ -219,61 -234,43 +219,90 @@@ STR_END_MOVEMENT$ç»\93æ\9d\9fè¿\90å\8a
  STR_END_THIS_MOVEMENT$是否结束本次运动\r
  STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度\r
  STR_TRAINING_DURATION$训练时长\r
 -STR_OFF$关闭\r
 +STR_CLOSE$关闭\r
  STR_MORE$更多\r
- STR_SETTING$设置\r
 +STR_MORE_APP$更多前往APP查看\r
 +STR_RANGE_MILE$距离(米）\r
 +STR_SAVENOTE$开启省电模式会关闭非必要的蓝牙连接，以及传感器监测等功能\r
 +STR_SAVEBACK$长按屏幕3秒以上或充电可退出省电模式\r
 +STR_SAVEASK$是否开启\r
 +STR_BLOOD$血氧饱和度\r
 +STR_CHECK$检测\r
 +STR_CHECKTIME$XX分钟前检测\r
 +STR_CHECKNO$暂无检测记录\r
 +STR_CHECKNOTE$偏紧佩戴，保持静止\r
 +STR_CHECKON$正在检测\r
 +STR_CHECKSTOP$停止检测\r
 +STR_CHECKERROR$检测不到结果\r
 +STR_WEARNOTE$请确认已带上手表，并保持静止，准备好后点击下方按钮进行重新检测\r
 +STR_RECHECK$重新检测\r
 +STR_CHECKEWARN$血氧提醒\r
 +STR_BLOODSHORT$当前血氧含量已低于XX%\r
 +STR_HEARTNOTE$请注意身体健康\r
 +STR_KONW$知道了\r
 +STR_EXPLAIN$说明\r
 +STR_HEARTREST$静息 \r
 +STR_HEARTDATA$心率检测结果\r
 +STR_HEARTTITLE$心率提醒\r
 +STR_HEARTMAX$当前心率值高于XXX\r
 +STR_HEARTMIN$当前心率值低于XXX\r
 +STR_TRAINGNO$无记录\r
 +STR_TRAINGGO$去训练\r
 +STR_MESSAGE$通知\r
 +STR_MESSAGENO$暂无内容\r
 +STR_STEP$今日步数\r
 +STR_DIS$里程(KM)\r
 +STR_DUR$燃脂时间\r
 +STR_STANDUP$站立次数\r
 +STR_SLEEP$昨夜睡眠\r
 +STR_SLEEPHOUR$小时\r
 +STR_SLEEPMGOAL$目标\r
 +STR_REATTIME$作息时间\r
 +STR_SLEEPTIME$入睡时间\r
 +STR_WALKTIME$醒来时间\r
 +STR_DISTURB$手表将在20分钟后开启勿扰模式，关闭请到控制中心\r
 +STR_DISTURBNOTE$已开启勿扰模式，此模式下手表将不会发出震动与铃声\r
 +STR_MORNNING$早安\r
 +STR_NOW$当前\r
 +STR_NAP$小睡(5分钟)\r
 +STR_TACK$请先打开app，进入“设备”-“拍照”\r
 +STR_CLICK$点击拍照\r
 +STR_TACKNUM$已拍摄X张\r
+ STR_HEART_RATE$心率\r
+ STR_BLOOD_OXYGEN$血氧\r
+ STR_TRAINING$训练\r
+ STR_TRAINING_RECORD$训练记录\r
+ STR_COMPASS$指南针\r
+ STR_PHONE$电话\r
+ STR_FAVORITE_CONTACTS$常用联系人\r
+ STR_WEATHER$天气\r
+ STR_ACTIVITY$活动\r
+ STR_WATCH_FACE$更换表盘\r
+ STR_DISPLAY_MODE$显示方式\r
+ STR_CARD_MANAGEMENT$卡片管理\r
+ STR_MUSIC$音乐\r
+ STR_SLEEP$睡眠\r
+ STR_RECORDING$录音\r
+ STR_BREATH_TRAINING$呼吸训练\r
+ STR_REMOTE_SHOOTING$遥控拍照\r
+ STR_VOICE_ASSISTANT$语音助手\r
+ STR_ALIPAY$支付宝\r
+ STR_TIMER$计时器\r
+ STR_ALARM$闹钟\r
+ STR_STOPWATCH$秒表\r
+ STR_CALCULATOR$计算器\r
+ STR_FIND_PHONE$查找手机\r
+ STR_BRIGHTNESS_ADJUSTMENT$亮度调节\r
+ STR_SOUND$声音\r
+ STR_BLUETOOTH$蓝牙\r
+ STR_DO_NOT_DISTURB$勿扰模式\r
+ STR_MESSAGE_NOTIFICATION$消息通知\r
+ STR_POWER_SAVE_MODE$省电模式\r
+ STR_FLASHLIGHT$手电筒\r
+ STR_SETTINGS$设置\r
  STR_SCREEN_AND_BRIGHTNESS$屏幕与亮度\r
  STR_NETWORKANDCALL$网络与通话\r
- STR_BLUETOOTH$蓝牙\r
  STR_SOUND_AND_VIBRATION$声音与震动\r
- STR_DISPLAY_MODE$显示方式\r
  STR_MOTION_RECOGNITION$运动识别\r
  STR_SYSTEM$系统\r
  STR_SHUTDOWN_AND_RESTART$关机和重启\r

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
index d7890ff,cc595a9..183f8d5
--- 1/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
--- 2/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
@@@ -220,61 -235,43 +220,90 @@@
        <lanstr id="STR_END_THIS_MOVEMENT" value="是否结束本次运动"/>
        <lanstr id="STR_GOAL_ACCOMPLISHMENT_DEGREE" value="目标完成度"/>
        <lanstr id="STR_TRAINING_DURATION" value="训练时长"/>
 -      <lanstr id="STR_OFF" value="关闭"/>
 +      <lanstr id="STR_CLOSE" value="关闭"/>
        <lanstr id="STR_MORE" value="更多"/>
-       <lanstr id="STR_SETTING" value="设置"/>
 +      <lanstr id="STR_MORE_APP" value="更多前往APP查看"/>
 +      <lanstr id="STR_RANGE_MILE" value="距离(米）"/>
 +      <lanstr id="STR_SAVENOTE" value="开启省电模式会关闭非必要的蓝牙连接，以及传感器监测等功能"/>
 +      <lanstr id="STR_SAVEBACK" value="长按屏幕3秒以上或充电可退出省电模式"/>
 +      <lanstr id="STR_SAVEASK" value="是否开启"/>
 +      <lanstr id="STR_BLOOD" value="血氧饱和度"/>
 +      <lanstr id="STR_CHECK" value="检测"/>
 +      <lanstr id="STR_CHECKTIME" value="XX分钟前检测"/>
 +      <lanstr id="STR_CHECKNO" value="暂无检测记录"/>
 +      <lanstr id="STR_CHECKNOTE" value="偏紧佩戴，保持静止"/>
 +      <lanstr id="STR_CHECKON" value="正在检测"/>
 +      <lanstr id="STR_CHECKSTOP" value="停止检测"/>
 +      <lanstr id="STR_CHECKERROR" value="检测不到结果"/>
 +      <lanstr id="STR_WEARNOTE" value="请确认已带上手表，并保持静止，准备好后点击下方按钮进行重新检测"/>
 +      <lanstr id="STR_RECHECK" value="重新检测"/>
 +      <lanstr id="STR_CHECKEWARN" value="血氧提醒"/>
 +      <lanstr id="STR_BLOODSHORT" value="当前血氧含量已低于XX%"/>
 +      <lanstr id="STR_HEARTNOTE" value="请注意身体健康"/>
 +      <lanstr id="STR_KONW" value="知道了"/>
 +      <lanstr id="STR_EXPLAIN" value="说明"/>
 +      <lanstr id="STR_HEARTREST" value="静息"/>
 +      <lanstr id="STR_HEARTDATA" value="心率检测结果"/>
 +      <lanstr id="STR_HEARTTITLE" value="心率提醒"/>
 +      <lanstr id="STR_HEARTMAX" value="当前心率值高于XXX"/>
 +      <lanstr id="STR_HEARTMIN" value="当前心率值低于XXX"/>
 +      <lanstr id="STR_TRAINGNO" value="无记录"/>
 +      <lanstr id="STR_TRAINGGO" value="去训练"/>
 +      <lanstr id="STR_MESSAGE" value="通知"/>
 +      <lanstr id="STR_MESSAGENO" value="暂无内容"/>
 +      <lanstr id="STR_STEP" value="今日步数"/>
 +      <lanstr id="STR_DIS" value="里程(KM)"/>
 +      <lanstr id="STR_DUR" value="燃脂时间"/>
 +      <lanstr id="STR_STANDUP" value="站立次数"/>
 +      <lanstr id="STR_SLEEP" value="昨夜睡眠"/>
 +      <lanstr id="STR_SLEEPHOUR" value="小时"/>
 +      <lanstr id="STR_SLEEPMGOAL" value="目标"/>
 +      <lanstr id="STR_REATTIME" value="作息时间"/>
 +      <lanstr id="STR_SLEEPTIME" value="入睡时间"/>
 +      <lanstr id="STR_WALKTIME" value="醒来时间"/>
 +      <lanstr id="STR_DISTURB" value="手表将在20分钟后开启勿扰模式，关闭请到控制中心"/>
 +      <lanstr id="STR_DISTURBNOTE" value="已开启勿扰模式，此模式下手表将不会发出震动与铃声"/>
 +      <lanstr id="STR_MORNNING" value="早安"/>
 +      <lanstr id="STR_NOW" value="当前"/>
 +      <lanstr id="STR_NAP" value="小睡(5分钟)"/>
 +      <lanstr id="STR_TACK" value="请先打开app，进入“设备”-“拍照”"/>
 +      <lanstr id="STR_CLICK" value="点击拍照"/>
 +      <lanstr id="STR_TACKNUM" value="已拍摄X张"/>
+       <lanstr id="STR_HEART_RATE" value="心率"/>
+       <lanstr id="STR_BLOOD_OXYGEN" value="血氧"/>
+       <lanstr id="STR_TRAINING" value="训练"/>
+       <lanstr id="STR_TRAINING_RECORD" value="训练记录"/>
+       <lanstr id="STR_COMPASS" value="指南针"/>
+       <lanstr id="STR_PHONE" value="电话"/>
+       <lanstr id="STR_FAVORITE_CONTACTS" value="常用联系人"/>
+       <lanstr id="STR_WEATHER" value="天气"/>
+       <lanstr id="STR_ACTIVITY" value="活动"/>
+       <lanstr id="STR_WATCH_FACE" value="更换表盘"/>
+       <lanstr id="STR_DISPLAY_MODE" value="显示方式"/>
+       <lanstr id="STR_CARD_MANAGEMENT" value="卡片管理"/>
+       <lanstr id="STR_MUSIC" value="音乐"/>
+       <lanstr id="STR_SLEEP" value="睡眠"/>
+       <lanstr id="STR_RECORDING" value="录音"/>
+       <lanstr id="STR_BREATH_TRAINING" value="呼吸训练"/>
+       <lanstr id="STR_REMOTE_SHOOTING" value="遥控拍照"/>
+       <lanstr id="STR_VOICE_ASSISTANT" value="语音助手"/>
+       <lanstr id="STR_ALIPAY" value="支付宝"/>
+       <lanstr id="STR_TIMER" value="计时器"/>
+       <lanstr id="STR_ALARM" value="闹钟"/>
+       <lanstr id="STR_STOPWATCH" value="秒表"/>
+       <lanstr id="STR_CALCULATOR" value="计算器"/>
+       <lanstr id="STR_FIND_PHONE" value="查找手机"/>
+       <lanstr id="STR_BRIGHTNESS_ADJUSTMENT" value="亮度调节"/>
+       <lanstr id="STR_SOUND" value="声音"/>
+       <lanstr id="STR_BLUETOOTH" value="蓝牙"/>
+       <lanstr id="STR_DO_NOT_DISTURB" value="勿扰模式"/>
+       <lanstr id="STR_MESSAGE_NOTIFICATION" value="消息通知"/>
+       <lanstr id="STR_POWER_SAVE_MODE" value="省电模式"/>
+       <lanstr id="STR_FLASHLIGHT" value="手电筒"/>
+       <lanstr id="STR_SETTINGS" value="设置"/>
        <lanstr id="STR_SCREEN_AND_BRIGHTNESS" value="屏幕与亮度"/>
        <lanstr id="STR_NETWORKANDCALL" value="网络与通话"/>
-       <lanstr id="STR_BLUETOOTH" value="蓝牙"/>
        <lanstr id="STR_SOUND_AND_VIBRATION" value="声音与震动"/>
-       <lanstr id="STR_DISPLAY_MODE" value="显示方式"/>
        <lanstr id="STR_MOTION_RECOGNITION" value="运动识别"/>
        <lanstr id="STR_SYSTEM" value="系统"/>
        <lanstr id="STR_SHUTDOWN_AND_RESTART" value="关机和重启"/>

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index 1197cf7,6626452..d75dc1a
Binary files differ

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
index 0d3cd40,de41d93..b278049
Binary files differ

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index fce0db1,d06ca5f..496562d
--- 1/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
--- 2/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@@ -251,64 -251,88 +251,134 @@@ enum UIResourceTextId : uint16_t 
      STR_EXERCISE_KETTLEBELLTRAINING = 238,\r
      STR_EXTREME_ORIENTEERING = 239,\r
      STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,\r
 -    STR_BLOOD_OXYGEN = 241,\r
 -    STR_TRAINING_RECORD = 242,\r
 -    STR_COMPASS = 243,\r
 -    STR_PHONE = 244,\r
 -    STR_FAVORITE_CONTACTS = 245,\r
 -    STR_WEATHER = 246,\r
 -    STR_ACTIVITY = 247,\r
 -    STR_WATCH_FACE = 248,\r
 -    STR_DISPLAY_MODE = 249,\r
 -    STR_CARD_MANAGEMENT = 250,\r
 -    STR_MUSIC = 251,\r
 -    STR_SLEEP = 252,\r
 -    STR_RECORDING = 253,\r
 -    STR_BREATH_TRAINING = 254,\r
 -    STR_REMOTE_SHOOTING = 255,\r
 -    STR_VOICE_ASSISTANT = 256,\r
 -    STR_ALIPAY = 257,\r
 -    STR_TIMER = 258,\r
 -    STR_ALARM = 259,\r
 -    STR_STOPWATCH = 260,\r
 -    STR_CALCULATOR = 261,\r
 -    STR_FIND_PHONE = 262,\r
 -    STR_BRIGHTNESS_ADJUSTMENT = 263,\r
 -    STR_SOUND = 264,\r
 -    STR_BLUETOOTH = 265,\r
 -    STR_DO_NOT_DISTURB = 266,\r
 -    STR_MESSAGE_NOTIFICATION = 267,\r
 -    STR_POWER_SAVE_MODE = 268,\r
 -    STR_FLASHLIGHT = 269,\r
 -    STR_SETTINGS = 270,\r
 -    STR_SCREEN_AND_BRIGHTNESS = 271,\r
 -    STR_NETWORKANDCALL = 272,\r
 -    STR_SOUND_AND_VIBRATION = 273,\r
 -    STR_MOTION_RECOGNITION = 274,\r
 -    STR_SYSTEM = 275,\r
 -    STR_SHUTDOWN_AND_RESTART = 276,\r
 -    STR_SCREEN_ON_DURATION = 277,\r
 -    STR_RAISE_TO_WAKE = 278,\r
 -    STR_5_SECONDS = 279,\r
 -    STR_10_SECONDS = 280,\r
 -    STR_15_SECONDS = 281,\r
 -    STR_30_SECONDS = 282,\r
 -    STR_60_SECONDS = 283,\r
 -    STR_300_SECONDS = 284,\r
 -    STR_4G_CAPABILITY = 285,\r
 -    STR_VOLTE_CALL = 286,\r
 -    STR_MOBILE_DATA_OPTION = 287,\r
 -    STR_SYSTEM_UPDATE = 288,\r
 -    STR_ONLINE_MUSIC = 289,\r
 -    STR_BLUETOOTH_HEADPHONES = 290,\r
 -    STR_TRADITIONAL_BLUETOOTH = 291,\r
 -    STR_AUTO_OFF_BLUETOOTH_NOTE = 292,\r
 -    STR_BLUETOOTH_SERVICE_OPTIONS = 293,\r
 -    STR_HFP = 294,\r
 -    STR_A2DP = 295,\r
 -    STR_SYSTEM_VOLUME = 296,\r
 -    STR_MEDIA_VOLUME = 297,\r
 -    STR_VIBRATION_MODE = 298,\r
 -    STR_SILENT_MODE = 299,\r
 -    STR_LIST_DISPLAY = 300,\r
 -    STR_GRID_DISPLAY = 301,\r
 -    STR_CELLULAR_DISPLAY = 302,\r
 -    STR_AUTO_DETECT = 303,\r
 -    STR_ABOUT_WATCH = 304,\r
 -    STR_WATCH_QR_CODE = 305,\r
 -    STR_SYSTEM_LANGUAGE = 306,\r
 -    STR_RESTART = 307,\r
 -    STR_SHUTDOWN = 308,\r
 -    STR_FACTORY_RESET = 309,\r
 -    STR_WATCH_NAME = 310,\r
 -    STR_FIRMWARE_VERSION = 311,\r
 -    STR_BLUETOOTH_NAME = 312,\r
 -    STR_BLUETOOTH_ADDRESS = 313,\r
 -    STR_LATEST_VERSION = 314,\r
 -    STR_LATER = 315,\r
 -    STR_UP_TO_DATE = 316,\r
 -    STR_NO_UPDATE = 317,\r
 -    STR_LANGUAGE_SELECTION = 318,\r
 -    STR_RESET_CONFIRM = 319,\r
 -    STR_SHUTDOWN_CONFIRM = 320,\r
 -    STR_RESET_CONFIRM_NOTE = 321,\r
 -    STR_MAX_ID = 322,\r
 +    STR_CLOSE = 241,\r
 +    STR_MORE_APP = 242,\r
 +    STR_RANGE_MILE = 243,\r
 +    STR_SAVENOTE = 244,\r
 +    STR_SAVEBACK = 245,\r
 +    STR_SAVEASK = 246,\r
 +    STR_BLOOD = 247,\r
 +    STR_CHECK = 248,\r
 +    STR_CHECKTIME = 249,\r
 +    STR_CHECKNO = 250,\r
 +    STR_CHECKNOTE = 251,\r
 +    STR_CHECKON = 252,\r
 +    STR_CHECKSTOP = 253,\r
 +    STR_CHECKERROR = 254,\r
 +    STR_WEARNOTE = 255,\r
 +    STR_RECHECK = 256,\r
 +    STR_CHECKEWARN = 257,\r
 +    STR_BLOODSHORT = 258,\r
 +    STR_HEARTNOTE = 259,\r
 +    STR_KONW = 260,\r
 +    STR_EXPLAIN = 261,\r
 +    STR_HEARTREST = 262,\r
 +    STR_HEARTDATA = 263,\r
 +    STR_HEARTTITLE = 264,\r
 +    STR_HEARTMAX = 265,\r
 +    STR_HEARTMIN = 266,\r
 +    STR_TRAINGNO = 267,\r
 +    STR_TRAINGGO = 268,\r
 +    STR_MESSAGE = 269,\r
 +    STR_MESSAGENO = 270,\r
 +    STR_DIS = 271,\r
 +    STR_DUR = 272,\r
 +    STR_STANDUP = 273,\r
 +    STR_SLEEP = 274,\r
 +    STR_SLEEPHOUR = 275,\r
 +    STR_SLEEPMGOAL = 276,\r
 +    STR_REATTIME = 277,\r
 +    STR_SLEEPTIME = 278,\r
 +    STR_WALKTIME = 279,\r
 +    STR_DISTURB = 280,\r
 +    STR_DISTURBNOTE = 281,\r
 +    STR_MORNNING = 282,\r
 +    STR_NOW = 283,\r
 +    STR_NAP = 284,\r
 +    STR_TACK = 285,\r
 +    STR_CLICK = 286,\r
 +    STR_TACKNUM = 287,\r
-     STR_SETTING = 288,\r
-     STR_SCREEN_AND_BRIGHTNESS = 289,\r
-     STR_NETWORKANDCALL = 290,\r
-     STR_BLUETOOTH = 291,\r
-     STR_SOUND_AND_VIBRATION = 292,\r
-     STR_DISPLAY_MODE = 293,\r
-     STR_MOTION_RECOGNITION = 294,\r
-     STR_SYSTEM = 295,\r
-     STR_SHUTDOWN_AND_RESTART = 296,\r
-     STR_LANGUAGE = 297,\r
-     STR_MAX_ID = 298,\r
++    STR_BLOOD_OXYGEN = 288,\r
++    STR_TRAINING_RECORD = 289,\r
++    STR_COMPASS = 290,\r
++    STR_PHONE = 291,\r
++    STR_FAVORITE_CONTACTS = 292,\r
++    STR_WEATHER = 293,\r
++    STR_ACTIVITY = 294,\r
++    STR_WATCH_FACE = 295,\r
++    STR_DISPLAY_MODE = 296,\r
++    STR_CARD_MANAGEMENT = 297,\r
++    STR_MUSIC = 298,\r
++    STR_RECORDING = 299,\r
++    STR_BREATH_TRAINING = 300,\r
++    STR_REMOTE_SHOOTING = 301,\r
++    STR_VOICE_ASSISTANT = 302,\r
++    STR_ALIPAY = 303,\r
++    STR_TIMER = 304,\r
++    STR_ALARM = 305,\r
++    STR_STOPWATCH = 306,\r
++    STR_CALCULATOR = 307,\r
++    STR_FIND_PHONE = 308,\r
++    STR_BRIGHTNESS_ADJUSTMENT = 309,\r
++    STR_SOUND = 310,\r
++    STR_BLUETOOTH = 311,\r
++    STR_DO_NOT_DISTURB = 312,\r
++    STR_MESSAGE_NOTIFICATION = 313,\r
++    STR_POWER_SAVE_MODE = 314,\r
++    STR_FLASHLIGHT = 315,\r
++    STR_SETTINGS = 316,\r
++    STR_SCREEN_AND_BRIGHTNESS = 317,\r
++    STR_NETWORKANDCALL = 318,\r
++    STR_SOUND_AND_VIBRATION = 319,\r
++    STR_MOTION_RECOGNITION = 320,\r
++    STR_SYSTEM = 321,\r
++    STR_SHUTDOWN_AND_RESTART = 322,\r
++    STR_SCREEN_ON_DURATION = 323,\r
++    STR_RAISE_TO_WAKE = 324,\r
++    STR_5_SECONDS = 325,\r
++    STR_10_SECONDS = 326,\r
++    STR_15_SECONDS = 327,\r
++    STR_30_SECONDS = 328,\r
++    STR_60_SECONDS = 329,\r
++    STR_300_SECONDS = 330,\r
++    STR_4G_CAPABILITY = 331,\r
++    STR_VOLTE_CALL = 332,\r
++    STR_MOBILE_DATA_OPTION = 333,\r
++    STR_SYSTEM_UPDATE = 334,\r
++    STR_ONLINE_MUSIC = 335,\r
++    STR_BLUETOOTH_HEADPHONES = 336,\r
++    STR_TRADITIONAL_BLUETOOTH = 337,\r
++    STR_AUTO_OFF_BLUETOOTH_NOTE = 338,\r
++    STR_BLUETOOTH_SERVICE_OPTIONS = 339,\r
++    STR_HFP = 340,\r
++    STR_A2DP = 341,\r
++    STR_SYSTEM_VOLUME = 342,\r
++    STR_MEDIA_VOLUME = 343,\r
++    STR_VIBRATION_MODE = 344,\r
++    STR_SILENT_MODE = 345,\r
++    STR_LIST_DISPLAY = 346,\r
++    STR_GRID_DISPLAY = 347,\r
++    STR_CELLULAR_DISPLAY = 348,\r
++    STR_AUTO_DETECT = 349,\r
++    STR_ABOUT_WATCH = 350,\r
++    STR_WATCH_QR_CODE = 351,\r
++    STR_SYSTEM_LANGUAGE = 352,\r
++    STR_RESTART = 353,\r
++    STR_SHUTDOWN = 354,\r
++    STR_FACTORY_RESET = 355,\r
++    STR_WATCH_NAME = 356,\r
++    STR_FIRMWARE_VERSION = 357,\r
++    STR_BLUETOOTH_NAME = 358,\r
++    STR_BLUETOOTH_ADDRESS = 359,\r
++    STR_LATEST_VERSION = 360,\r
++    STR_LATER = 361,\r
++    STR_UP_TO_DATE = 362,\r
++    STR_NO_UPDATE = 363,\r
++    STR_LANGUAGE_SELECTION = 364,\r
++    STR_RESET_CONFIRM = 365,\r
++    STR_SHUTDOWN_CONFIRM = 366,\r
++    STR_RESET_CONFIRM_NOTE = 367,\r
++    STR_MAX_ID = 368,\r
  }; // UIResourceTextId\r
  
  enum FontLanguageId : uint8_t {

diff --cc code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 5d30ae8,fb667d5..3dae354
Binary files differ

diff --cc code/sdk/application/wearable/fd230app/nativeui/traing/TrainingType.h
index 0000000,0000000..daabd24
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/TrainingType.h
@@@ -1,0 -1,0 +1,186 @@@
++/***
++ * @Date: 2024-04-23 17:54:29
++ * @LastEditors: Caisking 3449750381@qq.com
++ * @LastEditTime: 2024-04-23 17:55:36
++ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/TrainingType.h
++ */
++#ifndef TRAINING_TYPE_H
++#define TRAINING_TYPE_H
++#include "traing/include/TraingModel.h"
++#include "uicomponents/UIComponents.h"
++namespace OHOS
++{
++#define MAX_TAININGNUM 176
++
++    struct training_data
++    {
++        Exercisetype sporttype;    // 运动类
++        UIResourceTextId sportId;  // 运动项目
++        ExerciseClass sport_cywee; // 在cywee里面对应的类型
++    };
++
++    training_data tainging_indetail_data[MAX_TAININGNUM] =
++        {
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING},            // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_FREETRAINING, ExerciseClass::FREE_TRAINING},       // 自由训练
++            {Exercisetype::FITNESS, STR_EXERCISE_RESISTANCETRAINING, ExerciseClass::FREE_TRAINING}, // 肌力训练
++            {Exercisetype::FITNESS, STR_EXERCISE_SPINBIKE, ExerciseClass::FREE_TRAINING},           // 飞轮车/室内健身车
++            {Exercisetype::FITNESS, STR_EXERCISE_TREADMILL, ExerciseClass::FREE_TRAINING},          // 踏步机
++            {Exercisetype::FITNESS, STR_EXERCISE_STROLLMACHINE, ExerciseClass::FREE_TRAINING},      // 漫步机
++            {Exercisetype::FITNESS, STR_EXERCISE_HIIT, ExerciseClass::FREE_TRAINING},               // 高强度间歇训练
++            {Exercisetype::FITNESS, STR_EXERCISE_CROSSFIT, ExerciseClass::FREE_TRAINING},           // 健身
++            {Exercisetype::FITNESS, STR_EXERCISE_GROUPCALISTHENICS, ExerciseClass::FREE_TRAINING},  // 团体操
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGA, ExerciseClass::FREE_TRAINING},               // 瑜珈
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGACAT, ExerciseClass::FREE_TRAINING},            // 瑜珈猫式
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGACOW, ExerciseClass::FREE_TRAINING},            // 瑜珈牛式
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGACOBRA, ExerciseClass::FREE_TRAINING},          // 瑜珈眼镜蛇式
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGAHERO1, ExerciseClass::FREE_TRAINING},          // 瑜珈英雄式1
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGAHERO2, ExerciseClass::FREE_TRAINING},          // 瑜珈英雄式2
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGAHERO3, ExerciseClass::FREE_TRAINING},          // 瑜珈英雄式3
++            {Exercisetype::FITNESS, STR_EXERCISE_YOGAROLLING, ExerciseClass::FREE_TRAINING},        // 瑜珈滚轮
++
++            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORWALKING, ExerciseClass::FREE_TRAINING}, // 室外走路
++            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORRUNNING, ExerciseClass::OUTDOOR},       // 室外跑步
++            {Exercisetype::FITNESS, STR_EXERCISE_INDOORWALKING, ExerciseClass::FREE_TRAINING},  // 室内走路
++            {Exercisetype::FITNESS, STR_EXERCISE_INDOORRUNNING, ExerciseClass::INDOOR},         // 室内跑步
++            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORBIKING, ExerciseClass::FREE_TRAINING},  // 室外骑行
++
++            {Exercisetype::FITNESS, STR_EXERCISE_JUMPINGROPE, ExerciseClass::FREE_TRAINING},                 // 跳绳
++            {Exercisetype::FITNESS, STR_EXERCISE_PILATES, ExerciseClass::FREE_TRAINING},                     // 皮拉提斯
++            {Exercisetype::FITNESS, STR_EXERCISE_CROSS_FIT, ExerciseClass::FREE_TRAINING},                   // 混合健身
++            {Exercisetype::FITNESS, STR_EXERCISE_FUNCTIONALTRAINING, ExerciseClass::FREE_TRAINING},          // 功能性训练
++            {Exercisetype::FITNESS, STR_EXERCISE_PHYSICALTRAINING, ExerciseClass::FREE_TRAINING},            // 体能训练
++            {Exercisetype::FITNESS, STR_EXERCISE_TAEKWONDO, ExerciseClass::FREE_TRAINING},                   // 跆拳道/踢拳
++            {Exercisetype::FITNESS, STR_EXERCISE_BOXING, ExerciseClass::FREE_TRAINING},                      // 拳击
++            {Exercisetype::FITNESS, STR_EXERCISE_KICKBOXING, ExerciseClass::FREE_TRAINING},                  // 自由搏击
++            {Exercisetype::FITNESS, STR_EXERCISE_KARATE, ExerciseClass::FREE_TRAINING},                      // 空手道
++            {Exercisetype::FITNESS, STR_EXERCISE_FENCING, ExerciseClass::FREE_TRAINING},                     // 击剑
++            {Exercisetype::FITNESS, STR_EXERCISE_CORETRAINING, ExerciseClass::FREE_TRAINING},                // 核心训练
++            {Exercisetype::FITNESS, STR_EXERCISE_BODYCOMBAT, ExerciseClass::FREE_TRAINING},                  // 拳击有氧
++            {Exercisetype::FITNESS, STR_EXERCISE_KENDO, ExerciseClass::FREE_TRAINING},                       // 剑道
++            {Exercisetype::FITNESS, STR_EXERCISE_HORIZONTALBAR, ExerciseClass::FREE_TRAINING},               // 单杠
++            {Exercisetype::FITNESS, STR_EXERCISE_PARALLELBARS, ExerciseClass::FREE_TRAINING},                // 双杠
++            {Exercisetype::FITNESS, STR_EXERCISE_CIRCUIT, ExerciseClass::FREE_TRAINING},                     // 循环训练
++            {Exercisetype::FITNESS, STR_EXERCISE_AEROBICS, ExerciseClass::FREE_TRAINING},                    // 有氧运动
++            {Exercisetype::FITNESS, STR_EXERCISE_CALISTHENICE, ExerciseClass::FREE_TRAINING},                // 健美操
++            {Exercisetype::FITNESS, STR_EXERCISE_P90X, ExerciseClass::FREE_TRAINING},                        // P90X
++            {Exercisetype::FITNESS, STR_EXERCISE_KETTLEBELLTRAINING, ExerciseClass::FREE_TRAINING},          // 壶铃训练
++            {Exercisetype::FITNESS, STR_EXERCISE_MIXEDMARTIALARTS, ExerciseClass::FREE_TRAINING},            // 综合格斗
++            {Exercisetype::FITNESS, STR_EXERCISE_STAIRCLIMBINGMACHINE, ExerciseClass::FREE_TRAINING},        // 爬楼梯机
++            {Exercisetype::FITNESS, STR_EXERCISE_WEIGHTLIFTING, ExerciseClass::FREE_TRAINING},               // 举重
++            {Exercisetype::FITNESS, STR_EXERCISE_BARRE, ExerciseClass::FREE_TRAINING},                       // Barre
++            {Exercisetype::FITNESS, STR_EXERCISE_HANDCYCLING, ExerciseClass::FREE_TRAINING},                 // 手轮
++            {Exercisetype::FITNESS, STR_EXERCISE_TRACKFIELD, ExerciseClass::FREE_TRAINING},                  // 田径
++            {Exercisetype::FITNESS, STR_EXERCISE_WRESTLING, ExerciseClass::FREE_TRAINING},                   // 角力
++            {Exercisetype::FITNESS, STR_EXERCISE_MINDBODY, ExerciseClass::FREE_TRAINING},                    // 身心运动
++            {Exercisetype::FITNESS, STR_EXERCISE_FLEXIBILITY, ExerciseClass::FREE_TRAINING},                 // 柔软操
++            {Exercisetype::FITNESS, STR_EXERCISE_MIXEDCARDIO, ExerciseClass::FREE_TRAINING},                 // 混和有氧
++            {Exercisetype::FITNESS, STR_EXERCISE_TRADITIONALSTRENGTHTRAINING, ExerciseClass::FREE_TRAINING}, // 传统肌力训练
++            {Exercisetype::FITNESS, STR_EXERCISE_CROSSTRAINING, ExerciseClass::FREE_TRAINING},               // 交叉训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GYMNASTICS, ExerciseClass::FREE_TRAINING},                  // 体操
++            {Exercisetype::FITNESS, STR_EXERCISE_STEPTRAINING, ExerciseClass::FREE_TRAINING},                // 阶梯训练
++            {Exercisetype::FITNESS, STR_EXERCISE_ELLIPTICALTRAINER, ExerciseClass::FREE_TRAINING},           // 椭圆机
++            {Exercisetype::FITNESS, STR_EXERCISE_ROWINGMACHINE, ExerciseClass::FREE_TRAINING},               // 划船机
++
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
++    };
++}
++#endif