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

lib/ui/community/community_views/event_detail_page.dart

@@ -567,6 +567,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
               color: kPrimaryColor,
               minWidth: 120.w,
               height: 55.w,
+
               onPressed: () async {
                 var res = await NetUtil()
                     .post(SAASAPI.community.commentInsert, params: params);
@@ -582,6 +583,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
                 } else {
                   BotToast.showText(text: res.msg);
                 }
+                FocusScope.of(context).requestFocus(FocusNode());
               },
               child: Text(
                 '发布',
@@ -592,6 +594,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
               ),
             )
           ],
-        ));
+        )
+    );
   }
 }

lib/ui/community/community_views/topic/topic_search_page.dart

@@ -103,7 +103,7 @@ class _TopicSearchPageState extends State<TopicSearchPage> {
               ),
             ),
             TextButton(
-                onPressed: () {},
+                onPressed: Get.back,
                 child: '取消'
                     .text
                     .size(28.sp)

lib/ui/community/community_views/widgets/chat_card_detail.dart

@@ -1,5 +1,6 @@
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/models/community/dynamic_detail_model.dart';
 import 'package:aku_new_community/provider/user_provider.dart';
@@ -12,6 +13,7 @@ import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:like_button/like_button.dart';
 import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 
@@ -136,17 +138,25 @@ class _ChatCardDetailState extends State<ChatCardDetail> {
                 ],
               ),
               Spacer(),
-              Image.asset(
+              LikeButton(
-                R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,
+                size: 40.w,
-                width: 40.w,
+                likeBuilder: (bool isLiked){
-                height: 40.w,
+                  return Image.asset(
+                    isLiked ? Assets.icons.communityLikeIs.path : Assets.icons.communityLike.path,);
+                },
+                likeCount:widget.model.likes,
               ),
-              5.wb,
+              // Image.asset(
-              '${widget.model.likes}'
+              //   Assets.icons.communityLikeIs.path,
-                  .text
+              //   width: 40.w,
-                  .size(24.sp)
+              //   height: 40.w,
-                  .color(Color(0xFF999999))
+              // ),
-                  .make(),
+              // 5.wb,
+              // '${widget.model.likes}'
+              //     .text
+              //     .size(24.sp)
+              //     .color(Color(0xFF999999))
+              //     .make(),
               32.wb,
             ].row(),
             Column(
@@ -191,6 +201,7 @@ class _ChatCardDetailState extends State<ChatCardDetail> {
     ]).paddingOnly(bottom: 16.w);
   }
 
+
   // _renderLikeAndComment() {
   //   if (widget.model!.likeNames!.isEmpty &&
   //       widget.model!.gambitThemeCommentVoList!.isEmpty) return SizedBox();

pubspec.yaml

@@ -120,7 +120,8 @@ dependencies:
   just_audio: ^0.9.20
   #录音
   flutter_sound: ^9.1.3
-
+  #点赞
+  like_button: ^2.0.4
 
 dev_dependencies:
   flutter_test: