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

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

diff --cc code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
index f2aa237,cb78569..8681cc5
--- 1/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
--- 2/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
@@@ -301,7 -301,7 +301,8 @@@ namespace OHO
       */
      void FindWatchViewEventListener::PopInterCancelMusic(void)
      {
 +        // SendMsgToUIService(SCREEN_TURN_OFF_TO_UI, 0, nullptr, 0);
+         ScreenTurnOff();
          GraphicService::GetInstance()->PostGraphicEvent(
              std::bind(&FindWatchViewEventListener::FindWatchRingPlayStop, &FindWatchViewEventListener::GetInstance()));
      }
@@@ -592,4 -591,4 +592,4 @@@
          // 此处实现代码处理进度控制完成的事件
      }
  
--}
++}

diff --cc code/sdk/drivers/peripheral/config/include/ConfigModel.h
Simple merge