移除拍照功能及其资源
authorCaisking <3449750381@qq.com>
Thu, 18 Jan 2024 06:39:39 +0000 (14:39 +0800)
committerCaisking <3449750381@qq.com>
Thu, 18 Jan 2024 06:39:39 +0000 (14:39 +0800)
18 files changed:
code/sdk/application/wearable/nativeapp/CMakeLists.txt
code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp
code/sdk/application/wearable/nativeapp/nativeui/blood/include/BlooocPresenter.h [new file with mode: 0644]
code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp [new file with mode: 0644]
code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicPresenter.h [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/include/GetPicView.h [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicPresenter.h [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/include/TakePicView.h [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicPresenter.cpp [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/src/GetPicView.cpp [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicPresenter.cpp [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/getpic/src/TakePicView.cpp [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/camera.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/pic_button.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/smile.bin [deleted file]

index 378c5c8..f56a8a0 100755 (executable)
@@ -228,12 +228,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/PhoneCallupPresenter.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/PhoneRingView.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/PhoneRingPresenter.cpp\r
-    #��������\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/GetPicPresenter.cpp\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/GetPicView.cpp\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/TakePicPresenter.cpp\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/getpic/src/TakePicView.cpp\r
-    #Ѫ��\r
+\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodView.cpp\r
 \r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodShowView.cpp\r
index 159a0fa..6e56e49 100755 (executable)
@@ -45,8 +45,7 @@ typedef enum : uint16_t
     VIEW_INDOORWALK,\r
     VIEW_REBOOT,\r
     VIEW_UISAMPLE, // 实例\r
-    VIEW_GETPIC,   // 手势拍照\r
-    VIEW_TAKEPIC,  // 拍照\r
+\r
 \r
     //VIEW_BLOOD,      // 血氧\r
     VIEW_BLOODSHOW,  // 血氧说明\r
index cc524ce..46f6f1b 100755 (executable)
@@ -233,10 +233,7 @@ namespace OHOS
     static constexpr const char *PNG_SLEEP_LINE1_IMAGE = APP_RES_PATH "/SleepTime/Line 1.bin";\r
     static constexpr const char *PNG_SLEEP_LINE3_IMAGE = APP_RES_PATH "/SleepTime/Line 3.bin";\r
     static constexpr const char *PNG_SLEEP_BUTTON_IMAGE = APP_RES_PATH "/SleepTime/button.bin";\r
-    // 手势拍照\r
-    static constexpr const char *PNG_GETPIC_CAMERA_IMAGE = APP_RES_PATH "/GetPic/camera.bin";\r
-    static constexpr const char *PNG_GETPIC_PICBOUTTON_IMAGE = APP_RES_PATH "/GetPic/pic_button.bin";\r
-    static constexpr const char *PNG_GETPIC_SMILE_IMAGE = APP_RES_PATH "/GetPic/smile.bin";\r
+    \r
     // 省电模式\r
     static constexpr const char *PNG_SAVEELE_BATE_IMAGE = APP_RES_PATH "/Save_Ele/Battery-E.bin";\r
     static constexpr const char *PNG_SAVEELE_BATF_IMAGE = APP_RES_PATH "/Save_Ele/Battery-F.bin";\r
@@ -383,7 +380,7 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_TRAINING_IMAGE = APP_RES_PATH "/training.bin";               // 训练\r
     static constexpr const char *PNG_APPLIST_TRAINING_RECORD_IMAGE = APP_RES_PATH "/Training record.bin"; // 训练记录\r
     static constexpr const char *PNG_APPLIST_BLOODPRESSURE_IMAGE = APP_RES_PATH "/bloodpressure.bin";     // 睡眠\r
-    static constexpr const char *PNG_APPLIST_GETPIC_IMAGE = APP_RES_PATH "/getpic.bin";                   // 拍照\r
+   \r
     static constexpr const char *PNG_APPLIST_BLOOD_IMAGE = APP_RES_PATH "/blood.bin";                     // 血氧\r
     static constexpr const char *PNG_APPLIST_MUSIC_IMAGE = APP_RES_PATH "/music.bin";                     // 音乐\r
     static constexpr const char *PNG_APPLIST_WEATHER_IMAGE = APP_RES_PATH "/weather.bin";                 // 天气\r
index 1206c63..2121249 100755 (executable)
 #include "sleep/include/SleepTimePresenter.h"\r
 #include "sleep/include/SleepActView.h"\r
 #include "sleep/include/SleepActPresenter.h"\r
-#include "getpic/include/GetPicView.h"\r
-#include "getpic/include/GetPicPresenter.h"\r
-#include "getpic/include/TakePicView.h"\r
-#include "getpic/include/TakePicPresenter.h"\r
+\r
 #include "phone/include/PhoneView.h"\r
 #include "phone/include/PhonePresenter.h"\r
 #include "phone/include/PhoneCallView.h"\r
@@ -277,8 +274,7 @@ static const AppViewMapper SLICE_MAPPER[] = {
     {VIEW_BLOODPRESSURE, &NativeLauncher::InitSleepSlice},\r
     {VIEW_SLEEPTIME, &NativeLauncher::InitSleepTimeSlice},\r
     {VIEW_SLEEPACT, &NativeLauncher::InitSleepActSlice},\r
-       {VIEW_GETPIC, &NativeLauncher::InitGetPicSlice},                            //拍照\r
-       {VIEW_TAKEPIC, &NativeLauncher::InitTakePicSlice},\r
+       \r
     {VIEW_PHONE, &NativeLauncher::InitPhoneSlice},                                                             //电话\r
     {VIEW_PHONECALL, &NativeLauncher::InitPhoneCallSlice},\r
     {VIEW_PHONEDIR, &NativeLauncher::InitPhoneDirSlice},\r
@@ -724,29 +720,7 @@ void NativeLauncher::InitSleepActSlice(void)
     NativeAbility::GetInstance().AddSliceProxy(VIEW_SLEEPACT, sleepactview);\r
 }\r
        \r
-void NativeLauncher::InitGetPicSlice(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitGetPicSlice");\r
-    SliceProxy *getpicview = new AbilitySliceProxy<GetPicView, GetPicPresenter>;\r
-    if (getpicview == nullptr)\r
-    {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "getpicview");\r
-        return;\r
-    }\r
-    NativeAbility::GetInstance().AddSliceProxy(VIEW_GETPIC, getpicview);\r
-}\r
 \r
-void NativeLauncher::InitTakePicSlice(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitTakePicSlice");\r
-    SliceProxy *takepicview = new AbilitySliceProxy<TakePicView, TakePicPresenter>;\r
-    if (takepicview == nullptr)\r
-    {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "takepicview");\r
-    return;\r
-    }\r
-    NativeAbility::GetInstance().AddSliceProxy(VIEW_TAKEPIC, takepicview);\r
-}\r
 \r
 void NativeLauncher::InitPhoneSlice(void)\r
 {\r
index 96cdfd3..932c81c 100755 (executable)
@@ -27,7 +27,6 @@ namespace OHOS
     {VIEW_MUSIC, PNG_APPLIST_MUSIC_IMAGE, PNG_APPLIST_MUSIC_IMAGE, "音乐", nullptr},\r
     {VIEW_RECORD, PNG_APPLIST_RECORD_IMAGE, PNG_APPLIST_RECORD_IMAGE, "录音", nullptr},\r
     {VIEW_PHONE, PNG_APPLIST_PHONE_IMAGE, PNG_APPLIST_PHONE_IMAGE, "电话", nullptr},\r
-    {VIEW_GETPIC, PNG_APPLIST_GETPIC_IMAGE, PNG_APPLIST_GETPIC_IMAGE, "拍照", nullptr},\r
     {VIEW_CONNECT_BLUETOOTH, PNG_APPLIST_BLUETOOTH_IMAGE, PNG_APPLIST_BLUETOOTH_IMAGE, "蓝牙", nullptr},\r
     {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr},\r
     {VIEW_MAIN_STOPWATCH, PNG_APPLIST_CHRONOMETER_IMAGE, PNG_APPLIST_CHRONOMETER_IMAGE, "秒表", nullptr},\r
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 (file)
index 0000000..f2b1b32
--- /dev/null
@@ -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<BloodView>,
+                           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 (file)
index 0000000..329da08
--- /dev/null
@@ -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<BloodView>::OnStart();
+    }
+
+    void BloodPresenter::OnPause(void)
+    {
+
+        Presenter<BloodView>::OnPause();
+    }
+
+    void BloodPresenter::OnResume(void)
+    {
+
+        Presenter<BloodView>::OnResume();
+    }
+
+    void BloodPresenter::OnStop(void)
+    {
+
+        Presenter<BloodView>::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 (executable)
index 488e1be..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _GETPIC_PRESENTER_H\r
-#define _GETPIC_PRESENTER_H\r
-\r
-#include "Presenter.h"\r
-#include "GetPicView.h"\r
-\r
-namespace OHOS\r
-{\r
-    class GetPicView;\r
-\r
-    class GetPicPresenter : public Presenter<GetPicView>,\r
-                            public UIView::OnClickListener,\r
-                            public UIView::OnDragListener\r
-    {\r
-    public:\r
-        GetPicPresenter();\r
-        virtual ~GetPicPresenter();\r
-\r
-        void OnStart() override;\r
-        void OnPause() override;\r
-        void OnResume() override;\r
-        void OnStop() override;\r
-\r
-        static GetPicPresenter *GetInstance();\r
-\r
-    private:\r
-        // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承;\r
-        bool OnClick(UIView &view, const ClickEvent &event) override;\r
-        bool OnDrag(UIView &view, const DragEvent &event) override;\r
-    };\r
-} // namespace OHOS\r
-\r
-#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 (executable)
index 219a7f2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _GETPIC_VIEW_H\r
-#define _GETPIC_VIEW_H\r
-\r
-#include "BaseView.h"\r
-#include "View.h"\r
-#include <ui_scroll_view.h>\r
-#include "components/ui_view_group.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_button.h"\r
-\r
-#include "GetPicPresenter.h"\r
-namespace OHOS\r
-{\r
-    class GetPicPresenter;\r
-    class GetPicView : public View<GetPicPresenter>\r
-    {\r
-\r
-    public:\r
-        GetPicView();\r
-        virtual ~GetPicView();\r
-        static GetPicView *GetInstance(void);\r
-\r
-        void OnStart() override;\r
-        void OnSetUpView() override;\r
-        void OnTearDownView() override;\r
-        void OnStop() override;\r
-        void Init();\r
-        void DeInit();\r
-        UIView *GetView();\r
-\r
-    private:\r
-        UIView::OnDragListener *draglistener{nullptr};\r
-        // 以下控件属性通过new实例化后,add到对应root属性上;\r
-        GetPicView(GetPicView &&) = delete;\r
-        GetPicView &operator=(GetPicView &&) = delete;\r
-\r
-        UIViewGroup *container_ = nullptr;\r
-        UILabel *label1_ = nullptr;\r
-        UIImageView *image1_ = nullptr;\r
-        UILabel *label2_ = nullptr;\r
-        UIButton *button1_ = nullptr;\r
-    };\r
-} // namespace OHOS\r
-#endif // GetPic_PRESENTER_H\r
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 (executable)
index 8551612..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _TAKEPIC_PRESENTER_H\r
-#define _TAKEPIC_PRESENTER_H\r
-\r
-#include "Presenter.h"\r
-#include "TakePicView.h"\r
-\r
-namespace OHOS\r
-{\r
-    class TakePicView;\r
-\r
-    class TakePicPresenter : public Presenter<TakePicView>,\r
-                             public UIView::OnClickListener,\r
-                             public UIView::OnDragListener\r
-    {\r
-    public:\r
-        TakePicPresenter();\r
-        virtual ~TakePicPresenter();\r
-\r
-        void OnStart() override;\r
-        void OnPause() override;\r
-        void OnResume() override;\r
-        void OnStop() override;\r
-\r
-        static TakePicPresenter *GetInstance();\r
-\r
-    private:\r
-        // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承;\r
-        bool OnClick(UIView &view, const ClickEvent &event) override;\r
-        bool OnDrag(UIView &view, const DragEvent &event) override;\r
-    };\r
-} // namespace OHOS\r
-\r
-#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 (executable)
index 995d188..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _TAKEPIC_VIEW_H\r
-#define _TAKEPIC_VIEW_H\r
-\r
-#include "BaseView.h"\r
-#include "View.h"\r
-#include <ui_scroll_view.h>\r
-#include "components/ui_view_group.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_button.h"\r
-\r
-#include "TakePicPresenter.h"\r
-namespace OHOS\r
-{\r
-    class TakePicPresenter;\r
-    class TakePicView : public View<TakePicPresenter>\r
-    {\r
-\r
-    public:\r
-        TakePicView();\r
-        virtual ~TakePicView();\r
-        static TakePicView *GetInstance(void);\r
-\r
-        void OnStart() override;\r
-        void OnSetUpView() override;\r
-        void OnTearDownView() override;\r
-        void OnStop() override;\r
-        void Init();\r
-        void DeInit();\r
-        UIView *GetView();\r
-\r
-    private:\r
-        UIView::OnDragListener *draglistener{nullptr};\r
-        // 以下控件属性通过new实例化后,add到对应root属性上;\r
-        TakePicView(TakePicView &&) = delete;\r
-        TakePicView &operator=(TakePicView &&) = delete;\r
-\r
-        UIViewGroup *container_ = nullptr;\r
-        UILabel *label1_ = nullptr;\r
-        UIImageView *image1_ = nullptr;\r
-        UILabel *label2_ = nullptr;\r
-        UILabel *label3_ = nullptr;\r
-    };\r
-} // namespace OHOS\r
-#endif // TakePic_PRESENTER_H\r
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 (executable)
index 9cbcda3..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "AppViewIDs.h"\r
-#include "NativeAbility.h"\r
-\r
-#include "getpic/include/GetPicPresenter.h"\r
-namespace OHOS\r
-{\r
-\r
-    // 当前Presenter属性实例化的内存指针\r
-    static GetPicPresenter *g_pGetPicPresenter = nullptr;\r
-\r
-    GetPicPresenter::GetPicPresenter()\r
-    {\r
-\r
-        g_pGetPicPresenter = this;\r
-    }\r
-\r
-    GetPicPresenter::~GetPicPresenter()\r
-    {\r
-\r
-        g_pGetPicPresenter = nullptr;\r
-    }\r
-\r
-    GetPicPresenter *GetPicPresenter::GetInstance()\r
-    {\r
-\r
-        return g_pGetPicPresenter;\r
-    }\r
-\r
-    void GetPicPresenter::OnStart()\r
-    {\r
-\r
-        Presenter<GetPicView>::OnStart();\r
-    }\r
-\r
-    void GetPicPresenter::OnPause(void)\r
-    {\r
-\r
-        Presenter<GetPicView>::OnPause();\r
-    }\r
-\r
-    void GetPicPresenter::OnResume(void)\r
-    {\r
-\r
-        Presenter<GetPicView>::OnResume();\r
-    }\r
-\r
-    void GetPicPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<GetPicView>::OnStop();\r
-    }\r
-\r
-    bool GetPicPresenter::OnDrag(UIView &view, const DragEvent &event)\r
-    {\r
-\r
-        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
-        {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
-        }\r
-        UNUSED(view);\r
-        return true;\r
-    }\r
-\r
-    bool GetPicPresenter::OnClick(UIView &view, const ClickEvent &event)\r
-    {\r
-        // 根据控件id查找是哪个控件触发了点击回调\r
-        // if (strcmp(view.GetViewId(), 控件ID) == 0)\r
-        if (strcmp(view.GetViewId(), "button1") == 0)\r
-        {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TAKEPIC);\r
-        }\r
-        return true;\r
-    }\r
-}
\ 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 (executable)
index df5701a..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-#include "getpic/include/GetPicView.h"\r
-\r
-#include "common/image_cache_manager.h"\r
-#include "UiConfig.h"\r
-#include "ui_resource_image.h"\r
-#include <ui_scroll_view.h>\r
-#include "components/ui_button.h"\r
-namespace OHOS\r
-{\r
-\r
-    static GetPicView *g_pGetPicView{nullptr};\r
-\r
-    GetPicView::GetPicView()\r
-    {\r
-\r
-        g_pGetPicView = this;\r
-    }\r
-\r
-    GetPicView::~GetPicView()\r
-    {\r
-        DeInit();\r
-        g_pGetPicView = nullptr;\r
-    }\r
-\r
-    GetPicView *GetPicView::GetInstance()\r
-    {\r
-\r
-        return g_pGetPicView;\r
-    }\r
-    void GetPicView::Init()\r
-    {\r
-        if (container_ == nullptr)\r
-        {\r
-            container_ = new UIViewGroup();\r
-            container_->SetPosition(0, 0, 466, 466);\r
-            container_->SetStyle(STYLE_BACKGROUND_OPA, 0);\r
-        }\r
-\r
-        // Add Label to App\r
-        if (label1_ == nullptr)\r
-        {\r
-            label1_ = new UILabel();\r
-        }\r
-        label1_->SetPosition(173, 52); // widget's left position and top position\r
-        label1_->Resize(120, 35);      // widget's width and height\r
-        label1_->SetViewId("label1");  // Set style\r
-        label1_->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
-        // Set additional property\r
-        label1_->SetText("手势拍照");\r
-        label1_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        label1_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label1_->SetRollSpeed(0);\r
-        label1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to rootView\r
-        container_->Add(label1_);\r
-        label1_->SetVisible(true);\r
-\r
-        // Add ImageView to App\r
-        if (image1_ == nullptr)\r
-        {\r
-            image1_ = new UIImageView();\r
-        }\r
-        image1_->SetPosition(163, 103); // widget's left position and top position\r
-        image1_->Resize(140, 140);      // widget's width and height\r
-        image1_->SetViewId("image1");   // Set style\r
-\r
-        // Set additional property\r
-#ifdef _WIN32\r
-        char *image1imagesPath = "c:/Users/caiking/project/image_converter_tool/output/GetPic/camera.bin";\r
-#else\r
-        char *image1imagesPath = "/user/res/GetPic/camera.bin";\r
-#endif\r
-        image1_->SetSrc(image1imagesPath);\r
-\r
-        // Add to rootView\r
-        container_->Add(image1_);\r
-        image1_->SetVisible(true);\r
-\r
-        // Add Label to App\r
-        if (label2_ == nullptr)\r
-        {\r
-            label2_ = new UILabel();\r
-        }\r
-        label2_->SetPosition(53, 253); // widget's left position and top position\r
-        label2_->Resize(360, 70);      // widget's width and height\r
-        label2_->SetViewId("label2");  // Set style\r
-        label2_->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
-        // Set additional property\r
-        label2_->SetText("请先打开小希爱玩app,进\n入“设备”-“拍照”");\r
-        label2_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        label2_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label2_->SetRollSpeed(0);\r
-        label2_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to rootView\r
-        container_->Add(label2_);\r
-        label2_->SetVisible(true);\r
-\r
-        // Add Button to App\r
-        if (button1_ == nullptr)\r
-        {\r
-            button1_ = new UIButton();\r
-        }\r
-        button1_->SetPosition(0, 366);  // widget's left position and top position\r
-        button1_->Resize(466, 100);     // widget's width and height\r
-        button1_->SetViewId("button1"); // Set style\r
-        button1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
-        button1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
-\r
-        // Set additional property\r
-#ifdef _WIN32\r
-        char *button1defaultImgSrc = "c:/Users/caiking/project/image_converter_tool/output/GetPic/button.bin";\r
-#else\r
-        char *button1defaultImgSrc = "/user/res/GetPic/pic_button.bin";\r
-#endif\r
-        char *button1triggeredImgSrc = nullptr;\r
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);\r
-        button1_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
-        button1_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
-\r
-        // Add the CallBack about events\r
-        UIView::OnClickListener *button1Click = static_cast<UIView::OnClickListener *>(GetPicPresenter::GetInstance());\r
-        button1_->SetOnClickListener(button1Click);\r
-        // Add to rootView\r
-        container_->Add(button1_);\r
-        button1_->SetVisible(true);\r
-    }\r
-\r
-    void GetPicView::DeInit()\r
-    {\r
-        if (container_ != nullptr)\r
-        {\r
-            container_->RemoveAll();\r
-            delete container_;\r
-            container_ = nullptr;\r
-        }\r
-        if (label1_ != nullptr)\r
-        {\r
-            delete label1_;\r
-            label1_ = nullptr;\r
-        }\r
-        if (image1_ != nullptr)\r
-        {\r
-            delete image1_;\r
-            image1_ = nullptr;\r
-        }\r
-        if (label2_ != nullptr)\r
-        {\r
-            delete label2_;\r
-            label2_ = nullptr;\r
-        }\r
-        if (button1_ != nullptr)\r
-        {\r
-            delete button1_;\r
-            button1_ = nullptr;\r
-        }\r
-    }\r
-\r
-    UIView *GetPicView::GetView()\r
-    {\r
-        Init();\r
-        return container_;\r
-    }\r
-\r
-    void GetPicView::OnStart()\r
-    {\r
-        container_ = new UIScrollView();\r
-        if (container_ == nullptr)\r
-        {\r
-            return;\r
-        }\r
-        container_->SetPosition(0, 0);\r
-        container_->SetWidth(Screen::GetInstance().GetWidth());\r
-        container_->SetHeight(Screen::GetInstance().GetHeight() * 2);\r
-\r
-        // 创建 draglistener 实例并设置为拖动监听器\r
-        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(GetPicPresenter::GetInstance());\r
-        if (draglistener == nullptr)\r
-        {\r
-            return;\r
-        }\r
-        container_->SetOnDragListener(draglistener);\r
-\r
-        container_->SetTouchable(true);\r
-        container_->SetDraggable(true);\r
-\r
-        GetView();\r
-        RootView::GetInstance()->Add(container_);\r
-    }\r
-\r
-    void GetPicView::OnSetUpView()\r
-    {\r
-\r
-        View<GetPicPresenter>::OnSetUpView();\r
-        Draw();\r
-    }\r
-\r
-    void GetPicView::OnTearDownView()\r
-    {\r
-\r
-        View<GetPicPresenter>::OnTearDownView();\r
-        return;\r
-    }\r
-\r
-    void GetPicView::OnStop()\r
-    {\r
-        View<GetPicPresenter>::OnStop();\r
-        RootView::GetInstance()->RemoveAll();\r
-        return;\r
-    }\r
-}\r
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 (executable)
index 5ddf466..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "AppViewIDs.h"\r
-#include "NativeAbility.h"\r
-\r
-#include "getpic/include/TakePicPresenter.h"\r
-\r
-namespace OHOS\r
-{\r
-\r
-    // 当前Presenter属性实例化的内存指针\r
-    static TakePicPresenter *g_pTakePicPresenter = nullptr;\r
-\r
-    TakePicPresenter::TakePicPresenter()\r
-    {\r
-\r
-        g_pTakePicPresenter = this;\r
-    }\r
-\r
-    TakePicPresenter::~TakePicPresenter()\r
-    {\r
-\r
-        g_pTakePicPresenter = nullptr;\r
-    }\r
-\r
-    TakePicPresenter *TakePicPresenter::GetInstance()\r
-    {\r
-\r
-        return g_pTakePicPresenter;\r
-    }\r
-\r
-    void TakePicPresenter::OnStart()\r
-    {\r
-\r
-        Presenter<TakePicView>::OnStart();\r
-    }\r
-\r
-    void TakePicPresenter::OnPause(void)\r
-    {\r
-\r
-        Presenter<TakePicView>::OnPause();\r
-    }\r
-\r
-    void TakePicPresenter::OnResume(void)\r
-    {\r
-\r
-        Presenter<TakePicView>::OnResume();\r
-    }\r
-\r
-    void TakePicPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<TakePicView>::OnStop();\r
-    }\r
-\r
-    bool TakePicPresenter::OnDrag(UIView &view, const DragEvent &event)\r
-    {\r
-\r
-        if (event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM)\r
-        {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_GETPIC);\r
-        }\r
-        UNUSED(view);\r
-        return true;\r
-    }\r
-\r
-    bool TakePicPresenter::OnClick(UIView &view, const ClickEvent &event)\r
-    {\r
-        // 根据控件id查找是哪个控件触发了点击回调\r
-        // if (strcmp(view.GetViewId(), 控件ID) == 0)\r
-        // if (strcmp(view.GetViewId(), "button1") == 0)\r
-        // {\r
-        //     NativeAbility::GetInstance().ChangeSlice(VIEW_SAVEBAT);\r
-        // }\r
-        return true;\r
-    }\r
-}
\ 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 (executable)
index 5ee861d..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "getpic/include/TakePicView.h"\r
-\r
-#include "common/image_cache_manager.h"\r
-#include "UiConfig.h"\r
-#include "ui_resource_image.h"\r
-#include <ui_scroll_view.h>\r
-#include "components/ui_button.h"\r
-namespace OHOS\r
-{\r
-\r
-    static TakePicView *g_pTakePicView{nullptr};\r
-\r
-    TakePicView::TakePicView()\r
-    {\r
-\r
-        g_pTakePicView = this;\r
-    }\r
-\r
-    TakePicView::~TakePicView()\r
-    {\r
-        DeInit();\r
-        g_pTakePicView = nullptr;\r
-    }\r
-\r
-    TakePicView *TakePicView::GetInstance()\r
-    {\r
-\r
-        return g_pTakePicView;\r
-    }\r
-    void TakePicView::Init()\r
-    {\r
-        if (container_ == nullptr)\r
-        {\r
-            container_ = new UIViewGroup();\r
-            container_->SetPosition(0, 0, 466, 466);\r
-            container_->SetStyle(STYLE_BACKGROUND_OPA, 0);\r
-        }\r
-\r
-        // Add Label to App\r
-        if (label1_ == nullptr)\r
-        {\r
-            label1_ = new UILabel();\r
-        }\r
-        label1_->SetPosition(173, 52); // widget's left position and top position\r
-        label1_->Resize(120, 35);      // widget's width and height\r
-        label1_->SetViewId("label1");  // Set style\r
-        label1_->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
-        // Set additional property\r
-        label1_->SetText("手势拍照");\r
-        label1_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        label1_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label1_->SetRollSpeed(0);\r
-        label1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to rootView\r
-        container_->Add(label1_);\r
-        label1_->SetVisible(true);\r
-\r
-        // Add ImageView to App\r
-        if (image1_ == nullptr)\r
-        {\r
-            image1_ = new UIImageView();\r
-        }\r
-        image1_->SetPosition(163, 140); // widget's left position and top position\r
-        image1_->Resize(140, 140);      // widget's width and height\r
-        image1_->SetViewId("image1");   // Set style\r
-\r
-        // Set additional property\r
-#ifdef _WIN32\r
-        char *image1imagesPath = "c:/Users/caiking/project/image_converter_tool/output/TakePic/smile.bin";\r
-#else\r
-        char *image1imagesPath = "/user/res/GetPic/smile.bin";\r
-#endif\r
-        image1_->SetSrc(image1imagesPath);\r
-\r
-        // Add to rootView\r
-        container_->Add(image1_);\r
-        image1_->SetVisible(true);\r
-\r
-        // Add Label to App\r
-        if (label2_ == nullptr)\r
-        {\r
-            label2_ = new UILabel();\r
-        }\r
-        label2_->SetPosition(128, 310); // widget's left position and top position\r
-        label2_->Resize(360, 70);       // widget's width and height\r
-        label2_->SetViewId("label2");   // Set style\r
-        label2_->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
-        // Set additional property\r
-        label2_->SetText("晃一晃手腕拍照");\r
-        label2_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        label2_->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
-        label2_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label2_->SetRollSpeed(0);\r
-        label2_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to rootView\r
-        container_->Add(label2_);\r
-        label2_->SetVisible(true);\r
-\r
-        // Add Label to App\r
-        if (label3_ == nullptr)\r
-        {\r
-            label3_ = new UILabel();\r
-        }\r
-        label3_->SetPosition(159, 347); // widget's left position and top position\r
-        label3_->Resize(200, 60);       // widget's width and height\r
-        label3_->SetViewId("label3");   // Set style\r
-        label3_->SetStyle(STYLE_TEXT_FONT, 30);\r
-\r
-        // Set additional property\r
-        label3_->SetText("已拍摄0张");\r
-        label3_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        label3_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label3_->SetRollSpeed(0);\r
-        label3_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        // Add to rootView\r
-        container_->Add(label3_);\r
-        label3_->SetVisible(true);\r
-    }\r
-\r
-    void TakePicView::DeInit()\r
-    {\r
-        if (container_ != nullptr)\r
-        {\r
-            container_->RemoveAll();\r
-            delete container_;\r
-            container_ = nullptr;\r
-        }\r
-        if (label1_ != nullptr)\r
-        {\r
-            delete label1_;\r
-            label1_ = nullptr;\r
-        }\r
-        if (image1_ != nullptr)\r
-        {\r
-            delete image1_;\r
-            image1_ = nullptr;\r
-        }\r
-        if (label2_ != nullptr)\r
-        {\r
-            delete label2_;\r
-            label2_ = nullptr;\r
-        }\r
-        if (label3_ != nullptr)\r
-        {\r
-            delete label3_;\r
-            label3_ = nullptr;\r
-        }\r
-    }\r
-\r
-    UIView *TakePicView::GetView()\r
-    {\r
-        Init();\r
-        return container_;\r
-    }\r
-    void TakePicView::OnStart()\r
-    {\r
-        container_ = new UIScrollView();\r
-        if (container_ == nullptr)\r
-        {\r
-            return;\r
-        }\r
-        container_->SetPosition(0, 0);\r
-        container_->SetWidth(Screen::GetInstance().GetWidth());\r
-        container_->SetHeight(Screen::GetInstance().GetHeight() * 2);\r
-\r
-        // 创建 draglistener 实例并设置为拖动监听器\r
-        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(TakePicPresenter::GetInstance());\r
-        if (draglistener == nullptr)\r
-        {\r
-            return;\r
-        }\r
-        container_->SetOnDragListener(draglistener);\r
-\r
-        container_->SetTouchable(true);\r
-        container_->SetDraggable(true);\r
-\r
-        GetView();\r
-        RootView::GetInstance()->Add(container_);\r
-    }\r
-\r
-    void TakePicView::OnSetUpView()\r
-    {\r
-\r
-        View<TakePicPresenter>::OnSetUpView();\r
-        Draw();\r
-    }\r
-\r
-    void TakePicView::OnTearDownView()\r
-    {\r
-\r
-        View<TakePicPresenter>::OnTearDownView();\r
-        return;\r
-    }\r
-\r
-    void TakePicView::OnStop()\r
-    {\r
-        View<TakePicPresenter>::OnStop();\r
-        RootView::GetInstance()->RemoveAll();\r
-        return;\r
-    }\r
-}\r
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 (file)
index 49f2abe..0000000
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 (file)
index 5be4c17..0000000
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 (file)
index bcb2b08..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/GetPic/smile.bin and /dev/null differ