删除冗余代码

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 7cc123b..f787403 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -62,7 +62,7 @@ namespace OHOS
         {VIEW_BLOOD_RESULT, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧", STR_BLOOD_OXYGEN, nullptr},
 #if defined(BOARD_W9) || defined(BOARD_N9)
         /*W9与N9的Slice写宏里面*/
-        {VIEW_BLOOD_PRESSURE_CHECK, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压测量", STR_BP_CHECK, nullptr},
+        {VIEW_BLOOD_PRESSURE_CHECK, PNG_APPLIST_BP_MESSURE_IMAGE_BIG, PNG_APPLIST_BP_MESSURE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压测量", STR_BP_CHECK, nullptr},
 #endif
         {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE_BIG, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr},
         {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE_BIG, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动", STR_TRAINING, nullptr},

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
index bf9047d..e0156af 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
@@ -25,7 +25,6 @@ namespace OHOS
         bool InitLable();
         bool Initbackground();
 
-        void UpSPO2Text(void);
 
     private:
         UIImageView *error = nullptr;  

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
index b2522f4..5896335 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
@@ -24,8 +24,6 @@ namespace OHOS
         bool InitLable();
         bool Initbackground();
 
-        void UpSPO2Text(void);
-
     private:
         UIImageView *background = nullptr;
         UIImageView *mind = nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
index de99f10..917f475 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
@@ -24,8 +24,6 @@ namespace OHOS
         bool InitLable();
         bool Initbackground();
 
-        void UpSPO2Text(void);
-
     private:
         UIImageView *pass = nullptr;  
         UILabelExt *titleLable = nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
index 1c5eb07..1fc29a8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
@@ -59,11 +59,6 @@ namespace OHOS
             delete checkButton;
             checkButton = nullptr;
         }
-    }
-    /* -------------------------------------------------------------------------- */
-    void BPCalibrationErrorView::UpSPO2Text()
-    {
-       
     }
     /* -------------------------------------------------------------------------- */
     /***

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
index 328aa12..0e7ab85 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
@@ -65,10 +65,7 @@ namespace OHOS
             checkButton = nullptr;
         }
     }
-    /* -------------------------------------------------------------------------- */
-    void BPCalibrationMindView::UpSPO2Text()
-    {
-    }
+
     /* -------------------------------------------------------------------------- */
     /***
      * @description:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp
index da7ac06..a76edc7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp
@@ -59,11 +59,6 @@ namespace OHOS
             delete checkButton;
             checkButton = nullptr;
         }
-    }
-    /* -------------------------------------------------------------------------- */
-    void BPCalibrationPassView::UpSPO2Text()
-    {
-       
     }
     /* -------------------------------------------------------------------------- */
     /***