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
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
#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
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
#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
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
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
#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
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
#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
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
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
//初始化指南针图片\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
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
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
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
#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
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
}\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
// 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
// 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
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
#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
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
}\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
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
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
#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
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
}\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
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
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
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
#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
}\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
#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
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
}\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
}\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
}\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
// 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
// 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
#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
}\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
}\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
// 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
#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
}\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
#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
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
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
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
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
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
#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
}\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
\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
\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