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

diff --cc code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
index e4742a8,86e00a1..7711d23
--- 1/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
@@@ -215,6 -215,6 +215,7 @@@ void MainAlarmView::AlarmAddButtonCreat
      }
  }
  
++//更新闹钟添加按钮的位置
  //更新闹钟添加按钮的位置
  void MainAlarmView::AlarmAddButtonUpdate(uint8_t count)
  {

diff --cc code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
Simple merge