Merge #684 into sdk602patch0626 from refs/changes/684/head

Code review from 袁清梦

* refs/changes/684/head: (3 commits squashed)

  - 删除重复的container_的Add

  - 更新默认表盘资源文件

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

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/684

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
index 81baa1e..2330481 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
@@ -141,7 +141,6 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodDetectionView::InitBloodView fail");
         }
 
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
index 1cb3e4d..e59bdab 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -198,7 +198,6 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodResultView::InitBloodView fail");
         }
 
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
index 1779e4d..09ab6f0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
@@ -169,7 +169,6 @@ namespace OHOS
             ui_api_vibrate_once_func();
         }
         
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
index 7c89fc5..78953d5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
@@ -221,7 +221,6 @@ namespace OHOS
             ui_api_vibrate_once_func();
         }
 
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionView.cpp
index e76c850..0e262c9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionView.cpp
@@ -141,7 +141,6 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartDetectionView::InitHeartView fail");
         }
 
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
index 8558bc5..4584b65 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
@@ -197,7 +197,6 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartResultView::InitHeartView fail");
         }
 
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index cf767f9..f8962be 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -410,7 +410,6 @@ namespace OHOS
         PreLoad();
         InitData(); // 刷新数据
 
-        RootView::GetInstance()->Add(container_);
         SetContainerView(container_);
 
         container_->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
index 8d8f941..9f2cbf0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
@@ -275,7 +275,6 @@ namespace OHOS
 \r
         GetView();\r
 \r
-        RootView::GetInstance()->Add(container_);\r
         SetContainerView(container_);\r
         // 增加按键监听\r
         SetKeyActListener();\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
index e94f572..77b4b4c 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/classic.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7597add39fcc95e3e3476bb1032cba2a384b604a9a75fd5d3720bead3d4ee9f
-size 212274
+oid sha256:65c0d4472d9bb822d678a16f460e53b833f8a1c7e41bbee39c6d6506403a39a0
+size 205120

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
index a2dfad4..5aa7299 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/galaxy.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e9a6258499e114e9dc9b253660ed79334337fb7521eed17f583b13346d7b3c7
-size 217079
+oid sha256:d5e73fb1b366d0ec5c5ba33d1c290fbd94ace6d0f654ea7d411512bd2fe65cef
+size 209925

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
index 21d246a..49ac2ea 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87aa20f99c96a5e21c55012eab383770de14af8b301c9145d0d260ae9c33fab6
-size 1323490
+oid sha256:690bfc69798ef34fff6a24cf66999755987d6597b4983d2cd91aa2c27a99b911
+size 1316336

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
index 7dcb4e1..739609e 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/sport.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf0d391926886e79f8db09ff61bc22ad9cd202a931ece38407f409ae8775e0b8
+oid sha256:6ce06332fcd4a61b22a41ae5c64b437b15edbf7dd855b2fab28d09897502186a
 size 344285