From 010011b32be4a63bafa346768ceca8c63035e280 Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Mon, 8 Feb 2021 11:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=83=AD=E5=BA=A6=EF=BC=8C=E4=B8=AA=E4=BA=BA=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E9=A1=B5=E9=9D=A2=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/icons/hot_fire.png                     | Bin 0 -> 1263 bytes
 lib/const/resource.dart                       |   3 ++
 lib/pages/personal/user_profile_page.dart     |  44 ++----------------
 .../topic/topic_community_view.dart           |  21 ++++++++-
 4 files changed, 26 insertions(+), 42 deletions(-)
 create mode 100644 assets/icons/hot_fire.png

diff --git a/assets/icons/hot_fire.png b/assets/icons/hot_fire.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2131ad4e799cf1259ef1a625fce9e5fed6ea0b9
GIT binary patch
literal 1263
zcmV<L1Q7d)P)<h;3K|Lk000e1NJLTq002Ay002e^1^@s6kVW^^00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1cXUMK~#7F?VF2n
z+%^z~Ke>W)2T%pJD-c{k>;`gF1y(8$(?FsMa&iMv(m<FrAgh7s&J9?01Gc$7(MN&1
zBq+Y_IR0mLMgsyk{MZK;55ahNp3A#jzT}eS;+Z+tY{`~I$~-efLX~V;R=GH41Wmi4
z+~%@m21sZoTgc~J&N*;s+P$D&>wj>dcte#;cK^-ga><NHJ9I6&px$XNcj%;l<A899
z9*s2|qfd_b^ce>L&6I_Zt7&7A{=hbA*;_bt^IS%>wMhTNp2DFIc-5khm*}SL*)uHI
z<;rbLIm8j$WoxgsY>^f5w8vAbk$Z2nTt_zL@ko{aerIAh?2IX;8=j))+mpd#Ckz*K
zhxl?v)vOmx0BxP^ldM1sUP5@(HCbkNg-tf4Uz}1UoG=m`c5o6IA_aU+Jz-J6D+V|`
z@Yw#kW;inolaMmu@?=Q*xuhp7v9+2pY!I;sOA4y3)8}+V9odxOq4}_w@Y)ztr`?q|
zI+dAC7#>!NnPDrTJSnZ<&}UJ|j<qak>u{`mpk*M_$gUY68rDDvTY)l0<JUySmvg4o
zY=PG_lfAyL`-}0t@rcMV-Wpp6(e5SnWF@a&l<I5#-k6zPDUDW)k7JrO8=9+-))FIg
zAMKgmZwpu^D)J|`Z)y`|?xQoM@{;jUXU=Iv`;-VRJ9O<%g)rd|fAx`Vt<#bRR-rlk
z6xuB#VH-bE+NG~n087i2LTA5YqK$S>&`v(To3&#<B6FV*EsIN5%=!uXI`uDykH3|&
z6Cv!C5C3u45RHZ$MC)D%KMOv5%w@yj<3=g_X3~p@iid~|TjiDUObEN6@DuYvNLbbI
z9W%xg=8a8QAcQ|MU%0S9BkY(DLU-K=;Z0EJ=>JDEb{mqhPEHn734ap8?}I`|zj<`R
zF1c}xm$rrzD-(Vrgtc||g#Pe`>OjWWn0Te^T`_=g^U&7~pw_oY!mwz(Y7IBceXYeQ
zI^m(sT081_aO$CLm_6N*p%Wf*zir(sKX5It3@W2L>JHL9!@$}LyRc%`^Pm>gAGP)|
zp&^89s{EGvP&J|7gFH_?;UToFz2p<^o>&dmG#q}lfTx*opIR2}z9mw-O@s8bM?y2<
zzO*c4&y>DZ-wlzWn|5Qv0I$$B8kSwt9WT(yp2swH=+U(;X^-w68U4A9z<PoEe~Ug$
z({4lBDeeC<`hM&?$`|NlZ+XNfD5X1TD}%e}I7so?m*|#Q8<m@oVh5X;JL3#JNLde3
zV@O+9DFxXj9g$*_zG@ht7CDQJiL}!+WRWhknlT{R0x33Wk(Dt>E!(;))%8YyLi+f=
z&e8qfZ)<*E9<lsH&p4y`k;#f`@X<7KRr-Ef)8DVu6BVsWG<FOGN8JArN*y6DYq9n6
zc3JB8G@?(9tUMSW<(4xg?nzOdgfD}vB}OAEd)pI6hNJnVO^hX!H6*@zi%nFrvY(k4
zjxF&R?P#K%Vy0{f7BY!OV<0|zNj&*=O<#`Pn%x_Y7!J=%B3H69aL0~-TmZ<rdczM4
Zhp%udx!E^0kJA7E002ovPDHLkV1jgLPT~Ln

literal 0
HcmV?d00001

diff --git a/lib/const/resource.dart b/lib/const/resource.dart
index 45cbb900..9e375542 100644
--- a/lib/const/resource.dart
+++ b/lib/const/resource.dart
@@ -236,6 +236,9 @@ class R {
   static const String ASSETS_ICONS_GROUPBUY_TAB_UNSELECTED_PNG =
       'assets/icons/groupbuy_tab_unselected.png';
 
+  /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/hot_fire.png)
+  static const String ASSETS_ICONS_HOT_FIRE_PNG = 'assets/icons/hot_fire.png';
+
   /// ![preview](file:///Users/akufe/Documents/akuCommunity/assets/icons/house.png)
   static const String ASSETS_ICONS_HOUSE_PNG = 'assets/icons/house.png';
 
diff --git a/lib/pages/personal/user_profile_page.dart b/lib/pages/personal/user_profile_page.dart
index 67646cec..b073c9fe 100644
--- a/lib/pages/personal/user_profile_page.dart
+++ b/lib/pages/personal/user_profile_page.dart
@@ -2,6 +2,7 @@
 import 'dart:io';
 
 // Flutter imports:
+import 'package:akuCommunity/widget/picker/bee_date_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -170,46 +171,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
           _buildTile(
             '出生日期',
             userProvider.userInfoModel.birthdayValue.text.make(),
-            onPressed: () {
-              Get.dialog(
-                CupertinoAlertDialog(
-                  title: '请选择'.text.isIntrinsic.make(),
-                  content: SizedBox(
-                    height: 340.w,
-                    child: CupertinoTheme(
-                      data: CupertinoThemeData(
-                        textTheme: CupertinoTextThemeData(
-                          dateTimePickerTextStyle: TextStyle(
-                            fontSize: 30.sp,
-                            color: Colors.black87,
-                          ),
-                        ),
-                      ),
-                      child: CupertinoDatePicker(
-                        maximumYear: DateTime.now().year,
-                        minimumYear: 1900,
-                        mode: CupertinoDatePickerMode.date,
-                        onDateTimeChanged: (date) {
-                          _birthday = date;
-                        },
-                      ),
-                    ),
-                  ),
-                  actions: [
-                    CupertinoDialogAction(
-                      child: '取消'.text.isIntrinsic.make(),
-                      onPressed: Get.back,
-                    ),
-                    CupertinoDialogAction(
-                      child: '确定'.text.isIntrinsic.make(),
-                      onPressed: () {
-                        userProvider.setBirthday(_birthday);
-                        Get.back();
-                      },
-                    ),
-                  ],
-                ),
-              );
+            onPressed: () async {
+              DateTime date = await BeeDatePicker.pick(DateTime.now());
+              if (date != null) userProvider.setBirthday(date);
             },
           ),
         ].sepWidget(
diff --git a/lib/ui/community/community_views/topic/topic_community_view.dart b/lib/ui/community/community_views/topic/topic_community_view.dart
index 5b73c38e..3706645b 100644
--- a/lib/ui/community/community_views/topic/topic_community_view.dart
+++ b/lib/ui/community/community_views/topic/topic_community_view.dart
@@ -91,15 +91,32 @@ class TopicCommunityViewState extends State<TopicCommunityView>
                   .bold
                   .overflow(TextOverflow.ellipsis)
                   .make(),
+              Spacer(),
               (model?.content ?? '')
                   .text
                   .maxLines(1)
                   .size(22.sp)
+                  .color(Color(0xFF666666))
                   .overflow(TextOverflow.ellipsis)
                   .make(),
-              12.hb,
+              21.hb,
+              [
+                Spacer(),
+                Image.asset(
+                  R.ASSETS_ICONS_HOT_FIRE_PNG,
+                  height: 24.w,
+                  width: 24.w,
+                ),
+                12.wb,
+                '${model?.activityNum}'
+                    .text
+                    .maxLines(1)
+                    .size(22.sp)
+                    .overflow(TextOverflow.ellipsis)
+                    .make()
+              ].row(),
             ],
-          ).expand(),
+          ).box.height(160.w).make().expand(),
         ],
       ),
     );