Support emote inbox chat

xfangfang · May 1, 2024 · fc995c5 · fc995c5
1 parent d5681fb
commit fc995c5
Show file tree

Hide file tree

Showing 20 changed files with 359 additions and 203 deletions.
diff --git a/resources/xml/fragment/inbox_chat.xml b/resources/xml/fragment/inbox_chat.xml
@@ -4,16 +4,19 @@
         height="auto"
         width="auto">
 
-        <ButtonClose
-                id="button/close"
-                focusable="true"
-                positionType="absolute"
-                positionTop="10"
-                positionRight="10" />
-
-        <brls:Box
-                height="50">
+        <brls:Box>
+                <ButtonClose
+                        id="inbox/back"
+                        focusable="true"
+                        positionType="absolute"
+                        positionTop="10"
+                        positionRight="10" />
 
+                <brls:Label
+                        marginTop="20"
+                        marginBottom="15"
+                        marginLeft="30"
+                        id="inbox/talker" />
         </brls:Box>
 
         <RecyclingGrid

diff --git a/resources/xml/fragment/inbox_view.xml b/resources/xml/fragment/inbox_view.xml
@@ -62,7 +62,7 @@
                         </AutoTabFrame>
 
                         <ButtonClose
-                                id="button/close"
+                                id="inbox/close"
                                 focusable="true"
                                 positionType="absolute"
                                 positionTop="10"

diff --git a/resources/xml/views/inbox_msg.xml b/resources/xml/views/inbox_msg.xml
@@ -1,85 +1,58 @@
 <brls:Box
         wireframe="false"
-        axis="column"
+        focusable="false"
+        paddingLeft="10"
+        paddingRight="10"
         width="auto"
+        hideHighlightBackground="true"
         height="auto">
 
-        <brls:Label
-                width="100%"
-                height="auto"
-                fontSize="16"
-                marginBottom="10"
-                horizontalAlign="center"
-                visibility="gone"
-                id="msg/time"
-                wireframe="false"
-                textColor="@theme/font/grey" />
+        <brls:Box
+                marginTop="5"
+                marginRight="15">
+                <brls:Image
+                        id="avatar/talker"
+                        width="40"
+                        height="40"
+                        visibility="invisible"
+                        aspectRatio="1"
+                        scalingType="fit"
+                        borderThickness="4"
+                        borderColor="@theme/color/grey_1"
+                        cornerRadius="100"
+                        image="@res/pictures/default_avatar.png" />
+        </brls:Box>
 
         <brls:Box
+                id="msg/content_box"
+                backgroundColor="@theme/color/grey_1"
+                highlightCornerRadius="16"
+                cornerRadius="16"
                 focusable="true"
-                wireframe="false"
-                paddingLeft="10"
-                paddingRight="10"
-                width="auto"
-                height="auto">
-
-                <brls:Box
-                        wireframe="false"
-                        marginRight="15">
-                        <brls:Image
-                                id="avatar/talker"
-                                width="40"
-                                height="40"
-                                visibility="invisible"
-                                aspectRatio="1"
-                                scalingType="fit"
-                                borderThickness="4"
-                                borderColor="@theme/color/grey_1"
-                                cornerRadius="100"
-                                image="@res/pictures/default_avatar.png" />
-                </brls:Box>
-
-                <brls:Box
-                        id="msg/content_box"
-                        backgroundColor="@theme/color/grey_1"
-                        highlightCornerRadius="16"
-                        cornerRadius="16"
-                        visibility="gone"
-                        axis="column"
+                axis="column"
+                grow="1"
+                padding="15">
+                <TextBox
+                        id="msg/content"
+                        width="auto"
+                        height="auto"
                         grow="1"
-                        padding="15">
-                        <TextBox
-                                id="msg/content"
-                                lineHeight="1.5"
-                                width="100%" />
-                </brls:Box>
-
-                <brls:Box
-                        id="msg/picture_box"
-                        visibility="gone"
-                        grow="1">
-                        <brls:Image
-                                id="msg/picture"
-                                scalingType="fit"
-                                image="@res/pictures/video-card-bg.png" />
-                </brls:Box>
-
-                <brls:Box
-                        wireframe="false"
-                        marginLeft="15">
-                        <brls:Image
-                                id="avatar/mine"
-                                width="40"
-                                height="40"
-                                visibility="invisible"
-                                aspectRatio="1"
-                                scalingType="fit"
-                                borderThickness="4"
-                                borderColor="@theme/color/grey_1"
-                                cornerRadius="100"
-                                image="@res/pictures/default_avatar.png" />
-                </brls:Box>
-
+                        wireframe="false" />
         </brls:Box>
 
+        <brls:Box
+                marginTop="5"
+                marginLeft="15">
+                <brls:Image
+                        id="avatar/mine"
+                        width="40"
+                        height="40"
+                        visibility="invisible"
+                        aspectRatio="1"
+                        scalingType="fit"
+                        borderThickness="4"
+                        borderColor="@theme/color/grey_1"
+                        cornerRadius="100"
+                        image="@res/pictures/default_avatar.png" />
+        </brls:Box>
 </brls:Box>
diff --git a/resources/xml/views/inbox_user.xml b/resources/xml/views/inbox_user.xml
@@ -4,13 +4,22 @@
         cornerRadius="8"
         alignItems="center"
         justifyContent="spaceBetween"
-        paddingLeft="20"
+        paddingLeft="15"
         paddingRight="20"
         width="auto"
         height="auto">
 
+        <brls:Rectangle
+            id="badge"
+            width="8"
+            height="8"
+            cornerRadius="8"
+            visibility="invisible"
+            color="@theme/color/tip/red"/>
+
         <UserInfoView
                 height="100%"
+                grow="1"
                 id="chat/talker" />
 
         <brls:Label

diff --git a/resources/xml/views/user_info.xml b/resources/xml/views/user_info.xml
@@ -47,6 +47,7 @@
                 fontSize="16"
                 grow="1"
                 marginTop="4"
+                autoAnimate="false"
                 verticalAlign="top"
                 wireframe="false"
                 textColor="@theme/font/grey"/>

diff --git a/wiliwili/include/api/bilibili.h b/wiliwili/include/api/bilibili.h
@@ -134,7 +134,7 @@ class BilibiliClient {
                                        const ErrorCallback& error                            = nullptr);
 
     /// 批量获取用户昵称头像
-    static void get_user_cards(const std::vector<unsigned int> uids,
+    static void get_user_cards(const std::vector<std::string>& uids,
                                const std::function<void(UserCardListResult)>& callback = nullptr,
                                const ErrorCallback& error                              = nullptr);
 

diff --git a/wiliwili/include/api/bilibili/api.h b/wiliwili/include/api/bilibili/api.h
@@ -175,6 +175,7 @@ const std::string MsgFeedReply            = _apiBase + "/x/msgfeed/reply";
 const std::string UserCards               = _vcBase + "/account/v1/user/cards";
 const std::string UserDynamicStat         = _vcBase + "/dynamic_svr/v1/dynamic_svr/space_num_ex";
 const std::string ChatSessions            = _vcBase + "/session_svr/v1/session_svr/new_sessions";
+const std::string ChatUpdateAct           = _vcBase + "/session_svr/v1/session_svr/update_ack";
 const std::string ChatFetchMsgs           = _vcBase + "/svr_sync/v1/svr_sync/fetch_session_msgs";
 const std::string ChatSendMsg             = _vcBase + "/web_im/v1/web_im/send_msg";
 /// 用户追番/追剧

diff --git a/wiliwili/include/api/bilibili/result/inbox_result.h b/wiliwili/include/api/bilibili/result/inbox_result.h
@@ -30,8 +30,9 @@ class MsgFeedItem {
     std::string title;
     std::string image;
     std::string source_content;
+    std::string uri;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(MsgFeedItem, subject_id, source_id, type, title, image, source_content);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(MsgFeedItem, subject_id, source_id, type, title, image, source_content, uri);
 
 class FeedReplyResult {
 public:
@@ -116,12 +117,17 @@ class InboxMessageResult {
     uint64_t sender_uid, receiver_id;
     uint64_t msg_seqno;
     std::vector<uint64_t> at_uids;
-    int receiver_type, msg_type;
-    std::string content;
+    int msg_type, msg_source;
+    nlohmann::json content;
     time_t timestamp;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(InboxMessageResult, sender_uid, receiver_id, receiver_type, msg_seqno, at_uids,
-                                   msg_type, content, timestamp);
+inline void from_json(const nlohmann::json& nlohmann_json_j, InboxMessageResult& nlohmann_json_t) {
+    if (nlohmann_json_j.contains("content") && nlohmann_json_j.at("content").is_string()) {
+        nlohmann::json::parse(nlohmann_json_j.at("content").get<std::string>()).get_to(nlohmann_json_t.content);
+    }
+    NLOHMANN_JSON_EXPAND(
+        NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, sender_uid, receiver_id, msg_seqno, msg_type, msg_source, timestamp));
+}
 
 typedef std::vector<InboxMessageResult> InboxMessageListResult;
 
@@ -162,11 +168,18 @@ class InboxChatResult {
     uint64_t talker_id;
     int session_type;
     time_t session_ts;
+    uint64_t max_seqno;
+    int unread_count;
     InboxAccountInfo account_info;
     InboxMessageResult last_msg;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(InboxChatResult, talker_id, session_type, session_ts, account_info,
-                                                last_msg);
+inline void from_json(const nlohmann::json& nlohmann_json_j, InboxChatResult& nlohmann_json_t) {
+    if (nlohmann_json_j.contains("last_msg") && nlohmann_json_j.at("last_msg").is_object()) {
+        nlohmann_json_j.at("last_msg").get_to(nlohmann_json_t.last_msg);
+    }
+    NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, talker_id, session_type, session_ts, max_seqno,
+                                             unread_count, account_info));
+}
 
 typedef std::vector<InboxChatResult> InboxChatListResult;
 

diff --git a/wiliwili/include/fragment/inbox_chat.hpp b/wiliwili/include/fragment/inbox_chat.hpp
@@ -5,11 +5,14 @@
 
 #include "presenter/inbox_msg.hpp"
 
+namespace brls {
+class Label;
+};
 class RecyclingGrid;
 
 class InboxChat : public brls::Box, public InboxMsgRequest {
 public:
-    InboxChat(uint64_t talker_id, int session_type);
+    InboxChat(const bilibili::InboxChatResult& r);
 
     ~InboxChat() override;
 
@@ -19,4 +22,5 @@ class InboxChat : public brls::Box, public InboxMsgRequest {
 
 private:
     BRLS_BIND(RecyclingGrid, recyclingGrid, "inbox/msgList");
+    BRLS_BIND(brls::Label, labelTalker, "inbox/talker");
 };
diff --git a/wiliwili/include/fragment/inbox_view.hpp b/wiliwili/include/fragment/inbox_view.hpp
@@ -23,8 +23,8 @@ class InboxView : public brls::Box, public InboxChatRequest {
     void onError(const std::string& error) override;
 
 private:
-    BRLS_BIND(ButtonClose, closebtn, "button/close");
+    BRLS_BIND(ButtonClose, closebtn, "inbox/close");
     BRLS_BIND(brls::Box, cancel, "player/cancel");
-    BRLS_BIND(AutoTabFrame, inboxFrame, "inbox/tab/frame");
+    BRLS_BIND(AutoTabFrame, tabFrame, "inbox/tab/frame");
     BRLS_BIND(RecyclingGrid, recyclingGrid, "inbox/chatList");
 };
diff --git a/wiliwili/include/presenter/inbox_chat.hpp b/wiliwili/include/presenter/inbox_chat.hpp
@@ -7,6 +7,8 @@
 #include "bilibili/result/inbox_result.h"
 #include "presenter.h"
 
+typedef std::unordered_map<unsigned int, bilibili::UserCardResult> InboxUserMap;
+
 class InboxChatRequest : public Presenter {
 public:
     virtual void onChatList(const bilibili::InboxChatListResult& result, bool refresh);
@@ -17,6 +19,4 @@ class InboxChatRequest : public Presenter {
 
 protected:
     time_t last_time = 0;
-
-    std::unordered_map<unsigned int, bilibili::UserCardResult> user_map;
 };
diff --git a/wiliwili/include/view/inbox_msg_card.hpp b/wiliwili/include/view/inbox_msg_card.hpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "view/recycling_grid.hpp"
+#include "bilibili/result/inbox_result.h"
+
+class TextBox;
+
+typedef std::shared_ptr<bilibili::InboxEmote> InboxEmotePtr;
+typedef std::unordered_map<std::string, InboxEmotePtr> IEMap;
+
+class InboxMsgCard : public RecyclingGridItem {
+public:
+    InboxMsgCard();
+
+    void setCard(const bilibili::InboxMessageResult& r, const IEMap& m, uint64_t talker);
+
+    void setAvatar(const std::string& face);
+
+private:
+    BRLS_BIND(TextBox, textBox, "msg/content");
+    BRLS_BIND(brls::Box, msgBox, "msg/content_box");
+    BRLS_BIND(brls::Image, talker, "avatar/talker");
+    BRLS_BIND(brls::Image, mine, "avatar/mine");
+};
diff --git a/wiliwili/source/activity/main_activity.cpp b/wiliwili/source/activity/main_activity.cpp
@@ -18,6 +18,7 @@
 
 #include "activity/main_activity.hpp"
 #include "utils/activity_helper.hpp"
+#include "utils/dialog_helper.hpp"
 #include "view/custom_button.hpp"
 #include "view/auto_tab_frame.hpp"
 #include "view/svg_image.hpp"
@@ -74,8 +75,8 @@ void MainActivity::onContentAvailable() {
     });
     this->settingBtn->addGestureRecognizer(new brls::TapGestureRecognizer(this->settingBtn));
 
-    this->inboxBtn->registerClickAction([](brls::View* view) -> bool {
-        Intent::openInbox();
+    this->inboxBtn->registerClickAction([this](brls::View* view) -> bool {
+        if (DialogHelper::checkLogin()) Intent::openInbox();
         return true;
     });