上拉消息中心
authorCaisking <3449750381@qq.com>
Tue, 23 Jan 2024 08:00:16 +0000 (16:00 +0800)
committerCaisking <3449750381@qq.com>
Tue, 23 Jan 2024 08:00:16 +0000 (16:00 +0800)
17 files changed:
code/sdk/application/wearable/nativeapp/nativeui/applist/include/AppItemView.h
code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistView.h
code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistView.cpp
code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h
code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageAdapter.h
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageCradView.h [new file with mode: 0644]
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageItem.h
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageItemView.h
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageModel.h
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessagePresenter.h
code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageView.h
code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageAdapter.cpp
code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageCardView.cpp [new file with mode: 0644]
code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageItemView.cpp
code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageModel.cpp
code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageView.cpp

index e77a9ef..71408f2 100755 (executable)
@@ -1,3 +1,13 @@
+/*** 
+ * @Author: Caisking 3449750381@qq.com
+ * @Date: 2024-01-20 17:32:42
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-01-23 11:02:35
+ * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistView.h
+ * @Description: 
+ * @
+ * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
+ */
 /*
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
  * Description: ApplistView.h
 #include "drag_event.h"
 #include "UiConfig.h"
 
-namespace OHOS {
-class AppListOnDragListener : public UIView::OnDragListener {
-public:
-    AppListOnDragListener()
-    {
-        continueDrag = false;
-    }
-    virtual ~AppListOnDragListener() {}
-    virtual bool OnDragStart(UIView& view, const DragEvent& event)
+namespace OHOS
+{
+    class AppListOnDragListener : public UIView::OnDragListener
     {
-        UNUSED(view);
-        UNUSED(event);
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondragstart!!");
-        continueDrag = true;
-        return false;
-    }
+    public:
+        AppListOnDragListener()
+        {
+            continueDrag = false;
+        }
+        virtual ~AppListOnDragListener() {}
+        virtual bool OnDragStart(UIView &view, const DragEvent &event)
+        {
+            UNUSED(view);
+            UNUSED(event);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondragstart!!");
+            continueDrag = true;
+            return false;
+        }
+
+        virtual bool OnDrag(UIView &view, const DragEvent &event)
+        {
+            UNUSED(view);
+            if (!continueDrag)
+            {
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AppList : Can not continue drag!!");
+                return false;
+            }
+            if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) &&
+                (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY()))))
+            {
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondrag!!");
+                NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TRANSITION_ZOOM);
+            }
 
-    virtual bool OnDrag(UIView& view, const DragEvent& event)
-    {
-        UNUSED(view);
-        if (!continueDrag) {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AppList : Can not continue drag!!");
             return false;
         }
-        if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) &&
-            (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondrag!!");
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TRANSITION_ZOOM);
+
+        virtual bool OnDragEnd(UIView &view, const DragEvent &event)
+        {
+            UNUSED(view);
+            UNUSED(event);
+            return false;
         }
 
-        return false;
-    }
+    private:
+        bool continueDrag{false};
+    };
 
-    virtual bool OnDragEnd(UIView& view, const DragEvent& event)
+    class ApplistPresenter;
+    class ApplistView : public View<ApplistPresenter>, public ListScrollListener, public UIViewGroup
     {
-        UNUSED(view);
-        UNUSED(event);
-        return false;
-    }
-private:
-    bool continueDrag{false};
-};
-
-class ApplistPresenter;
-class ApplistView : public View<ApplistPresenter>, public ListScrollListener ,public UIViewGroup{
-public:
-    ApplistView();
-    virtual ~ApplistView();
+    public:
+        ApplistView();
+        virtual ~ApplistView();
 
-    virtual void OnStart() override;
-    virtual void OnSetUpView() override;
-    virtual void OnTearDownView() override;
-    virtual void OnStop() override;
-    bool InitPage();
-    bool SetupViewPage(ApplistView *applistView);
-    ApplistPresenter *g_ApplistPresenter{nullptr};
-    void AddAppItemToList(const AppItem &item);
-    void ClearAppItemToList();
-    void OnItemSelected(int16 index, UIView *view) override;
-    UIList* GetAppUIList(void);
+        virtual void OnStart() override;
+        virtual void OnSetUpView() override;
+        virtual void OnTearDownView() override;
+        virtual void OnStop() override;
+        bool InitPage();
+        bool SetupViewPage(ApplistView *applistView);
+        ApplistPresenter *g_ApplistPresenter{nullptr};
+        void AddAppItemToList(const AppItem &item);
+        void ClearAppItemToList();
+        void OnItemSelected(int16 index, UIView *view) override;
+        UIList *GetAppUIList(void);
 
-private:
-    ApplistAdapter *listAdapter_{nullptr};
-    UIList *contentList_{nullptr};
-    UIView::OnDragListener *dragListener{nullptr};
-    AppItemView *itemViewSele{nullptr};
-    AppItemView *preItemViewSele{nullptr};
-};
+    private:
+        ApplistAdapter *listAdapter_{nullptr};
+        UIList *contentList_{nullptr};
+        UIView::OnDragListener *dragListener{nullptr};
+        AppItemView *itemViewSele{nullptr};
+        AppItemView *preItemViewSele{nullptr};
+    };
 }
 #endif // APPLIST_VIEW_H
\ No newline at end of file
index bf1dd63..e2954a8 100755 (executable)
@@ -124,6 +124,7 @@ void ApplistView::OnStart()
     contentList_->EnableAutoAlign(true);
     contentList_->SetScrollStateListener(this);
     contentList_->SetMaxScrollDistance(MAX_SCROLL_DIS);
+    //SetXScrollBarVisible(true);
     SetContainerView(contentList_);
 
     dragListener = new AppListOnDragListener();
index 42c356b..1cf41df 100755 (executable)
@@ -33,7 +33,7 @@
 #include "traing/include/TraingView.h"
 #include "ApplistCardView.h"
 #include "weather/include/WeatherControlView.h"
-#include "message/include/MessageView.h"
+#include "message/include/MessageCradView.h"
 namespace OHOS
 {
     class MainPresenterSample;
@@ -76,8 +76,13 @@ namespace OHOS
         int16_t maxPage{0};
         bool continuDragFg{false};
         PullUpDownView *dropDownView{nullptr};
-        MessageView *messageView{nullptr};
-        UILabel *messageLable{nullptr};
+        /* -------------------------------------------------------------------------- */
+        UICardPage *messageView{nullptr};
+        UILabel *Messagelabel = nullptr;
+        UIList *Messagelist = nullptr;
+        IconAdapter *list1adapter_ = nullptr;
+        List<IconItemNode *> *Messagelistdate = nullptr;
+        /* -------------------------------------------------------------------------- */
         Digital_clockView *mainClockView{nullptr};
         ActivityWeekView *activityWeekView{nullptr};
         PlayersView *playersView{nullptr};
index 711d7e0..20838b2 100755 (executable)
@@ -54,7 +54,7 @@ namespace OHOS
             recordCard[i] = nullptr;
             pageStatus[i] = false;
         }
-       mainSwipeGroup->RemoveAll();
+        mainSwipeGroup->RemoveAll();
 /* -------------------------------------------------------------------------- */
 #if 0
         UIView *view = static_cast<UICrossView *>(MainViewSample::mainSwipeGroup)->GetChildrenHead();
@@ -93,17 +93,29 @@ namespace OHOS
             delete dropDownView;
             dropDownView = nullptr;
         }
+        /* -------------------------------------------------------------------------- */
         if (messageView != nullptr)
         {
             messageView->RemoveAll();
             delete messageView;
             messageView = nullptr;
         }
-        if (messageLable != nullptr)
+        if (Messagelabel != nullptr)
+        {
+            delete Messagelabel;
+            Messagelabel = nullptr;
+        }
+        if (Messagelist != nullptr)
+        {
+            delete Messagelist;
+            Messagelist = nullptr;
+        }
+        if (list1adapter_ != nullptr)
         {
-            delete messageLable;
-            messageLable = nullptr;
+            delete list1adapter_;
+            list1adapter_ = nullptr;
         }
+        /* -------------------------------------------------------------------------- */
         if (compassControlView != nullptr)
         {
             delete compassControlView;
@@ -112,7 +124,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */
         if (mainClockView != nullptr)
         {
-            //mainClockView->RemoveAll();
+            // mainClockView->RemoveAll();
             delete mainClockView;
             mainClockView = nullptr;
         }
@@ -123,13 +135,13 @@ namespace OHOS
         }
         if (bloodView != nullptr)
         {
-            //bloodView->RemoveAll();
+            // bloodView->RemoveAll();
             delete bloodView;
             bloodView = nullptr;
         }
         if (traingView != nullptr)
         {
-            //traingView->RemoveAll();
+            // traingView->RemoveAll();
             delete traingView;
             traingView = nullptr;
         }
@@ -242,17 +254,89 @@ namespace OHOS
         dropDownView->SetViewId("dropDownView");
         dropDownView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         dropDownView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
-
-        messageView = new MessageView();
+        /* -------------------------------------------------------------------------- */
+        messageView = new UICardPage();
         if (messageView == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageView new fail");
             return;
         }
-        messageView->PreLoad();
-        messageView->SetViewId("messageView");
+        // Add Label to App
+        if (Messagelabel == nullptr)
+        {
+            Messagelabel = new UILabel();
+        }
+        Messagelabel->SetPosition(173, 51); // widget's left position and top position
+        Messagelabel->Resize(200, 60);      // widget's width and height
+        Messagelabel->SetViewId("label1");  // Set style
+        Messagelabel->SetStyle(STYLE_TEXT_FONT, 30);
+        // Set additional property
+        Messagelabel->SetText("信息通知");
+        Messagelabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
+        Messagelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        Messagelabel->SetRollSpeed(0);
+        Messagelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        // Add to rootView
+        messageView->Add(Messagelabel);
+        Messagelabel->SetVisible(true);
+        // Add List to App
+        if (Messagelist == nullptr)
+        {
+            Messagelist = new UIList();
+        }
+        Messagelist->SetPosition(100, 96); // widget's left position and top position
+        Messagelist->Resize(246, 503);     // widget's width and height
+        Messagelist->SetViewId("list1");   // Set style
+        Messagelist->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);
+        Messagelist->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
+        Messagelist->SetStyle(STYLE_PADDING_LEFT, 9);
+        Messagelist->SetStyle(STYLE_PADDING_RIGHT, 10);
+        Messagelist->SetStyle(STYLE_PADDING_TOP, 1);
+        Messagelist->SetStyle(STYLE_PADDING_BOTTOM, 6);
+        // Set additional property
+        if (Messagelistdate == nullptr)
+        {
+            Messagelistdate = new List<IconItemNode *>();
+        }
+        IconItemNode *list1data1 = new IconItemNode();
+        list1data1->imagePath = "/user/res/message/WeChat-icon.bin";
+        list1data1->txt = "微信";
+        Messagelistdate->PushBack(list1data1);
+        IconItemNode *list1data2 = new IconItemNode();
+        list1data2->imagePath = "/user/res/message/message-icon.bin";
+        list1data2->txt = "消息";
+        Messagelistdate->PushBack(list1data2);
+        IconItemNode *list1data3 = new IconItemNode();
+        list1data3->imagePath = "/user/res/message/QQ-icon.bin";
+        list1data3->txt = "QQ";
+        Messagelistdate->PushBack(list1data3);
+        IconItemNode *list1data4 = new IconItemNode();
+        list1data4->imagePath = "/user/res/message/system-icon.bin";
+        list1data4->txt = "系统";
+        Messagelistdate->PushBack(list1data4);
+        if (list1adapter_ == nullptr)
+        {
+            list1adapter_ = new IconAdapter();
+        }
+        list1adapter_->SetItemSize(199, 86);
+        list1adapter_->SetImageSize(71, 91);
+        list1adapter_->SetImageOffset(20, 8);
+        list1adapter_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        list1adapter_->SetData(Messagelistdate);
+        Messagelist->SetAdapter(list1adapter_);
+        // Add to rootView
+        messageView->Add(Messagelist);
+        Messagelist->SetVisible(true);
+
         messageView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         messageView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
+        /* -------------------------------------------------------------------------- */
+#if 0
+        messageView->PreLoad();
+        messageView->SetViewId("messageView");
+
+#endif
+/* -------------------------------------------------------------------------- */
 #if 0
         messageView->SetPosition(0, 0);
         messageView->SetWidth(Screen::GetInstance().GetWidth());
@@ -354,7 +438,7 @@ namespace OHOS
         }
         return playersView;
     }
-    //主界面指南针卡片
+    // 主界面指南针卡片
     UICardPage *MainViewSample::InitCompassPage(void)
     {
         compassControlView = new CompassControlView();
index 5176f7f..2fbe1e1 100644 (file)
@@ -2,68 +2,9 @@
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-01-22 16:46:45
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 17:00:55
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/include/MessageAdapter.h
+ * @LastEditTime: 2024-01-23 14:32:57
+ * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageAdapter.h
  * @Description: 
  * @
  * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
  */
-
-#ifndef Message_ADAPTER_H
-#define Message_ADAPTER_H
-
-#include <list>
-#include <string>
-#include "components/ui_list.h"
-#include "components/ui_label.h"
-#include "components/ui_view_group.h"
-#include "components/ui_image_view.h"
-#include "components/abstract_adapter.h"
-#include "wearable_log.h"
-#include "UiConfig.h"
-#include "message/include/MessageModel.h"
-#include "message/include/MessageItemView.h"
-#include "message/include/MessageItem.h"
-
-namespace OHOS
-{
-    class MessageAdapter : public AbstractAdapter
-    {
-    public:
-        explicit MessageAdapter();
-        virtual ~MessageAdapter();
-
-        /* *
-         * @brief Sets the UIView adapter data, which is a MessageItem linked list.
-         *
-         * @param data Indicates the MessageItem linked list data.
-         * @since 1.0
-         * @version 1.0
-         */
-        void SetData(std::list<MessageItem> &data);
-
-        /* *
-         * @brief Obtains the <b>data</b> size of the UILabel adapter.
-         *
-         * @return Returns the <b>data</b> size of the UILabel adapter.
-         * @since 1.0
-         * @version 1.0
-         */
-        virtual uint16_t GetCount(void) override;
-
-        virtual UIView *GetView(UIView *inView, int16_t index) override;
-
-        virtual void AddListItem(const MessageItem &item);
-
-        void SetItemClickListener(UIView::OnClickListener *itemclicklistener)
-        {
-            itemClickListener = itemclicklistener;
-        }
-
-    private:
-        std::list<MessageItem> listData;
-        UIView::OnClickListener *itemClickListener{nullptr};
-    };
-}
-
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageCradView.h b/code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageCradView.h
new file mode 100644 (file)
index 0000000..00b3283
--- /dev/null
@@ -0,0 +1,10 @@
+/*** 
+ * @Author: Caisking 3449750381@qq.com
+ * @Date: 2024-01-23 10:38:47
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-01-23 10:38:49
+ * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageCradView.h
+ * @Description: 
+ * @
+ * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
+ */
index 6fc9c92..e69de29 100644 (file)
@@ -1,39 +0,0 @@
-/***
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:47:13
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 19:21:23
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/include/MessageItem.h
- * @Description:
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved.
- */
-
-#ifndef MessageITEM_H
-#define MessageITEM_H
-
-#include <cstdint>
-
-namespace OHOS
-{
-    /*
-     * setting id.
-     */
-    typedef enum : uint16_t
-    {
-        // setting item index
-        Message_ITEM_ZERO = 0x0000,
-        Message_ITEM_ONE,
-        Message_ITEM_TWO,
-        Message_ITEM_THREE,
-    } MessageIndex;
-
-    typedef struct
-    {
-        MessageIndex index;
-        const char *icon;
-        const char *label;
-        bool hasSecondMenu;
-    } MessageItem;
-}
-#endif
\ No newline at end of file
index 596cb21..e69de29 100644 (file)
@@ -1,49 +0,0 @@
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:51:30
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 17:02:00
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/include/MessageItemView.h
- * @Description: 
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
- */
-/*
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
- * Description: MessageItemView.h
- * Author:
- * Create: 2021-11-23
- */
-
-#ifndef Message_ITEM_VIEW_H
-#define Message_ITEM_VIEW_H
-
-#include "components/ui_label.h"
-#include "components/ui_view_group.h"
-#include "components/ui_image_view.h"
-
-#include "UiConfig.h"
-#include "MessageModel.h"
-
-namespace OHOS
-{
-    class MessageItemView : public UIViewGroup
-    {
-    public:
-        explicit MessageItemView();
-        virtual ~MessageItemView();
-        virtual void SetItemInfo(const MessageItem itemInfo);
-        virtual void SetUpChild();
-        MessageIndex GetMessageIndex();
-
-    private:
-        MessageItemView(const MessageItemView &);
-        UIImageView sBackground;
-        UIImageView sIcon;
-        UILabel sLabel;
-        UIImageView sNextImage;
-        MessageItem sItemInfo = {Message_ITEM_ZERO, nullptr, nullptr, false};
-    };
-}
-
-#endif
index f735e72..e69de29 100644 (file)
@@ -1,44 +0,0 @@
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:23:08
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 19:40:25
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/include/MessageModel.h
- * @Description: 
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
- */
-#ifndef Message_MODEL_H
-#define Message_MODEL_H
-
-#include <cstdint>
-#include <map>
-#include "AppViewIDs.h"
-#include "UiConfig.h"
-#include "message/include/MessageItem.h"
-#include "message/include/MessagePresenter.h"
-
-namespace OHOS
-{
-    class MessageModel
-    {
-    public:
-        static MessageModel &GetInstance(void);
-        void InitMessageItem();
-        const MessageItem *GetMessagelistItems() const;
-        uint8_t GetMessageListNum() const;
-        const std::map<MessageIndex, AppViewId> &GetMessageIdToViewId() const;
-        
-    private:
-        MessageModel();
-        MessageModel(const MessageModel &);
-        MessageModel &operator=(const MessageModel &);
-        virtual ~MessageModel();
-        static const uint16_t Message_ITEM_LEN = 5;
-        MessageItem Messages[Message_ITEM_LEN] = {Message_ITEM_ZERO, nullptr, nullptr, false};
-        std::map<MessageIndex, AppViewId> MessageIdToViewId;
-
-    };
-}
-
-#endif
\ No newline at end of file
index de46f06..e69de29 100644 (file)
@@ -1,10 +0,0 @@
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:22:13
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 16:22:15
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/include/MessagePresenter.h
- * @Description: 
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
- */
index 52296e9..e69de29 100644 (file)
@@ -1,79 +0,0 @@
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:20:09
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 19:47:37
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/message/include/MessageView.h
- * @Description: 
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
- */
-
-/***
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:20:09
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 17:09:32
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/include/MessageView.h
- * @Description:
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved.
- */
-#ifndef Message_VIEW_H
-#define Message_VIEW_H
-
-#include <string>
-#include "components/ui_image_view.h"
-#include "components/ui_label.h"
-#include "components/root_view.h"
-#include "components/ui_view_group.h"
-#include "components/ui_button.h"
-#include "components/ui_label_button.h"
-#include "components/ui_abstract_scroll.h"
-#include "components/ui_circle_progress.h"
-#include "components/ui_checkbox.h"
-#include "components/ui_list.h"
-#include "BaseView.h"
-#include "font/ui_font_bitmap.h"
-#include "font/ui_font.h"
-#include "graphic_config.h"
-#include "components/ui_card_page.h"
-#include "components/ui_scroll_view.h"
-#include "common/image_cache_manager.h"
-
-#include "message/include/MessagePresenter.h"
-#include "message/include/MessageItem.h"
-#include "message/include/MessageAdapter.h"
-namespace OHOS
-{
-    class MessageJumpView;
-    class MessagePresenter;
-    class MessageCaseListAdapter;
-    class MessageView : public UICardPage
-    {
-    public:
-        MessageView();
-        virtual ~MessageView();
-        static MessageView *GetInstance(void);
-        bool InitView(void);
-        void PreLoad(void) override;
-        void UnLoad(void) override;
-        void CreateMessagesPresenter(void);
-        void CreateMessageOnDragListener(void);
-        void AddMessageItemToList(const MessageItem &item);
-        void CreateJumpView(void);
-
-    private:
-        MessageAdapter *listAdapter{nullptr};
-        UIList *contentList{nullptr};
-        UIScrollView *scrollView{nullptr};
-        UILabel *title{nullptr};
-        UIView::OnDragListener *dragListener{nullptr};
-        MessageJumpView *messagejumpView{nullptr};
-        MessagePresenter *messagePresenter{nullptr};
-        //MessageOnDragListener *messageOnDragListener{nullptr};
-
-        bool viewiInitStatus{false};
-    };
-}
-#endif // Message_VIEW_H
\ No newline at end of file
index 9efce40..e69de29 100644 (file)
@@ -1,81 +0,0 @@
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:47:55
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 16:52:34
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/src/MessageAdapter.cpp
- * @Description: 
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
- */
-#include "message/include/MessageAdapter.h"
-
-namespace OHOS
-{
-    MessageAdapter::MessageAdapter() {}
-
-    MessageAdapter::~MessageAdapter()
-    {
-        listData.clear();
-    }
-
-    uint16_t MessageAdapter::GetCount(void)
-    {
-        return listData.size();
-    }
-
-    void MessageAdapter::SetData(std::list<MessageItem> &data)
-    {
-        if (!listData.empty())
-        {
-            listData.clear();
-        }
-        std::list<MessageItem>::iterator it;
-        for (it = data.begin(); it != data.end(); it++)
-        {
-            listData.push_back(*it);
-        }
-    }
-
-    UIView *MessageAdapter::GetView(UIView *inView, int16_t index)
-    {
-        if (listData.empty())
-        {
-            return nullptr;
-        }
-        if (index < 0)
-        {
-            return nullptr;
-        }
-        size_t uindex = index;
-        if (uindex >= listData.size())
-        {
-            return nullptr;
-        }
-
-        std::list<MessageItem>::iterator it = listData.begin();
-        for (int i = 0; i < index; i++)
-        {
-            it++;
-        }
-        MessageItem itemData = *it;
-        MessageItemView *item = nullptr;
-        if (inView == nullptr)
-        {
-            item = new MessageItemView();
-        }
-        else
-        {
-            item = static_cast<MessageItemView *>(inView);
-        }
-
-        item->SetItemInfo(itemData);
-        item->SetOnClickListener(itemClickListener);
-        return item;
-    }
-
-    void MessageAdapter::AddListItem(const MessageItem &item)
-    {
-        listData.push_back(item);
-    }
-} // namespace OHOS
\ No newline at end of file
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageCardView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageCardView.cpp
new file mode 100644 (file)
index 0000000..e69de29
index 0018bef..e69de29 100644 (file)
@@ -1,83 +0,0 @@
-
-/*** 
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:51:49
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 20:03:01
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageItemView.cpp
- * @Description: 
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
- */
-
-
-#include "wearable_log.h"
-#include "message/include/MessageItemView.h"
-
-namespace OHOS
-{
-    static constexpr int16_t Message_ICON_X = 19;
-    static constexpr int16_t Message_SICON_Y = 19;
-    static constexpr int16_t Message_SLABEL_X = 115;
-    static constexpr int16_t Message_SLABEL_Y = 33;
-    static constexpr int16_t Message_SLABEL_W = 200;
-    static constexpr int16_t Message_SLABEL_H = 40;
-    static constexpr int16_t Message_SNEXTIMAGE_X = 326;
-    static constexpr int16 Message_SLABEL_FONT_SIZE = 30;
-    static constexpr int16 Message_SLABEL_FONT_HEIGHT = 36;
-    static constexpr int16 Message_SBACKGROUND_HEIGHT = 100;
-    static constexpr int16 NUMS_2 = 2;
-
-    MessageItemView::MessageItemView()
-    {
-        SetPosition(0, 0, 380, 120);
-        SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
-        SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY);
-        SetTouchable(true);
-        SetUpChild();
-
-        Add(&sBackground);
-        Add(&sIcon);
-        Add(&sLabel);
-        Add(&sNextImage);
-    }
-
-    MessageItemView::~MessageItemView()
-    {
-        Remove(&sBackground);
-        Remove(&sIcon);
-        Remove(&sLabel);
-        Remove(&sNextImage);
-    }
-
-    void MessageItemView::SetItemInfo(const MessageItem itemInfo)
-    {
-        sItemInfo = itemInfo;
-        sIcon.SetSrc(itemInfo.icon);
-        sLabel.SetText(itemInfo.label);
-        sNextImage.SetVisible(itemInfo.hasSecondMenu);
-    }
-
-    void MessageItemView::SetUpChild()
-    {
-        sBackground.SetSrc(PNG_SETTING_BACKGROUND_IMAGE);
-
-        sIcon.SetPosition(Message_ICON_X, Message_SICON_Y);
-        sIcon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
-
-        sLabel.SetPosition(Message_SLABEL_X, Message_SLABEL_Y, Message_SLABEL_W, Message_SLABEL_H);
-        sLabel.SetStyle(STYLE_TEXT_FONT, Message_SLABEL_FONT_SIZE);
-        sLabel.SetStyle(STYLE_LINE_HEIGHT, Message_SLABEL_FONT_HEIGHT);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, Message_SLABEL_FONT_SIZE);
-
-        sNextImage.SetSrc(PNG_SETTING_NEXT_IMAGE);
-        sNextImage.SetPosition(Message_SNEXTIMAGE_X, (Message_SBACKGROUND_HEIGHT - sNextImage.GetHeight()) / NUMS_2);
-        sNextImage.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
-    }
-
-    MessageIndex MessageItemView::GetMessageIndex()
-    {
-        return sItemInfo.index;
-    }
-}
\ No newline at end of file
index 31cfb12..e69de29 100644 (file)
@@ -1,54 +0,0 @@
-
-/***
- * @Author: Caisking 3449750381@qq.com
- * @Date: 2024-01-22 16:23:25
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 19:18:37
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/src/MessageModel.cpp
- * @Description:
- * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved.
- */
-#include "message/include/MessageModel.h"
-#include "PullUpDownView.h"
-
-namespace OHOS
-{
-    MessageModel::MessageModel() {}
-
-    MessageModel::~MessageModel() {}
-
-    MessageModel &MessageModel::GetInstance()
-    {
-        static MessageModel instance;
-        return instance;
-    }
-
-    void MessageModel::InitMessageItem()
-    {
-        Messages[0] = {Message_ITEM_ZERO, PNG_Message_System, "系统", true};
-        Messages[1] = {Message_ITEM_ONE, PNG_Message_Note, "信息", true};
-        Messages[2] = {Message_ITEM_TWO, PNG_Message_Wechat, "微信", true};
-        Messages[3] = {Message_ITEM_THREE, PNG_Message_QQ, "QQ", true};
-        MessageIdToViewId.insert(std::pair<MessageIndex, AppViewId>(Message_ITEM_ZERO, VIEW_SHUTDOWN_OR_REBOOT));
-        MessageIdToViewId.insert(std::pair<MessageIndex, AppViewId>(Message_ITEM_ONE, VIEW_BLUETOOTH_EARPHONE));
-        MessageIdToViewId.insert(std::pair<MessageIndex, AppViewId>(Message_ITEM_TWO, VIEW_SHUTDOWN_OR_REBOOT));
-        MessageIdToViewId.insert(std::pair<MessageIndex, AppViewId>(Message_ITEM_THREE, VIEW_SHUTDOWN_OR_REBOOT));
-    }
-
-    const MessageItem *MessageModel::GetMessagelistItems() const
-    {
-        return Messages;
-    }
-
-    uint8_t MessageModel::GetMessageListNum() const
-    {
-        return Message_ITEM_LEN;
-    }
-
-    const std::map<MessageIndex, AppViewId> &MessageModel::GetMessageIdToViewId() const
-    {
-        return MessageIdToViewId;
-    }
-
-}
index 195620b..dda2c91 100644 (file)
-
-/***
+/*** 
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-01-22 16:20:34
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-01-22 17:22:05
- * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/messagecenter/src/MessageView.cpp
- * @Description:
+ * @LastEditTime: 2024-01-23 14:30:37
+ * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/message/src/MessageView.cpp
+ * @Description: 
  * @
- * @Copyright (c) 2024 by Caisking , All Rights Reserved.
+ * @Copyright (c) 2024 by Caisking , All Rights Reserved. 
  */
-#include <string>
-
-#include "message/include/MessageView.h"
-#include "message/include/MessageItem.h"
-#include "message/include/MessagePresenter.h"
-namespace OHOS
-{
-    static MessageView *g_pMessageView = nullptr;
-    MessageView::MessageView()
-    {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageView::MessageView");
-        SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
-        g_pMessageView = this;
-    }
-    MessageView::~MessageView()
-    {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageView::~MessageView");
-        scrollView->RemoveAll();
-        delete title;
-        title = nullptr;
-
-        delete listAdapter;
-        listAdapter = nullptr;
-
-        delete contentList;
-        contentList = nullptr;
-
-        delete scrollView;
-        scrollView = nullptr;
-    }
-    MessageView *MessageView::GetInstance(void)
-    {
-        return g_pMessageView;
-    }
-    bool MessageView::InitView(void)
-    {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitView");
-        /* -------------------------------------------------------------------------- */
-        scrollView = new UIScrollView();
-        if (scrollView == nullptr)
-        {
-            return false;
-        }
-        scrollView->SetPosition(0, 0);
-        scrollView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION);
-        scrollView->SetScrollBlankSize(20);
-        scrollView->SetReboundSize(50);
-        scrollView->SetDirection(1);
-        /* -------------------------------------------------------------------------- */
-        title = new UILabel();
-        if (title == nullptr)
-        {
-            return false;
-        }
-        title->SetPosition(173, 52, 120, 35);
-        title->SetStyle(STYLE_TEXT_FONT, 30);
-        title->SetStyle(STYLE_LINE_HEIGHT, 36);
-        title->SetText("信息通知");
-        title->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        title->SetTextColor(Color::GetColorFromRGBA(0xff, 0xf3, 0xff, 0xff));
-        title->SetRollSpeed(0);
-        title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-        scrollView->Add(title);
-
-        // list type
-        if (listAdapter == nullptr)
-        {
-            listAdapter = new MessageAdapter();
-            if (listAdapter == nullptr)
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "listAdapter new fail");
-                return false;
-            }
-        }
-        if (contentList == nullptr)
-        {
-            contentList = new UIList(UIList::VERTICAL);
-            if (contentList == nullptr)
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "list new fail");
-                return false;
-            }
-            contentList->SetPosition(67, 138, 332, 500);
-            contentList->SetStartIndex(0); // 0 : list start index
-            contentList->SetAdapter(listAdapter);
-        }
-        scrollView->Add(contentList);
-        RootView::GetInstance()->Add(scrollView);
-#if 0
-        UIView::OnDragListener *dragListener = (UIView::OnDragListener *)OHOS::MessageOnDragListener::GetInstance();
-        if (dragListener == nullptr)
-        {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessagesView::OnDragListener fail");
-            return;
-        }
-        scrollView->SetDraggable(true);
-        scrollView->SetTouchable(true);
-        scrollView->SetOnDragListener(dragListener);
-#endif
-        scrollView->SetVisible(true);
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitView end");
-        return true;
-    }
-    void MessageView::PreLoad(void)
-    {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageView::PreLoad(void)");
-        if (!viewiInitStatus)
-        {
-            if (InitView())
-            {
-                viewiInitStatus = true;
-            }
-        }
-    }
-    void MessageView::UnLoad(void)
-    {
-    }
-    void MessageView::CreateMessagesPresenter(void)
-    {
-    }
-    void MessageView::CreateMessageOnDragListener(void)
-    {
-    }
-    void MessageView::AddMessageItemToList(const MessageItem &item)
-    {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageView::AddMessageItemToList");
-        listAdapter->AddListItem(item);
-    }
-
-#if 0
-    void MessageView::CreateJumpView(void)
-    {
-        if (messagejumpView == nullptr)
-        {
-            messagejumpView = new MessageJumpView();
-            if (messagejumpView == nullptr)
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messagejumpView new fail");
-                return;
-            }
-        }
-    }
-#endif
-}
\ No newline at end of file