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

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index f409a9a,aad142d..2092d12
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
--- 2/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@@ -436,18 -435,19 +439,19 @@@ namespace OHO
          {VIEW_TRAININGENDDATA,
           &NativeLauncher::InitTraingEnddataSlice}, // 训练结束详细数据
          {VIEW_TRAINING_RECORD,
 -         &NativeLauncher::InitTraingRecordSlice}, // 训练记录
 -        {VIEW_TRAININGMORE, &NativeLauncher::InitTraingMoreSlice}, // 更多训练
 +         &NativeLauncher::InitTraingRecordSlice},                    // 训练记录
 +        {VIEW_TRAININGMORE, &NativeLauncher::InitTraingMoreSlice},   // 更多训练
          {VIEW_TRAININGLIMIT, &NativeLauncher::InitTraingLimitSlice}, // 极限训练
 -        {VIEW_TRAININGICE, &NativeLauncher::InitTraingIceSlice}, // 冰上训练
 +        {VIEW_TRAININGICE, &NativeLauncher::InitTraingIceSlice},     // 冰上训练
          {VIEW_TRAININGFITNESS,
 -         &NativeLauncher::InitTraingFitnessSlice}, // 健身训练
 +         &NativeLauncher::InitTraingFitnessSlice},                   // 健身训练
          {VIEW_TRAININGDANCE, &NativeLauncher::InitTraingDanceSlice}, // 舞蹈训练
 -        {VIEW_TRAININGREST, &NativeLauncher::InitTraingRestSlice}, // 休闲训练
 -        {VIEW_TRAININGBALL, &NativeLauncher::InitTraingBallSlice}, // 球类训练
 +        {VIEW_TRAININGREST, &NativeLauncher::InitTraingRestSlice},   // 休闲训练
 +        {VIEW_TRAININGBALL, &NativeLauncher::InitTraingBallSlice},   // 球类训练
          {VIEW_TRAININGAQUATIC,
 -         &NativeLauncher::InitTraingAquaticSlice}, // 水上训练
 +         &NativeLauncher::InitTraingAquaticSlice},                   // 水上训练
          {VIEW_TRAININGOTHER, &NativeLauncher::InitTraingOtherSlice}, // 水上训练
+         {VIEW_TRAINING_GPSNOTE, &NativeLauncher::InitTraingGPSNoteSlice}, // 训练GPS提醒
          /* --------------------------------------------------------------------------
           */
          /*消息通知*/

diff --cc code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 0ca5b0a,4606562..6e6a9f3
--- 1/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@@ -69,13 -69,13 +69,13 @@@ namespace OHO
  // #endif
  #if defined(BOARD_W9) || defined(BOARD_N9)
          //ECG
 -        {VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr},
 +        //{VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr},
          //情绪
-         //{VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr},
+         {VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr},
          //压力
 -        //{VIEW_STRESS, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_STRESS, nullptr},
 +        //{VIEW_PRESSURE, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_STRESS, nullptr},
          //疲劳度
 -        //{VIEW_FATIGUE, PNG_APPLIST_FATIGUE_IMAGE_BIG, PNG_APPLIST_FATIGUE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "疲劳度", STR_FATIGUE, nullptr},
 +        {VIEW_FATIGUE, PNG_APPLIST_FATIGUE_IMAGE_BIG, PNG_APPLIST_FATIGUE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "疲劳度", STR_BP_CHECK, nullptr},
  #endif
          {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE_BIG, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr},
          {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE_BIG, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动", STR_TRAINING, nullptr},