xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
CYH 2024-05-14 15:14:52 +08:00
parent 3639ddf773
commit e8b365d421
36 changed files with 1642 additions and 1061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
circle_app/assets/images/circle/circle_selected_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

158
circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
View File

@ -102,7 +102,7 @@ class TIMInputTextField extends StatefulWidget {
required this.conversationID, required this.conversationID,
required this.conversationType, required this.conversationType,
this.initText, this.initText,
required this.isBlack, required this.isBlack,
required this.hintText, required this.hintText,
this.scrollController, this.scrollController,
this.morePanelConfig, this.morePanelConfig,
@ -140,6 +140,17 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
String hintText = '用心聊天更容易获得回复哦~'; String hintText = '用心聊天更容易获得回复哦~';
List<String> urlList = [
'https://iquanpai.com',
'https://cdtszn.net',
'https://ikuayou.com',
'https://leyuan666.com',
'https://kuayou666.com',
'https://cdts666.com',
'https://quanpai666.com',
'https://xidi.iquanpai.com'
];
Map<String, V2TimGroupMemberFullInfo> memberInfoMap = {}; Map<String, V2TimGroupMemberFullInfo> memberInfoMap = {};
late TextEditingController textEditingController; late TextEditingController textEditingController;
@ -274,12 +285,11 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
} }
Future checkImStatus() async { Future checkImStatus() async {
List<String> pressionStr =
'微信、QQ、加Q、+V、地球号、绿泡泡、公众号、网站、app、视频、手机号、id、企鹅、门槛、收费、加群'.split('、');
List< if (textEditingController.text.isNotEmpty &&
String> pressionStr = '微信、QQ、加Q、+V、地球号、绿泡泡、公众号、网站、app、视频、手机号、id、企鹅、门槛、收费、加群' (userInfoBean?.wx_num?.isEmpty ?? true)) {
.split('、');
if (textEditingController.text.isNotEmpty && (userInfoBean?.wx_num?.isEmpty ?? true)) {
bool isContain = false; bool isContain = false;
String sendText = textEditingController.text.toUpperCase(); String sendText = textEditingController.text.toUpperCase();
for (String text in pressionStr) { for (String text in pressionStr) {
@ -290,25 +300,22 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
if (isContain) { if (isContain) {
await showAddWxPicker( await showAddWxPicker(
userInfoBean!.wx_num!.isNotEmpty ?? false, userInfoBean!.wx_num!.isNotEmpty ?? false,
isHidden: isHidden: userInfoBean!.wx_num!.isNotEmpty ?? false,
userInfoBean!.wx_num!.isNotEmpty ?? false,
isWxHidden: userInfoBean!.hide_wx_num == 1, isWxHidden: userInfoBean!.hide_wx_num == 1,
); );
imStatusOK = false; imStatusOK = false;
return imStatusOK; return imStatusOK;
} }
} }
var data = await DioManager.instance.get(url: Api.imstate);
var data =
await DioManager.instance.get(url: Api.imstate);
int code = data['code']; int code = data['code'];
if (code == 200) { if (code == 200) {
try { try {
var result = var result = await DioManager.instance.get(
await DioManager.instance.get(url: Api.adImstate + widget.conversationID.split('_').last,); url: Api.adImstate + widget.conversationID.split('_').last,
);
if (result['code'] == 21201) { if (result['code'] == 21201) {
Get.bottomSheet( Get.bottomSheet(
Scaffold( Scaffold(
@ -320,9 +327,7 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
imStatusOK = false; imStatusOK = false;
return false; return false;
} }
} catch (e) { } catch (e) {}
}
imStatusOK = true; imStatusOK = true;
} else { } else {
@ -383,7 +388,7 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
child: Text( child: Text(
"是否解除拉黑", "是否解除拉黑",
style: style:
TextStyle(color: Colors.white, fontSize: 16.sp), TextStyle(color: Colors.white, fontSize: 16.sp),
), ),
), ),
Container( Container(
@ -446,14 +451,16 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
onTap: () async { onTap: () async {
Get.back(); Get.back();
var data = await DioManager.instance.post( var data = await DioManager.instance.post(
url: '${Api.setBlock + widget.conversationID.split('_').last}/block', params: {'status': '0'}); url:
'${Api.setBlock + widget.conversationID.split('_').last}/block',
params: {'status': '0'});
var bean = BaseResponse<dynamic>.fromJson( var bean = BaseResponse<dynamic>.fromJson(
data, data,
(jsonData) => jsonData, (jsonData) => jsonData,
); );
if (bean.isSuccess()) { if (bean.isSuccess()) {
final FriendshipServices _friendshipServices = final FriendshipServices _friendshipServices =
serviceLocator<FriendshipServices>(); serviceLocator<FriendshipServices>();
isBlack = false; isBlack = false;
} }
showOKToast(bean.msg); showOKToast(bean.msg);
@ -505,7 +512,6 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
return; return;
} }
if (isSending) return; if (isSending) return;
isSending = true; isSending = true;
bool isOK = await checkImStatus(); bool isOK = await checkImStatus();
@ -515,7 +521,6 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
return; return;
} }
lastText = ""; lastText = "";
String text = textEditingController.text.trim(); String text = textEditingController.text.trim();
final convType = widget.conversationType; final convType = widget.conversationType;
@ -523,7 +528,9 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
if (text.isEmpty) { if (text.isEmpty) {
if (hintText.contains('用心聊天更容易获得回复哦~')) { if (hintText.contains('用心聊天更容易获得回复哦~')) {
showOKToast('请输入消息内容后发送'); showOKToast('请输入消息内容后发送');
Future.delayed(Duration(seconds: 1), () {isSending = false;}); Future.delayed(Duration(seconds: 1), () {
isSending = false;
});
return; return;
} else { } else {
if ((widget.currentConversation.lastMessage?.customElem ?? null) != if ((widget.currentConversation.lastMessage?.customElem ?? null) !=
@ -555,7 +562,9 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
showOKToast('请输入消息内容后发送'); showOKToast('请输入消息内容后发送');
} }
} }
Future.delayed(Duration(seconds: 1), () {isSending = false;}); Future.delayed(Duration(seconds: 1), () {
isSending = false;
});
return; return;
} }
} }
@ -570,8 +579,6 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
atUserIDList: getUserIdFromMemberInfoMap()), atUserIDList: getUserIdFromMemberInfoMap()),
context); context);
} else if (memberInfoMap.isNotEmpty) { } else if (memberInfoMap.isNotEmpty) {
widget.model.sendTextAtMessage( widget.model.sendTextAtMessage(
text: text, text: text,
convType: widget.conversationType, convType: widget.conversationType,
@ -580,47 +587,65 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
} else { } else {
bool isOK = await loadIsShowSendGiftDialogData(); bool isOK = await loadIsShowSendGiftDialogData();
if (!isOK) { if (!isOK) {
Future.delayed(Duration(seconds: 1), () {isSending = false;}); Future.delayed(Duration(seconds: 1), () {
isSending = false;
});
return; return;
} }
var data = await DioManager.instance
.post(url: Api.shieldWordCheck, params: {'text': text, 'type': 2});
bool isContain = false;
urlList.forEach((element) {
if (text.contains(element)) {
isContain = true;
}
});
List words = []; List words = [];
if (data['data']['code'] == 10000) {
words = data['data']['words'];
if (words.isNotEmpty) { if (!isContain) {
for (int i = 0; i < words.length; i++) { var data = await DioManager.instance
text = text.replaceAll(words[i], '*'); .post(url: Api.shieldWordCheck, params: {'text': text, 'type': 2});
if (data['data']['code'] == 10000) {
words = data['data']['words'];
if (words.isNotEmpty) {
for (int i = 0; i < words.length; i++) {
text = text.replaceAll(words[i], '*');
}
} }
} }
if (words.isNotEmpty) {
textEditingController.text = text;
showOKToast('含违规词汇，无法发送');
Future.delayed(Duration(seconds: 1), () {
isSending = false;
});
return;
}
} }
Future.delayed(Duration(seconds: 1), () {isSending = false;});
if (words.isEmpty) {
try {
var msgResult = await MessageUtils.handleMessageError(
widget.model.sendTextMessage(
text: text,
convID: widget.conversationID,
convType: convType),
context);
addChatRecord(text, msgResult!.data!.msgID ?? '', msgResult!.data!.timestamp.toString() ?? '');
} catch (e) {
} if (words.isEmpty) {
} else { try {
showOKToast('含违规词汇，无法发送'); var msgResult = await MessageUtils.handleMessageError(
return; widget.model.sendTextMessage(
text: text,
convID: widget.conversationID,
convType: convType),
context);
addChatRecord(text, msgResult!.data!.msgID ?? '',
msgResult!.data!.timestamp.toString() ?? '');
} catch (e) {}
} }
} }
textEditingController.clear(); textEditingController.clear();
currentCursor = null; currentCursor = null;
lastText = ""; lastText = "";
memberInfoMap = {}; memberInfoMap = {};
isSending = false;
goDownBottom(); goDownBottom();
_handleSendEditStatus("", false); _handleSendEditStatus("", false);
} else { } else {
showOKToast('请输入消息内容'); showOKToast('请输入消息内容');
isSending = false; isSending = false;
@ -629,10 +654,16 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
loadIsShowSendGiftDialogData() async { loadIsShowSendGiftDialogData() async {
V2TimConversation con = Get.arguments; V2TimConversation con = Get.arguments;
var data = await DioManager.instance.get(url: Api.isShow_give_gift + widget.conversationID.split('_').last); var data = await DioManager.instance
.get(url: Api.isShow_give_gift + widget.conversationID.split('_').last);
if (data['code'] == 200) { if (data['code'] == 200) {
if (data['data']) { if (data['data']) {
Get.bottomSheet(SendGiftDialog(accid: widget.conversationID,title: data['msg'],), isScrollControlled: true, Get.bottomSheet(
SendGiftDialog(
accid: widget.conversationID,
title: data['msg'],
),
isScrollControlled: true,
enableDrag: false); enableDrag: false);
return false; return false;
} }
@ -660,10 +691,9 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
setState(() {}); setState(() {});
} }
addChatRecord(String msgContent,String msgId,String sendTime) async { addChatRecord(String msgContent, String msgId, String sendTime) async {
String str = DateTime.now().toString().split('.').first; String str = DateTime.now().toString().split('.').first;
var data = var data = await DioManager.instance.post(url: Api.chatRecord, params: {
await DioManager.instance.post(url: Api.chatRecord, params: {
"content": msgContent, "content": msgContent,
"msgId": msgId, "msgId": msgId,
"sendTime": str, "sendTime": str,
@ -1024,22 +1054,20 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
if (null == commentBlackEvent) { if (null == commentBlackEvent) {
commentBlackEvent = commentBlackEvent =
EventBusManager.on<CommentBlackEvent>().listen((event) { EventBusManager.on<CommentBlackEvent>().listen((event) {
if (event.userId == widget.currentConversation.userID!) { if (event.userId == widget.currentConversation.userID!) {
isBlack = event.isBlack; isBlack = event.isBlack;
} }
}); });
} }
getBlack(); getBlack();
} }
StreamSubscription? commentBlackEvent = null; StreamSubscription? commentBlackEvent = null;
bool isBlack = false; bool isBlack = false;
bool isSending = false; bool isSending = false;
getBlack() async { getBlack() async {
isBlack = widget.isBlack!; isBlack = widget.isBlack!;
EventBusManager.fire(CommentBlackMoreEvent()); EventBusManager.fire(CommentBlackMoreEvent());
} }
@override @override

2
circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
View File

@ -1141,7 +1141,7 @@ class _TIMTextFieldLayoutNarrowState
} }
if (!isVip) { if (!isVip) {
showOKToast(plate== 0 ? '开通会员之后才能发送语音' : '开通会员之后才能发送图片'); showOKToast(plate== 5 ? '开通会员之后才能发送语音' : '开通会员之后才能发送图片');
Get.bottomSheet( Get.bottomSheet(
Scaffold( Scaffold(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,

33
circle_app/lib/app/circle/logic.dart
View File

@ -55,14 +55,20 @@ class CircleLogic extends GetxController {
bool isNewPeopleMore = true; bool isNewPeopleMore = true;
bool isLoadFail = false;
bool isNewPeopleRed = false; bool isNewPeopleRed = false;
bool isNearLoad = true;
int flush = 0; int flush = 0;
bool isMore = true; bool isMore = true;
int myVip = -1; int myVip = -1;
bool isShowCircle = true; bool isShowCircle = true;
String cityName = ""; String cityName = "";
Map recommendCircleFriendData = {};
List openCallOutIdList = [];
List<BannerItem> bannerList = []; List<BannerItem> bannerList = [];
List<MyConfigData> genderList List<MyConfigData> genderList
@ -107,6 +113,7 @@ class CircleLogic extends GetxController {
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
loadRecommendCircleFriendData();
loadCircleListData(); loadCircleListData();
loadCirclePeopleData(); loadCirclePeopleData();
initGerder(); initGerder();
@ -375,6 +382,7 @@ class CircleLogic extends GetxController {
'flush': flush, 'flush': flush,
"orientations": orientations "orientations": orientations
}); });
isNearLoad = false;
var bean = BaseResponse<VicinityBean>.fromJson( var bean = BaseResponse<VicinityBean>.fromJson(
data, (data) => VicinityBean.fromJson(data)); data, (data) => VicinityBean.fromJson(data));
@ -481,6 +489,7 @@ class CircleLogic extends GetxController {
} }
getNewPeopleListData() async { getNewPeopleListData() async {
isLoadFail = false;
List<String> genders = []; List<String> genders = [];
new_genderList.forEach((element) { new_genderList.forEach((element) {
if (element.isSelect) { if (element.isSelect) {
@ -535,12 +544,36 @@ class CircleLogic extends GetxController {
isNewPeopleMore = false; isNewPeopleMore = false;
} }
update(); update();
} else if (data['code'] == 404) {
isLoadFail = true;
update();
} else { } else {
isNewPeopleMore = false; isNewPeopleMore = false;
} }
} }
void loadRecommendCircleFriendData() async {
var data = await DioManager.instance.get(
url: Api.chatRecommendFriend,
);
if (data['code'] == 200) {
List dataList = data['data'];
if (dataList.isNotEmpty) {
recommendCircleFriendData = data['data'][0];
}
update();
} else {
if ((data['code'] == 21201 || data['code'] == 21202) && recommendCircleFriendData.isNotEmpty) {
showOKToast(data['msg']);
showVipDialog();
}
}
}
void onRefresh() async { void onRefresh() async {
pageIndex = 1; pageIndex = 1;
newPeopleList.clear(); newPeopleList.clear();

1134
circle_app/lib/app/circle/widgets/discover.dart
View File

File diff suppressed because it is too large Load Diff

26
circle_app/lib/app/circle/widgets/info_list_view.dart
View File

@ -683,10 +683,15 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
///至尊喊话 ///至尊喊话
vipDynamicItem(Lists lists) { vipDynamicItem(Lists lists) {
Text descText = Text( Widget descText = widget.logic.openCallOutIdList.contains(lists.id) ? Text(
lists.content!, lists.content!,
style: TextStyle(color: Colors.white, fontSize: 17.sp), style: TextStyle(color: Colors.white, fontSize: 14.sp),
maxLines: 2, ) : HideText(text: lists.content!,maxWidth: Get.currentRoute == AppRoutes.Home ? Get.width - 90.sp : Get.width - 20.sp,additionText: '查看更多',maxLines: 5,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () {
widget.logic.openCallOutIdList.add(lists.id);
setState(() {
});
},
); );
// List<JoinUser> urlList = bean.lastJoinUsers; // List<JoinUser> urlList = bean.lastJoinUsers;
@ -991,10 +996,15 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
///普通图文喊话 ///普通图文喊话
normalDynamicItem(Lists lists) { normalDynamicItem(Lists lists) {
Text descText = Text( Widget descText = widget.logic.openCallOutIdList.contains(lists.id) ? Text(
lists.content!, lists.content!,
style: TextStyle(color: Colors.white, fontSize: 17.sp), style: TextStyle(color: Colors.white, fontSize: 14.sp),
// maxLines: 2, ) : HideText(text: lists.content!,maxWidth: Get.currentRoute == AppRoutes.Home ? Get.width - 90.sp : Get.width - 20.sp,additionText: '查看更多',maxLines: 5,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () {
widget.logic.openCallOutIdList.add(lists.id);
setState(() {
});
},
); );
double picHeight = 0.0; double picHeight = 0.0;
@ -1035,7 +1045,7 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
return Container( return Container(
margin: EdgeInsets.only(top: 10.sp), margin: EdgeInsets.only(top: 10.sp),
width: Get.width, width: Get.width,
height: 120.sp + contentHeight(lists.content!) + picHeight, // height: 120.sp + contentHeight(lists.content!) + picHeight,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
@ -1255,7 +1265,7 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
Container( Container(
height: 30.sp, height: 30.sp,
padding: EdgeInsets.only(left: 5.sp, right: 10.sp,), padding: EdgeInsets.only(left: 5.sp, right: 10.sp,),
margin: EdgeInsets.only(top: picHeight > 0 ? 5.sp : 10.sp), margin: EdgeInsets.only(top: picHeight > 0 ? 5.sp : 10.sp,bottom: 10.sp),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.sp), borderRadius: BorderRadius.circular(15.sp),
color: Color(0x33000000)), color: Color(0x33000000)),

794
circle_app/lib/app/circle/widgets/like_view.dart
View File

@ -24,7 +24,9 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../../../common/Widgets/base_tip_widget.dart'; import '../../../common/Widgets/base_tip_widget.dart';
import '../../../common/Widgets/tag_widget.dart'; import '../../../common/Widgets/tag_widget.dart';
import '../../../common/colors/app_color.dart'; import '../../../common/colors/app_color.dart';
import '../../../network/api.dart';
import '../../circle_list/logic.dart'; import '../../circle_list/logic.dart';
import '../../msg/recommend_circle_friend_item.dart';
class LikeView extends StatefulWidget { class LikeView extends StatefulWidget {
LikeView({super.key, required this.changeCallback}); LikeView({super.key, required this.changeCallback});
@ -41,6 +43,7 @@ class _LikeViewState extends State<LikeView>
bool get wantKeepAlive => true; bool get wantKeepAlive => true;
final ScrollController scrollController = ScrollController(); final ScrollController scrollController = ScrollController();
final RefreshController refreshController = RefreshController(); final RefreshController refreshController = RefreshController();
CircleLogic logic = Get.find<CircleLogic>();
// ListLogic? listsLg; // ListLogic? listsLg;
@ -253,12 +256,15 @@ class _LikeViewState extends State<LikeView>
url: "/up-service/callout/${bean.id}/chat", url: "/up-service/callout/${bean.id}/chat",
); );
if (data["code"] == 200) { if (data["code"] == 200) {
pushChatPage(data['data']['account_id'].toString().split("_").last, pushChatPage(data['data']['account_id']
.toString()
.split("_")
.last,
data['data']['account_id'], bean.user!.nickname!); data['data']['account_id'], bean.user!.nickname!);
await Future.delayed(Duration(seconds: 1)); await Future.delayed(Duration(seconds: 1));
SharedPreferences sharedPreferences = SharedPreferences sharedPreferences =
await SharedPreferences.getInstance(); await SharedPreferences.getInstance();
// SharedPreferencesHelper.getInstance().then((sharedPreferences) { // SharedPreferencesHelper.getInstance().then((sharedPreferences) {
int userId = int userId =
sharedPreferences.getInt(SharedPreferencesHelper.USERID) ?? 0; sharedPreferences.getInt(SharedPreferencesHelper.USERID) ?? 0;
@ -357,7 +363,7 @@ class _LikeViewState extends State<LikeView>
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColor.bgColor, color: AppColor.bgColor,
borderRadius: borderRadius:
BorderRadius.circular(5.sp)), BorderRadius.circular(5.sp)),
child: Text( child: Text(
' 展开更早发布的喊话 ↓ ', ' 展开更早发布的喊话 ↓ ',
style: TextStyle( style: TextStyle(
@ -385,16 +391,16 @@ class _LikeViewState extends State<LikeView>
decoration: BoxDecoration( decoration: BoxDecoration(
border: GradientBoxBorder( border: GradientBoxBorder(
gradient: gradient:
AppColor.mainVerLinearGradient, AppColor.mainVerLinearGradient,
width: 1.sp, width: 1.sp,
), ),
borderRadius: borderRadius:
BorderRadius.circular(5.sp)), BorderRadius.circular(5.sp)),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.center, CrossAxisAlignment.center,
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
children: [ children: [
Text( Text(
' 展开更早发布的喊话 ↓ ', ' 展开更早发布的喊话 ↓ ',
@ -429,32 +435,32 @@ class _LikeViewState extends State<LikeView>
} else { } else {
return Container( return Container(
margin: margin:
EdgeInsets.only(top: recomandMore ? 0 : 10.sp), EdgeInsets.only(top: recomandMore ? 0 : 10.sp),
child: recomandMore child: recomandMore
? loaddingWidget(recomandMore) ? loaddingWidget(recomandMore)
: GestureDetector( : GestureDetector(
onTap: () { onTap: () {
widget.changeCallback(); widget.changeCallback();
}, },
child: Container( child: Container(
margin: EdgeInsets.only(bottom: 10.sp), margin: EdgeInsets.only(bottom: 10.sp),
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Image.asset( Image.asset(
getLoginImage('start_bg'), getLoginImage('start_bg'),
width: 180.sp, width: 180.sp,
),
Text(
'查看更多圈子',
style: TextStyle(
color: Colors.white,
fontSize: 18.sp),
)
],
),
), ),
)); Text(
'查看更多圈子',
style: TextStyle(
color: Colors.white,
fontSize: 18.sp),
)
],
),
),
));
} }
}), }),
), ),
@ -524,7 +530,7 @@ class _LikeViewState extends State<LikeView>
margin: EdgeInsets.only(top: 24.sp, bottom: 24.sp), margin: EdgeInsets.only(top: 24.sp, bottom: 24.sp),
child: Container( child: Container(
margin: margin:
EdgeInsets.only(top: 12.sp, left: 14.sp, right: 14.sp), EdgeInsets.only(top: 12.sp, left: 14.sp, right: 14.sp),
alignment: Alignment.center, alignment: Alignment.center,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Text( child: Text(
@ -576,7 +582,7 @@ class _LikeViewState extends State<LikeView>
// pushOtherPeopleHomePage(element.id.toString()); // pushOtherPeopleHomePage(element.id.toString());
}, },
child: child:
circleWidget(element.avatar!, element.id.toString(), width: 24), circleWidget(element.avatar!, element.id.toString(), width: 24),
), ),
)); ));
index++; index++;
@ -647,7 +653,7 @@ class _LikeViewState extends State<LikeView>
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Container( Container(
// margin: EdgeInsets.only(top: 5.sp,right: 5.sp), // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
padding: EdgeInsets.only(left: 15.sp, right: 15.sp), padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
alignment: Alignment.center, alignment: Alignment.center,
height: 28.sp, height: 28.sp,
@ -660,7 +666,8 @@ class _LikeViewState extends State<LikeView>
bottomLeft: Radius.circular(12.sp))), bottomLeft: Radius.circular(12.sp))),
child: Text( child: Text(
(lists.user!.city ?? '外星').length > 4 (lists.user!.city ?? '外星').length > 4
? (lists.user!.city ?? '外星').substring(0, 4) + '...' ? (lists.user!.city ?? '外星').substring(0, 4) +
'...'
: (lists.user!.city ?? '外星'), : (lists.user!.city ?? '外星'),
style: TextStyle(color: Colors.white, fontSize: 15.sp), style: TextStyle(color: Colors.white, fontSize: 15.sp),
)) ))
@ -698,73 +705,73 @@ class _LikeViewState extends State<LikeView>
), ),
Expanded( Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(left: 8.sp, top: 12.sp), padding: EdgeInsets.only(left: 8.sp, top: 12.sp),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
height: 72.sp, height: 72.sp,
child: Column( child: Column(
children: [
Row(
children: [ children: [
Text( Row(
lists.user!.nickname!, children: [
style: TextStyle( Text(
color: Colors.white, lists.user!.nickname!,
fontSize: 18.sp, style: TextStyle(
fontWeight: FontWeight.w600), color: Colors.white,
fontSize: 18.sp,
fontWeight: FontWeight.w600),
),
SizedBox(
width: 8.sp,
),
UserTagWidget(lists.user!.mark!),
// lists.user?.vip != null &&
// lists.user!.vip == 0
// ? Container()
// : Image.asset(
// getCircleImage(lists.user!.vip == 1
// ? 'vip'
// : 'year_vip'),
// width: 36.sp,
// )
],
), ),
SizedBox( SizedBox(
width: 8.sp, height: 4.sp,
), ),
UserTagWidget(lists.user!.mark!), Row(
// lists.user?.vip != null && children: [
// lists.user!.vip == 0 Container(
// ? Container() alignment: Alignment.center,
// : Image.asset( height: 18.sp,
// getCircleImage(lists.user!.vip == 1 padding: EdgeInsets.only(
// ? 'vip' left: 6.sp, right: 6.sp),
// : 'year_vip'), decoration: BoxDecoration(
// width: 36.sp, borderRadius:
// )
],
),
SizedBox(
height: 4.sp,
),
Row(
children: [
Container(
alignment: Alignment.center,
height: 18.sp,
padding: EdgeInsets.only(
left: 6.sp, right: 6.sp),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(9.sp), BorderRadius.circular(9.sp),
gradient: const LinearGradient( gradient: const LinearGradient(
begin: Alignment(0.25, 0.5), begin: Alignment(0.25, 0.5),
end: Alignment(0.75, 0.5), end: Alignment(0.75, 0.5),
colors: [ colors: [
Color(0xff8DFFF8), Color(0xff8DFFF8),
Color(0xffB5D3FF) Color(0xffB5D3FF)
])), ])),
child: Text( child: Text(
getAgeCOntent( getAgeCOntent(
lists.user!.gender ?? 0, lists.user!.gender ?? 0,
lists.user!.age ?? 0, lists.user!.age ?? 0,
lists.user!.role ?? 0, lists.user!.role ?? 0,
lists.user!.orientation ?? 0), lists.user!.orientation ?? 0),
// '${genderList[lists.user!.gender!]}.${lists.user!.age}.${roleList[lists.user!.role!]}.${orientationList[lists.user!.orientation!]}', // '${genderList[lists.user!.gender!]}.${lists.user!.age}.${roleList[lists.user!.role!]}.${orientationList[lists.user!.orientation!]}',
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
) )
],
),
], ],
), ),
], )),
),
)),
], ],
), ),
), ),
@ -778,52 +785,52 @@ class _LikeViewState extends State<LikeView>
margin: EdgeInsets.only(top: 5.sp), margin: EdgeInsets.only(top: 5.sp),
child: picHeight == 140.sp child: picHeight == 140.sp
? ClipRRect( ? ClipRRect(
borderRadius: BorderRadius.circular(6.sp), borderRadius: BorderRadius.circular(6.sp),
child: VideoItemWidget(lists.album![0].url!)) child: VideoItemWidget(lists.album![0].url!))
: GridView.builder( : GridView.builder(
itemCount: lists.album!.length, itemCount: lists.album!.length,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
gridDelegate: gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount( SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3, //横轴三个子widget crossAxisCount: 3, //横轴三个子widget
crossAxisSpacing: 8.sp, crossAxisSpacing: 8.sp,
mainAxisSpacing: 8.sp, mainAxisSpacing: 8.sp,
childAspectRatio: 0.7 //宽高比为1时，子widget childAspectRatio: 0.7 //宽高比为1时，子widget
), ),
itemBuilder: (contentxt, currentIndex) { itemBuilder: (contentxt, currentIndex) {
Album album = lists.album![currentIndex]; Album album = lists.album![currentIndex];
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
var imgList = <String>[]; var imgList = <String>[];
for (var element in lists.album!) { for (var element in lists.album!) {
imgList.add(element.url!); imgList.add(element.url!);
} }
Get.toNamed(AppRoutes.Swiper, arguments: { Get.toNamed(AppRoutes.Swiper, arguments: {
'imaglist': imgList, 'imaglist': imgList,
'index': currentIndex, 'index': currentIndex,
'userId':lists.user!.id.toString() 'userId': lists.user!.id.toString()
}); });
}, },
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(6.sp), borderRadius: BorderRadius.circular(6.sp),
child: CachedNetworkImage( child: CachedNetworkImage(
imageUrl: album.url!, imageUrl: album.url!,
// placeholder: (context, url) => // placeholder: (context, url) =>
// SizedBox( // SizedBox(
// width: 30.sp, // width: 30.sp,
// height: 30.sp, // height: 30.sp,
// child: CircularProgressIndicator( // child: CircularProgressIndicator(
// color: Color(0xFF07FAFB), // color: Color(0xFF07FAFB),
// strokeWidth: 2.sp, // strokeWidth: 2.sp,
// ), // ),
// ), // ),
errorWidget: (context, url, error) => errorWidget: (context, url, error) =>
const Icon(Icons.error), const Icon(Icons.error),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
); );
}), }),
), ),
Container( Container(
height: 30.sp, height: 30.sp,
@ -836,29 +843,29 @@ class _LikeViewState extends State<LikeView>
children: [ children: [
widgets.isNotEmpty widgets.isNotEmpty
? SizedBox( ? SizedBox(
width: 24 + 12.sp * widgets.length - 8.sp, width: 24 + 12.sp * widgets.length - 8.sp,
height: 24.sp, height: 24.sp,
child: Stack(children: widgets), child: Stack(children: widgets),
) )
: Container(), : Container(),
SizedBox( SizedBox(
width: 4.sp, width: 4.sp,
), ),
widgets.isNotEmpty widgets.isNotEmpty
? Expanded( ? Expanded(
child: Text( child: Text(
'${lists.chat!.count!}位圈友已私聊', '${lists.chat!.count!}位圈友已私聊',
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.75), color: Colors.white.withOpacity(0.75),
fontSize: 14.sp), fontSize: 14.sp),
)) ))
: Expanded( : Expanded(
child: Text( child: Text(
'赶紧成为第一位私聊ta的圈友吧', '赶紧成为第一位私聊ta的圈友吧',
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.75), color: Colors.white.withOpacity(0.75),
fontSize: 14.sp), fontSize: 14.sp),
)), )),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
pushMsgPage( pushMsgPage(
@ -924,7 +931,7 @@ class _LikeViewState extends State<LikeView>
child: GestureDetector( child: GestureDetector(
onTap: () {}, onTap: () {},
child: child:
circleWidget(element.avatar!, element.id.toString(), width: 24), circleWidget(element.avatar!, element.id.toString(), width: 24),
), ),
)); ));
index++; index++;
@ -966,7 +973,7 @@ class _LikeViewState extends State<LikeView>
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Container( Container(
// margin: EdgeInsets.only(top: 5.sp,right: 5.sp), // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
padding: EdgeInsets.only(left: 15.sp, right: 15.sp), padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
alignment: Alignment.center, alignment: Alignment.center,
height: 28.sp, height: 28.sp,
@ -980,10 +987,10 @@ class _LikeViewState extends State<LikeView>
child: Text( child: Text(
(lists.user!.city ?? '外星').length > 4 (lists.user!.city ?? '外星').length > 4
? (lists.user!.city ?? '外星').substring(0, 4) + ? (lists.user!.city ?? '外星').substring(0, 4) +
'...' '...'
: (lists.user!.city ?? '外星'), : (lists.user!.city ?? '外星'),
style: style:
TextStyle(color: Colors.white, fontSize: 15.sp), TextStyle(color: Colors.white, fontSize: 15.sp),
)) ))
], ],
), ),
@ -1018,63 +1025,64 @@ class _LikeViewState extends State<LikeView>
), ),
Expanded( Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(left: 8.sp, top: 12.sp), padding: EdgeInsets.only(
alignment: Alignment.centerLeft, left: 8.sp, top: 12.sp),
height: 72.sp, alignment: Alignment.centerLeft,
child: Column( height: 72.sp,
children: [ child: Column(
Row(
children: [ children: [
Text( Row(
lists.user!.nickname!, children: [
style: TextStyle( Text(
color: Colors.white, lists.user!.nickname!,
fontSize: 18.sp, style: TextStyle(
fontWeight: FontWeight.w600), color: Colors.white,
fontSize: 18.sp,
fontWeight: FontWeight.w600),
),
SizedBox(
width: 8.sp,
),
UserTagWidget(lists.user!.mark!),
],
), ),
SizedBox( SizedBox(
width: 8.sp, height: 4.sp,
), ),
UserTagWidget(lists.user!.mark!), Row(
], children: [
), Container(
SizedBox( alignment: Alignment.center,
height: 4.sp, height: 18.sp,
), padding: EdgeInsets.only(
Row( left: 6.sp, right: 6.sp),
children: [ decoration: BoxDecoration(
Container( borderRadius:
alignment: Alignment.center,
height: 18.sp,
padding: EdgeInsets.only(
left: 6.sp, right: 6.sp),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(9.sp), BorderRadius.circular(9.sp),
gradient: const LinearGradient( gradient: const LinearGradient(
begin: Alignment(0.25, 0.5), begin: Alignment(0.25, 0.5),
end: Alignment(0.75, 0.5), end: Alignment(0.75, 0.5),
colors: [ colors: [
Color(0xff8DFFF8), Color(0xff8DFFF8),
Color(0xffB5D3FF) Color(0xffB5D3FF)
])), ])),
child: Text( child: Text(
getAgeCOntent( getAgeCOntent(
lists.user!.gender ?? 0, lists.user!.gender ?? 0,
lists.user!.age ?? 0, lists.user!.age ?? 0,
lists.user!.role ?? 0, lists.user!.role ?? 0,
lists.user!.orientation ?? 0), lists.user!.orientation ?? 0),
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
) )
],
),
], ],
), ),
], )),
),
)),
], ],
), ),
), ),
@ -1085,69 +1093,70 @@ class _LikeViewState extends State<LikeView>
), ),
picHeight > 0 picHeight > 0
? Container( ? Container(
height: picHeight, height: picHeight,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
margin: EdgeInsets.only(top: 5.sp), margin: EdgeInsets.only(top: 5.sp),
child: picHeight == 140.sp child: picHeight == 140.sp
? ClipRRect( ? ClipRRect(
borderRadius: BorderRadius.circular(6.sp), borderRadius: BorderRadius.circular(6.sp),
child: child:
VideoItemWidget(lists.album![0].url!)) VideoItemWidget(lists.album![0].url!))
: GridView.builder( : GridView.builder(
itemCount: lists.album!.length, itemCount: lists.album!.length,
physics: physics:
const NeverScrollableScrollPhysics(), const NeverScrollableScrollPhysics(),
gridDelegate: gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount( SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3, //横轴三个子widget crossAxisCount: 3, //横轴三个子widget
crossAxisSpacing: 8.sp, crossAxisSpacing: 8.sp,
mainAxisSpacing: 8.sp, mainAxisSpacing: 8.sp,
childAspectRatio: childAspectRatio:
0.7 //宽高比为1时，子widget 0.7 //宽高比为1时，子widget
), ),
itemBuilder: (contentxt, currentIndex) { itemBuilder: (contentxt, currentIndex) {
Album album = lists.album![currentIndex]; Album album = lists.album![currentIndex];
if (album.type == 2) { if (album.type == 2) {
return ClipRRect( return ClipRRect(
borderRadius: borderRadius:
BorderRadius.circular(6.sp), BorderRadius.circular(6.sp),
child: VideoItemWidget(album.url!)); child: VideoItemWidget(album.url!));
} }
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
var imgList = <String>[]; var imgList = <String>[];
for (var element in lists.album!) { for (var element in lists.album!) {
imgList.add(element.url!); imgList.add(element.url!);
} }
Get.toNamed(AppRoutes.Swiper, Get.toNamed(AppRoutes.Swiper,
arguments: { arguments: {
'imaglist': imgList, 'imaglist': imgList,
'index': currentIndex, 'index': currentIndex,
'userId':lists.user!.id.toString() 'userId':
}); lists.user!.id.toString()
}, });
child: ClipRRect( },
borderRadius: child: ClipRRect(
BorderRadius.circular(6.sp), borderRadius:
child: CachedNetworkImage( BorderRadius.circular(6.sp),
imageUrl: album.url!, child: CachedNetworkImage(
// placeholder: (context, url) => imageUrl: album.url!,
// SizedBox( // placeholder: (context, url) =>
// width: 30.sp, // SizedBox(
// height: 30.sp, // width: 30.sp,
// child: CircularProgressIndicator( // height: 30.sp,
// color: Color(0xFF07FAFB), // child: CircularProgressIndicator(
// strokeWidth: 2.sp, // color: Color(0xFF07FAFB),
// ), // strokeWidth: 2.sp,
// ), // ),
errorWidget: // ),
(context, url, error) => errorWidget:
const Icon(Icons.error), (context, url, error) =>
fit: BoxFit.cover, const Icon(Icons.error),
), fit: BoxFit.cover,
), ),
); ),
})) );
}))
: Container(), : Container(),
Container( Container(
height: 30.sp, height: 30.sp,
@ -1156,7 +1165,7 @@ class _LikeViewState extends State<LikeView>
right: 10.sp, right: 10.sp,
), ),
margin: margin:
EdgeInsets.only(top: picHeight == 0 ? 15.sp : 5.sp), EdgeInsets.only(top: picHeight == 0 ? 15.sp : 5.sp),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.sp), borderRadius: BorderRadius.circular(15.sp),
color: Color(0x33000000)), color: Color(0x33000000)),
@ -1164,29 +1173,29 @@ class _LikeViewState extends State<LikeView>
children: [ children: [
widgets.isNotEmpty widgets.isNotEmpty
? SizedBox( ? SizedBox(
width: 24 + 12.sp * widgets.length - 8.sp, width: 24 + 12.sp * widgets.length - 8.sp,
height: 24.sp, height: 24.sp,
child: Stack(children: widgets), child: Stack(children: widgets),
) )
: Container(), : Container(),
SizedBox( SizedBox(
width: 4.sp, width: 4.sp,
), ),
widgets.isNotEmpty widgets.isNotEmpty
? Expanded( ? Expanded(
child: Text( child: Text(
'${lists.chat!.count!}位圈友已私聊', '${lists.chat!.count!}位圈友已私聊',
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.75), color: Colors.white.withOpacity(0.75),
fontSize: 14.sp), fontSize: 14.sp),
)) ))
: Expanded( : Expanded(
child: Text( child: Text(
'赶紧成为第一位私聊ta的圈友吧', '赶紧成为第一位私聊ta的圈友吧',
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.75), color: Colors.white.withOpacity(0.75),
fontSize: 14.sp), fontSize: 14.sp),
)), )),
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
pushMsgPage( pushMsgPage(
@ -1218,74 +1227,85 @@ class _LikeViewState extends State<LikeView>
tipItem() { tipItem() {
bool showTitle = lists.isEmpty; bool showTitle = lists.isEmpty;
return Container( return GetBuilder<CircleLogic>(builder: (logic) {
margin: EdgeInsets.only(top: showTitle ? 20.sp : 0, bottom: 10.sp), return Container(
// height: 30.sp, margin: EdgeInsets.only(top: showTitle ? 10.sp : 0, bottom: 10.sp),
child: Column( // height: 30.sp,
children: [ child: Column(
if (showTitle) children: [
Container( if (showTitle)
margin: EdgeInsets.only(bottom: 8.sp), logic.recommendCircleFriendData.isNotEmpty
child: Image.asset( ? RecommendCircleFriendItem(
getBaseImage('no_result'), false,
width: 200.sp, recommendCircleFriendData: logic.recommendCircleFriendData,
getDataCallBack: () {
logic.loadRecommendCircleFriendData();
})
: Container(),
if (showTitle)
Container(
margin: EdgeInsets.only(bottom: 8.sp),
child: Image.asset(
getBaseImage('no_result'),
width: 200.sp,
),
), ),
), if (showTitle)
if (showTitle) Text(
Text( '还没有您喜欢的圈友发布喊话哦~',
'还没有您喜欢的圈友发布喊话哦~', style: TextStyle(color: Colors.white, fontSize: 16.sp),
style: TextStyle(color: Colors.white, fontSize: 16.sp), ),
), Container(
Container( margin: EdgeInsets.only(top: 20.sp),
margin: EdgeInsets.only(top: 20.sp), padding: EdgeInsets.only(left: 30.sp, right: 30.sp),
padding: EdgeInsets.only(left: 30.sp, right: 30.sp), child: Row(
child: Row( children: [
children: [ Expanded(
Expanded( child: Container(
child: Container( height: 2.sp,
height: 2.sp, color: Colors.white.withOpacity(0.5),
color: Colors.white.withOpacity(0.5), )),
)), Container(
Container( margin: EdgeInsets.only(left: 8.sp, right: 8.sp),
margin: EdgeInsets.only(left: 8.sp, right: 8.sp), height: 2.sp,
height: 2.sp, width: 2.sp,
width: 2.sp, decoration: BoxDecoration(
decoration: BoxDecoration( color: Colors.white,
color: Colors.white, borderRadius: BorderRadius.circular(1.sp)),
borderRadius: BorderRadius.circular(1.sp)),
),
ShaderMask(
shaderCallback: (Rect bounds) {
return const LinearGradient(
begin: Alignment.centerRight,
end: Alignment.centerLeft,
colors: [Color(0xff71F3F2), Color(0xffF657FF)],
).createShader(Offset.zero & bounds.size);
},
child: Text(
'喊话推荐',
style: TextStyle(color: Colors.white, fontSize: 17.sp),
), ),
), ShaderMask(
Container( shaderCallback: (Rect bounds) {
margin: EdgeInsets.only(left: 8.sp, right: 8.sp), return const LinearGradient(
height: 2.sp, begin: Alignment.centerRight,
width: 2.sp, end: Alignment.centerLeft,
decoration: BoxDecoration( colors: [Color(0xff71F3F2), Color(0xffF657FF)],
color: Colors.white, ).createShader(Offset.zero & bounds.size);
borderRadius: BorderRadius.circular(1.sp)), },
), child: Text(
Expanded( '喊话推荐',
child: Container( style: TextStyle(color: Colors.white, fontSize: 17.sp),
height: 2.sp, ),
color: Colors.white.withOpacity(0.5), ),
)), Container(
], margin: EdgeInsets.only(left: 8.sp, right: 8.sp),
), height: 2.sp,
) width: 2.sp,
], decoration: BoxDecoration(
), color: Colors.white,
); borderRadius: BorderRadius.circular(1.sp)),
),
Expanded(
child: Container(
height: 2.sp,
color: Colors.white.withOpacity(0.5),
)),
],
),
)
],
),
);
});
} }
circleInfoItem(var bean, Lists list, int index) { circleInfoItem(var bean, Lists list, int index) {
@ -1333,41 +1353,41 @@ class _LikeViewState extends State<LikeView>
), ),
Expanded( Expanded(
child: Container( child: Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 8.sp, left: 8.sp,
top: 12.sp, top: 12.sp,
),
// alignment: Alignment.,
height: 72.sp,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
bean['title'],
style: TextStyle(
color: Colors.white,
fontSize: 18.sp,
fontWeight: FontWeight.w600),
), ),
SizedBox( // alignment: Alignment.,
height: 4.sp, height: 72.sp,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
bean['title'],
style: TextStyle(
color: Colors.white,
fontSize: 18.sp,
fontWeight: FontWeight.w600),
),
SizedBox(
height: 4.sp,
),
Text(
// "view_total" -> 21
'${convertToTenThousand(bean['view_total'])}人看过',
textAlign: TextAlign.left,
style: TextStyle(
color: const Color(0xff03FEFB),
fontSize: 12.sp,
),
),
],
), ),
Text( )),
// "view_total" -> 21
'${convertToTenThousand(bean['view_total'])}人看过',
textAlign: TextAlign.left,
style: TextStyle(
color: const Color(0xff03FEFB),
fontSize: 12.sp,
),
),
],
),
)),
Container( Container(
margin: EdgeInsets.only(right: 8.sp), margin: EdgeInsets.only(right: 8.sp),
child: GestureDetector( child: GestureDetector(
//加入圈子 //加入圈子
onTap: () async { onTap: () async {
CircleLogic cLogic = Get.find<CircleLogic>(); CircleLogic cLogic = Get.find<CircleLogic>();
if (bean['is_join']) { if (bean['is_join']) {
@ -1401,8 +1421,6 @@ class _LikeViewState extends State<LikeView>
element.interest = element.interest!; element.interest = element.interest!;
} }
}); });
} }
if (Get.isRegistered<LikeLogic>()) { if (Get.isRegistered<LikeLogic>()) {
LikeLogic likeLogic = Get.find<LikeLogic>(); LikeLogic likeLogic = Get.find<LikeLogic>();
@ -1424,7 +1442,7 @@ class _LikeViewState extends State<LikeView>
Text( Text(
!bean['is_join'] ? '申请加入' : '分享有奖', !bean['is_join'] ? '申请加入' : '分享有奖',
style: style:
TextStyle(color: Colors.white, fontSize: 12.sp), TextStyle(color: Colors.white, fontSize: 12.sp),
) )
], ],
)), )),
@ -1502,7 +1520,7 @@ class _LikeViewState extends State<LikeView>
child: Text( child: Text(
"提示", "提示",
style: style:
TextStyle(color: Colors.white, fontSize: 16.sp), TextStyle(color: Colors.white, fontSize: 16.sp),
), ),
), ),
Container( Container(

4
circle_app/lib/app/circle/widgets/new_people.dart
View File

@ -73,7 +73,9 @@ class _NewPeopleState extends State<NewPeople> {
}, },
), ),
) )
: loaddingWidget(logic.isNewPeopleMore,tip: '过段时间再来欢迎新人吧～'); : logic.isLoadFail ? noResultWidget(tip: '', callBack: () {
logic.onLoading();
}) : loaddingWidget(logic.isNewPeopleMore,tip: '过段时间再来欢迎新人吧～');
}); });
} }
} }

34
circle_app/lib/app/circle/widgets/vicinity.dart
View File

@ -41,17 +41,13 @@ class _VicinityState extends State<Vicinity> with AutomaticKeepAliveClientMixin
super.initState(); super.initState();
widget.logic.getNearByList(); widget.logic.getNearByList();
sub = EventBusManager.on<NearScrollTap>().listen((event) { sub = EventBusManager.on<NearScrollTap>().listen((event) {
// if (widget.logic.myVip > 0) { try {
_scrollController.animateTo(0, _scrollController.animateTo(0,
duration: const Duration(milliseconds: 300), curve: Curves.easeInOut); duration: const Duration(milliseconds: 300), curve: Curves.easeInOut);
// } } catch (e) {
});
// _scrollController.addListener(() { }
// if (maxOff > 0 && widget.logic.myVip == 0 && _scrollController.offset >= maxOff) { });
// _scrollController.jumpTo(maxOff);
// }
// });
} }
@override @override
@ -92,17 +88,19 @@ class _VicinityState extends State<Vicinity> with AutomaticKeepAliveClientMixin
// Positioned( // Positioned(
// bottom: 0, // bottom: 0,
// child: showVipView()) // child: showVipView())
Positioned(top: 10.sp,left: 10.sp,child: GestureDetector( // Positioned(top: 10.sp,left: 10.sp,child: GestureDetector(
onTap: () { // onTap: () {
Get.toNamed(AppRoutes.WorldCallOut); // Get.toNamed(AppRoutes.WorldCallOut);
}, // },
child: Image.asset( // child: Image.asset(
getMsgImage('hu_icon'), // getMsgImage('hu_icon'),
width: 30.sp, // width: 30.sp,
), // ),
),) // ),)
], ],
) : loaddingWidget(true); ) : widget.logic.isNearLoad ? loaddingWidget(true) : noResultWidget(tip: '',callBack: () {
_onLoading();
});
} }
Widget bannerView(CircleLogic controller) { Widget bannerView(CircleLogic controller) {

8
circle_app/lib/app/circle_list/logic.dart
View File

@ -31,11 +31,14 @@ class LikeLogic extends GetxController {
List<bool> hasNewList = []; List<bool> hasNewList = [];
List categoriesList = []; List categoriesList = [];
List openCallOutIdList = [];
bool isNewPeople = false; bool isNewPeople = false;
bool isLoadNewData = false; bool isLoadNewData = false;
bool isLoadFial = false;
Data? homeData; Data? homeData;
@override @override
void onInit() async { void onInit() async {
@ -55,6 +58,7 @@ class LikeLogic extends GetxController {
} }
loadMyInfo() async { loadMyInfo() async {
isLoadFial = false;
var data = await DioManager.instance.get(url: Api.getUserMine); var data = await DioManager.instance.get(url: Api.getUserMine);
var bean = BaseResponse<MineResponseBean>.fromJson( var bean = BaseResponse<MineResponseBean>.fromJson(
data, (data) => MineResponseBean.fromJson(data)); data, (data) => MineResponseBean.fromJson(data));
@ -65,6 +69,9 @@ class LikeLogic extends GetxController {
isLoadNewData = true; isLoadNewData = true;
update(); update();
} }
} else if (bean.code == 404) {
isLoadFial = true;
update();
} }
} }
@ -72,6 +79,7 @@ class LikeLogic extends GetxController {
loadInviteData(); loadInviteData();
loadCircleListData(); loadCircleListData();
loadMyCircleData(); loadMyCircleData();
loadCircleTypeData();
} }
loadInviteData() async { loadInviteData() async {

18
circle_app/lib/app/circle_list/view.dart
View File

@ -108,7 +108,10 @@ class _CircleListPageState extends State<CircleListPage>
logic.update(); logic.update();
} }
return logic.isLoad return logic.isLoadFial ? noResultWidget(tip:'',callBack: () {
logic.loadMyInfo();
logic.loadData();
}) : logic.isLoad
? loaddingWidget(true) ? loaddingWidget(true)
: Container( : Container(
width: Get.width, width: Get.width,
@ -628,7 +631,7 @@ class _CircleListPageState extends State<CircleListPage>
)); ));
} }
leftItem(String text, bool isSelcted, bool isUnread, int index) { leftItem(String text, bool isSelcted, bool isUnread, int index) {
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () async { onTap: () async {
@ -667,10 +670,19 @@ class _CircleListPageState extends State<CircleListPage>
child: Container( child: Container(
width: 65.sp, width: 65.sp,
height: 65.sp, height: 65.sp,
color: isSelcted ? Colors.white.withOpacity(0.3) : Colors.transparent, // color: isSelcted ? Colors.white.withOpacity(0.3) : Colors.transparent,
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
if (isSelcted)
OverflowBox(
minWidth: 0.0,
maxWidth: double.infinity,
minHeight: 0.0,
maxHeight: double.infinity,
child: Image.asset(getCircleImage('circle_selected_bg'),width: 65.sp,),
),
if (text.isEmpty && index == -1) if (text.isEmpty && index == -1)
topCicleStatusItem( topCicleStatusItem(
isSelcted, isSelcted,

17
circle_app/lib/app/home/logic.dart
View File

@ -86,6 +86,12 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
void onInit() async { void onInit() async {
super.onInit(); super.onInit();
unreadSIze.value = '0'; unreadSIze.value = '0';
tabs.add(CirclePage());
tabs.add(CircleListPage());
tabs.add(WorldCallOutPage());
tabs.add(MsgPage());
tabs.add(MinefragmentPage());
loadEnvTypeData(); loadEnvTypeData();
// 设置网络变化监听 // 设置网络变化监听
connectListener(); connectListener();
@ -94,11 +100,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
setFirstData(); setFirstData();
loadMyInfoData(); loadMyInfoData();
tabs.add(CirclePage());
tabs.add(CircleListPage());
tabs.add(World_call_outPage());
tabs.add(MsgPage());
tabs.add(MinefragmentPage());
sub = EventBusManager.on<RefreshUnread>().listen((event) { sub = EventBusManager.on<RefreshUnread>().listen((event) {
getUnreadSize(); getUnreadSize();
@ -115,6 +117,8 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
} }
void addMsgListener() { void addMsgListener() {
msgListener = V2TimSimpleMsgListener(onRecvC2CTextMessage: ( msgListener = V2TimSimpleMsgListener(onRecvC2CTextMessage: (
msgID, msgID,
@ -319,6 +323,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
super.onReady(); super.onReady();
FlutterNativeSplash.remove(); FlutterNativeSplash.remove();
updateIndex(1);
final logic = Get.find<CircleLogic>(); final logic = Get.find<CircleLogic>();
logic.loadCirclePeopleData(); logic.loadCirclePeopleData();
@ -353,6 +358,8 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
loginIM( loginIM(
data['data']['account_id'].toString(), data['data']['user_sig']); data['data']['account_id'].toString(), data['data']['user_sig']);
accountId = data['data']['account_id'].toString(); accountId = data['data']['account_id'].toString();
} else {
getIMData();
} }
} }
} }

2
circle_app/lib/app/home/view.dart
View File

@ -116,7 +116,7 @@ class _HomePageState extends State<HomePage>
children: [ children: [
const CirclePage(), const CirclePage(),
CircleListPage(), CircleListPage(),
World_call_outPage(), WorldCallOutPage(),
MsgPage(), MsgPage(),
MinefragmentPage() MinefragmentPage()
], ],

4
circle_app/lib/app/minefragment/logic.dart
View File

@ -92,11 +92,11 @@ class MinefragmentLogic extends GetxController {
int likeMeCount = sharedPreferences.getInt(SharedPreferencesHelper.LIKEMECOUNT)??0; int likeMeCount = sharedPreferences.getInt(SharedPreferencesHelper.LIKEMECOUNT)??0;
int recentVisitCount = sharedPreferences.getInt(SharedPreferencesHelper.RECENTVISITCOUNT)??0; int recentVisitCount = sharedPreferences.getInt(SharedPreferencesHelper.RECENTVISITCOUNT)??0;
sharedPreferences.setString(SharedPreferencesHelper.PHOTO, bean.data.phone); sharedPreferences.setString(SharedPreferencesHelper.PHOTO, bean.data.phone);
like_me_count_new = likeMeCount - like_me_count; like_me_count_new = like_me_count - likeMeCount;
print("***************"); print("***************");
print("$likeMeCount-$like_me_count=$like_me_count_new"); print("$likeMeCount-$like_me_count=$like_me_count_new");
recent_visit_count_new = recentVisitCount - recent_visit_count; recent_visit_count_new = recent_visit_count - recentVisitCount;
// like_me_count_new = recentVisitCount.toInt() - bean.data.likeMeCount.toInt(); // like_me_count_new = recentVisitCount.toInt() - bean.data.likeMeCount.toInt();

2
circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation.dart
View File

@ -488,7 +488,7 @@ class _TIMConversationState extends TIMUIKitState<TIMConversation> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
if (index == filteredConversationList.length) { if (index == filteredConversationList.length) {
return recommendCircleFriendData.isNotEmpty return recommendCircleFriendData.isNotEmpty
? RecommendCircleFriendItem(recommendCircleFriendData: recommendCircleFriendData,getDataCallBack: () { ? RecommendCircleFriendItem(true,recommendCircleFriendData: recommendCircleFriendData,getDataCallBack: () {
loadRecommendCircleFriendData(); loadRecommendCircleFriendData();
}) })
: Container(); : Container();

6
circle_app/lib/app/msg/recommend_circle_friend_item.dart
View File

@ -11,9 +11,10 @@ import '../../util/util.dart';
import '../circle/widgets/discover.dart'; import '../circle/widgets/discover.dart';
class RecommendCircleFriendItem extends StatefulWidget { class RecommendCircleFriendItem extends StatefulWidget {
RecommendCircleFriendItem({super.key,required this.recommendCircleFriendData,required this.getDataCallBack}); RecommendCircleFriendItem(this.isShowTopLine,{super.key,required this.recommendCircleFriendData,required this.getDataCallBack,});
var recommendCircleFriendData; var recommendCircleFriendData;
Function getDataCallBack; Function getDataCallBack;
bool isShowTopLine;
@override @override
_RecommendCircleFriendItemState createState() => _RecommendCircleFriendItemState createState() =>
_RecommendCircleFriendItemState(); _RecommendCircleFriendItemState();
@ -56,6 +57,7 @@ class _RecommendCircleFriendItemState extends State<RecommendCircleFriendItem> {
return Container( return Container(
padding: EdgeInsets.only(left: 15.sp, right: 15.sp), padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
child: Column(children: [ child: Column(children: [
if (widget.isShowTopLine)
Container( Container(
margin: EdgeInsets.only(top: 20.sp), margin: EdgeInsets.only(top: 20.sp),
child: Row( child: Row(
@ -82,7 +84,7 @@ class _RecommendCircleFriendItemState extends State<RecommendCircleFriendItem> {
), ),
), ),
Container( Container(
margin: EdgeInsets.only(top: 16.sp), margin: EdgeInsets.only(top: widget.isShowTopLine ? 16.sp : 0),
child: Row( child: Row(
children: [ children: [
Image.asset( Image.asset(

2
circle_app/lib/app/my_circle/view.dart
View File

@ -493,7 +493,7 @@ class _My_circlePageState extends State<My_circlePage>
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
child: Text( child: Text(
msg, msg,
textAlign: TextAlign.center, textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
color: Color(0xCCF7FAFA), fontSize: 16.sp), color: Color(0xCCF7FAFA), fontSize: 16.sp),
), ),

2
circle_app/lib/app/signal_circle_list/logic.dart
View File

@ -8,7 +8,7 @@ import 'state.dart';
class Signal_circle_listLogic extends GetxController { class Signal_circle_listLogic extends GetxController {
final Signal_circle_listState state = Signal_circle_listState(); final Signal_circle_listState state = Signal_circle_listState();
List openCallOutIdList = [];
Circle? circle; Circle? circle;
@override @override

9
circle_app/lib/app/splash/logic.dart
View File

@ -94,7 +94,14 @@ class SplashLogic extends GetxController {
await Future.delayed(Duration(seconds: 5)); await Future.delayed(Duration(seconds: 5));
onInit(); onInit();
} else { } else {
pushLoginPage(); SharedPreferencesHelper sp =
await SharedPreferencesHelper.getInstance();
String token = sp.getString(SharedPreferencesHelper.AUTHORIZATION);
if (token.isNotEmpty) {
Get.offNamed(AppRoutes.Home);
} else {
pushLoginPage();
}
} }
// Get.toNamed(AppRoutes.Home); // Get.toNamed(AppRoutes.Home);

9
circle_app/lib/app/userinfo/logic.dart
View File

@ -48,9 +48,14 @@ class UserinfoLogic extends GetxController {
List recevigiftList = []; List recevigiftList = [];
List openCallOutIdList = [];
Map toUser = {}; Map toUser = {};
int unLockWxNum = 0; int unLockWxNum = 0;
int likeMeCount = 0;
int imageUrgeCount = 0;
final startTime = DateTime.now(); final startTime = DateTime.now();
SharedPreferences? sharedPreferences; SharedPreferences? sharedPreferences;
@override @override
@ -174,6 +179,8 @@ class UserinfoLogic extends GetxController {
isLikeFoMsg = isLikeFoMsg =
"${bean.data.likeMeCount}位圈友感兴趣，其中${bean.data.imageUrgeCount}位已催您更新"; "${bean.data.likeMeCount}位圈友感兴趣，其中${bean.data.imageUrgeCount}位已催您更新";
likeMeCount = bean.data.likeMeCount;
imageUrgeCount = bean.data.imageUrgeCount;
userInfoBean = bean.data.user; userInfoBean = bean.data.user;
unLockWxNum = userInfoBean!.contact!.contains('*') ? 0 : 1; unLockWxNum = userInfoBean!.contact!.contains('*') ? 0 : 1;
isVip = userInfoBean?.vip ?? 0; isVip = userInfoBean?.vip ?? 0;
@ -350,6 +357,8 @@ class UserinfoLogic extends GetxController {
} catch (e) {} } catch (e) {}
update(); update();
} else if (bean.code == 21201 || bean.code == 21202) {
showVipDialog();
} }
showOKToast(bean.msg); showOKToast(bean.msg);
} }

99
circle_app/lib/app/userinfo/view.dart
View File

@ -245,7 +245,25 @@ class MyTabbedScreenState extends State<UserinfoPage>
], ],
), ),
) )
: Container() :Container(
alignment: Alignment.centerLeft,
// width: 200.sp,
// color: Colors.red,
margin: EdgeInsets.only(left: 5.sp, bottom: 5.sp),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
userWxStatusWidget(
!logic.userInfoBean!.contact!.contains('*'),
logic.userInfoBean!.contact!,
logic.userId.toString(),
logic.userInfoBean!.contactType!,
logic.userInfoBean!.avatar!, () {
logic.fetchUserInfo(
"${Api.getUserInfoTA + logic.userId}/home");
}),
],
))
: Container()) : Container())
: MyAppBar( : MyAppBar(
centerTitle: logic.userInfoBean != null centerTitle: logic.userInfoBean != null
@ -273,13 +291,7 @@ class MyTabbedScreenState extends State<UserinfoPage>
toolbarHeight: 0, toolbarHeight: 0,
foregroundColor: Colors.transparent, foregroundColor: Colors.transparent,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
expandedHeight: 352.sp + expandedHeight: 352.sp,
(logic.userInfoBean != null
? logic.userInfoBean!.contact!.isNotEmpty &&
logic.userId.toString().isNotEmpty
? 42.sp
: 0
: 0),
// bottom: PreferredSize( // bottom: PreferredSize(
// preferredSize: Size(Get.width, 40), // preferredSize: Size(Get.width, 40),
// child: titleTab(logic), // child: titleTab(logic),
@ -561,30 +573,30 @@ class MyTabbedScreenState extends State<UserinfoPage>
? Container() ? Container()
: _buildInterestsListView(interests), : _buildInterestsListView(interests),
), ),
if (!logic.isMe) // if (!logic.isMe)
logic.userInfoBean != null // logic.userInfoBean != null
? logic.userInfoBean!.contact!.isNotEmpty // ? logic.userInfoBean!.contact!.isNotEmpty
? Container( // ? Container(
alignment: Alignment.centerLeft, // alignment: Alignment.centerLeft,
// width: 200.sp, // // width: 200.sp,
// color: Colors.red, // // color: Colors.red,
margin: EdgeInsets.only(left: 5.sp, bottom: 5.sp), // margin: EdgeInsets.only(left: 5.sp, bottom: 5.sp),
child: Row( // child: Row(
mainAxisAlignment: MainAxisAlignment.start, // mainAxisAlignment: MainAxisAlignment.start,
children: [ // children: [
wxStatusWidget( // wxStatusWidget(
!logic.userInfoBean!.contact!.contains('*'), // !logic.userInfoBean!.contact!.contains('*'),
logic.userInfoBean!.contact!, // logic.userInfoBean!.contact!,
logic.userId.toString(), // logic.userId.toString(),
logic.userInfoBean!.contactType!, // logic.userInfoBean!.contactType!,
logic.userInfoBean!.avatar!, () { // logic.userInfoBean!.avatar!, () {
logic.fetchUserInfo( // logic.fetchUserInfo(
"${Api.getUserInfoTA + logic.userId}/home"); // "${Api.getUserInfoTA + logic.userId}/home");
}), // }),
], // ],
)) // ))
: Container() // : Container()
: Container(), // : Container(),
if (logic.userInfoBean != null && logic.giftList.isNotEmpty) if (logic.userInfoBean != null && logic.giftList.isNotEmpty)
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
@ -950,9 +962,26 @@ class MyTabbedScreenState extends State<UserinfoPage>
if (controller.isMe) if (controller.isMe)
Container( Container(
margin: EdgeInsets.only(top: 18.sp, bottom: 14.sp), margin: EdgeInsets.only(top: 18.sp, bottom: 14.sp),
child: Text( child: Row(
controller.isLikeFoMsg, mainAxisAlignment: MainAxisAlignment.center,
style: const TextStyle(color: Colors.white30), children: [
Text(
controller.likeMeCount.toString(),
style: TextStyle(color:AppColor.mainColor),
),
Text(
'位圈友感兴趣，其中',
style: const TextStyle(color: Colors.white30),
),
Text(
controller.imageUrgeCount.toString(),
style: TextStyle(color:AppColor.mainColor),
),
Text(
'位已催您更新',
style: const TextStyle(color: Colors.white30),
),
],
), ),
), ),
controller.state.imaglist.isEmpty && !controller.isMe controller.state.imaglist.isEmpty && !controller.isMe

50
circle_app/lib/app/userinfo/widgets/home_call_out.dart
View File

@ -12,6 +12,8 @@ import 'package:get/get.dart';
import 'package:get/get_core/src/get_main.dart'; import 'package:get/get_core/src/get_main.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../../common/Widgets/text_more.dart';
import '../logic.dart';
import '../view.dart'; import '../view.dart';
class HomeCallOutView extends StatefulWidget { class HomeCallOutView extends StatefulWidget {
@ -32,6 +34,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
HomeCallOutLogic? listsLg; HomeCallOutLogic? listsLg;
ScrollController scrollController = ScrollController(); ScrollController scrollController = ScrollController();
UserinfoLogic logic = Get.find<UserinfoLogic>();
bool isEnd = false; bool isEnd = false;
var sub; var sub;
@ -128,10 +131,15 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
///至尊喊话 ///至尊喊话
vipDynamicItem(Lists lists) { vipDynamicItem(Lists lists) {
Text descText = Text( Widget descText = logic.openCallOutIdList.contains(lists.id) ? Text(
lists.content!, lists.content!,
style: TextStyle(color: Colors.white, fontSize: 14.sp), style: TextStyle(color: Colors.white, fontSize: 14.sp),
maxLines: 2, ) : HideText(text: lists.content!,maxWidth: Get.currentRoute == AppRoutes.Home ? Get.width - 90.sp : Get.width - 20.sp,additionText: '查看更多',maxLines: 5,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () {
logic.openCallOutIdList.add(lists.id);
setState(() {
});
},
); );
double picHeight = 0.0; double picHeight = 0.0;
@ -154,9 +162,9 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
} }
} }
double titleHeight = textWidth(lists.interest!['title']); double titleHeight = textWidth(lists.interest!['title']);
double widgetHeight = 115.sp + // double widgetHeight = 115.sp +
contentHeight(lists.content!) + // contentHeight(lists.content!) +
(picHeight > 0 ? picHeight + 5 : 0); // (picHeight > 0 ? picHeight + 5 : 0);
return Column( return Column(
children: [ children: [
@ -171,7 +179,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
Container( Container(
margin: EdgeInsets.only(top: 10.sp), margin: EdgeInsets.only(top: 10.sp),
width: Get.width, width: Get.width,
height: widgetHeight, // height: widgetHeight,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
@ -205,10 +213,11 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
), ),
), ),
Container( Container(
height: widgetHeight, // height: widgetHeight,
width: Get.width, width: Get.width,
padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp), padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp,bottom: 12.sp),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
height: 72.sp, height: 72.sp,
@ -358,9 +367,10 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
); );
}), }),
), ),
if (widget.userId.isEmpty)
Container( Container(
width: Get.width, width: Get.width,
margin: EdgeInsets.only(top: 4.sp), margin: EdgeInsets.only(top: 4.sp,bottom: 5.sp),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -379,7 +389,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
}, },
child: Image.asset( child: Image.asset(
getCircleImage('delete'), getCircleImage('delete'),
width: 14.sp, width: 20.sp,
)) ))
], ],
)) ))
@ -393,10 +403,15 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
///普通图文喊话 ///普通图文喊话
normalDynamicItem(Lists lists) { normalDynamicItem(Lists lists) {
Text descText = Text( Widget descText = logic.openCallOutIdList.contains(lists.id) ? Text(
lists.content!, lists.content!,
style: TextStyle(color: Colors.white, fontSize: 14.sp), style: TextStyle(color: Colors.white, fontSize: 14.sp),
// maxLines: 2, ) : HideText(text: lists.content!,maxWidth: Get.currentRoute == AppRoutes.Home ? Get.width - 90.sp : Get.width - 20.sp,additionText: '查看更多',maxLines: 5,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () {
logic.openCallOutIdList.add(lists.id);
setState(() {
});
},
); );
double picHeight = 0.0; double picHeight = 0.0;
@ -434,9 +449,9 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
Container( Container(
margin: EdgeInsets.only(top: 10.sp), margin: EdgeInsets.only(top: 10.sp),
width: Get.width, width: Get.width,
height: picHeight > 0 // height: picHeight > 0
? 105.sp + contentHeight(lists.content!) + picHeight // ? 105.sp + contentHeight(lists.content!) + picHeight
: 100.sp + contentHeight(lists.content!), // : 100.sp + contentHeight(lists.content!),
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
@ -630,9 +645,10 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
); );
})) }))
: Container(), : Container(),
if (widget.userId.isEmpty)
Container( Container(
width: Get.width, width: Get.width,
margin: EdgeInsets.only(top: 4.sp), margin: EdgeInsets.only(top: 4.sp,bottom: 5.sp),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -651,7 +667,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
}, },
child: Image.asset( child: Image.asset(
getCircleImage('delete'), getCircleImage('delete'),
width: 14.sp, width: 20.sp,
)) ))
], ],
)) ))

18
circle_app/lib/app/visitorlist/widget/visitors_follow_item.dart
View File

@ -130,12 +130,18 @@ class _VisitorsFollowItemState extends State<VisitorsFollowItem> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
VisitorlistLogic logic = Get.find<VisitorlistLogic>(); VisitorlistLogic logic = Get.find<VisitorlistLogic>();
List<String> idList = []; if (logic.isVip > 0) {
widget.users.forEach((element) { List<String> idList = [];
var user = UserListItem.fromJson(element).user; widget.users.forEach((element) {
idList.add(user.id.toString()); var user = UserListItem.fromJson(element).user;
}); idList.add(user.id.toString());
logic.sendAllLike(idList); });
logic.sendAllLike(idList);
} else {
showOKToast('开通会员可以一键喜欢哦～');
showOepnVipDialog();
}
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 50.sp,right: 50.sp,top: 10.sp), margin: EdgeInsets.only(left: 50.sp,right: 50.sp,top: 10.sp),

14
circle_app/lib/app/world_call_out/logic.dart
View File

@ -2,6 +2,7 @@ import 'package:circle_app/app/world_call_out/world_data.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import '../../network/api.dart'; import '../../network/api.dart';
import '../../network/dio_manager.dart'; import '../../network/dio_manager.dart';
@ -13,6 +14,7 @@ import '../select_circle/logic.dart';
class World_call_outLogic extends GetxController { class World_call_outLogic extends GetxController {
ScrollController scrollController = ScrollController(); ScrollController scrollController = ScrollController();
TextEditingController inputController = TextEditingController(); TextEditingController inputController = TextEditingController();
final RefreshController refreshController = RefreshController();
FocusNode focusNode = FocusNode(); FocusNode focusNode = FocusNode();
List<MyConfigData> genderList = []; List<MyConfigData> genderList = [];
String myUserId = ''; String myUserId = '';
@ -24,6 +26,7 @@ class World_call_outLogic extends GetxController {
int total = 0; int total = 0;
bool isMore = true; bool isMore = true;
bool loadFail = false;
bool showEmojiPanel = false; bool showEmojiPanel = false;
bool showKeyboard = false; bool showKeyboard = false;
@ -54,6 +57,7 @@ class World_call_outLogic extends GetxController {
} }
void initGerder() async { void initGerder() async {
genderList.clear();
var data1 = var data1 =
await DioManager.instance.get(url: Api.getCircleList, params: {}); await DioManager.instance.get(url: Api.getCircleList, params: {});
var bean1 = BaseResponse<ConfigBean>.fromJson( var bean1 = BaseResponse<ConfigBean>.fromJson(
@ -96,6 +100,7 @@ class World_call_outLogic extends GetxController {
} }
void loadData() async { void loadData() async {
loadFail = false;
Map<String, dynamic> params = {'page': index, 'pageSize': 20}; Map<String, dynamic> params = {'page': index, 'pageSize': 20};
List wantMeet = []; List wantMeet = [];
@ -119,17 +124,22 @@ class World_call_outLogic extends GetxController {
isLoad = false; isLoad = false;
if (index == 1) { if (index == 1) {
lists = tempLists; lists = tempLists;
} else { } else {
lists.addAll(tempLists); lists.addAll(tempLists);
refreshController.loadComplete();
scrollController.jumpTo(scrollController.offset + 20); // scrollController.jumpTo(scrollController.offset + 20);
} }
index++; index++;
} else { } else {
isMore = false; isMore = false;
refreshController.refreshCompleted();
} }
update();
} else if (bean1.code == 404) {
loadFail = true;
update(); update();
} }
} }

25
circle_app/lib/app/world_call_out/view.dart
View File

@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:gradient_borders/box_borders/gradient_box_border.dart'; import 'package:gradient_borders/box_borders/gradient_box_border.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import '../../common/Widgets/circle_share.dart'; import '../../common/Widgets/circle_share.dart';
import '../../common/Widgets/tag_widget.dart'; import '../../common/Widgets/tag_widget.dart';
@ -17,14 +18,14 @@ import '../../router/app_routers.dart';
import '../circle/widgets/video_item.dart'; import '../circle/widgets/video_item.dart';
import 'logic.dart'; import 'logic.dart';
class World_call_outPage extends StatefulWidget { class WorldCallOutPage extends StatefulWidget {
World_call_outPage({Key? key}) : super(key: key); WorldCallOutPage({Key? key}) : super(key: key);
@override @override
State<World_call_outPage> createState() => _World_call_outPageState(); State<WorldCallOutPage> createState() => _WorldCallOutPageState();
} }
class _World_call_outPageState extends State<World_call_outPage> class _WorldCallOutPageState extends State<WorldCallOutPage>
with WidgetsBindingObserver { with WidgetsBindingObserver {
String zeroWidthSpace = '\ufeff'; String zeroWidthSpace = '\ufeff';
@ -145,11 +146,17 @@ class _World_call_outPageState extends State<World_call_outPage>
logic.update(); logic.update();
// logic.sendTextMessage(); // logic.sendTextMessage();
}, },
child: RefreshIndicator( child:
onRefresh: () async { SmartRefresher(
logic.loadMore(); controller: logic.refreshController,
}, onLoading: () {
child: logic.lists.isEmpty logic.loadMore();
},
enablePullUp: true,
child:logic.loadFail ? noResultWidget(tip: '',callBack: () {
logic.initGerder();
logic.loadData();
}) : logic.lists.isEmpty
? !logic.isMore ? !logic.isMore
? noResultWidget() ? noResultWidget()
: loaddingWidget(true) : loaddingWidget(true)

2
circle_app/lib/common/Widgets/RechargeScreenDialog.dart
View File

@ -343,7 +343,7 @@ class _RechargeScreenDialogState extends State<RechargeScreenDialog> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
'充值金额仅限APP使用，充值遇到问题？', '充值遇到问题？',
style: TextStyle( style: TextStyle(
color: const Color(0xFFB7BECC), fontSize: 10.0.sp), color: const Color(0xFFB7BECC), fontSize: 10.0.sp),
), ),

64
circle_app/lib/common/Widgets/base_tip_widget.dart
View File

@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:circle_app/common/Widgets/add_wx_tip.dart'; import 'package:circle_app/common/Widgets/add_wx_tip.dart';
import 'package:circle_app/common/colors/app_color.dart';
import 'package:circle_app/util/paymentUtil.dart'; import 'package:circle_app/util/paymentUtil.dart';
import 'package:circle_app/util/util.dart'; import 'package:circle_app/util/util.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -32,7 +33,8 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
children: [ children: [
Container( Container(
width: 339.sp, width: 339.sp,
height: 400.sp, height: Platform.isIOS ? 380.sp :420.sp ,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
@ -73,13 +75,13 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
color: const Color.fromRGBO(247, 250, 250, 0.8), color: const Color.fromRGBO(247, 250, 250, 0.8),
fontSize: 14.sp)), fontSize: 14.sp)),
)), )),
Platform.isIOS Platform.isIOS
? Container( ? Container(
height: 1, height: 1,
width: 1, width: 1,
) )
: Positioned( : Positioned(
bottom: 108.sp, bottom: 128.sp,
child: Container( child: Container(
margin: EdgeInsets.only(top: 24.0.sp), margin: EdgeInsets.only(top: 24.0.sp),
child: Row( child: Row(
@ -161,35 +163,41 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
), ),
), ),
Positioned( Positioned(
bottom: 18.sp, bottom: 8.sp,
child: GestureDetector( child: Column(
behavior: HitTestBehavior.opaque, children: [
onTap: () { GestureDetector(
if (Platform.isIOS) { behavior: HitTestBehavior.opaque,
IOSPayment.instance.iosPay(iosItem, cicleId, 1); onTap: () {
} else { if (Platform.isIOS) {
unlockingPayment(cicleId, myCallback); IOSPayment.instance.iosPay(iosItem, cicleId, 1);
} else {
unlockingPayment(cicleId, myCallback);
} }
}, },
child: Container( child: Container(
width: 168.sp, width: 168.sp,
height: 42.sp, height: 42.sp,
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(21.sp), borderRadius: BorderRadius.circular(21.sp),
gradient: const LinearGradient( gradient: const LinearGradient(
begin: Alignment.centerLeft, begin: Alignment.centerLeft,
end: Alignment.centerRight, end: Alignment.centerRight,
colors: [Color(0xff0AFCFF), Color(0xffD739EA)])), colors: [Color(0xff0AFCFF), Color(0xffD739EA)])),
child: Text( child: Text(
'立即解锁', '立即解锁',
style: TextStyle(color: Colors.white, fontSize: 16.sp), style: TextStyle(color: Colors.white, fontSize: 16.sp),
),
),
), ),
), SizedBox(height: 10.sp,),
Text('一次解锁 · 永久有效',style: TextStyle(color: AppColor.mainColor,fontSize: 15.sp),)
],
)), )),
Positioned( Positioned(
bottom: 72.sp, bottom: 90.sp,
child: Row( child: Row(
children: [ children: [
Text( Text(

26
circle_app/lib/common/Widgets/today_people_dialog.dart
View File

@ -5,9 +5,11 @@ import 'package:get/get.dart';
import 'package:gradient_borders/gradient_borders.dart'; import 'package:gradient_borders/gradient_borders.dart';
import '../../app/circle/widgets/discover.dart'; import '../../app/circle/widgets/discover.dart';
import '../../app/userinfo/logic.dart';
import '../../network/api.dart'; import '../../network/api.dart';
import '../../network/dio_manager.dart'; import '../../network/dio_manager.dart';
import '../../router/app_routers.dart'; import '../../router/app_routers.dart';
import '../../util/SharedPreferencesHelper.dart';
import '../../util/util.dart'; import '../../util/util.dart';
import '../colors/app_color.dart'; import '../colors/app_color.dart';
import 'dart:math' as math; import 'dart:math' as math;
@ -26,20 +28,40 @@ class _TodayPeopleDialogState extends State<TodayPeopleDialog> {
List<String> chatImIdList = []; List<String> chatImIdList = [];
bool isLoad = true; bool isLoad = true;
List<AlbumListItem> imgList = [];
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
fetchMyAlbum(Api.getMyAlbum);
// loadRecommendCircleFriendData();
}
Future<void> fetchMyAlbum(String url) async {
var myAlbumData = await DioManager.instance.get(url: url);
var myAlbumBean = BaseResponse<AlbumResponseBean>.fromJson(
myAlbumData, (myAlbumData) => AlbumResponseBean.fromJson(myAlbumData));
if (myAlbumBean.isSuccess()) {
imgList.addAll(myAlbumBean.data.lists);
}
loadRecommendCircleFriendData(); loadRecommendCircleFriendData();
} }
void loadRecommendCircleFriendData() async { void loadRecommendCircleFriendData() async {
var data = await DioManager.instance.get( var data = await DioManager.instance.get(
url: Api.chatRecommendFriend, url: Api.chatRecommendFriend,
); );
if (data['code'] == 200) { if (data['code'] == 200) {
SharedPreferencesHelper sp = await SharedPreferencesHelper.getInstance();
if (await sp.isShowMatch() && imgList.isEmpty) {
showOKToast('上传真实头像和形象照后更容易匹配到想认识的人哦~');
}
isLoad = false; isLoad = false;
List dataList = data['data']; List dataList = data['data'];
if (dataList.isNotEmpty) { if (dataList.isNotEmpty) {
@ -47,6 +69,8 @@ class _TodayPeopleDialogState extends State<TodayPeopleDialog> {
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
} else {
Get.back();
} }
} else { } else {
if (widget.isShow) { if (widget.isShow) {

66
circle_app/lib/common/const.dart
View File

@ -19,6 +19,72 @@ const bgAssetImage = DecorationImage(
const bgBoxDecoration = BoxDecoration(image: bgAssetImage); const bgBoxDecoration = BoxDecoration(image: bgAssetImage);
userWxStatusWidget(bool isUnclock,String wx,String userId,int type,String avatarUrl,Function callBack,{bool isSelf = false}) {
double textWidth = boundingTextSize(Get.context!, wx, TextStyle(color: Colors.white, fontSize: 12.sp)).width;
return GestureDetector(
onTap: () async {
if (!isUnclock) {
var result = await DioManager().post(url: Api.unlockStatus,params: {'targetUserId':userId});
if (result['code'] == 200) {
int price = result['data']['unlockPrice'];
int residueUnlockNum = result['data']['residueUnlockNum'];
if (price > 0 && (residueUnlockNum == -1 || residueUnlockNum > 0)) {
Get.bottomSheet(UnlockWxTip(userId, avatarUrl,false),isScrollControlled: true,enableDrag: false).then((value) {if (value != null) {
callBack();
}});
} else if (price > 0) {
Get.bottomSheet(UnlockWxTip(userId, avatarUrl,true),isScrollControlled: true,enableDrag: false).then((value) {if (value != null) {
callBack();
}});
} else {
var result = await DioManager().post(url: Api.unlockWx,params: {'targetUserId':userId});
if (result['code'] == 200) {
showOKToast('已成功解锁TA的联系方式，快去和TA私聊呗～');
callBack();
} else {
Get.bottomSheet(UnlockWxTip(userId, avatarUrl,true),isScrollControlled: true,enableDrag: false).then((value) {if (value != null) {
callBack();
}});
}
}
}
} else {
if (!isSelf) {
// Clipboard.setData(ClipboardData(text: wx));
// showToast('联系方式复制成功');
} else {
showAddWxPicker(wx.isNotEmpty).then((value) {
if (value != null) {
callBack();
}
});
}
}
},
child: Container(
height: 26.sp,
width: (isUnclock ? 32.sp : 43.sp) + textWidth,
padding: EdgeInsets.only(left: 5.sp,right: 5.sp),
decoration: BoxDecoration(
color: Color(0x66000000),
borderRadius: BorderRadius.circular(4.sp)
),
child: Row(
children: [
Image.asset(getMineImage(type == 1 ? 'phone_icon' : type == 3 ? 'qq' : 'wx'),width: 14.sp,),
SizedBox(width: 2.sp,),
Text(wx,style: TextStyle(color: Colors.white,fontSize: 12.sp),),
if (!isUnclock)
Image.asset(getDisCoverImage('unclock_icon'),width: 16.sp,)
],
),
),
);
}
wxStatusWidget(bool isUnclock,String wx,String userId,int type,String avatarUrl,Function callBack,{bool isSelf = false}) { wxStatusWidget(bool isUnclock,String wx,String userId,int type,String avatarUrl,Function callBack,{bool isSelf = false}) {
double textWidth = boundingTextSize(Get.context!, wx, TextStyle(color: Colors.white, fontSize: 14.sp)).width; double textWidth = boundingTextSize(Get.context!, wx, TextStyle(color: Colors.white, fontSize: 14.sp)).width;
return GestureDetector( return GestureDetector(

6
circle_app/lib/main.dart
View File

@ -371,6 +371,10 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
duration: const Duration(seconds: 2), duration: const Duration(seconds: 2),
child: GetMaterialApp( child: GetMaterialApp(
title: '微乐园', title: '微乐园',
theme: ThemeData(
splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
),
initialBinding: SplashBinding(), initialBinding: SplashBinding(),
getPages: AppPages.routes, getPages: AppPages.routes,
@ -379,7 +383,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
GlobalMaterialLocalizations.delegate, GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate, GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
RefreshLocalizations.delegate,
/// iOS一定要设置，不然报错 /// iOS一定要设置，不然报错
], ],
locale: const Locale('zh', 'CN'), locale: const Locale('zh', 'CN'),

4
circle_app/lib/network/dio_manager.dart
View File

@ -42,8 +42,8 @@ class DioManager {
_dio ??= Dio(BaseOptions( _dio ??= Dio(BaseOptions(
// baseUrl2 // baseUrl2
baseUrl: baseUrl:
Api.baseUrl2, // Api.baseUrl2,
// Api.baseUrl, Api.baseUrl,
// type == 1 ? Api.baseUrl2 : Api.baseUrl1, // type == 1 ? Api.baseUrl2 : Api.baseUrl1,
// 连接服务器超时时间，单位是毫秒 // 连接服务器超时时间，单位是毫秒

23
circle_app/lib/util/SharedPreferencesHelper.dart
View File

@ -21,6 +21,8 @@ class SharedPreferencesHelper {
static const msgTip = 'msgTip'; static const msgTip = 'msgTip';
static const FirstMatch = 'FirstMatch';
static SharedPreferencesHelper? _instance; static SharedPreferencesHelper? _instance;
static SharedPreferences? _preferences; static SharedPreferences? _preferences;
@ -81,6 +83,27 @@ class SharedPreferencesHelper {
} }
Future<bool> isShowMatch() async {
String time = await preferences!.getString(FirstMatch) ?? '';
if (time.isNotEmpty) {
DateTime dateTime = DateTime.parse(time);
bool isShow = !isSameDay(dateTime,DateTime.now());
if (isShow) {
preferences!.setString(FirstMatch, DateTime.now().toString());
}
return isShow;
} else {
preferences!.setString(FirstMatch, DateTime.now().toString());
}
return true;
}
bool isSameDay(DateTime time1, DateTime time2) {
return time1.year == time2.year &&
time1.month == time2.month &&
time1.day == time2.day;
}
bool? getBool(String key) { bool? getBool(String key) {
final prefs = preferences; final prefs = preferences;
return prefs?.getBool(key); return prefs?.getBool(key);

2
circle_app/lib/util/paymentUtil.dart
View File

@ -74,7 +74,7 @@ class IOSPayment {
List<PurchaseDetails> purchaseDetailsList) async { List<PurchaseDetails> purchaseDetailsList) async {
for (final PurchaseDetails purchaseDetails in purchaseDetailsList) { for (final PurchaseDetails purchaseDetails in purchaseDetailsList) {
if (purchaseDetails.status == PurchaseStatus.pending) { if (purchaseDetails.status == PurchaseStatus.pending) {
SmartDialog.showLoading(msg: '正在处理'); SmartDialog.showLoading(msg: '请稍等片刻');
} else { } else {
if (purchaseDetails.status == PurchaseStatus.error) { if (purchaseDetails.status == PurchaseStatus.error) {
showOKToast('支付发生错误'); showOKToast('支付发生错误');

24
circle_app/lib/util/util.dart
View File

@ -35,6 +35,7 @@ import '../app/home/logic.dart';
import '../app/select_circle/logic.dart'; import '../app/select_circle/logic.dart';
import '../common/Widgets/open_vip_tip/view.dart'; import '../common/Widgets/open_vip_tip/view.dart';
import '../common/Widgets/wx_edit_dialog.dart'; import '../common/Widgets/wx_edit_dialog.dart';
import '../common/colors/app_color.dart';
import '../network/dio_manager.dart'; import '../network/dio_manager.dart';
import 'SharedPreferencesHelper.dart'; import 'SharedPreferencesHelper.dart';
@ -108,7 +109,7 @@ loaddingWidget(bool isMore,{String tip = '--到底了--'}) {
); );
} }
noResultWidget({String tip = '正在等待被填充~'}) { noResultWidget({String tip = '正在等待被填充~',Function? callBack, String action = '重新加载'}) {
return Container( return Container(
width: Get.width, width: Get.width,
child: Column( child: Column(
@ -121,10 +122,31 @@ noResultWidget({String tip = '正在等待被填充~'}) {
SizedBox( SizedBox(
height: 8.sp, height: 8.sp,
), ),
if (callBack == null || tip.isNotEmpty)
Text( Text(
tip, tip,
style: TextStyle(color: Color(0xffdbdbdb), fontSize: 15.sp), style: TextStyle(color: Color(0xffdbdbdb), fontSize: 15.sp),
), ),
if (callBack != null)
GestureDetector(
onTap: () {
callBack();
},
child: Container(
margin: EdgeInsets.only(top: 10.sp),
height: 42.sp,
width: 160.sp,
alignment: Alignment.center,
// padding: EdgeInsets.only(left: 4.sp,right: 4.sp),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.sp),
gradient: AppColor.mainVerLinearGradient),
child: Text(
action,
style: TextStyle(color: Colors.white, fontSize: 14.sp),
),
),
)
], ],
), ),
); );

12
circle_app/pubspec.lock
View File

@ -45,10 +45,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: app_settings name: app_settings
sha256: e6a34735d4ddb24ca9c5fd7e965ec65c8b611cbd3a329152c294f9e9f4bacb33 sha256: "2ec421f375d747916c4c0193933567074ea60c4f01c4a68642f07fef1002524e"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.1" version: "4.0.4"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@ -630,14 +630,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.3" version: "1.1.3"
flutter_install_app:
dependency: "direct main"
description:
name: flutter_install_app
sha256: "9b117006d17c900e671c26bcbc9b15c7b8efd15d6f9b4442ad5d576de20fab53"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
flutter_intl: flutter_intl:
dependency: "direct main" dependency: "direct main"
description: description:

4
circle_app/pubspec.yaml
View File

@ -90,7 +90,7 @@ dependencies:
fluwx: ^3.8.1+1 fluwx: ^3.8.1+1
event_bus: ^2.0.0 event_bus: ^2.0.0
#安装apk #安装apk
flutter_install_app: 1.3.0 # flutter_install_app: 1.3.0
#闪屏页 #闪屏页
flutter_native_splash: 2.2.16 flutter_native_splash: 2.2.16
#腾讯离线推送 #腾讯离线推送
@ -112,7 +112,7 @@ dependencies:
#边框渐变 #边框渐变
gradient_borders: ^1.0.0 gradient_borders: ^1.0.0
#系统设置 安卓4.3.1 苹果4.0.4 #系统设置 安卓4.3.1 苹果4.0.4
app_settings: 4.3.1 app_settings: 4.0.4
#百度定位插件 #百度定位插件
flutter_bmflocation: ^3.6.0 flutter_bmflocation: ^3.6.0