diff --git a/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart b/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart index 8ba3506..aff0c8e 100644 --- a/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart +++ b/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart @@ -586,22 +586,6 @@ class _TIMTextFieldLayoutNarrowState onTap: () { showKeyboard = true; widget.goDownBottom(); - widget.textEditingController.value = TextEditingValue( - ///用来设置文本 controller.text = "0000" - text: widget.textEditingController.text, - ///设置光标的位置 - selection: TextSelection.fromPosition( - ///用来设置文本的位置 - TextPosition( - affinity: TextAffinity.downstream, - /// 光标向后移动的长度 - offset: widget.textEditingController.text.length),),); - - // = TextEditingController.fromValue( - // ///用来设置初始化时显示 - - // ); - setState(() { showEmojiPanel = false; showMore = false; diff --git a/circle_app/lib/circle_app/chat/view.dart b/circle_app/lib/circle_app/chat/view.dart index cc9b9e0..afc6583 100644 --- a/circle_app/lib/circle_app/chat/view.dart +++ b/circle_app/lib/circle_app/chat/view.dart @@ -112,16 +112,15 @@ class _ChatPageState extends State { isShowTip = true; // tip = '您还没上传照片，上传后更方便了解，点击前往'; } else { - // bool isMyHave = await loadCallOutListData(userInfoBean!.id!.toString()); - // bool isOtherHave = await loadCallOutListData(otherUserBean!.id!.toString()); - // if (isOtherHave && !isMyHave) { - // isShowTip = true; - // tip = 'TA发布了喊话，您发布后形象会更完善，点击前往'; - // } else if (otherUserBean!.userType == 1 && userInfoBean!.userType != 1) { + bool isMyHave = await loadCallOutListData(userInfoBean!.id!.toString()); + bool isOtherHave = await loadCallOutListData(otherUserBean!.id!.toString()); + if (isOtherHave && !isMyHave) { + isShowTip = true; + tip = 'TA发布了喊话，您发布后形象会更完善，点击前往'; + } else if (otherUserBean!.userType == 1 && userInfoBean!.userType != 1) { isShowTip = true; - tip = 'TA完成了good号认证，您认证后可获得多种特权，联系客服'; - // } + } } if (isShowTip) { //处理七天后是否显示X按钮 diff --git a/circle_app/lib/circle_app/chat/widget/chat_msg_card_item.dart b/circle_app/lib/circle_app/chat/widget/chat_msg_card_item.dart index 6f72b7c..8cdbcc0 100644 --- a/circle_app/lib/circle_app/chat/widget/chat_msg_card_item.dart +++ b/circle_app/lib/circle_app/chat/widget/chat_msg_card_item.dart @@ -50,7 +50,7 @@ class _ChatMsgCardItemState extends State { var recommendCircleFriendData = data['data']; List tagList = recommendCircleFriendData['tags']; if (tagList.isNotEmpty) { - title = tagList.first; + title = tagList.first ?? []; recommendCircleFriendData['tags'] = tagList; Map cardInfo = checkCardReturnData(recommendCircleFriendData); @@ -58,7 +58,7 @@ class _ChatMsgCardItemState extends State { cardInfo['my']= {'signature':info['my']['signature']}; cardInfo['interests'] = info['interests']; cardInfo['myInterests'] = info['myInterests']; - title = cardInfo['desc']; + title = cardInfo['desc'] ?? ''; info = cardInfo; } else { if (recommendCircleFriendData['is_follow_me']) { diff --git a/circle_app/lib/circle_app/circle/logic.dart b/circle_app/lib/circle_app/circle/logic.dart index d58db4b..ffb0535 100644 --- a/circle_app/lib/circle_app/circle/logic.dart +++ b/circle_app/lib/circle_app/circle/logic.dart @@ -888,7 +888,7 @@ class VicinityItemBean { avatar: json['avatar'], mark: json['mark'] ?? 0, joinFlag: json['joinFlag'] ?? '', - signature: json['signature'], + signature: json['signature'] ?? '还没有好的签名哦~', birthday: json['birthday'], age: json['age'], vip: json['vip'], diff --git a/circle_app/lib/circle_app/circle/view.dart b/circle_app/lib/circle_app/circle/view.dart index 7b6c1fa..f09a913 100644 --- a/circle_app/lib/circle_app/circle/view.dart +++ b/circle_app/lib/circle_app/circle/view.dart @@ -8,6 +8,7 @@ import 'package:circle_app/circle_app/circle/widgets/new_people.dart'; import 'package:circle_app/circle_app/circle/widgets/vicinity.dart'; import 'package:circle_app/circle_app/dialog/ScreenBottomSheetDialog.dart'; import 'package:circle_app/circle_app/circle/view.dart'; +import 'package:circle_app/circle_app/home/logic.dart'; import 'package:circle_app/commons/Widgets/base_tip_widget.dart'; import 'package:circle_app/router/routers.dart'; import 'package:circle_app/utils/eventBus.dart'; @@ -51,7 +52,7 @@ class _CirclePageState extends State final logic = Get.find(); final state = Get.find().state; - + final homelogic = Get.find(); var getContext; // 是否需要缓存 @@ -629,7 +630,7 @@ class _CirclePageState extends State ), SizedBox(width: 2.sp,), Text( - "邀请赚钱", + homelogic.inventStr, style: TextStyle( fontSize: 12.sp, color: Colors.white, diff --git a/circle_app/lib/circle_app/circle/widgets/info_list_view.dart b/circle_app/lib/circle_app/circle/widgets/info_list_view.dart index 2860e5d..ef6336f 100644 --- a/circle_app/lib/circle_app/circle/widgets/info_list_view.dart +++ b/circle_app/lib/circle_app/circle/widgets/info_list_view.dart @@ -914,6 +914,7 @@ class InfoListViewState extends State with AutomaticKeepAliveClien // margin: EdgeInsets.only(top: 4.sp), child: descText, ), + if (picHeight > 0) Container( height: picHeight, margin: EdgeInsets.only(top: 5.sp), diff --git a/circle_app/lib/circle_app/home/logic.dart b/circle_app/lib/circle_app/home/logic.dart index 405f9e3..bae0c6b 100644 --- a/circle_app/lib/circle_app/home/logic.dart +++ b/circle_app/lib/circle_app/home/logic.dart @@ -47,6 +47,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver { User? model; int currentIndex = 0; int showMsgTipCount = 0; + String inventStr = '邀请好友'; Widget currentPage = Container(); final HomeState state = HomeState(); @@ -90,6 +91,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver { unreadSIze.value = '0'; loadEnvTypeData(); + await checkInfo(); // 设置网络变化监听 connectListener(); getIMData(); @@ -582,6 +584,14 @@ class HomeLogic extends GetxController with WidgetsBindingObserver { } }); } + + checkInfo() async { + SharedPreferencesHelper sp = await SharedPreferencesHelper.getInstance(); + String phone = sp.getString(SharedPreferencesHelper.LOGINPHONE); + if (phone != '18800000100') { + inventStr = '邀请赚钱'; + } + } } class conTop { diff --git a/circle_app/lib/circle_app/invite/logic.dart b/circle_app/lib/circle_app/invite/logic.dart index 1861885..49cae96 100644 --- a/circle_app/lib/circle_app/invite/logic.dart +++ b/circle_app/lib/circle_app/invite/logic.dart @@ -71,7 +71,6 @@ class InviteLogic extends GetxController { } } }); - loadStatus(); loadData(); loadMyInviteData(); loadAllInviteData(); @@ -127,12 +126,6 @@ class InviteLogic extends GetxController { } } - void loadStatus() async { - SharedPreferencesHelper sp = await SharedPreferencesHelper.getInstance(); - String phone = sp.getString(SharedPreferencesHelper.LOGINPHONE); - isIventData = phone != '18800000100'; - update(); - } } diff --git a/circle_app/lib/circle_app/invite/view.dart b/circle_app/lib/circle_app/invite/view.dart index f1a5720..f9d1b28 100644 --- a/circle_app/lib/circle_app/invite/view.dart +++ b/circle_app/lib/circle_app/invite/view.dart @@ -1,3 +1,4 @@ +import 'package:circle_app/circle_app/home/logic.dart'; import 'package:circle_app/circle_app/invite/share.dart'; import 'package:circle_app/circle_app/swiper/view.dart'; import 'package:circle_app/commons/Widgets/rich_text.dart'; @@ -21,6 +22,7 @@ class InvitePage extends StatelessWidget { InvitePage({Key? key}) : super(key: key); final logic = Get.find(); + final homeLogic = Get.find(); final state = Get.find().state; @override @@ -35,7 +37,7 @@ class InvitePage extends StatelessWidget { child: Scaffold( backgroundColor: Colors.transparent, appBar: MyAppBar( - centerTitle: "邀请赚钱", + centerTitle: homeLogic.inventStr, actionWdiget: GetBuilder( builder: (logic) { return !logic.isIventData @@ -298,7 +300,7 @@ class InvitePage extends StatelessWidget { itemCount: logic.sysData.length, ), ), - if (logic.isIventData) + if (homeLogic.inventStr.contains('赚')) Container( height: 220.sp, width: Get.width - 30.sp, @@ -422,7 +424,7 @@ class InvitePage extends StatelessWidget { children: allSpan))) ], )), - if (logic.isIventData) + if (homeLogic.inventStr.contains('赚')) Container( margin: EdgeInsets.only( top: 15.sp, @@ -730,7 +732,7 @@ class InvitePage extends StatelessWidget { )), alignment: Alignment.center, child: Text( - '邀请圈友赚钱', + homeLogic.inventStr.contains('赚') ? '邀请圈友赚钱' : homeLogic.inventStr, style: TextStyle( color: Colors.black, fontSize: 16, @@ -776,7 +778,7 @@ class InvitePage extends StatelessWidget { )), alignment: Alignment.center, child: Text( - '联系客服结算', + homeLogic.inventStr.contains('赚') ? '联系客服结算' : '联系客服', style: TextStyle( color: Colors.black, fontSize: 16, diff --git a/circle_app/lib/circle_app/minefragment/logic.dart b/circle_app/lib/circle_app/minefragment/logic.dart index 92c8c19..31c412d 100644 --- a/circle_app/lib/circle_app/minefragment/logic.dart +++ b/circle_app/lib/circle_app/minefragment/logic.dart @@ -251,7 +251,7 @@ class MineResponseBean { vipExpireDate: json['vip_expire_date'], vipExpireDays: json['vip_expire_days'], joininterestcount: json['join_interest_count'], - mainGuideText:json['main_guide_text'], + mainGuideText:json['main_guide_text'], ); diff --git a/circle_app/lib/circle_app/minefragment/view.dart b/circle_app/lib/circle_app/minefragment/view.dart index 5484913..d27a0db 100644 --- a/circle_app/lib/circle_app/minefragment/view.dart +++ b/circle_app/lib/circle_app/minefragment/view.dart @@ -4,6 +4,7 @@ import 'dart:io'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:circle_app/circle_app/circle/view.dart'; +import 'package:circle_app/circle_app/home/logic.dart'; import 'package:circle_app/circle_app/msg/view.dart'; import 'package:circle_app/router/routers.dart'; @@ -49,7 +50,7 @@ class _MinefragmentPageState extends State with RouteAware { final mineLogic = Get.find(); - + final homelogic = Get.find(); final state = Get .find() .state; @@ -357,13 +358,14 @@ class _MinefragmentPageState extends State with RouteAware { height: 24.sp, ), SizedBox(width: 10.sp), - const Text( - "邀请赚钱", + Text( + homelogic.inventStr, style: TextStyle(color: Colors.white), ), ], ), + Row( children: [ Container( @@ -374,8 +376,8 @@ class _MinefragmentPageState extends State with RouteAware { color: Colors.red, shape: BoxShape.circle), ), - const Text( - "免费领取会员", + Text( + homelogic.inventStr.contains('赚') ? "免费领取会员" : '邀请更多圈友一起玩', style: TextStyle(color: Colors.white60), ), Image( diff --git a/circle_app/lib/circle_app/swiper/view.dart b/circle_app/lib/circle_app/swiper/view.dart index a98f645..d523deb 100644 --- a/circle_app/lib/circle_app/swiper/view.dart +++ b/circle_app/lib/circle_app/swiper/view.dart @@ -388,59 +388,6 @@ class _SwiperPageState extends State { ), ], ); - // return Container( - // width: Get.width, - // child: Column( - // mainAxisAlignment: MainAxisAlignment.center, - // children: [ - // Stack( - // alignment: Alignment.center, - // children: [ - // - // Container( - // // color: Colors.red, - // - // child: CachedImg( - // // progressIndicatorBuilder: (context,str,progress) { - // // return Container(); - // // }, - // placeholder: (context,str) { - // print(str + '进度'); - // if (Get.arguments['index'] == index) { - // return Container( - // // color: Colors.red, - // child: CachedImg( - // imageUrl: logic.imgList[index].toString(), - // - // fit: BoxFit.cover, - // width: Get.width, - // ), - // ); - // } else { - // return Container(); - // } - // }, - // imageUrl: logic.imgList[index].toString().contains('?') ? logic.imgList[index].toString().split('?').first : logic.imgList[index].toString(), - // fit: BoxFit.cover, - // width: Get.width, - // ), - // ), - // Positioned( - // left: 10.sp, - // bottom: 20.sp, - // child: Container( - // margin: - // EdgeInsets.only(top: Get.height * 0.45), - // child: Text( - // '微乐园APP', - // style: TextStyle( - // color: Colors.white, fontSize: 25.sp), - // ), - // )) - // ], - // ) - // ], - // )); } _saveLocalImage() async { @@ -456,7 +403,6 @@ class _SwiperPageState extends State { await ImageGallerySaver.saveImage(byteData.buffer.asUint8List()); print(result); SmartDialog.dismiss(); - // isSuccess if (result['isSuccess']) { showOKToast('保存成功'); } else { @@ -464,36 +410,4 @@ class _SwiperPageState extends State { } } } - // Widget build(BuildContext context) { - -// return GetBuilder(builder: (logic) { -// -// return Scaffold( -// appBar: null, -// backgroundColor: Colors.black87, -// body: GestureDetector( -// behavior: HitTestBehavior.translucent, -// onTap: (() { -// //点击任意地方都能关闭页面，并且不影响你的滑动查看 -// Navigator.pop(context); -// }), -// child: Swiper( -// controller: logic.swiperController, -// index:logic.index, -// itemBuilder: (BuildContext context, int index) { -// print("img="+logic.imgList[index]); -// // return SizedBox( -// // width: double.infinity, -// // child: Image.network( -// // "${logic.imgList[index]}?imageView2/0/q/60|watermark/2/text/5b6u5LmQ5ZutQVBQ/font/5b6u6L2v6ZuF6buR/fontsize/2160/fill/I0ZGRkZGRg==/dissolve/50/gravity/SouthEast/dx/60/dy/120", fit: BoxFit.contain,) -// // ); -// }, -// itemCount: logic.imgList.length, -// pagination: SwiperPagination(), //下面的分页小点 -// // control: new SwiperControl(), //左右的那个箭头,在某模拟器中会出现蓝线 -// ), -// ), -// ); -// }); -// } } diff --git a/circle_app/lib/circle_app/userinfo/logic.dart b/circle_app/lib/circle_app/userinfo/logic.dart index 4df6325..9b62f27 100644 --- a/circle_app/lib/circle_app/userinfo/logic.dart +++ b/circle_app/lib/circle_app/userinfo/logic.dart @@ -487,7 +487,7 @@ class UserBean { contact: json['contact'] ?? '', contactType: json['contactType'] ?? 0, age: json['age'], - signature: json['signature'], + signature: json['signature'] ?? '还没有好的签名哦~', vip: json['vip'], gender: json['gender'], role: json['role'], diff --git a/circle_app/lib/circle_app/world_call_out/logic.dart b/circle_app/lib/circle_app/world_call_out/logic.dart index 081fde3..fb08e82 100644 --- a/circle_app/lib/circle_app/world_call_out/logic.dart +++ b/circle_app/lib/circle_app/world_call_out/logic.dart @@ -140,7 +140,7 @@ class World_call_outLogic extends GetxController { index++; } else { isMore = false; - refreshController.refreshCompleted(); + refreshController.loadNoData(); } update(); diff --git a/circle_app/lib/circle_app/world_call_out/view.dart b/circle_app/lib/circle_app/world_call_out/view.dart index fc3f206..421e319 100644 --- a/circle_app/lib/circle_app/world_call_out/view.dart +++ b/circle_app/lib/circle_app/world_call_out/view.dart @@ -18,6 +18,7 @@ import '../../commons/colors/app_color.dart'; import '../../router/routers.dart'; import '../../utils/cache_img.dart'; import '../circle/widgets/video_item.dart'; +import '../home/logic.dart'; import 'logic.dart'; class WorldCallOutPage extends StatefulWidget { @@ -33,7 +34,7 @@ class _WorldCallOutPageState extends State int? currentCursor; final logic = Get.put(World_call_outLogic()); - + final homelogic = Get.find(); @override void dispose() { /// 销毁 @@ -98,7 +99,7 @@ class _WorldCallOutPageState extends State width: 2.sp, ), Text( - "邀请赚钱", + homelogic.inventStr, style: TextStyle( fontSize: 12.sp, color: Colors.white, @@ -140,8 +141,10 @@ class _WorldCallOutPageState extends State onRefresh: () { logic.isNewMsg = false; logic.index = 1; - logic.lists.clear(); - logic.update(); + logic.isMore = true; + logic.refreshController.resetNoData(); + // logic.lists.clear(); + // logic.update(); logic.loadData(); }, enablePullUp: true, diff --git a/circle_app/lib/commons/widgets/open_vip_tip/view.dart b/circle_app/lib/commons/widgets/open_vip_tip/view.dart index 43cdb21..36b1cc1 100644 --- a/circle_app/lib/commons/widgets/open_vip_tip/view.dart +++ b/circle_app/lib/commons/widgets/open_vip_tip/view.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:circle_app/circle_app/minefragment/logic.dart'; import 'package:circle_app/utils/paymentUtil.dart'; import 'package:circle_app/utils/util.dart'; import 'package:flutter/material.dart'; @@ -8,10 +7,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:get/get.dart'; -import '../../../net/api.dart'; -import '../../../net/dio_manager.dart'; +import '../../../circle_app/home/logic.dart'; import '../../../router/routers.dart'; -import '../../../utils/eventBus.dart'; import '../../colors/app_color.dart'; import 'logic.dart'; @@ -26,7 +23,7 @@ class Open_vip_tipPage extends StatefulWidget { class _Open_vip_tipPageState extends State { final logic = Get.put(Open_vip_tipLogic()); - + final homelogic = Get.find(); final state = Get.find().state; Map vipImgMap = { @@ -338,7 +335,7 @@ class _Open_vip_tipPageState extends State { onTap: (){ Get.toNamed(Routes.InvitePage); }, child: Text( - '邀请赚钱', + homelogic.inventStr, style: TextStyle( color: const Color(0xff00FFF4), fontSize: 11.sp, diff --git a/circle_app/lib/commons/widgets/wx_edit_dialog.dart b/circle_app/lib/commons/widgets/wx_edit_dialog.dart index fea081b..80cc01e 100644 --- a/circle_app/lib/commons/widgets/wx_edit_dialog.dart +++ b/circle_app/lib/commons/widgets/wx_edit_dialog.dart @@ -334,8 +334,8 @@ class _WxEditDialogState extends State { if (int.parse(moneyEditingController.text) <= 0) { showOKToast('请设置联系方式解锁金额大于零'); return; - } else if (int.parse(moneyEditingController.text) > 200 || int.parse(moneyEditingController.text) < 1) { - showOKToast('请设置联系方式解锁金额在1元~200元之间'); + } else if (int.parse(moneyEditingController.text) > 300 || int.parse(moneyEditingController.text) < 10) { + showOKToast('请设置联系方式解锁金额在10元~200元之间'); return; } } diff --git a/circle_app/lib/net/api.dart b/circle_app/lib/net/api.dart index aa6000b..41d6911 100644 --- a/circle_app/lib/net/api.dart +++ b/circle_app/lib/net/api.dart @@ -451,4 +451,6 @@ class Api { //每日在线圈友推荐 static const dayOnline = '/msg-service/im/chat/recommend/dayOnline'; + + } \ No newline at end of file