From: Caisking <3449750381@qq.com> Date: Thu, 18 Jan 2024 06:39:39 +0000 (+0800) Subject: 移除拍照功能及其资源 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=75f5ec894a846c6c76f8c4da6aec3d83f92415c6;p=mirrors%2FFD230.git 移除拍照功能及其资源 --- diff --git a/code/sdk/application/wearable/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/nativeapp/CMakeLists.txt index 378c5c821..f56a8a028 100755 --- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt +++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt @@ -228,12 +228,7 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/PhoneCallupPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/PhoneRingView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/PhoneRingPresenter.cpp - #�������� - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/GetPicPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/GetPicView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/TakePicPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/TakePicView.cpp - #Ѫ�� + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodShowView.cpp diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h index 159a0fa04..6e56e499a 100755 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h @@ -45,8 +45,7 @@ typedef enum : uint16_t VIEW_INDOORWALK, VIEW_REBOOT, VIEW_UISAMPLE, // 实例 - VIEW_GETPIC, // 手势拍照 - VIEW_TAKEPIC, // 拍照 + //VIEW_BLOOD, // 血氧 VIEW_BLOODSHOW, // 血氧说明 diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h index cc524cead..46f6f1bf5 100755 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h @@ -233,10 +233,7 @@ namespace OHOS static constexpr const char *PNG_SLEEP_LINE1_IMAGE = APP_RES_PATH "/SleepTime/Line 1.bin"; static constexpr const char *PNG_SLEEP_LINE3_IMAGE = APP_RES_PATH "/SleepTime/Line 3.bin"; static constexpr const char *PNG_SLEEP_BUTTON_IMAGE = APP_RES_PATH "/SleepTime/button.bin"; - // 手势拍照 - static constexpr const char *PNG_GETPIC_CAMERA_IMAGE = APP_RES_PATH "/GetPic/camera.bin"; - static constexpr const char *PNG_GETPIC_PICBOUTTON_IMAGE = APP_RES_PATH "/GetPic/pic_button.bin"; - static constexpr const char *PNG_GETPIC_SMILE_IMAGE = APP_RES_PATH "/GetPic/smile.bin"; + // 省电模式 static constexpr const char *PNG_SAVEELE_BATE_IMAGE = APP_RES_PATH "/Save_Ele/Battery-E.bin"; static constexpr const char *PNG_SAVEELE_BATF_IMAGE = APP_RES_PATH "/Save_Ele/Battery-F.bin"; @@ -383,7 +380,7 @@ namespace OHOS static constexpr const char *PNG_APPLIST_TRAINING_IMAGE = APP_RES_PATH "/training.bin"; // 训练 static constexpr const char *PNG_APPLIST_TRAINING_RECORD_IMAGE = APP_RES_PATH "/Training record.bin"; // 训练记录 static constexpr const char *PNG_APPLIST_BLOODPRESSURE_IMAGE = APP_RES_PATH "/bloodpressure.bin"; // 睡眠 - static constexpr const char *PNG_APPLIST_GETPIC_IMAGE = APP_RES_PATH "/getpic.bin"; // 拍照 + static constexpr const char *PNG_APPLIST_BLOOD_IMAGE = APP_RES_PATH "/blood.bin"; // 血氧 static constexpr const char *PNG_APPLIST_MUSIC_IMAGE = APP_RES_PATH "/music.bin"; // 音乐 static constexpr const char *PNG_APPLIST_WEATHER_IMAGE = APP_RES_PATH "/weather.bin"; // 天气 diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp index 1206c632e..212124921 100755 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -72,10 +72,7 @@ #include "sleep/include/SleepTimePresenter.h" #include "sleep/include/SleepActView.h" #include "sleep/include/SleepActPresenter.h" -#include "getpic/include/GetPicView.h" -#include "getpic/include/GetPicPresenter.h" -#include "getpic/include/TakePicView.h" -#include "getpic/include/TakePicPresenter.h" + #include "phone/include/PhoneView.h" #include "phone/include/PhonePresenter.h" #include "phone/include/PhoneCallView.h" @@ -277,8 +274,7 @@ static const AppViewMapper SLICE_MAPPER[] = { {VIEW_BLOODPRESSURE, &NativeLauncher::InitSleepSlice}, {VIEW_SLEEPTIME, &NativeLauncher::InitSleepTimeSlice}, {VIEW_SLEEPACT, &NativeLauncher::InitSleepActSlice}, - {VIEW_GETPIC, &NativeLauncher::InitGetPicSlice}, //拍照 - {VIEW_TAKEPIC, &NativeLauncher::InitTakePicSlice}, + {VIEW_PHONE, &NativeLauncher::InitPhoneSlice}, //电话 {VIEW_PHONECALL, &NativeLauncher::InitPhoneCallSlice}, {VIEW_PHONEDIR, &NativeLauncher::InitPhoneDirSlice}, @@ -724,29 +720,7 @@ void NativeLauncher::InitSleepActSlice(void) NativeAbility::GetInstance().AddSliceProxy(VIEW_SLEEPACT, sleepactview); } -void NativeLauncher::InitGetPicSlice(void) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitGetPicSlice"); - SliceProxy *getpicview = new AbilitySliceProxy; - if (getpicview == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "getpicview"); - return; - } - NativeAbility::GetInstance().AddSliceProxy(VIEW_GETPIC, getpicview); -} -void NativeLauncher::InitTakePicSlice(void) -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitTakePicSlice"); - SliceProxy *takepicview = new AbilitySliceProxy; - if (takepicview == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "takepicview"); - return; - } - NativeAbility::GetInstance().AddSliceProxy(VIEW_TAKEPIC, takepicview); -} void NativeLauncher::InitPhoneSlice(void) { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp index 96cdfd350..932c81cb9 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp @@ -27,7 +27,6 @@ namespace OHOS {VIEW_MUSIC, PNG_APPLIST_MUSIC_IMAGE, PNG_APPLIST_MUSIC_IMAGE, "音乐", nullptr}, {VIEW_RECORD, PNG_APPLIST_RECORD_IMAGE, PNG_APPLIST_RECORD_IMAGE, "录音", nullptr}, {VIEW_PHONE, PNG_APPLIST_PHONE_IMAGE, PNG_APPLIST_PHONE_IMAGE, "电话", nullptr}, - {VIEW_GETPIC, PNG_APPLIST_GETPIC_IMAGE, PNG_APPLIST_GETPIC_IMAGE, "拍照", nullptr}, {VIEW_CONNECT_BLUETOOTH, PNG_APPLIST_BLUETOOTH_IMAGE, PNG_APPLIST_BLUETOOTH_IMAGE, "蓝牙", nullptr}, {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr}, {VIEW_MAIN_STOPWATCH, PNG_APPLIST_CHRONOMETER_IMAGE, PNG_APPLIST_CHRONOMETER_IMAGE, "秒表", nullptr}, diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/include/BlooocPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/blood/include/BlooocPresenter.h new file mode 100644 index 000000000..f2b1b3205 --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/include/BlooocPresenter.h @@ -0,0 +1,43 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-18 10:37:14 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-01-18 10:37:16 + * @FilePath: /1.FD230/FD230/code/sdk/application/wearable/nativeapp/nativeui/blood/include/BlooocPresenter.h + * @Description: + * @ + * @Copyright (c) 2024 by Caisking , All Rights Reserved. + */ +#ifndef _Blood_PRESENTER_H +#define _Blood_PRESENTER_H + +#include "Presenter.h" +#include "BloodView.h" + +namespace OHOS +{ + class BloodView; + + class BloodPresenter : public Presenter, + public UIView::OnClickListener, + public UIView::OnDragListener + { + public: + BloodPresenter(); + virtual ~BloodPresenter(); + + void OnStart() override; + void OnPause() override; + void OnResume() override; + void OnStop() override; + + static BloodPresenter *GetInstance(); + + private: + // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; + bool OnClick(UIView &view, const ClickEvent &event) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + }; +} // namespace OHOS + +#endif // SLEEPDETAIL_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp new file mode 100644 index 000000000..329da0842 --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp @@ -0,0 +1,89 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-18 10:38:26 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-01-18 10:38:28 + * @FilePath: /1.FD230/FD230/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp + * @Description: + * @ + * @Copyright (c) 2024 by Caisking , All Rights Reserved. + */ +#include "AppViewIDs.h" +#include "NativeAbility.h" + +#include "blood/include/BloodPresenter.h" + +namespace OHOS +{ + + // 当前Presenter属性实例化的内存指针 + static BloodPresenter *g_pBloodPresenter = nullptr; + + BloodPresenter::BloodPresenter() + { + + g_pBloodPresenter = this; + } + + BloodPresenter::~BloodPresenter() + { + + g_pBloodPresenter = nullptr; + } + + BloodPresenter *BloodPresenter::GetInstance() + { + + return g_pBloodPresenter; + } + + void BloodPresenter::OnStart() + { + + Presenter::OnStart(); + } + + void BloodPresenter::OnPause(void) + { + + Presenter::OnPause(); + } + + void BloodPresenter::OnResume(void) + { + + Presenter::OnResume(); + } + + void BloodPresenter::OnStop(void) + { + + Presenter::OnStop(); + } + + bool BloodPresenter::OnDrag(UIView &view, const DragEvent &event) + { + + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + { + printf("draglistene is ok!\n"); + NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + } + UNUSED(view); + return true; + } + + bool BloodPresenter::OnClick(UIView &view, const ClickEvent &event) + { + // 根据控件id查找是哪个控件触发了点击回调 + if (strcmp(view.GetViewId(), WARNING) == 0) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODSHOW); + } + if (strcmp(view.GetViewId(), CHECK) == 0) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODCHECK); + } + return true; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicPresenter.h deleted file mode 100755 index 488e1beba..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicPresenter.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef _GETPIC_PRESENTER_H -#define _GETPIC_PRESENTER_H - -#include "Presenter.h" -#include "GetPicView.h" - -namespace OHOS -{ - class GetPicView; - - class GetPicPresenter : public Presenter, - public UIView::OnClickListener, - public UIView::OnDragListener - { - public: - GetPicPresenter(); - virtual ~GetPicPresenter(); - - void OnStart() override; - void OnPause() override; - void OnResume() override; - void OnStop() override; - - static GetPicPresenter *GetInstance(); - - private: - // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; - bool OnClick(UIView &view, const ClickEvent &event) override; - bool OnDrag(UIView &view, const DragEvent &event) override; - }; -} // namespace OHOS - -#endif // SLEEPDETAIL_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicView.h b/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicView.h deleted file mode 100755 index 219a7f2ac..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicView.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef _GETPIC_VIEW_H -#define _GETPIC_VIEW_H - -#include "BaseView.h" -#include "View.h" -#include -#include "components/ui_view_group.h" -#include "components/ui_label.h" -#include "components/ui_image_view.h" -#include "components/ui_button.h" - -#include "GetPicPresenter.h" -namespace OHOS -{ - class GetPicPresenter; - class GetPicView : public View - { - - public: - GetPicView(); - virtual ~GetPicView(); - static GetPicView *GetInstance(void); - - void OnStart() override; - void OnSetUpView() override; - void OnTearDownView() override; - void OnStop() override; - void Init(); - void DeInit(); - UIView *GetView(); - - private: - UIView::OnDragListener *draglistener{nullptr}; - // 以下控件属性通过new实例化后,add到对应root属性上; - GetPicView(GetPicView &&) = delete; - GetPicView &operator=(GetPicView &&) = delete; - - UIViewGroup *container_ = nullptr; - UILabel *label1_ = nullptr; - UIImageView *image1_ = nullptr; - UILabel *label2_ = nullptr; - UIButton *button1_ = nullptr; - }; -} // namespace OHOS -#endif // GetPic_PRESENTER_H diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicPresenter.h deleted file mode 100755 index 855161218..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicPresenter.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef _TAKEPIC_PRESENTER_H -#define _TAKEPIC_PRESENTER_H - -#include "Presenter.h" -#include "TakePicView.h" - -namespace OHOS -{ - class TakePicView; - - class TakePicPresenter : public Presenter, - public UIView::OnClickListener, - public UIView::OnDragListener - { - public: - TakePicPresenter(); - virtual ~TakePicPresenter(); - - void OnStart() override; - void OnPause() override; - void OnResume() override; - void OnStop() override; - - static TakePicPresenter *GetInstance(); - - private: - // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; - bool OnClick(UIView &view, const ClickEvent &event) override; - bool OnDrag(UIView &view, const DragEvent &event) override; - }; -} // namespace OHOS - -#endif // SLEEPDETAIL_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicView.h b/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicView.h deleted file mode 100755 index 995d188cf..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicView.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef _TAKEPIC_VIEW_H -#define _TAKEPIC_VIEW_H - -#include "BaseView.h" -#include "View.h" -#include -#include "components/ui_view_group.h" -#include "components/ui_label.h" -#include "components/ui_image_view.h" -#include "components/ui_button.h" - -#include "TakePicPresenter.h" -namespace OHOS -{ - class TakePicPresenter; - class TakePicView : public View - { - - public: - TakePicView(); - virtual ~TakePicView(); - static TakePicView *GetInstance(void); - - void OnStart() override; - void OnSetUpView() override; - void OnTearDownView() override; - void OnStop() override; - void Init(); - void DeInit(); - UIView *GetView(); - - private: - UIView::OnDragListener *draglistener{nullptr}; - // 以下控件属性通过new实例化后,add到对应root属性上; - TakePicView(TakePicView &&) = delete; - TakePicView &operator=(TakePicView &&) = delete; - - UIViewGroup *container_ = nullptr; - UILabel *label1_ = nullptr; - UIImageView *image1_ = nullptr; - UILabel *label2_ = nullptr; - UILabel *label3_ = nullptr; - }; -} // namespace OHOS -#endif // TakePic_PRESENTER_H diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicPresenter.cpp deleted file mode 100755 index 9cbcda332..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicPresenter.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "AppViewIDs.h" -#include "NativeAbility.h" - -#include "getpic/include/GetPicPresenter.h" -namespace OHOS -{ - - // 当前Presenter属性实例化的内存指针 - static GetPicPresenter *g_pGetPicPresenter = nullptr; - - GetPicPresenter::GetPicPresenter() - { - - g_pGetPicPresenter = this; - } - - GetPicPresenter::~GetPicPresenter() - { - - g_pGetPicPresenter = nullptr; - } - - GetPicPresenter *GetPicPresenter::GetInstance() - { - - return g_pGetPicPresenter; - } - - void GetPicPresenter::OnStart() - { - - Presenter::OnStart(); - } - - void GetPicPresenter::OnPause(void) - { - - Presenter::OnPause(); - } - - void GetPicPresenter::OnResume(void) - { - - Presenter::OnResume(); - } - - void GetPicPresenter::OnStop(void) - { - - Presenter::OnStop(); - } - - bool GetPicPresenter::OnDrag(UIView &view, const DragEvent &event) - { - - if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); - } - UNUSED(view); - return true; - } - - bool GetPicPresenter::OnClick(UIView &view, const ClickEvent &event) - { - // 根据控件id查找是哪个控件触发了点击回调 - // if (strcmp(view.GetViewId(), 控件ID) == 0) - if (strcmp(view.GetViewId(), "button1") == 0) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TAKEPIC); - } - return true; - } -} \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicView.cpp deleted file mode 100755 index df5701a72..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicView.cpp +++ /dev/null @@ -1,214 +0,0 @@ -#include "getpic/include/GetPicView.h" - -#include "common/image_cache_manager.h" -#include "UiConfig.h" -#include "ui_resource_image.h" -#include -#include "components/ui_button.h" -namespace OHOS -{ - - static GetPicView *g_pGetPicView{nullptr}; - - GetPicView::GetPicView() - { - - g_pGetPicView = this; - } - - GetPicView::~GetPicView() - { - DeInit(); - g_pGetPicView = nullptr; - } - - GetPicView *GetPicView::GetInstance() - { - - return g_pGetPicView; - } - void GetPicView::Init() - { - if (container_ == nullptr) - { - container_ = new UIViewGroup(); - container_->SetPosition(0, 0, 466, 466); - container_->SetStyle(STYLE_BACKGROUND_OPA, 0); - } - - // Add Label to App - if (label1_ == nullptr) - { - label1_ = new UILabel(); - } - label1_->SetPosition(173, 52); // widget's left position and top position - label1_->Resize(120, 35); // widget's width and height - label1_->SetViewId("label1"); // Set style - label1_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label1_->SetText("手势拍照"); - label1_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label1_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label1_->SetRollSpeed(0); - label1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - container_->Add(label1_); - label1_->SetVisible(true); - - // Add ImageView to App - if (image1_ == nullptr) - { - image1_ = new UIImageView(); - } - image1_->SetPosition(163, 103); // widget's left position and top position - image1_->Resize(140, 140); // widget's width and height - image1_->SetViewId("image1"); // Set style - - // Set additional property -#ifdef _WIN32 - char *image1imagesPath = "c:/Users/caiking/project/image_converter_tool/output/GetPic/camera.bin"; -#else - char *image1imagesPath = "/user/res/GetPic/camera.bin"; -#endif - image1_->SetSrc(image1imagesPath); - - // Add to rootView - container_->Add(image1_); - image1_->SetVisible(true); - - // Add Label to App - if (label2_ == nullptr) - { - label2_ = new UILabel(); - } - label2_->SetPosition(53, 253); // widget's left position and top position - label2_->Resize(360, 70); // widget's width and height - label2_->SetViewId("label2"); // Set style - label2_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label2_->SetText("请先打开小希爱玩app,进\n入“设备”-“拍照”"); - label2_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label2_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label2_->SetRollSpeed(0); - label2_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - container_->Add(label2_); - label2_->SetVisible(true); - - // Add Button to App - if (button1_ == nullptr) - { - button1_ = new UIButton(); - } - button1_->SetPosition(0, 366); // widget's left position and top position - button1_->Resize(466, 100); // widget's width and height - button1_->SetViewId("button1"); // Set style - button1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); - button1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - - // Set additional property -#ifdef _WIN32 - char *button1defaultImgSrc = "c:/Users/caiking/project/image_converter_tool/output/GetPic/button.bin"; -#else - char *button1defaultImgSrc = "/user/res/GetPic/pic_button.bin"; -#endif - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); - button1_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); - button1_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - - // Add the CallBack about events - UIView::OnClickListener *button1Click = static_cast(GetPicPresenter::GetInstance()); - button1_->SetOnClickListener(button1Click); - // Add to rootView - container_->Add(button1_); - button1_->SetVisible(true); - } - - void GetPicView::DeInit() - { - if (container_ != nullptr) - { - container_->RemoveAll(); - delete container_; - container_ = nullptr; - } - if (label1_ != nullptr) - { - delete label1_; - label1_ = nullptr; - } - if (image1_ != nullptr) - { - delete image1_; - image1_ = nullptr; - } - if (label2_ != nullptr) - { - delete label2_; - label2_ = nullptr; - } - if (button1_ != nullptr) - { - delete button1_; - button1_ = nullptr; - } - } - - UIView *GetPicView::GetView() - { - Init(); - return container_; - } - - void GetPicView::OnStart() - { - container_ = new UIScrollView(); - if (container_ == nullptr) - { - return; - } - container_->SetPosition(0, 0); - container_->SetWidth(Screen::GetInstance().GetWidth()); - container_->SetHeight(Screen::GetInstance().GetHeight() * 2); - - // 创建 draglistener 实例并设置为拖动监听器 - UIView::OnDragListener *draglistener = static_cast(GetPicPresenter::GetInstance()); - if (draglistener == nullptr) - { - return; - } - container_->SetOnDragListener(draglistener); - - container_->SetTouchable(true); - container_->SetDraggable(true); - - GetView(); - RootView::GetInstance()->Add(container_); - } - - void GetPicView::OnSetUpView() - { - - View::OnSetUpView(); - Draw(); - } - - void GetPicView::OnTearDownView() - { - - View::OnTearDownView(); - return; - } - - void GetPicView::OnStop() - { - View::OnStop(); - RootView::GetInstance()->RemoveAll(); - return; - } -} diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicPresenter.cpp deleted file mode 100755 index 5ddf466b5..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicPresenter.cpp +++ /dev/null @@ -1,75 +0,0 @@ -#include "AppViewIDs.h" -#include "NativeAbility.h" - -#include "getpic/include/TakePicPresenter.h" - -namespace OHOS -{ - - // 当前Presenter属性实例化的内存指针 - static TakePicPresenter *g_pTakePicPresenter = nullptr; - - TakePicPresenter::TakePicPresenter() - { - - g_pTakePicPresenter = this; - } - - TakePicPresenter::~TakePicPresenter() - { - - g_pTakePicPresenter = nullptr; - } - - TakePicPresenter *TakePicPresenter::GetInstance() - { - - return g_pTakePicPresenter; - } - - void TakePicPresenter::OnStart() - { - - Presenter::OnStart(); - } - - void TakePicPresenter::OnPause(void) - { - - Presenter::OnPause(); - } - - void TakePicPresenter::OnResume(void) - { - - Presenter::OnResume(); - } - - void TakePicPresenter::OnStop(void) - { - - Presenter::OnStop(); - } - - bool TakePicPresenter::OnDrag(UIView &view, const DragEvent &event) - { - - if (event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_GETPIC); - } - UNUSED(view); - return true; - } - - bool TakePicPresenter::OnClick(UIView &view, const ClickEvent &event) - { - // 根据控件id查找是哪个控件触发了点击回调 - // if (strcmp(view.GetViewId(), 控件ID) == 0) - // if (strcmp(view.GetViewId(), "button1") == 0) - // { - // NativeAbility::GetInstance().ChangeSlice(VIEW_SAVEBAT); - // } - return true; - } -} \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicView.cpp deleted file mode 100755 index 5ee861da1..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicView.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#include "getpic/include/TakePicView.h" - -#include "common/image_cache_manager.h" -#include "UiConfig.h" -#include "ui_resource_image.h" -#include -#include "components/ui_button.h" -namespace OHOS -{ - - static TakePicView *g_pTakePicView{nullptr}; - - TakePicView::TakePicView() - { - - g_pTakePicView = this; - } - - TakePicView::~TakePicView() - { - DeInit(); - g_pTakePicView = nullptr; - } - - TakePicView *TakePicView::GetInstance() - { - - return g_pTakePicView; - } - void TakePicView::Init() - { - if (container_ == nullptr) - { - container_ = new UIViewGroup(); - container_->SetPosition(0, 0, 466, 466); - container_->SetStyle(STYLE_BACKGROUND_OPA, 0); - } - - // Add Label to App - if (label1_ == nullptr) - { - label1_ = new UILabel(); - } - label1_->SetPosition(173, 52); // widget's left position and top position - label1_->Resize(120, 35); // widget's width and height - label1_->SetViewId("label1"); // Set style - label1_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label1_->SetText("手势拍照"); - label1_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label1_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label1_->SetRollSpeed(0); - label1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - container_->Add(label1_); - label1_->SetVisible(true); - - // Add ImageView to App - if (image1_ == nullptr) - { - image1_ = new UIImageView(); - } - image1_->SetPosition(163, 140); // widget's left position and top position - image1_->Resize(140, 140); // widget's width and height - image1_->SetViewId("image1"); // Set style - - // Set additional property -#ifdef _WIN32 - char *image1imagesPath = "c:/Users/caiking/project/image_converter_tool/output/TakePic/smile.bin"; -#else - char *image1imagesPath = "/user/res/GetPic/smile.bin"; -#endif - image1_->SetSrc(image1imagesPath); - - // Add to rootView - container_->Add(image1_); - image1_->SetVisible(true); - - // Add Label to App - if (label2_ == nullptr) - { - label2_ = new UILabel(); - } - label2_->SetPosition(128, 310); // widget's left position and top position - label2_->Resize(360, 70); // widget's width and height - label2_->SetViewId("label2"); // Set style - label2_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label2_->SetText("晃一晃手腕拍照"); - label2_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label2_->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); - label2_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label2_->SetRollSpeed(0); - label2_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - container_->Add(label2_); - label2_->SetVisible(true); - - // Add Label to App - if (label3_ == nullptr) - { - label3_ = new UILabel(); - } - label3_->SetPosition(159, 347); // widget's left position and top position - label3_->Resize(200, 60); // widget's width and height - label3_->SetViewId("label3"); // Set style - label3_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label3_->SetText("已拍摄0å¼ "); - label3_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label3_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label3_->SetRollSpeed(0); - label3_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - container_->Add(label3_); - label3_->SetVisible(true); - } - - void TakePicView::DeInit() - { - if (container_ != nullptr) - { - container_->RemoveAll(); - delete container_; - container_ = nullptr; - } - if (label1_ != nullptr) - { - delete label1_; - label1_ = nullptr; - } - if (image1_ != nullptr) - { - delete image1_; - image1_ = nullptr; - } - if (label2_ != nullptr) - { - delete label2_; - label2_ = nullptr; - } - if (label3_ != nullptr) - { - delete label3_; - label3_ = nullptr; - } - } - - UIView *TakePicView::GetView() - { - Init(); - return container_; - } - void TakePicView::OnStart() - { - container_ = new UIScrollView(); - if (container_ == nullptr) - { - return; - } - container_->SetPosition(0, 0); - container_->SetWidth(Screen::GetInstance().GetWidth()); - container_->SetHeight(Screen::GetInstance().GetHeight() * 2); - - // 创建 draglistener 实例并设置为拖动监听器 - UIView::OnDragListener *draglistener = static_cast(TakePicPresenter::GetInstance()); - if (draglistener == nullptr) - { - return; - } - container_->SetOnDragListener(draglistener); - - container_->SetTouchable(true); - container_->SetDraggable(true); - - GetView(); - RootView::GetInstance()->Add(container_); - } - - void TakePicView::OnSetUpView() - { - - View::OnSetUpView(); - Draw(); - } - - void TakePicView::OnTearDownView() - { - - View::OnTearDownView(); - return; - } - - void TakePicView::OnStop() - { - View::OnStop(); - RootView::GetInstance()->RemoveAll(); - return; - } -} diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/camera.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/camera.bin deleted file mode 100644 index 49f2abe79..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/camera.bin and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/pic_button.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/pic_button.bin deleted file mode 100644 index 5be4c17d5..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/pic_button.bin and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/smile.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/smile.bin deleted file mode 100644 index bcb2b081b..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/smile.bin and /dev/null differ