F-解决话题中订阅者列表为空的问题；完善base64图片头部问题

LUO12826 · Jun 2, 2020 · 08da1c7 · 08da1c7
1 parent 9c57da7
commit 08da1c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CodeChatSDK/Client/Client.cs b/CodeChatSDK/Client/Client.cs
@@ -1105,8 +1105,8 @@ private void OnGetFindMeta(ServerMeta meta)
                         subscriber.Username = publicObject["fn"].ToString();
                         if (publicObject.ContainsKey("photo"))
                         {
-                            subscriber.PhotoData = publicObject["photo"]["data"].ToString();
                             subscriber.PhotoType = publicObject["photo"]["type"].ToString();
+                            subscriber.PhotoData = $"data:image/{subscriber.PhotoType};base64,{ publicObject["photo"]["data"]}";
                         }
                     }
 

diff --git a/CodeChatSDK/Controllers/TopicController.cs b/CodeChatSDK/Controllers/TopicController.cs
@@ -45,7 +45,9 @@ public async Task SetTopic(Topic topic)
         {
             instance = topic;
             MessageController messageController = new MessageController(db.Messages);
+            SubscriberController subscriberController = new SubscriberController(db.Subscribers);
             instance.MessageList = await messageController.GetMessages(instance,instance.Limit);
+            instance.SubsriberList = await subscriberController.GetSubscribers(instance);
         }
 
         /// <summary>

diff --git a/CodeChatSDK/Repository/Sqlite/SqliteTopicRepository.cs b/CodeChatSDK/Repository/Sqlite/SqliteTopicRepository.cs
@@ -90,7 +90,6 @@ public IEnumerable<Topic> GetSync(string condition, int pageIndex, int pageSize,
                             OrderByDescending(t => t.LastUsed);
 
             pageCount = query.Count() % pageSize == 0 ? (query.Count() / pageSize) : (query.Count() / pageSize) + 1;
-                            ;
             return query.Skip(pageIndex-1).Take(pageSize).ToList();
 
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                                 OrderByDescending(t => t.LastUsed);
                 pageCount = query.Count() % pageSize == 0 ? (query.Count() / pageSize) : (query.Count() / pageSize) + 1;
-                                ;
                 return query.Skip(pageIndex-1).Take(pageSize).ToList();
             }
@@ Expand Down @@