Browse Source

更改

master
w-R 3 years ago
parent
commit
f285fe76af
  1. 11
      lib/community/community_child_page.dart
  2. 8
      lib/community/community_details.dart
  3. 89
      lib/community/community_view/community_dynamic.dart
  4. 5
      lib/mine/fans_page.dart
  5. 4
      lib/mine/mine_view/community_follow.dart
  6. 2
      lib/web/web_page.dart
  7. 2
      lib/web/web_view/comment_list.dart

11
lib/community/community_child_page.dart

@ -25,6 +25,7 @@ class _CommunityChildPage extends State<CommunityChildPage> {
RefreshController refreshController = RefreshController();
ApiService apiService;
int pageNum = 0;
String userId;
List<ComunityComment> comments = [];
@ -43,6 +44,7 @@ class _CommunityChildPage extends State<CommunityChildPage> {
queryCommunity() async {
if (apiService == null) {
SharedPreferences value = await SharedPreferences.getInstance();
userId = value.getString('userId');
apiService = ApiService(
Dio(),
context: context,
@ -103,16 +105,17 @@ class _CommunityChildPage extends State<CommunityChildPage> {
child: CommunityDynamic(
comments[position],
0,
userId: userId,
isList: true,
exitFull: () {
setState(() {});
},
exitFull: (){setState(() {
_onRefresh();
});},
),
onTap: () {
Navigator.of(context).pushNamed(
'/router/community_details',
arguments: {
"comment": comments[position],
"comment": comments[position],"userId":userId,
},
);
},

8
lib/community/community_details.dart

@ -1,20 +1,15 @@
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/community/community_view/community_comment.dart';
import 'package:huixiang/community/community_view/community_dynamic.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/retrofit/data/activity.dart';
import 'package:huixiang/retrofit/data/article.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/comunity_comment.dart';
import 'package:huixiang/retrofit/data/member_comment_list.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/comment_menu.dart';
import 'package:huixiang/view_widget/login_tips_dialog.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/tips_dialog.dart';
import 'package:huixiang/web/web_view/comment_list.dart';
@ -125,6 +120,7 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
exitFull: () {
setState(() {});
},
userId:widget.arguments["userId"],
itemCount: 3,
isDetails: true,
heightFun: (height) {
@ -140,7 +136,7 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
),
CommentList(
commentKey,
"${comunity?.likes ?? comunity?.likes ?? "0"}",
comunity?.likes ?? comunity?.likes.toString() ?? 0,
comunity.id,
isKeyBoardShow,
_reply,

89
lib/community/community_view/community_dynamic.dart

@ -1,4 +1,4 @@
import 'dart:io';
import 'dart:ui';
import 'package:chewie/chewie.dart';
@ -15,10 +15,8 @@ import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:video_player/video_player.dart';
import 'package:thumbnails/thumbnails.dart';
class CommunityDynamic extends StatefulWidget {
final int itemCount;
@ -29,6 +27,7 @@ class CommunityDynamic extends StatefulWidget {
final Function exitFull;
final bool isList;
final ComunityComment comment;
final String userId;
CommunityDynamic(
this.comment,
@ -39,6 +38,7 @@ class CommunityDynamic extends StatefulWidget {
this.isDetails = false,
this.removalDynamic,
this.exitFull,
this.userId,
this.isList = false,
}) : super(key: key);
@ -57,6 +57,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
ChewieController chewieAudioController;
Chewie chewies;
@override
void initState() {
super.initState();
@ -114,6 +115,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
_vipFollow(followId) async {
BaseData baseData = await apiService.follow(followId);
if (baseData != null && baseData.isSuccess) {
widget.exitFull();
SmartDialog.showToast("关注成功", alignment: Alignment.center);
} else {
SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
@ -183,15 +185,15 @@ class _CommunityDynamic extends State<CommunityDynamic> {
Text(
widget?.comment?.memberInfo?.nickname ?? "",
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
fontSize: 15.sp,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF1A1A1A),
),
),
Text(
widget?.comment?.createTime ?? "",
style: TextStyle(
fontSize: 12.sp,
fontSize: 13.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF808080),
),
@ -201,24 +203,30 @@ class _CommunityDynamic extends State<CommunityDynamic> {
],
),
),
GestureDetector(
onTap: () {
setState(() {
if (widget.commentType == 0) {
widget.comment.selfFollow =
!(widget.comment.selfFollow ?? false);
_vipFollow(widget.comment.memberInfo.mid);
} else {
showDeleteDialog();
}
});
},
child: (widget.commentType == 0)
? RoundButton(
padding: EdgeInsets.symmetric(
horizontal: 8,
vertical: 3,
),
if(widget.comment.memberInfo.mid != widget.userId??"")
GestureDetector(
onTap: () {
setState(() {
if (widget.commentType == 0) {
widget.comment.selfFollow =
!(widget.comment.selfFollow ?? false);
_vipFollow(widget.comment.memberInfo.mid);
} else {
showDeleteDialog();
}
});
},
child: (widget.commentType == 0
)
? Container(
width: 56.w,
height: 21.h,
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(11.w),
color: Color(0xFF32A060),
),
child: RoundButton(
backgroup: (widget.comment.selfFollow ?? false)
? Color(0xFFE6E6E6)
: Color(0xFF32A060),
@ -236,15 +244,15 @@ class _CommunityDynamic extends State<CommunityDynamic> {
color: (widget.comment.selfFollow ?? false)
? Color(0xFF808080)
: Colors.white,
size: 14,
size: 15,
),
)
: Icon(
Icons.close,
color: Colors.black,
size: 16,
),
),
))
: Icon(
Icons.close,
color: Colors.black,
size: 16,
),
),
],
),
SizedBox(
@ -257,7 +265,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
style: TextStyle(
color: Color(0xFF1A1A1A),
fontWeight: MyFontWeight.regular,
fontSize: 14.sp,
fontSize: 15.sp,
),
),
buildMedia(widget.comment.subjectInfo),
@ -284,11 +292,16 @@ class _CommunityDynamic extends State<CommunityDynamic> {
leftImage: "assets/svg/pinglun.svg",
iconSize: 16,
),
IconText(
"${widget.comment.likes ?? 0}",
space: 4.w,
leftImage: "assets/svg/xihuan.svg",
iconSize: 16,
GestureDetector(
onTap: (){
},
child: IconText(
"${widget.comment.likes ?? 0}",
space: 4.w,
leftImage: "assets/svg/xihuan.svg",
iconSize: 16,
),
),
],
),

5
lib/mine/fans_page.dart

@ -167,6 +167,7 @@ class _FansPage extends State<FansPage> {
Container(
width: 56.w,
height: 21.h,
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(11.w),
color: Color(0xFF32A060),
@ -178,10 +179,6 @@ class _FansPage extends State<FansPage> {
});
},
child: RoundButton(
padding: EdgeInsets.symmetric(
horizontal: 8,
vertical: 3,
),
backgroup: (list?.isFollow ?? false)
? Color(0xFFE6E6E6)
: Color(0xFF32A060),

4
lib/mine/mine_view/community_follow.dart

@ -84,8 +84,8 @@ class _CommunityFollow extends State<CommunityFollow>
indicatorSize: TabBarIndicatorSize.label,
//
tabs: <Widget>[
MyTab(text:"关注(${infoNumber?.follow??"0"})",),
MyTab(text: "粉丝(${infoNumber?.fans??"0"})"),
MyTab(text:"关注${infoNumber?.follow??"0"}",),
MyTab(text: "粉丝${infoNumber?.fans??"0"}"),
],
),
),

2
lib/web/web_page.dart

@ -271,7 +271,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
///
CommentList(
commentKey,
article?.likes ?? activity?.likes.toString() ?? "0",
article?.likes ?? activity?.likes ?? 0,
article?.id ?? activity?.id,
isKeyBoardShow,
_reply,

2
lib/web/web_view/comment_list.dart

@ -22,7 +22,7 @@ class CommentList extends StatefulWidget {
final Function delCommentTips;
final double fontSize;
final String relationalId;
final String like;
final int like;
CommentList(Key key, this.like, this.relationalId,
this.isKeyBoardShow, this.reply, this.delCommentTips, this.fontSize)

Loading…
Cancel
Save