修改缘分匹配重复两次问题

circle_app/lib/app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart

@@ -426,7 +426,7 @@ class _TIMUIKItHistoryMessageListItemState
                       child: Column(
                         children: [
                           if (info.containsKey('city'))
-                            Container(
+                           info['city'].toString().isNotEmpty ? Container(
                               margin: EdgeInsets.only(top: 10.sp),
                               child: Row(
                                 children: [
@@ -447,7 +447,7 @@ class _TIMUIKItHistoryMessageListItemState
                                   )
                                 ],
                               ),
-                            ),
+                            ) : Container(),
                           if (info.containsKey('both_interests'))
                             Container(
 

circle_app/lib/app/circle/widgets/info_list_view.dart

@@ -275,20 +275,20 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
                                 return Container(
                                   padding: EdgeInsets.only(
                                       left: 12.sp, right: 12.sp),
-                                  height:urlList.length==0?47.sp: 118.sp,
+                                  // height:urlList.length==0?47.sp: 118.sp,
                                   decoration: BoxDecoration(
                                       image: DecorationImage(
                                           fit: BoxFit.fill,
                                           image: AssetImage(
                                               getCircleImage('circle_desc')))),
                                   child: Container(
-                                    margin: EdgeInsets.only(top: 10.sp),
+                                    margin: EdgeInsets.only(top: 10.sp,bottom: 10.sp),
                                     child: Column(
                                       children: [
                                         Container(
                                           margin: EdgeInsets.only(bottom: 7.sp),
                                           width: Get.width,
-                                          height: 50.sp,
+                                          // height: 50.sp,
                                           child:  HideText(text: widget.bean.intro,additionText: '查看更多',maxLines: 3,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () {
                                             _showTextContentDialog(
                                                 context, widget.bean.intro,widget.bean.title);

circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation.dart

@@ -328,8 +328,10 @@ class _TIMConversationState extends TIMUIKitState<TIMConversation> {
         await TencentImSDKPlugin.v2TIMManager.getLoginUser();
     if (getLoginUserRes.code == 0) {
       //获取成功
-      userIdList.insert(
+      if (getLoginUserRes.data != null) {
-          0, getLoginUserRes.data!); // getLoginUserRes.data为查询到的登录用户的UserID
+        userIdList.insert(
+            0, getLoginUserRes.data!); // getLoginUserRes.data为查询到的登录用户的UserID
+      }
     }
     //获取用户资料
     V2TimValueCallback<List<V2TimUserFullInfo>> getUsersInfoRes =

circle_app/lib/app/msg/view.dart

@@ -1,6 +1,10 @@
 import 'dart:math';
 
 import 'package:circle_app/app/circle/logic.dart';
+import 'package:circle_app/common/Widgets/open_vip_tip/view.dart';
+import 'package:circle_app/main.dart';
+import 'package:circle_app/network/api.dart';
+import 'package:circle_app/network/dio_manager.dart';
 import 'package:circle_app/router/app_routers.dart';
 import 'package:circle_app/util/util.dart';
 import 'package:flutter/material.dart';
@@ -16,7 +20,37 @@ import 'logic.dart';
 class MsgPage extends StatelessWidget {
   MsgPage({Key? key}) : super(key: key);
 
-  final logic = Get.put(MsgLogic());
+  final ctr = Get.put(MsgLogic());
+
+
+  void getPipeiData() async {
+    var data = await DioManager.instance
+        .get(url: Api.getMatch);
+    if(data['code'] == 200) {
+      //发送消息
+      bool isSuccess = await  createCustomMsg(data['data']['account_id'].toString().split('_').last,data['data']['account_id']);
+      if (!isSuccess) {
+        await sendTextMsg(data['data']['account_id']);
+      }
+    } else if(data['code'] == 21201){
+      showOKToast(data['msg']);
+      showRechargeDialog();
+    }else{
+      showOKToast(data['msg']);
+    }
+  }
+
+
+  showRechargeDialog(){
+    Get.bottomSheet(
+        Scaffold(
+          backgroundColor: Colors.transparent,
+          body: Open_vip_tipPage(true),
+        ),
+        isScrollControlled: true,
+        enableDrag: false);
+
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -37,7 +71,7 @@ class MsgPage extends StatelessWidget {
             child: GetBuilder(builder: (MsgLogic controller) {
               return Column(
                 children: [
-                  navigatorItem(),
+                  navigatorItem(controller),
                   // tipWidget(),
                   // reconmandWidget(),
                   // Text(controller.state.msg),
@@ -51,7 +85,7 @@ class MsgPage extends StatelessWidget {
     );
   }
 
-  navigatorItem() {
+  navigatorItem(MsgLogic ctr) {
     var logic = Get.find<CircleLogic>();
     String count = '0';
     if (logic != null) {
@@ -143,7 +177,7 @@ class MsgPage extends StatelessWidget {
               right: 0,
               child: GestureDetector(
                 onTap: () {
-                  logic.getPipeiData();
+                  getPipeiData();
                 },
                 child: Image.asset(
                   getMsgImage('msg_pipei'),