From 0fd0d0af9c9c1deb2ce154fc604615b066d069cb Mon Sep 17 00:00:00 2001 From: CYH <13923927013@163.com> Date: Sat, 8 Jul 2023 18:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99=E7=99=BB?= =?UTF-8?q?=E5=BD=95code=EF=BC=8C=E5=88=A4=E6=96=AD=E5=96=8A=E8=AF=9D?= =?UTF-8?q?=E7=A7=81=E8=81=8A=E6=98=AF=E5=90=A6=E4=B8=BA=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circle_app/lib/app/circle/view.dart | 3 +- .../app/circle/widgets/info_list_view.dart | 39 ++++++++++--------- circle_app/lib/network/dio_manager.dart | 2 +- .../lib/util/SharedPreferencesHelper.dart | 4 +- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/circle_app/lib/app/circle/view.dart b/circle_app/lib/app/circle/view.dart index e9dda94..de3c8fe 100644 --- a/circle_app/lib/app/circle/view.dart +++ b/circle_app/lib/app/circle/view.dart @@ -126,13 +126,14 @@ class _CirclePageState extends State ), ); } - if (logic.statistics != null) { + if (logic.statistics != null && widgets.isNotEmpty) { widgets.add(Positioned( left: 15.sp * urlList.length, child: circleWidget(logic.statistics!['visit_count'].toString()), ), ); } + return Container( width: Get.width, padding: EdgeInsets.only(left: 18.sp, right: 18.sp), diff --git a/circle_app/lib/app/circle/widgets/info_list_view.dart b/circle_app/lib/app/circle/widgets/info_list_view.dart index eaa4636..d6612b0 100644 --- a/circle_app/lib/app/circle/widgets/info_list_view.dart +++ b/circle_app/lib/app/circle/widgets/info_list_view.dart @@ -170,13 +170,22 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie } void pushMsgPage(Lists bean, String cicleId) async { - if (widget.bean.is_limit) { - showJoinCiclePiker(cicleId,widget.bean.amount.toString(),widget.bean.oldAmount.toString(),2); + + // if (widget.bean.is_limit) { + // showJoinCiclePiker(cicleId,widget.bean.amount.toString(),widget.bean.oldAmount.toString(),2); + // return; + // } + + var sp = await SharedPreferencesHelper.getInstance(); + String myUserId = sp.getMyUserId(); + if (bean.user!.id.toString().contains(myUserId)) { + showToast('无法与自己私聊'); return; } + // if () var data = await DioManager.instance.get( - url: "/up-service/callout/$circleId/chat",); + url: "/up-service/callout/${bean.id}/chat",); if (data["code"] == 200) { pushChatPage(data['data']['account_id'], bean.user!.nickname!); } @@ -523,8 +532,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie left: 12.sp * index, child: GestureDetector( onTap: () { - - pushOtherPeopleHomePage(element.id.toString()); + // pushOtherPeopleHomePage(element.id.toString()); }, child: circleWidget(element.avatar!,element.id.toString(), width: 24), ), @@ -618,10 +626,10 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie ), GestureDetector( onTap: () { - // if (widget.bean.is_limit) { - // showJoinCiclePiker(widget.bean.id.toString(),widget.bean.amount.toString(),widget.bean.oldAmount.toString(),1); - // return; - // } + if (widget.bean.is_limit) { + showJoinCiclePiker(widget.bean.id.toString(),widget.bean.amount.toString(),widget.bean.oldAmount.toString(),1); + return; + } pushHomePage(lists, lists.id.toString()); }, child: ClipOval( @@ -843,11 +851,6 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie left: 12.sp * index, child: GestureDetector( onTap: () { - // if (widget.bean.is_limit) { - // showJoinCiclePiker(widget.bean.id.toString(),widget.bean.amount.toString(),widget.bean.oldAmount.toString(),1); - // return; - // } - // pushOtherPeopleHomePage(element.id.toString()); }, child: circleWidget(element.avatar!,element.id.toString(), width: 24), ), @@ -913,10 +916,10 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie ), GestureDetector( onTap: () { - // if (widget.bean.is_limit) { - // showJoinCiclePiker(widget.bean.id.toString(),widget.bean.amount.toString(),widget.bean.oldAmount.toString(),1); - // return; - // } + if (widget.bean.is_limit) { + showJoinCiclePiker(widget.bean.id.toString(),widget.bean.amount.toString(),widget.bean.oldAmount.toString(),1); + return; + } pushHomePage( lists, widget.bean.id.toString()); }, diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart index 623c631..33f991a 100644 --- a/circle_app/lib/network/dio_manager.dart +++ b/circle_app/lib/network/dio_manager.dart @@ -203,7 +203,7 @@ class DioManager { // json转model String jsonStr = json.encode(response.data); Map responseMap = json.decode(jsonStr); - if (responseMap["code"] == 5003) { + if (responseMap["code"] == 5003 || responseMap["code"] == 30003) { pushLoginPage(); } return responseMap; diff --git a/circle_app/lib/util/SharedPreferencesHelper.dart b/circle_app/lib/util/SharedPreferencesHelper.dart index fbca91b..e9c9919 100644 --- a/circle_app/lib/util/SharedPreferencesHelper.dart +++ b/circle_app/lib/util/SharedPreferencesHelper.dart @@ -52,7 +52,9 @@ class SharedPreferencesHelper { return prefs?.getString(key) ?? ''; } - + String getMyUserId() { + return preferences?.getInt(SharedPreferencesHelper.USERID).toString() ?? ''; + } bool? getBool(String key) { final prefs = preferences;