Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

# Conflicts:
#	lib/widget/picker/bee_city_picker.dart

lib/gen/assets.gen.dart

@@ -1297,10 +1297,6 @@ class $AssetsImagesGen {
   AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png');
 }
 
-class $AssetsJsonGen {
-  const $AssetsJsonGen();
-}
-
 class $AssetsNewIconGen {
   const $AssetsNewIconGen();
 
@@ -1533,7 +1529,6 @@ class Assets {
   static const $AssetsHomeGen home = $AssetsHomeGen();
   static const $AssetsIconsGen icons = $AssetsIconsGen();
   static const $AssetsImagesGen images = $AssetsImagesGen();
-  static const $AssetsJsonGen json = $AssetsJsonGen();
   static const $AssetsNewIconGen newIcon = $AssetsNewIconGen();
   static const $AssetsStaticGen static = $AssetsStaticGen();
   static const $AssetsTabGen tab = $AssetsTabGen();

lib/models/message/reply_list_model.dart

@@ -7,8 +7,9 @@ part 'reply_list_model.g.dart';
 @JsonSerializable()
 class ReplyListModel {
   final int id;
+  final int type;
   final int status;
-  final String content;
+  final String? content;
   final int sendId;
   final String sendName;
   final String sendDate;
@@ -26,6 +27,7 @@ class ReplyListModel {
 
   const ReplyListModel({
     required this.id,
+    required this.type,
     required this.status,
     required this.content,
     required this.sendId,

lib/models/message/reply_list_model.g.dart

@@ -9,8 +9,9 @@ part of 'reply_list_model.dart';
 ReplyListModel _$ReplyListModelFromJson(Map<String, dynamic> json) =>
     ReplyListModel(
       id: json['id'] as int,
+      type: json['type'] as int,
       status: json['status'] as int,
-      content: json['content'] as String,
+      content:  json['content'] !=null? json['content'] as String:'',
       sendId: json['sendId'] as int,
       sendName: json['sendName'] as String,
       sendDate: json['sendDate'] as String,

lib/pages/message_center_page/message_center_page.dart

@@ -47,6 +47,8 @@ class _MessageCenterPageState extends State<MessageCenterPage>
   @override
   Widget build(BuildContext context) {
     return BeeScaffold(
+      bgColor: Colors.white,
+      bodyColor: Color(0xFFF9F9F9),
       title: '消息',
       actions: [
         MaterialButton(
@@ -65,11 +67,17 @@ class _MessageCenterPageState extends State<MessageCenterPage>
           padding: EdgeInsets.symmetric(horizontal: 32.w),
         ),
       ],
-      appBarBottom: BeeTabBar(
+      appBarBottom:
+      TabBar(
         controller: _tabController,
-        tabs: _tabs,
+        indicatorColor: Color(0xffffc40c),
+        tabs: _tabs.map((e) => Tab(text: e)).toList(),
+        indicatorPadding: EdgeInsets.only(bottom: 15.w,left: 35.w,right: 35.w),
       ),
-      body: TabBarView(
+      body:
+      Padding(
+        padding:  EdgeInsets.only(top: 10.w),
+        child: TabBarView(
           children: [
             ReplayView(
               controller: _controllers[0],
@@ -81,6 +89,7 @@ class _MessageCenterPageState extends State<MessageCenterPage>
           ],
           controller: _tabController,
         ),
+      ),
     );
   }
 }

lib/pages/message_center_page/reply/replay_view.dart

@@ -38,7 +38,9 @@ class _ReplayViewState extends State<ReplayView> {
               itemBuilder: (context, index) {
                 return ReplyCard(model: items[index]);
               },
-              separatorBuilder: (_, __) =>1.w.heightBox,
+              separatorBuilder: (_, __) =>Container(
+                color: Color(0xFFF0F0F0),height: 2.w,
+              ),
               itemCount: items.length);
         });
   }

lib/pages/message_center_page/reply/reply_card.dart

@@ -42,7 +42,13 @@ class ReplyCard extends StatelessWidget {
                 children: [
                   model.sendName.text.size(26.sp).black.bold.make(),
                   5.heightBox,
-                  model.content.text
+                  model.content==null?''.text
+                      .size(26.sp)
+                      .color(ktextSubColor)
+                      .maxLines(1)
+                      .ellipsis
+                      .make():
+                  (model.content!).text
                       .size(26.sp)
                       .color(ktextSubColor)
                       .maxLines(1)

lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart

@@ -1,5 +1,6 @@
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
+import 'package:aku_new_community/models/message/reply_list_model.dart';
 import 'package:aku_new_community/models/message/thumbs_up_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/message_func.dart';
 import 'package:aku_new_community/widget/beeImageNetwork.dart';
@@ -8,7 +9,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 class ThumbsUpCard extends StatelessWidget {
-  final ThumbsUpListModel model;
+  final ReplyListModel model;
 
   const ThumbsUpCard({Key? key, required this.model}) : super(key: key);
 
@@ -36,8 +37,10 @@ class ThumbsUpCard extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   model.sendName.text.size(26.sp).black.bold.make(),
+                  5.heightBox,
                   Assets.icons.communityLikeIs
                       .image(width: 28.w, height: 28.w, fit: BoxFit.contain),
+                  5.heightBox,
                   model.sendDate.text.size(24.sp).color(ktextSubColor).make(),
                 ],
               ),

lib/ui/community/community_views/event_detail_page.dart

@@ -300,7 +300,14 @@ class _EventDetailPageState extends State<EventDetailPage> {
   }
 
   Widget _commentWidget(CommentListModel model, int rootIndex) {
-    return Container(
+    return GestureDetector(
+      onTap: () {
+        _rootId = model.id;
+        _parentId = model.id;
+        _focusNode.requestFocus();
+        _currentCommentIndex = rootIndex;
+      },
+      child: Container(
         // key: UniqueKey(),
         color: Colors.white,
         padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w),
@@ -420,14 +427,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
                     ),
                   ),
                   32.wb,
-                GestureDetector(
-                  onTap: () {
-                    _rootId = model.id;
-                    _parentId = model.id;
-                    _focusNode.requestFocus();
-                    _currentCommentIndex = rootIndex;
-                  },
-                  child: Row(
+                  Row(
                     children: [
                       Image.asset(
                         R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,
@@ -436,7 +436,6 @@ class _EventDetailPageState extends State<EventDetailPage> {
                       ),
                     ],
                   ),
-                ),
                   5.wb,
                   '${model.commentNum}'
                       .text
@@ -477,6 +476,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
                   ),
           ],
         ),
+      ),
     );
   }
 

lib/widget/bee_scaffold.dart

@@ -73,6 +73,7 @@ class BeeScaffold extends StatelessWidget {
         actions: actions,
         bottom: appBarBottom,
         titleSpacing: titleSpacing,
+
       );
 
     return AnnotatedRegion<SystemUiOverlayStyle>(

lib/widget/picker/bee_city_picker.dart

@@ -145,7 +145,11 @@ class _BeeCityPickerState extends State<BeeCityPicker> {
                   : districts
                       .map((e) => Center(
                             child: Padding(
-                              padding: EdgeInsets.only(left: 20.w, right: 20.w,top: 10.w,bottom: 10.w),
+                              padding: EdgeInsets.only(
+                                  left: 20.w,
+                                  right: 20.w,
+                                  top: 10.w,
+                                  bottom: 10.w),
                               child: Text(e.name, textAlign: TextAlign.center),
                             ),
                           ))