优化修改指南针视图的图片读取,将多张bin图片合成一张图片(compass.bin),用ImageCacheManager类来管理,避免图片的多次读取。
author罗正yun <1732036298@qq.com>
Tue, 9 Jan 2024 10:23:02 +0000 (18:23 +0800)
committer罗正yun <1732036298@qq.com>
Tue, 9 Jan 2024 10:23:02 +0000 (18:23 +0800)
34 files changed:
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h
code/sdk/application/wearable/nativeapp/nativeui/compass/include/EndBackTrackingCompassView.h
code/sdk/application/wearable/nativeapp/nativeui/compass/include/EndBackTrackingEarlyCompassView.h
code/sdk/application/wearable/nativeapp/nativeui/compass/include/EndPathRecordCompassView.h
code/sdk/application/wearable/nativeapp/nativeui/compass/include/PathBackTrackingCompassView.h
code/sdk/application/wearable/nativeapp/nativeui/compass/include/PathRetracingCompassView.h
code/sdk/application/wearable/nativeapp/nativeui/compass/include/ResetPlaceMakerCompassView.h
code/sdk/application/wearable/nativeapp/nativeui/compass/src/CompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/EndBackTrackingCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/EndBackTrackingEarlyCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/EndPathRecordCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/GPSLossCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/MakerPointCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/PathBackTrackingCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/PathRetracingCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/PlaceMakerCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/ResetPlaceMakerCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/compass/src/StartPathRecordCompassView.cpp
code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING_EARLY.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_PATH_RECORD.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_GPS_LOSS.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING_DIRECT.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_RESET_PLACE_MAKER_BACKGROUND.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_START_PATH_RECORD.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/MAKER_POINT_BACKGROUND.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/PLACE_MAKER_BACKGROUND.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass.bin
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass0.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass1.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass2.bin [deleted file]

index 458dae1..cc524ce 100755 (executable)
@@ -224,20 +224,6 @@ namespace OHOS
     static constexpr const char *PNG_RECORD_PLAY_DELETE_IMAGE = APP_RES_PATH "/Record/RECORD_PLAY_DELETE.bin";             // 删除\r
     static constexpr const char *PNG_RECORD_PLAY_VOLUME_IMAGE = APP_RES_PATH "/Record/RECORD_PLAY_VOLUME.bin";             // 音量\r
     static constexpr const char *PNG_RECORD_DELETE_BACKGROUND_IMAGE = APP_RES_PATH "/Record/RECORD_DELETE_BACKGROUND.bin"; // 删除录音的背景图\r
-    // 指南针\r
-    static constexpr const char *PNG_COMPASS_BACKGROUND_IMAGE = APP_RES_PATH "/compass/compass0.bin";                                               // 指南针的背景图片\r
-    static constexpr const char *PNG_COMPASS_PLACE_MARKER_BUTTON_IMAGE = APP_RES_PATH "/compass/compass1.bin";                                      // 指南针放置标记点按钮图片\r
-    static constexpr const char *PNG_COMPASS_TRIANGULATION_IMAGE = APP_RES_PATH "/compass/compass2.bin";                                            // 指南针三角形图片\r
-    static constexpr const char *PNG_COMPASS_PLACE_MAKER_BACKGROUND_IMAGE = APP_RES_PATH "/compass/PLACE_MAKER_BACKGROUND.bin";                     // 指南针放置标记点背景图片\r
-    static constexpr const char *PNG_COMPASS_MAKER_POINT_BACKGROUND_IMAGE = APP_RES_PATH "/compass/MAKER_POINT_BACKGROUND.bin";                     // 指南针标记点介绍背景图片\r
-    static constexpr const char *PNG_COMPASS_START_PATH_RECORD_IMAGE = APP_RES_PATH "/compass/COMPASS_START_PATH_RECORD.bin";                       // 指南针开始路径记录图片\r
-    static constexpr const char *PNG_COMPASS_END_PATH_RECORD_IMAGE = APP_RES_PATH "/compass/COMPASS_END_PATH_RECORD.bin";                           // 指南针结束路径记录图片\r
-    static constexpr const char *PNG_COMPASS_PATH_BACKTRACKING_IMAGE = APP_RES_PATH "/compass/COMPASS_PATH_BACKTRACKING.bin";                       // 指南针路径回溯按钮图片\r
-    static constexpr const char *PNG_COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE = APP_RES_PATH "/compass/COMPASS_RESET_PLACE_MAKER_BACKGROUND.bin"; // 指南针:重置标记点背景图片\r
-    static constexpr const char *PNG_COMPASS_PATH_BACKTRACKING_DIRECT_IMAGE = APP_RES_PATH "/compass/COMPASS_PATH_BACKTRACKING_DIRECT.bin";         // 指南针:路径回溯中的方向箭头图片\r
-    static constexpr const char *PNG_COMPASS_END_BACK_TRACKING_EARLY_IMAGE = APP_RES_PATH "/compass/COMPASS_END_BACK_TRACKING_EARLY.bin";           // 指南针提前结束路径回溯\r
-    static constexpr const char *PNG_COMPASS_END_BACK_TRACKING_IMAGE = APP_RES_PATH "/compass/COMPASS_END_BACK_TRACKING.bin";                       // 指南针结束路径回溯\r
-    static constexpr const char *PNG_COMPASS_GPS_LOSS_IMAGE = APP_RES_PATH "/compass/COMPASS_GPS_LOSS.bin";                                         // 指南针GPS丢失背景图片\r
     // 睡眠记录\r
     static constexpr const char *PNG_SLEEP_ROOM_IMAGE = APP_RES_PATH "/SleepTime/room.bin";\r
     static constexpr const char *PNG_SLEEP_NOTE_IMAGE = APP_RES_PATH "/SleepTime/Ellipse 185.bin";\r
index f79de41..fd05160 100755 (executable)
@@ -67,9 +67,21 @@ namespace OHOS
     static const int DROPDOWN_DROPDOWN_SETTING_B = 0x40000b;\r
     static const int DROPDOWN_DROPDOWN_BATTERY = 0x40000c;\r
     static const int DROPDOWN_DROPDOWN_BRI_SCREEN_B = 0x40000d;\r
-    static const int COMPASS_ROTATE_CENTER_IMAGE = 0x500001;\r
-    static const int COMPASS_CORRESPONDENCE_DEGREE = 0x500002;\r
-    static const int COMPASS_COMPASS = 0x500003;\r
+    /* -------------------------------------------------------------------------- */\r
+    static const int COMPASS_COMPASS0 = 0x500001;                     // 指南针的背景图片\r
+    static const int COMPASS_COMPASS1 = 0x500002;                     // 指南针放置标记点按钮图片\r
+    static const int COMPASS_COMPASS2 = 0x500003;                     // 指南针三角形图片\r
+    static const int COMPASS_END_BACK_TRACKING = 0x500004;            // 指南针结束路径回溯\r
+    static const int COMPASS_END_BACK_TRACKING_EARLY = 0x500005;      // 指南针提前结束路径回溯\r
+    static const int COMPASS_END_PATH_RECORD = 0x500006;              // 指南针结束路径记录图片\r
+    static const int COMPASS_GPS_LOSS = 0x500007;                     // 指南针GPS丢失背景图片\r
+    static const int COMPASS_MAKER_POINT_BACKGROUND = 0x500008;       // 指南针标记点介绍背景图片\r
+    static const int COMPASS_PATH_BACKTRACKING = 0x500009;            // 指南针路径回溯按钮图片\r
+    static const int COMPASS_PATH_BACKTRACKING_DIRECT = 0x50000a;     // 指南针:路径回溯中的方向箭头图片\r
+    static const int COMPASS_PLACE_MAKER_BACKGROUND = 0x50000b;       // 指南针放置标记点背景图片\r
+    static const int COMPASS_RESET_PLACE_MAKER_BACKGROUND = 0x50000c; // 指南针:重置标记点背景图片\r
+    static const int COMPASS_START_PATH_RECORD = 0x50000d;            // 指南针开始路径记录图片\r
+    /* -------------------------------------------------------------------------- */\r
 \r
 }\r
 #endif\r
index 94dd194..396fc85 100755 (executable)
@@ -7,7 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_image_view.h"\r
-#include "components/ui_label_button_ext.h"\r
+#include "components/ui_label_button.h"\r
 namespace OHOS\r
 {\r
     static const char *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1_VIEWID = "COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1"; // 结束路径回溯\r
@@ -34,9 +34,8 @@ namespace OHOS
         UIViewGroup *container_ = nullptr;\r
         UIScrollView *scrollView1_ = nullptr;\r
         UIImageView *COMPASS_END_BACK_TRACKING_EARLY_IMAGE = nullptr;\r
-        UIImageView *image = nullptr;\r
-        UILabelButtonExt *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1 = nullptr;\r
-        UILabelButtonExt *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2 = nullptr;\r
+        UILabelButton *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1 = nullptr;\r
+        UILabelButton *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2 = nullptr;\r
         UIView::OnClickListener *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1_CLICK{nullptr};\r
         UIView::OnClickListener *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2_CLICK{nullptr};\r
     };\r
index a67f05d..29e1128 100755 (executable)
@@ -7,7 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_image_view.h"\r
-#include "components/ui_label_button_ext.h"\r
+#include "components/ui_label_button.h"\r
 namespace OHOS\r
 {\r
     static const char *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON_VIEWID = "COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON"; // 提前结束路径回溯\r
@@ -32,9 +32,8 @@ namespace OHOS
     private:\r
         UIViewGroup *container_ = nullptr;\r
         UIScrollView *scrollView1_ = nullptr;\r
-        UIImageView *image4_ = nullptr;\r
         UIImageView *COMPASS_END_BACK_TRACKING_EARLY_IMAGE = nullptr;\r
-        UILabelButtonExt *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON = nullptr;\r
+        UILabelButton *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON = nullptr;\r
         UIView::OnClickListener *COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON_CLICK{nullptr};\r
     };\r
 } // namespace OHOS\r
index f37b972..e85fbdc 100755 (executable)
@@ -34,7 +34,6 @@ namespace OHOS
         UIViewGroup *container_ = nullptr;\r
         UIScrollView *scrollView = nullptr;\r
         UIImageView *COMPASS_END_PATH_RECORD_IMAGE = nullptr;           \r
-        UIImageView *image = nullptr;\r
         UIButton *END_PATH_RECORD_BUTTON1 = nullptr;                     // 结束路径记录:结束按钮\r
         UIButton *END_PATH_RECORD_BUTTON2 = nullptr;                     // 结束路径记录:暂不按钮\r
         UIView::OnClickListener *END_PATH_RECORD_BUTTON1_CLICK{nullptr}; // 结束路径记录:结束按钮点击回调\r
index 01245c1..8226d30 100755 (executable)
@@ -7,7 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
-#include "components/ui_label_button_ext.h"\r
+#include "components/ui_label_button.h"\r
 namespace OHOS\r
 {\r
     static const char *PATH_BACKTRACKING_LABELBUTTON1_VIEWID = "labelButton1"; //开始回溯\r
@@ -35,8 +35,8 @@ namespace OHOS
         UIScrollView *scrollView = nullptr;\r
         UILabel *label1_ = nullptr;\r
         UILabel *label2_ = nullptr;\r
-        UILabelButtonExt *labelButton1 = nullptr;\r
-        UILabelButtonExt *labelButton2 = nullptr;\r
+        UILabelButton *labelButton1 = nullptr;\r
+        UILabelButton *labelButton2 = nullptr;\r
         UIView::OnClickListener *labelButton1Click{nullptr};\r
         UIView::OnClickListener *labelButton2Click{nullptr};\r
     };\r
index 7680147..57b7fe5 100755 (executable)
@@ -7,7 +7,7 @@
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_image_view.h"\r
-#include "components/ui_label_button_ext.h"\r
+#include "components/ui_label_button.h"\r
 namespace OHOS\r
 {\r
     static const char *PATH_RETRACING_LABELBUTTON_VIEWID = "PATH_RETRACING_LABELBUTTON"; //结束路径回溯按钮ID\r
@@ -35,7 +35,7 @@ namespace OHOS
         UILabel *label1_ = nullptr;\r
         UIImageView *image2_ = nullptr;\r
         UIImageView *image1_ = nullptr;\r
-        UILabelButtonExt *PATH_RETRACING_LABELBUTTON = nullptr;\r
+        UILabelButton *PATH_RETRACING_LABELBUTTON = nullptr;\r
          UIView::OnClickListener *PATH_RETRACING_LABELBUTTON_CLICK{nullptr};\r
     };\r
 } // namespace OHOS\r
index d50573f..1d7cea6 100755 (executable)
@@ -33,7 +33,6 @@ namespace OHOS
         UIViewGroup *container_ = nullptr;\r
         UIScrollView *scrollView = nullptr;\r
         UIImageView *COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE = nullptr;\r
-        UIImageView *image = nullptr;\r
         UIButton *RESET_PLACE_MAKER_BUTTON1 = nullptr;\r
         UIButton *RESET_PLACE_MAKER_BUTTON2 = nullptr;\r
         UIView::OnClickListener *RESET_PLACE_MAKER_BUTTON1Click{nullptr};\r
index 03add36..3484f1f 100755 (executable)
@@ -132,56 +132,22 @@ bool CompassView::LoadCompassImage(UIImageView *view, uint32_t resId)
 //初始化指南针图片\r
 bool CompassView::InitCompassImage(void)\r
 {\r
-    /*\r
+    ImageInfo* image;\r
     backGround = new UIImageView();\r
     if (backGround == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], backGround new fail", __LINE__);\r
         return false;\r
     }\r
-    backGround->SetPosition(0, 0);\r
-\r
-    if (LoadCompassImage(backGround, COMPASS_COMPASS) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation load fail", __LINE__);\r
-        return false;\r
-    }\r
-\r
-    rotateShaft = new UIImageView();\r
-    if (rotateShaft == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], rotateShaft new fail", __LINE__);\r
-        return false;\r
-    }\r
-    rotateShaft->SetPosition(POINT_CENTER_IMAGE_X, POINT_CENTER_IMAGE_Y);\r
-    if (LoadCompassImage(rotateShaft, COMPASS_ROTATE_CENTER_IMAGE) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], rotateShaft load fail", __LINE__);\r
-        return false;\r
-    }\r
-\r
-    triangulation = new UIImageView();\r
-    if (triangulation == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation new fail", __LINE__);\r
+    backGround->SetPosition(0, 0,466,466);\r
+    if (LoadCompassImage(backGround, COMPASS_COMPASS0) == false) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], backGround load fail", __LINE__);\r
         return false;\r
     }\r
-    triangulation->SetPosition(TRIANGULATION_X, TRIANGULATION_Y);\r
-    if (LoadCompassImage(triangulation, COMPASS_CORRESPONDENCE_DEGREE) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "triangulation load fail");\r
-        return false;\r
-    }\r
-    return true;\r
-    */\r
-    backGround = new UIImageView();\r
-    if (backGround == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], backGround new fail", __LINE__);\r
-        return false;\r
-    }\r
-    backGround->SetPosition(0, 0);\r
-    backGround->Resize(466, 466);          \r
-    backGround->SetViewId("backGround");\r
-    backGround->SetSrc(PNG_COMPASS_BACKGROUND_IMAGE);\r
-    backGround->SetVisible(true);\r
     /***********************************************************************************************************/\r
-    // Add Button to App\r
+    PlaceMarkerButton = new UIButton();\r
     if (PlaceMarkerButton == nullptr) {\r
-        PlaceMarkerButton = new UIButton();\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], PlaceMarkerButton new fail", __LINE__);\r
+        return false;\r
     }\r
     if(EndPathRecordFlag == false)\r
     {\r
@@ -190,15 +156,18 @@ bool CompassView::InitCompassImage(void)
     else\r
     {\r
         PlaceMarkerButton->SetPosition(148, 282);\r
+        PathBackTrackingButton = new UIButton();\r
         if (PathBackTrackingButton == nullptr) {\r
-            PathBackTrackingButton = new UIButton();\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], PathBackTrackingButton new fail", __LINE__);\r
+            return false;\r
         }\r
         PathBackTrackingButton->SetPosition(248, 282);         \r
         PathBackTrackingButton->Resize(70, 70);          \r
         PathBackTrackingButton->SetViewId(PATH_BACKTRACKING_BUTTON_VIEWID);\r
         PathBackTrackingButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xfffafafa);\r
         PathBackTrackingButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
-        PathBackTrackingButton->SetImageSrc(PNG_COMPASS_PATH_BACKTRACKING_IMAGE, nullptr);\r
+        image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_PATH_BACKTRACKING, COMPASS_IAMGES);\r
+        PathBackTrackingButton->SetImageSrc(image, nullptr);\r
         PathBackTrackingButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED);\r
         PathBackTrackingButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
         PathBackTrackingButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
@@ -211,7 +180,8 @@ bool CompassView::InitCompassImage(void)
     PlaceMarkerButton->SetViewId(PLACE_MARKER_BUTTON_VIEWID);\r
     PlaceMarkerButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
     PlaceMarkerButton->SetStyle(STYLE_BORDER_RADIUS, 0);\r
-    PlaceMarkerButton->SetImageSrc(PNG_COMPASS_PLACE_MARKER_BUTTON_IMAGE, nullptr);\r
+    image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_COMPASS1, COMPASS_IAMGES);\r
+    PlaceMarkerButton->SetImageSrc(image, nullptr);\r
     PlaceMarkerButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED);\r
     PlaceMarkerButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
     PlaceMarkerButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
@@ -229,7 +199,10 @@ bool CompassView::InitCompassImage(void)
     triangulation->SetPosition(221, 20);\r
     triangulation->Resize(24, 20);\r
     triangulation->SetViewId("triangulation");\r
-    triangulation->SetSrc(PNG_COMPASS_TRIANGULATION_IMAGE);\r
+    if (LoadCompassImage(triangulation, COMPASS_COMPASS2) == false) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation load fail", __LINE__);\r
+        return false;\r
+    }\r
     triangulation->SetVisible(true);    \r
     return true;\r
 }\r
index e3a4b4b..1b3692c 100755 (executable)
@@ -1,7 +1,8 @@
 #include "EndBackTrackingCompassView.h"\r
 #include "EndBackTrackingCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -42,6 +43,9 @@ namespace OHOS
         scrollView1_->SetPosition(0, 0);\r
         scrollView1_->Resize(466, 466);\r
         scrollView1_->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+        scrollView1_->SetScrollBlankSize(20);\r
+        scrollView1_->SetReboundSize(50);\r
+        scrollView1_->SetDirection(1);\r
         container_->Add(scrollView1_);\r
         scrollView1_->SetVisible(true);\r
         // Add ImageView to App\r
@@ -51,14 +55,15 @@ namespace OHOS
         }\r
         COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetPosition(0, 0);\r
         COMPASS_END_BACK_TRACKING_EARLY_IMAGE->Resize(466, 466);\r
-        COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetSrc(PNG_COMPASS_END_BACK_TRACKING_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_END_BACK_TRACKING, COMPASS_IAMGES);\r
+        COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetSrc(image);\r
         // Add to scrollView1\r
         scrollView1_->Add(COMPASS_END_BACK_TRACKING_EARLY_IMAGE);\r
         COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetVisible(true);\r
         // Add LabelButtonExt to App\r
         if (COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1 == nullptr)\r
         {\r
-            COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1 = new UILabelButtonExt();\r
+            COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1 = new UILabelButton();\r
         }\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1->SetPosition(118, 378);\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON1->Resize(230, 80);\r
@@ -81,7 +86,7 @@ namespace OHOS
         // Add LabelButtonExt to App\r
         if (COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2 == nullptr)\r
         {\r
-            COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2 = new UILabelButtonExt();\r
+            COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2 = new UILabelButton();\r
         }\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2->SetPosition(118, 484);\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2->Resize(230, 80);\r
@@ -99,15 +104,6 @@ namespace OHOS
         // Add to scrollView1\r
         scrollView1_->Add(COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2);\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON2->SetVisible(true);\r
-        // Add ImageView to App\r
-        if (image == nullptr)\r
-        {\r
-            image = new UIImageView();\r
-        }\r
-        image->SetPosition(183, 493);\r
-        image->Resize(100, 100);\r
-        scrollView1_->Add(image);\r
-        image->SetVisible(true);\r
     }\r
 \r
     void EndBackTrackingCompassView::DeInitView()\r
@@ -123,11 +119,6 @@ namespace OHOS
             delete scrollView1_;\r
             scrollView1_ = nullptr;\r
         }\r
-        if (image != nullptr)\r
-        {\r
-            delete image;\r
-            image = nullptr;\r
-        }\r
         if (COMPASS_END_BACK_TRACKING_EARLY_IMAGE != nullptr)\r
         {\r
             delete COMPASS_END_BACK_TRACKING_EARLY_IMAGE;\r
index f2bfeaa..bfe8e4d 100755 (executable)
@@ -1,7 +1,8 @@
 #include "EndBackTrackingEarlyCompassView.h"\r
 #include "EndBackTrackingEarlyCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -43,6 +44,9 @@ namespace OHOS
         scrollView1_->Resize(466, 466);\r
         scrollView1_->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
         container_->Add(scrollView1_);\r
+        scrollView1_->SetScrollBlankSize(20);\r
+        scrollView1_->SetReboundSize(50);\r
+        scrollView1_->SetDirection(1);\r
         scrollView1_->SetVisible(true);\r
         // Add ImageView to App\r
         if (COMPASS_END_BACK_TRACKING_EARLY_IMAGE == nullptr)\r
@@ -51,14 +55,15 @@ namespace OHOS
         }\r
         COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetPosition(0, 0);\r
         COMPASS_END_BACK_TRACKING_EARLY_IMAGE->Resize(466, 466);\r
-        COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetSrc(PNG_COMPASS_END_BACK_TRACKING_EARLY_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_END_BACK_TRACKING_EARLY, COMPASS_IAMGES);\r
+        COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetSrc(image);\r
         // Add to scrollView1\r
         scrollView1_->Add(COMPASS_END_BACK_TRACKING_EARLY_IMAGE);\r
         COMPASS_END_BACK_TRACKING_EARLY_IMAGE->SetVisible(true);\r
         // Add LabelButtonExt to App\r
         if (COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON == nullptr)\r
         {\r
-            COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON = new UILabelButtonExt();\r
+            COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON = new UILabelButton();\r
         }\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON->SetPosition(118, 378);\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON->Resize(230, 80);\r
@@ -78,15 +83,6 @@ namespace OHOS
         scrollView1_->Add(COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON);\r
         COMPASS_END_BACK_TRACKING_EARLY_LABELBUTTON->SetVisible(true);\r
 \r
-        // Add ImageView to App\r
-        if (image4_ == nullptr)\r
-        {\r
-            image4_ = new UIImageView();\r
-        }\r
-        image4_->SetPosition(183, 414);\r
-        image4_->Resize(100, 100);\r
-        scrollView1_->Add(image4_);\r
-        image4_->SetVisible(true);\r
     }\r
 \r
     void EndBackTrackingEarlyCompassView::DeInitView()\r
@@ -102,11 +98,6 @@ namespace OHOS
             delete scrollView1_;\r
             scrollView1_ = nullptr;\r
         }\r
-        if (image4_ != nullptr)\r
-        {\r
-            delete image4_;\r
-            image4_ = nullptr;\r
-        }\r
         if (COMPASS_END_BACK_TRACKING_EARLY_IMAGE != nullptr)\r
         {\r
             delete COMPASS_END_BACK_TRACKING_EARLY_IMAGE;\r
index b138ffd..d8eed52 100755 (executable)
@@ -4,7 +4,8 @@
 #include "common/image_cache_manager.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -46,6 +47,9 @@ namespace OHOS
         scrollView->Resize(466, 466);\r
         scrollView->SetViewId("scrollView");\r
         scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+        scrollView->SetScrollBlankSize(20);\r
+        scrollView->SetReboundSize(50);\r
+        scrollView->SetDirection(1);\r
         container_->Add(scrollView);\r
         scrollView->SetVisible(true);\r
         // Add ImageView to App\r
@@ -55,7 +59,8 @@ namespace OHOS
         }\r
         COMPASS_END_PATH_RECORD_IMAGE->SetPosition(0, 0);\r
         COMPASS_END_PATH_RECORD_IMAGE->Resize(466, 466);\r
-        COMPASS_END_PATH_RECORD_IMAGE->SetSrc(PNG_COMPASS_END_PATH_RECORD_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_END_PATH_RECORD, COMPASS_IAMGES);\r
+        COMPASS_END_PATH_RECORD_IMAGE->SetSrc(image);\r
         scrollView->Add(COMPASS_END_PATH_RECORD_IMAGE);\r
         COMPASS_END_PATH_RECORD_IMAGE->SetVisible(true);\r
 \r
@@ -72,7 +77,7 @@ namespace OHOS
         END_PATH_RECORD_BUTTON1->SetStyle(STYLE_BORDER_RADIUS, 100);\r
         // Set additional property\r
         END_PATH_RECORD_BUTTON1->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED);\r
-        END_PATH_RECORD_BUTTON1->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+        END_PATH_RECORD_BUTTON1->SetStyleForState(STYLE_BACKGROUND_OPA, 0xff0b1928, UIButton::PRESSED);\r
         END_PATH_RECORD_BUTTON1->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
         END_PATH_RECORD_BUTTON1->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
         // Add the CallBack about events\r
@@ -107,16 +112,6 @@ namespace OHOS
         scrollView->Add(END_PATH_RECORD_BUTTON2);\r
         END_PATH_RECORD_BUTTON2->SetVisible(true);\r
 \r
-        // Add ImageView to App\r
-        if (image == nullptr)\r
-        {\r
-            image = new UIImageView();\r
-        }\r
-        image->SetPosition(183, 475);\r
-        image->Resize(100, 100);\r
-        image->SetViewId("image");\r
-        scrollView->Add(image);\r
-        image->SetVisible(true);\r
     }\r
 \r
     void EndPathRecordCompassView::DeInitView()\r
@@ -137,11 +132,6 @@ namespace OHOS
             delete COMPASS_END_PATH_RECORD_IMAGE;\r
             COMPASS_END_PATH_RECORD_IMAGE = nullptr;\r
         }\r
-        if (image != nullptr)\r
-        {\r
-            delete image;\r
-            image = nullptr;\r
-        }\r
         if (END_PATH_RECORD_BUTTON1 != nullptr)\r
         {\r
             delete END_PATH_RECORD_BUTTON1;\r
index b97027d..573a183 100755 (executable)
@@ -1,7 +1,8 @@
 #include "GPSLossCompassView.h"\r
 #include "GPSLossCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -49,7 +50,8 @@ namespace OHOS
         }\r
         COMPASS_GPS_LOSS_IMAGE->SetPosition(0, 0);\r
         COMPASS_GPS_LOSS_IMAGE->Resize(466, 466);\r
-        COMPASS_GPS_LOSS_IMAGE->SetSrc(PNG_COMPASS_GPS_LOSS_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_GPS_LOSS, COMPASS_IAMGES);\r
+        COMPASS_GPS_LOSS_IMAGE->SetSrc(image);\r
         // Add to scrollView1\r
         scrollView1_->Add(COMPASS_GPS_LOSS_IMAGE);\r
         COMPASS_GPS_LOSS_IMAGE->SetVisible(true);\r
index 1088142..d6359c1 100755 (executable)
@@ -1,7 +1,8 @@
 #include "MakerPointCompassView.h"\r
 #include "MakerPointCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -39,8 +40,9 @@ namespace OHOS
             COMPASS_MAKER_POINT_BACKGROUND_IMAGE = new UIImageView();\r
         }\r
         COMPASS_MAKER_POINT_BACKGROUND_IMAGE->SetPosition(0, 0);    \r
-        COMPASS_MAKER_POINT_BACKGROUND_IMAGE->Resize(466, 466);     \r
-        COMPASS_MAKER_POINT_BACKGROUND_IMAGE->SetSrc(PNG_COMPASS_MAKER_POINT_BACKGROUND_IMAGE);\r
+        COMPASS_MAKER_POINT_BACKGROUND_IMAGE->Resize(466, 466);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_MAKER_POINT_BACKGROUND, COMPASS_IAMGES);     \r
+        COMPASS_MAKER_POINT_BACKGROUND_IMAGE->SetSrc(image);\r
         container_->Add(COMPASS_MAKER_POINT_BACKGROUND_IMAGE);\r
         COMPASS_MAKER_POINT_BACKGROUND_IMAGE->SetVisible(true);\r
 \r
index 3f5cce1..a736021 100755 (executable)
@@ -43,7 +43,6 @@ namespace OHOS
         }\r
         scrollView->SetPosition(0, 0);\r
         scrollView->Resize(466, 466);\r
-        scrollView->SetViewId("scrollView");\r
         scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
         container_->Add(scrollView);\r
         scrollView->SetVisible(true);\r
@@ -55,7 +54,6 @@ namespace OHOS
         }\r
         label1_->SetPosition(173, 52);\r
         label1_->Resize(120, 35);\r
-        label1_->SetViewId("label1");\r
         label1_->SetStyle(STYLE_TEXT_FONT, 30);\r
         label1_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
 \r
@@ -77,7 +75,6 @@ namespace OHOS
         }\r
         label2_->SetPosition(33, 100);\r
         label2_->Resize(200, 60);\r
-        label2_->SetViewId("label2");\r
         label2_->SetStyle(STYLE_TEXT_FONT, 30);\r
         label2_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
 \r
@@ -98,7 +95,7 @@ namespace OHOS
         // Add LabelButtonExt to App\r
         if (labelButton1 == nullptr)\r
         {\r
-            labelButton1 = new UILabelButtonExt();\r
+            labelButton1 = new UILabelButton();\r
         }\r
         labelButton1->SetPosition(118, 226);\r
         labelButton1->Resize(230, 80);\r
@@ -122,7 +119,7 @@ namespace OHOS
         // Add LabelButtonExt to App\r
         if (labelButton2 == nullptr)\r
         {\r
-            labelButton2 = new UILabelButtonExt();\r
+            labelButton2 = new UILabelButton();\r
         }\r
         labelButton2->SetPosition(118, 333);\r
         labelButton2->Resize(230, 80);\r
index 7ceb3fc..3570351 100755 (executable)
@@ -1,7 +1,8 @@
 #include "PathRetracingCompassView.h"\r
 #include "PathRetracingCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -73,8 +74,8 @@ namespace OHOS
         }\r
         image2_->SetPosition(315, 227);\r
         image2_->Resize(47, 58);\r
-        image2_->SetViewId("image2");\r
-        image2_->SetSrc(PNG_COMPASS_PLACE_MARKER_BUTTON_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_COMPASS1, COMPASS_IAMGES);     \r
+        image2_->SetSrc(image);\r
 \r
         // Add to scrollView1\r
         scrollView1_->Add(image2_);\r
@@ -87,8 +88,8 @@ namespace OHOS
         }\r
         image1_->SetPosition(110, 267);\r
         image1_->Resize(40, 46);\r
-        image1_->SetViewId("image1");\r
-        image1_->SetSrc(PNG_COMPASS_PATH_BACKTRACKING_DIRECT_IMAGE);\r
+        image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_PATH_BACKTRACKING_DIRECT, COMPASS_IAMGES);  \r
+        image1_->SetSrc(image);\r
 \r
         // Add to scrollView1\r
         scrollView1_->Add(image1_);\r
@@ -97,7 +98,7 @@ namespace OHOS
         // Add LabelButtonExt to App\r
         if (PATH_RETRACING_LABELBUTTON == nullptr)\r
         {\r
-            PATH_RETRACING_LABELBUTTON = new UILabelButtonExt();\r
+            PATH_RETRACING_LABELBUTTON = new UILabelButton();\r
         }\r
         PATH_RETRACING_LABELBUTTON->SetPosition(118, 345);\r
         PATH_RETRACING_LABELBUTTON->Resize(230, 80);\r
index c86470b..4b6b4ec 100755 (executable)
@@ -1,7 +1,8 @@
 #include "PlaceMakerCompassView.h"\r
 #include "PlaceMakerCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -47,7 +48,8 @@ namespace OHOS
         }\r
         PLACE_MAKER_BACKGROUND_IMAGE->SetPosition(0, 0);\r
         PLACE_MAKER_BACKGROUND_IMAGE->Resize(466, 466);\r
-        PLACE_MAKER_BACKGROUND_IMAGE->SetSrc(PNG_COMPASS_PLACE_MAKER_BACKGROUND_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_PLACE_MAKER_BACKGROUND, COMPASS_IAMGES);     \r
+        PLACE_MAKER_BACKGROUND_IMAGE->SetSrc(image);\r
         container_->Add(PLACE_MAKER_BACKGROUND_IMAGE);\r
         PLACE_MAKER_BACKGROUND_IMAGE->SetVisible(true);\r
 \r
index 69b60ed..a791ce8 100755 (executable)
@@ -1,7 +1,8 @@
 #include "ResetPlaceMakerCompassView.h"\r
 #include "ResetPlaceMakerCompassPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -43,6 +44,9 @@ namespace OHOS
         scrollView->Resize(466, 466);\r
         scrollView->SetViewId("scrollView");\r
         scrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+        scrollView->SetScrollBlankSize(20);\r
+        scrollView->SetReboundSize(50);\r
+        scrollView->SetDirection(1);\r
         container_->Add(scrollView);\r
         scrollView->SetVisible(true);\r
 \r
@@ -54,7 +58,8 @@ namespace OHOS
         COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE->SetPosition(0, 0);\r
         COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE->Resize(466, 466);\r
         COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE->SetViewId("COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE");\r
-        COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE->SetSrc(PNG_COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_RESET_PLACE_MAKER_BACKGROUND, COMPASS_IAMGES);  \r
+        COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE->SetSrc(image);\r
         // Add to scrollView1\r
         scrollView->Add(COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE);\r
         COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE->SetVisible(true);\r
@@ -71,8 +76,7 @@ namespace OHOS
         RESET_PLACE_MAKER_BUTTON1->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         // Set additional property\r
         RESET_PLACE_MAKER_BUTTON1->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffdfdfd, UIButton::PRESSED);\r
-        RESET_PLACE_MAKER_BUTTON1->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
-        RESET_PLACE_MAKER_BUTTON1->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        RESET_PLACE_MAKER_BUTTON1->SetStyleForState(STYLE_BACKGROUND_OPA, 0xff0b1928, UIButton::PRESSED);\r
         // Add the CallBack about events\r
         RESET_PLACE_MAKER_BUTTON1Click = static_cast<UIView::OnClickListener *>(ResetPlaceMakerCompassPresenter::GetInstance());\r
         RESET_PLACE_MAKER_BUTTON1->SetOnClickListener(RESET_PLACE_MAKER_BUTTON1Click);\r
@@ -92,24 +96,13 @@ namespace OHOS
         RESET_PLACE_MAKER_BUTTON2->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         // Set additional property\r
         RESET_PLACE_MAKER_BUTTON2->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffdfdfd, UIButton::PRESSED);\r
-        RESET_PLACE_MAKER_BUTTON2->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
-        RESET_PLACE_MAKER_BUTTON2->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        RESET_PLACE_MAKER_BUTTON2->SetStyleForState(STYLE_BACKGROUND_OPA, 0xff0b1928, UIButton::PRESSED);\r
         // Add the CallBack about events\r
         RESET_PLACE_MAKER_BUTTON2Click = static_cast<UIView::OnClickListener *>(ResetPlaceMakerCompassPresenter::GetInstance());\r
         RESET_PLACE_MAKER_BUTTON2->SetOnClickListener(RESET_PLACE_MAKER_BUTTON2Click);\r
         // Add to scrollView1\r
         scrollView->Add(RESET_PLACE_MAKER_BUTTON2);\r
         RESET_PLACE_MAKER_BUTTON2->SetVisible(true);\r
-\r
-        if (image == nullptr)\r
-        {\r
-            image = new UIImageView();\r
-        }\r
-        image->SetPosition(12, 472);\r
-        image->Resize(100, 100);\r
-        image->SetViewId("image2");\r
-        scrollView->Add(image);\r
-        image->SetVisible(true);\r
     }\r
 \r
     void ResetPlaceMakerCompassView::DeInitView()\r
@@ -130,11 +123,6 @@ namespace OHOS
             delete COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE;\r
             COMPASS_RESET_PLACE_MAKER_BACKGROUND_IMAGE = nullptr;\r
         }\r
-        if (image != nullptr)\r
-        {\r
-            delete image;\r
-            image = nullptr;\r
-        }\r
         if (RESET_PLACE_MAKER_BUTTON1 != nullptr)\r
         {\r
             delete RESET_PLACE_MAKER_BUTTON1;\r
index 0571bfe..f278196 100755 (executable)
@@ -1,7 +1,8 @@
 #include "StartPathRecordCompassView.h"\r
 #include "StartPathRecordCompassPresenter.h"\r
-\r
 #include "UiConfig.h"\r
+#include "common/image_cache_manager.h"\r
+#include "ui_resource_image.h"\r
 \r
 /*路径记录需要修改:记录路径的时候有类似水滴滴落水面的波纹效果*/\r
 namespace OHOS\r
@@ -42,7 +43,8 @@ namespace OHOS
         }\r
         COMPASS_START_PATH_RECORD_IMAGE->SetPosition(0, 0);\r
         COMPASS_START_PATH_RECORD_IMAGE->Resize(466, 466);       \r
-        COMPASS_START_PATH_RECORD_IMAGE->SetSrc(PNG_COMPASS_START_PATH_RECORD_IMAGE);\r
+        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(COMPASS_START_PATH_RECORD, COMPASS_IAMGES);  \r
+        COMPASS_START_PATH_RECORD_IMAGE->SetSrc(image);\r
         container_->Add(COMPASS_START_PATH_RECORD_IMAGE);\r
         COMPASS_START_PATH_RECORD_IMAGE->SetVisible(true);\r
         // Add Button to App\r
@@ -59,8 +61,7 @@ namespace OHOS
 \r
         // Set additional property\r
         COMPASS_START_PATH_RECORD_BUTTON->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED);\r
-        COMPASS_START_PATH_RECORD_BUTTON->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
-        COMPASS_START_PATH_RECORD_BUTTON->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        COMPASS_START_PATH_RECORD_BUTTON->SetStyleForState(STYLE_BACKGROUND_OPA, 0xff0b1928, UIButton::PRESSED);\r
         COMPASS_START_PATH_RECORD_BUTTON->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
 \r
         // Add the CallBack about events\r
index c12093c..eb7185b 100755 (executable)
@@ -168,10 +168,10 @@ bool ScreenModels::LoadAppImages(std::string file, UIImageView *view, uint32_t r
 \r
 void ScreenModels::PreLoadAppimages(void)\r
 {\r
-    LoadAppMultiImages(PLAYER_IAMGES, PLAYER_PLAYERSMODEL_RANDOM, PLAYER_PLAY);\r
+    LoadAppMultiImages(PLAYER_IAMGES, PLAYER_BACKGROUND, PLAYER_PLAYING);\r
     LoadAppMultiImages(DIAL_CLOCK, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH);\r
     //LoadAppMultiImages(CLOCK_IAMGES, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH);\r
-    LoadAppMultiImages(COMPASS_IAMGES, COMPASS_ROTATE_CENTER_IMAGE, COMPASS_COMPASS);\r
+    LoadAppMultiImages(COMPASS_IAMGES, COMPASS_COMPASS0, COMPASS_START_PATH_RECORD);\r
     LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_DROPDOWN_BLUETOOTH, DROPDOWN_DROPDOWN_BRI_SCREEN_B);\r
     LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);\r
 }\r
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING.bin
deleted file mode 100644 (file)
index eb9a17e..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING_EARLY.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING_EARLY.bin
deleted file mode 100644 (file)
index d94c849..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_BACK_TRACKING_EARLY.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_PATH_RECORD.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_PATH_RECORD.bin
deleted file mode 100644 (file)
index 4d84735..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_END_PATH_RECORD.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_GPS_LOSS.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_GPS_LOSS.bin
deleted file mode 100644 (file)
index f147589..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_GPS_LOSS.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING.bin
deleted file mode 100644 (file)
index 6e203b3..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING_DIRECT.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING_DIRECT.bin
deleted file mode 100644 (file)
index 9025b56..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_PATH_BACKTRACKING_DIRECT.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_RESET_PLACE_MAKER_BACKGROUND.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_RESET_PLACE_MAKER_BACKGROUND.bin
deleted file mode 100644 (file)
index 307b505..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_RESET_PLACE_MAKER_BACKGROUND.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_START_PATH_RECORD.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_START_PATH_RECORD.bin
deleted file mode 100644 (file)
index 6684c3c..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/COMPASS_START_PATH_RECORD.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/MAKER_POINT_BACKGROUND.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/MAKER_POINT_BACKGROUND.bin
deleted file mode 100644 (file)
index eb172a4..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/MAKER_POINT_BACKGROUND.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/PLACE_MAKER_BACKGROUND.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/PLACE_MAKER_BACKGROUND.bin
deleted file mode 100644 (file)
index 19dcbe3..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/PLACE_MAKER_BACKGROUND.bin and /dev/null differ
index 8b5b2db..407b171 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass.bin differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass0.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass0.bin
deleted file mode 100644 (file)
index 937d73d..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass0.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass1.bin
deleted file mode 100644 (file)
index b03f5e3..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass1.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass2.bin
deleted file mode 100644 (file)
index 7ffd4d8..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/compass/compass2.bin and /dev/null differ