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

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

diff --cc code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index 827ce08,da7cec5..28f6001
--- 1/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@@ -42,8 -42,10 +42,10 @@@ namespace OHO
          {DROPDOWN_CLICK_SETTING, VIEW_SETTING},             // 设置
          {DROPDOWN_CLICK_BLUETOOTH, VIEW_CLASSIC_BLUETOOTH}, // 蓝牙
          {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB},     // 勿扰
 -        {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE},             // 省电模式
 -        {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE},      // 查找手机
 +        {DROPDOWN_CLICK_SAVEELE, VIEW_NETWORKANDCALL},      // 4G
 +        {DROPDOWN_CLICK_FINDMYPHONE, VIEW_MAIN_ALIPAY},     // 支付宝
+         {MAIN_CLICK_BLOOD, VIEW_BLOODOXY_CHECK},            // 血氧检查
+         {MAIN_CLICK_SETCARD, VIEW_ADD_CARD},                // 卡片管理
      };
  
      static MainPresenterSample *g_pMainPresenterSample = nullptr;

diff --cc code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
Simple merge

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