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
index 493e559,1154017..117fc6b
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
--- 2/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
@@@ -136,7 -136,7 +136,8 @@@ namespace OHO
          void InittestSlice(void);
  
          void InitBloodPressureCheckSlice(void);
 +        void InitCanvasTestSlice(void);
+         void InitECGSlice(void);
  
      private:
          void InitAllNativeSlices(void);

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
Simple merge