From 4284732820a5e3d3db5346854ee10e18c67c0305 Mon Sep 17 00:00:00 2001
From: CYH <13923927013@163.com>
Date: Sun, 27 Apr 2025 17:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 circle_app/android/app/build.gradle           |    4 +-
 .../android/app/src/main/AndroidManifest.xml  |    2 +-
 .../app/src/main/res/values-night/styles.xml  |    1 +
 .../res/values/ic_launcher_background.xml     |    2 +-
 .../app/src/main/res/values/styles.xml        |    1 +
 circle_app/data/android-light-config.json     |    4 +-
 circle_app/data/ios-light-config.json         |    4 +-
 circle_app/lib/circle_app/account/view.dart   |    2 +-
 circle_app/lib/circle_app/call_out/view.dart  |    2 +-
 .../circle_app/call_out_detail/binding.dart   |   10 +
 .../lib/circle_app/call_out_detail/logic.dart |   31 +
 .../lib/circle_app/call_out_detail/view.dart  | 1411 +++++++++++
 ..._uikit_chat_history_message_list_item.dart | 1015 +++++++-
 .../tim_uikit_chat_text_elem.dart             |  234 +-
 .../circle_app/chat/widget/more_dialog.dart   |    2 +-
 circle_app/lib/circle_app/circle/view.dart    |   97 +-
 .../circle/widgets/info_list_view.dart        |   34 +-
 .../circle_app/circle/widgets/like_view.dart  |   87 +-
 .../lib/circle_app/circle_list/view.dart      |  180 +-
 .../circle_list/widgets/all_circle_item.dart  |   68 +-
 .../widgets/right_circle_iten.dart            |   34 +-
 .../lib/circle_app/help_back/logic.dart       |   34 +-
 circle_app/lib/circle_app/help_back/view.dart |    4 +-
 circle_app/lib/circle_app/home/logic.dart     |   30 +-
 circle_app/lib/circle_app/home/view.dart      |    1 +
 circle_app/lib/circle_app/invite/share.dart   |    4 +-
 .../lib/circle_app/login/login/view.dart      |   11 +-
 .../lib/circle_app/minefragment/logic.dart    |    2 +-
 .../lib/circle_app/minefragment/view.dart     |  134 +-
 circle_app/lib/circle_app/msg/logic.dart      |  131 +-
 circle_app/lib/circle_app/msg/view.dart       |  378 +--
 .../lib/circle_app/photoinfo/logic.dart       |   20 +-
 circle_app/lib/circle_app/photoinfo/view.dart |   13 +-
 circle_app/lib/circle_app/quick/view.dart     |    2 +-
 circle_app/lib/circle_app/report/logic.dart   |    5 +-
 circle_app/lib/circle_app/swiper/view.dart    |    2 +-
 circle_app/lib/circle_app/userinfo/logic.dart |   58 +-
 circle_app/lib/circle_app/userinfo/view.dart  |   95 +-
 .../circle_app/userinfo/widgets/dyanmic.dart  |    2 +-
 .../userinfo/widgets/home_call_out.dart       |    2 +-
 .../lib/circle_app/world_call_out/logic.dart  |   11 +
 .../lib/circle_app/world_call_out/view.dart   |  106 +-
 .../lib/commons/widgets/base_tip_widget.dart  |    1 -
 .../lib/commons/widgets/circle_share.dart     | 2107 +++++++++++++++--
 .../lib/commons/widgets/follow_me_dialog.dart |  576 +++++
 .../lib/commons/widgets/sign_in_dialog.dart   |    2 +-
 .../lib/commons/widgets/user_share.dart       |    4 +-
 .../commons/widgets/video_share_dialog.dart   |    4 +-
 circle_app/lib/main.dart                      |  176 +-
 circle_app/lib/net/api.dart                   |   20 +-
 circle_app/lib/net/dio_manager.dart           |    8 -
 circle_app/lib/router/pages.dart              |   13 +
 circle_app/lib/router/routers.dart            |    4 +
 .../lib/utils/SharedPreferencesHelper.dart    |    4 -
 circle_app/lib/utils/util.dart                |  358 +++
 circle_app/lib/view/notice.dart               |    5 +-
 circle_app/pubspec.yaml                       |    2 +-
 57 files changed, 6454 insertions(+), 1100 deletions(-)
 create mode 100644 circle_app/lib/circle_app/call_out_detail/binding.dart
 create mode 100644 circle_app/lib/circle_app/call_out_detail/logic.dart
 create mode 100644 circle_app/lib/circle_app/call_out_detail/view.dart

diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle
index df8a9c8..374cd03 100644
--- a/circle_app/android/app/build.gradle
+++ b/circle_app/android/app/build.gradle
@@ -71,8 +71,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
-        versionCode 109
-        versionName "2.5.9"
+        versionCode 111
+        versionName "2.6.1"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",
diff --git a/circle_app/android/app/src/main/AndroidManifest.xml b/circle_app/android/app/src/main/AndroidManifest.xml
index 1c96165..a9dd87e 100644
--- a/circle_app/android/app/src/main/AndroidManifest.xml
+++ b/circle_app/android/app/src/main/AndroidManifest.xml
@@ -66,7 +66,7 @@
 
     <application
         android:label="微乐园"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher" >
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/circle_app/android/app/src/main/res/values-night/styles.xml b/circle_app/android/app/src/main/res/values-night/styles.xml
index 53e063f..61c5839 100644
--- a/circle_app/android/app/src/main/res/values-night/styles.xml
+++ b/circle_app/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,7 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/circle_app/android/app/src/main/res/values/ic_launcher_background.xml b/circle_app/android/app/src/main/res/values/ic_launcher_background.xml
index beab31f..ab98328 100644
--- a/circle_app/android/app/src/main/res/values/ic_launcher_background.xml
+++ b/circle_app/android/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#000000</color>
+    <color name="ic_launcher_background">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/circle_app/android/app/src/main/res/values/styles.xml b/circle_app/android/app/src/main/res/values/styles.xml
index 6336307..b99341a 100644
--- a/circle_app/android/app/src/main/res/values/styles.xml
+++ b/circle_app/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/circle_app/data/android-light-config.json b/circle_app/data/android-light-config.json
index 1789dec..0340c93 100644
--- a/circle_app/data/android-light-config.json
+++ b/circle_app/data/android-light-config.json
@@ -48,8 +48,8 @@
   "isPrivacyDialogTitleBold": true,
   "isPrivacyDialogAuto": true,
   "privacyDialogSize": 14,
-  "protocolLink": "https://iquanpai.com/app-h5/4_163.html",
-  "protocol2Link": "https://iquanpai.com/app-h5/4_164.html",
+  "protocolLink": "https://sourl.cn/G6yiGJ",
+  "protocol2Link": "https://sourl.cn/X5LP5a",
   "privacyDialogTextColor": "#999999",
   "privacyDialogTitleMarginTop": 25,
   "privacyDialogContentStart": "我已阅读并同意",
diff --git a/circle_app/data/ios-light-config.json b/circle_app/data/ios-light-config.json
index d51ea9a..58e7d4e 100644
--- a/circle_app/data/ios-light-config.json
+++ b/circle_app/data/ios-light-config.json
@@ -105,9 +105,9 @@
   "appPrivacyOriginRight": 40,
   "appPrivacyText": "登录即同意《默认》并授权获得《隐私政策》和《用户隐私协议》",
   "appFPrivacyText": "《隐私政策》",
-  "appFPrivacyURL": "https://iquanpai.com/app-h5/4_164.html",
+  "appFPrivacyURL": "https://sourl.cn/G6yiGJ",
   "appSPrivacyText": "《用户隐私协议》",
-  "appSPrivacyURL": "https://iquanpai.com/app-h5/4_163.html",
+  "appSPrivacyURL": "https://sourl.cn/X5LP5a",
   "appPrivacyAlignment": 0,
   "appPrivacyOriginLeftMargin": 60,
   "appPrivacyOriginBottomMargin": 60,
diff --git a/circle_app/lib/circle_app/account/view.dart b/circle_app/lib/circle_app/account/view.dart
index 978e7eb..2cbcf23 100644
--- a/circle_app/lib/circle_app/account/view.dart
+++ b/circle_app/lib/circle_app/account/view.dart
@@ -111,7 +111,7 @@ class AccountPage extends StatelessWidget {
                     child: Row(
                       children: [
                         Text(
-                          "换绑邮箱",
+                          mineLogic.userInfoBean?.email?.isNotEmpty ?? false ?  "换绑邮箱" : '绑定邮箱',
                           style: TextStyle(
                             color: Color(0xFFF7FAFA),
                             fontSize: 16.0.sp,
diff --git a/circle_app/lib/circle_app/call_out/view.dart b/circle_app/lib/circle_app/call_out/view.dart
index e71aefa..8cff11e 100644
--- a/circle_app/lib/circle_app/call_out/view.dart
+++ b/circle_app/lib/circle_app/call_out/view.dart
@@ -568,7 +568,7 @@ class _Call_outPageState extends State<Call_outPage>  {
       child: Container(
         height: 30.sp,
         width: Get.width,
-        padding: EdgeInsets.only(left: 4.sp, right: 4.sp),
+        padding: EdgeInsets.only(left: 6.sp, right: 8.sp),
         margin: EdgeInsets.only(
           // left: 15.sp,
           bottom: 10.sp,
diff --git a/circle_app/lib/circle_app/call_out_detail/binding.dart b/circle_app/lib/circle_app/call_out_detail/binding.dart
new file mode 100644
index 0000000..3f9bb92
--- /dev/null
+++ b/circle_app/lib/circle_app/call_out_detail/binding.dart
@@ -0,0 +1,10 @@
+import 'package:get/get.dart';
+
+import 'logic.dart';
+
+class Call_out_detailBinding extends Bindings {
+  @override
+  void dependencies() {
+    Get.lazyPut(() => Call_out_detailLogic());
+  }
+}
diff --git a/circle_app/lib/circle_app/call_out_detail/logic.dart b/circle_app/lib/circle_app/call_out_detail/logic.dart
new file mode 100644
index 0000000..0fc759e
--- /dev/null
+++ b/circle_app/lib/circle_app/call_out_detail/logic.dart
@@ -0,0 +1,31 @@
+import 'package:circle_app/net/dio_manager.dart';
+import 'package:get/get.dart';
+
+import '../../net/api.dart';
+import '../circle/state.dart';
+
+class Call_out_detailLogic extends GetxController {
+    bool isOpen = false;
+    Lists? lists;
+    String id = Get.arguments['id'];
+
+
+
+    @override
+  void onInit() {
+    // TODO: implement onInit
+    super.onInit();
+    loadData();
+  }
+
+loadData() async {
+    var result = await DioManager.getInstance().get(url: Api.signInterestCalloutDetail,params: {'calloutId':id});
+    if (result['code'] == 200) {
+        lists = Lists.fromJson(result['data']);
+        update();
+    }
+
+}
+
+
+}
diff --git a/circle_app/lib/circle_app/call_out_detail/view.dart b/circle_app/lib/circle_app/call_out_detail/view.dart
new file mode 100644
index 0000000..2ea6ed6
--- /dev/null
+++ b/circle_app/lib/circle_app/call_out_detail/view.dart
@@ -0,0 +1,1411 @@
+import 'dart:convert';
+
+import 'package:circle_app/commons/Widgets/my_app_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:gradient_borders/box_borders/gradient_box_border.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../../commons/Widgets/circle_share.dart';
+import '../../commons/Widgets/tag_widget.dart';
+import '../../commons/Widgets/text_more.dart';
+import '../../commons/colors/app_color.dart';
+import '../../net/api.dart';
+import '../../net/dio_manager.dart';
+import '../../router/routers.dart';
+import '../../utils/SharedPreferencesHelper.dart';
+import '../../utils/cache_img.dart';
+import '../../utils/util.dart';
+import '../circle/logic.dart';
+import '../circle/state.dart';
+import '../circle/widgets/video_item.dart';
+import '../circle_list/widgets/right_circle_iten.dart';
+import '../home/logic.dart';
+import 'logic.dart';
+
+class Call_out_detailPage extends StatefulWidget {
+  Call_out_detailPage({Key? key}) : super(key: key);
+
+  @override
+  State<Call_out_detailPage> createState() => _Call_out_detailPageState();
+}
+
+class _Call_out_detailPageState extends State<Call_out_detailPage> {
+  HomeLogic homeLogic = Get.find<HomeLogic>();
+
+  final logic = Get.find<Call_out_detailLogic>();
+
+  OverlayEntry? _overlayEntry;
+
+  bool isShowEmoji = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<Call_out_detailLogic>(builder: (logic) {
+      return Container(
+          decoration: BoxDecoration(
+          image: DecorationImage(
+          image: AssetImage(getBaseImage("home_back")),
+      fit: BoxFit.cover,
+      ),
+      ),
+      child: Scaffold(
+      backgroundColor: Colors.transparent,
+        appBar: MyAppBar(
+          centerTitle: '喊话详情',
+        ),
+        body: logic.lists == null ? loaddingWidget(true) : Container(
+          padding: EdgeInsets.only(left: 15.sp,right: 15.sp),
+          child: Column(
+            children: [
+              logic.lists!.isQueen! ? vipDynamicItem(logic.lists!) : normalDynamicItem(logic.lists!)
+            ],
+          ),
+        )
+      ));
+    });
+  }
+
+  ///至尊喊话
+  vipDynamicItem(Lists lists) {
+    int type = (lists.topInteractType?['type'] ?? 1) - 1;
+    Widget descText = logic.isOpen
+        ? Text(
+      lists.content!,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+    )
+        : HideText(
+      text: lists.content!,
+      maxWidth: Get.currentRoute == Routes.Home
+          ? Get.width - 90.sp
+          : Get.width - 20.sp,
+      additionText: '查看更多',
+      maxLines: 10,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+      additionStyle:
+      TextStyle(color: const Color(0xFFFF4DF6), fontSize: 15.sp),
+      onTap: () {
+        logic.isOpen = true;
+        logic.update();
+      },
+    );
+
+    // List<JoinUser> urlList = bean.lastJoinUsers;
+    List<Widget> widgets = [];
+    int index = 0;
+    for (var element in lists.chat!.users!) {
+      widgets.add(Positioned(
+        left: 12.sp * index,
+        child: circleWidget(element.avatar!, element.id.toString(), width: 24),
+      ));
+      index++;
+    }
+    if (widgets.isNotEmpty) {
+      widgets.add(Positioned(
+          left: 12.sp * lists.chat!.users!.length,
+          child: Image.asset(
+            getCircleImage('more'),
+            width: 24.sp,
+          )));
+    }
+
+    double picHeight = 0.0;
+
+    if (lists.album != null) {
+      if (lists.album!.isNotEmpty) {
+        Album info = lists.album!.first;
+
+        if (info.type == 1) {
+          double picWidth = (Get.width -60.sp) /
+              3 +
+              45;
+          if (lists.album!.length > 3) {
+            picHeight = picWidth * 2;
+          } else {
+            if (lists.album!.length == 1) {
+              picHeight = 250;
+            } else {
+              picHeight = picWidth;
+            }
+          }
+        } else {
+          picHeight = 200.sp;
+        }
+      }
+    }
+
+    Widget atWidget = Container();
+
+    List<Widget> atList = [];
+    if (lists.at!.isNotEmpty) {
+      List infoList = jsonDecode(lists.at!);
+      infoList.forEach((element) {
+        atList.add(GestureDetector(
+          onTap: () {
+            Get.toNamed(Routes.UserInfoPage,
+                arguments: element['userId'].toString(),
+                preventDuplicates: false);
+          },
+          child: Container(
+            margin: EdgeInsets.only(right: 4.sp),
+            child: Text(
+              '@${element['nickName']}',
+              style: TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+            ),
+          ),
+        ));
+      });
+      atWidget = Container(
+          padding: EdgeInsets.only(bottom: 5.sp),
+          child: Row(
+            children: [
+              Wrap(
+                children: atList,
+              ),
+            ],
+          ));
+    }
+
+    // double widgetHeight = 130.sp + contentHeight(lists.content!) + picHeight;
+
+    return Container(
+        margin: EdgeInsets.only(bottom: 10.sp),
+        width: Get.width,
+        // height: widgetHeight,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage(
+                  getCircleImage('pic_bg'),
+                ))),
+        child: Stack(children: [
+          Positioned(
+            left: 0,
+            top: 2.sp,
+            height: 21.sp,
+            child: Image.asset(getCircleImage('vip_say')),
+          ),
+          Positioned(
+            right: 2.sp,
+            top: 2.sp,
+            child: Stack(
+              alignment: Alignment.center,
+              children: [
+                Container(
+                  // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
+                  padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                  alignment: Alignment.center,
+                  height: 24.sp,
+                  decoration: BoxDecoration(
+                      color: Color.fromRGBO(52, 41, 67, 1),
+                      borderRadius: BorderRadius.only(
+                          topLeft: Radius.circular(0),
+                          bottomRight: Radius.circular(0),
+                          topRight: Radius.circular(12.sp),
+                          bottomLeft: Radius.circular(12.sp))),
+                  child: Text(
+                    (lists.user!.city ?? '外星').length > 4
+                        ? (lists.user!.city ?? '外星').substring(0, 4) + '...'
+                        : (lists.user!.city ?? '外星'),
+                    style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                  ),
+                )
+              ],
+            ),
+          ),
+          Container(
+            // height: widgetHeight,
+            width: Get.width,
+            padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                SizedBox(
+                  height: 72.sp,
+                  child: Row(
+                    // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      GestureDetector(
+                          onTap: () async {
+                            var sp =
+                            await SharedPreferencesHelper.getInstance();
+                            String myUserId = sp.getMyUserId();
+
+                            Get.toNamed(Routes.UserInfoPage,
+                                arguments: lists.user?.id!.toString());
+                          },
+                          child: Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              Container(
+                                width: 60.sp,
+                                height: 50.sp,
+                              ),
+                              Container(
+                                // margin: EdgeInsets.only(top: 6.sp, ),
+                                width: 41.sp,
+                                height: 41.sp,
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(20.5.sp),
+                                  gradient: const LinearGradient(
+                                    begin: Alignment.topCenter,
+                                    end: Alignment.bottomCenter,
+                                    colors: [
+                                      Color(0xFF71F3F2),
+                                      Color(0xFFF558FF),
+                                    ],
+                                    stops: [0.0365, 0.9427],
+                                  ),
+                                ),
+                                padding: EdgeInsets.all(2.sp),
+                                child: ClipRRect(
+                                  borderRadius: BorderRadius.circular(30.sp),
+                                  child: Image.network(
+                                      lists.user!.avatar_thumb!,
+                                      width: 40.sp,
+                                      height: 40.sp,
+                                      fit: BoxFit.cover),
+                                ),
+                              ),
+                              if ((lists.user!.onlineFlag ?? '').isNotEmpty)
+                                Positioned(
+                                    bottom: 0,
+                                    child: Container(
+                                        height: 20.sp,
+                                        padding: EdgeInsets.only(
+                                            left: 4.sp, right: 4.sp),
+                                        decoration: BoxDecoration(
+                                          borderRadius:
+                                          BorderRadius.circular(10.sp),
+                                          color: AppColor.bgColor,
+                                          border: GradientBoxBorder(
+                                            gradient:
+                                            AppColor.mainVerLinearGradient,
+                                            width: 1.sp,
+                                          ),
+                                        ),
+                                        alignment: Alignment.center,
+                                        child: Text(
+                                          lists.user!.onlineFlag ?? '',
+                                          style: TextStyle(
+                                            color: const Color.fromRGBO(
+                                                247, 250, 250, 1.0),
+                                            fontSize: 10.sp,
+                                          ),
+                                        )))
+                            ],
+                          )),
+                      Expanded(
+                          child: Container(
+                            padding: EdgeInsets.only(left: 0.sp, top: 12.sp),
+                            alignment: Alignment.centerLeft,
+                            height: 72.sp,
+                            child: Column(
+                              children: [
+                                Row(
+                                  children: [
+                                    Text(
+                                      lists.user!.nickname!,
+                                      style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 18.sp,
+                                          fontWeight: FontWeight.w600),
+                                    ),
+                                    SizedBox(
+                                      width: 8.sp,
+                                    ),
+                                    UserTagWidget(lists.user!.mark!),
+                                  ],
+                                ),
+                                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),
+                                          gradient: sexBgGradient(
+                                              lists.user!.gender ?? 0)),
+                                      child: Text(
+                                        getAgeCOntent(
+                                            lists.user!.gender ?? 0,
+                                            lists.user!.age ?? 0,
+                                            lists.user!.role ?? 0,
+                                            lists.user!.orientation ?? 0),
+                                        //  '${genderList[lists.user!.gender!]}.${lists.user!.age}.${roleList[lists.user!.role!]}.${orientationList[lists.user!.orientation!]}',
+                                        style: TextStyle(
+                                          color:
+                                          sexBgColor(lists.user!.gender ?? 0),
+                                          fontSize: 12.sp,
+                                        ),
+                                      ),
+                                    )
+                                  ],
+                                ),
+                              ],
+                            ),
+                          )),
+                    ],
+                  ),
+                ),
+                atWidget,
+                Container(
+                  alignment: Alignment.topLeft,
+                  // margin: EdgeInsets.only(top: 4.sp),
+                  child: descText,
+                ),
+                Listener(
+                  child: Container(
+                    height: picHeight,
+                    margin: EdgeInsets.only(top: 5.sp),
+                    child: picHeight == 200.sp
+                        ? ClipRRect(
+                        borderRadius: BorderRadius.circular(6.sp),
+                        child: VideoItemWidget(
+                            lists.album![0].url!,
+                            lists.id!.toString(),
+                            lists.user!.id.toString()))
+                        : picHeight == 250
+                        ? GestureDetector(
+                      onTap: () async {
+                        var imgList = <String>[];
+                        for (var element in lists.album!) {
+                          imgList.add(element.url!);
+                        }
+
+                        Get.toNamed(Routes.SwiperPage, arguments: {
+                          'imaglist': imgList,
+                          'index': 0,
+                          'userId': lists.user?.id!.toString()
+                        });
+                      },
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(6.sp),
+                        child: CachedImg(
+                          imageUrl: lists.album!.first.url!,
+                          fit: BoxFit.cover,
+                        ),
+                      ),
+                    )
+                        : GridView.builder(
+                        // controller: GridScrollController,
+                        itemCount: lists.album!.length,
+                        scrollDirection: Axis.vertical,
+                        physics: const NeverScrollableScrollPhysics(),
+                        gridDelegate:
+                        SliverGridDelegateWithFixedCrossAxisCount(
+                            crossAxisCount: 3, //横轴三个子widget
+                            crossAxisSpacing: 8.sp,
+                            mainAxisSpacing: 8.sp,
+                            childAspectRatio: 0.6 //宽高比为1时，子widget
+                        ),
+                        itemBuilder: (contentxt, currentIndex) {
+                          Album album = lists.album![currentIndex];
+                          return GestureDetector(
+                            onTap: () async {
+                              var imgList = <String>[];
+                              for (var element in lists.album!) {
+                                imgList.add(element.url!);
+                              }
+                              Get.toNamed(Routes.SwiperPage,
+                                  arguments: {
+                                    'imaglist': imgList,
+                                    'index': currentIndex
+                                  });
+                            },
+                            child: ClipRRect(
+                              borderRadius: BorderRadius.circular(6.sp),
+                              child: CachedImg(
+                                imageUrl: album.url!,
+                                fit: BoxFit.cover,
+                              ),
+                            ),
+                          );
+                        }),
+                  ),
+                ),
+                Row(
+                  children: [
+                    InkWell(
+                      onTap: () {
+                        Get.bottomSheet(
+                            CallOutShareDialog('','',lists), isScrollControlled: true,
+                            enableDrag: false
+                        );
+
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(right: 5.sp),
+                        child: Image.asset(
+                          getCircleImage('forward'),
+                          width: 20.sp,
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Container(
+                        height: 30.sp,
+                        padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
+                        margin: EdgeInsets.only(
+                            top: picHeight > 0 ? 5.sp : 5.sp, bottom: 10.sp),
+                        decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(15.sp),
+                            color: Color(0x33000000)),
+                        child: Row(
+                          children: [
+                            widgets.isNotEmpty
+                                ? SizedBox(
+                              width: 24 + 12.sp * widgets.length - 8.sp,
+                              height: 24.sp,
+                              child: Stack(children: widgets),
+                            )
+                                : Container(),
+                            SizedBox(
+                              width: 4.sp,
+                            ),
+                            widgets.isNotEmpty
+                                ? Expanded(
+                                child: Text(
+                                  '${lists.chat!.count!}位圈友已私聊',
+                                  style: TextStyle(
+                                      color: Colors.white.withOpacity(0.75),
+                                      fontSize: 13.sp),
+                                ))
+                                : Expanded(
+                                child: Text(
+                                  '赶紧成为第一位私聊ta的人吧',
+                                  style: TextStyle(
+                                      color: Colors.white.withOpacity(0.75),
+                                      fontSize: 13.sp),
+                                )),
+                            GestureDetector(
+                              onTap: () {
+                                pushMsgPage(lists, '');
+                              },
+                              child: Image.asset(
+                                getCircleImage('chat'),
+                                width: 50.sp,
+                              ),
+                            )
+                          ],
+                        ),
+                      ),
+                    ),
+                    GestureDetector(
+                      onTapUp: (TapUpDetails details) {
+                        if (lists.isInteract! > 0) {
+                          showOKToast('这个喊话已经点过了哦');
+                          return;
+                        }
+
+                        _showEmojiPicker(
+                            lists, lists.id!, context, details.globalPosition);
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(
+                            left: 10.sp,
+                            bottom:
+                            (lists.topInteractType!['userCount'] ?? 0) > 0
+                                ? 5.sp
+                                : 5.sp),
+                        // height: 40.sp,
+                        alignment: Alignment.center,
+                        child: Stack(
+                          alignment: Alignment.center,
+                          children: [
+                            Container(
+                              height: 43.sp,
+                            ),
+                            Text(
+                              lists.interactedTypeEmote ?? '❤',
+                              style: TextStyle(
+                                  color: Colors.white, fontSize: 20.sp),
+                            ),
+                            if ((lists.topInteractType!['userCount'] ?? 0) > 0)
+                              Positioned(
+                                bottom: 0,
+                                child: Text(
+                                  '${lists.topInteractType!['userCount']}',
+                                  style: TextStyle(
+                                      color: Colors.white, fontSize: 10.sp),
+                                ),
+                              ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                if (lists.interest?.isNotEmpty ?? false)
+                  Container(
+                    width: Get.width - 26.sp,
+                    margin: EdgeInsets.only(bottom: 15.sp),
+                    child: circleInfoItem(lists.interest!),
+                  )
+              ],
+            ),
+          )
+        ]));
+  }
+
+  void pushMsgPage(Lists bean, String cicleId) async {
+    var sp = await SharedPreferencesHelper.getInstance();
+    String myUserId = sp.getMyUserId();
+    if (bean.user!.id.toString() == myUserId) {
+      showOKToast('无法与自己私聊');
+      return;
+    }
+
+    var data = await DioManager.instance.get(
+      url: "/up-service/callout/${bean.id}/chat",
+    );
+    if (data["code"] == 200) {
+      pushChatPage(data['data']['account_id'].toString().split("_").last,
+          data['data']['account_id'], bean.user!.nickname!);
+
+      await Future.delayed(Duration(seconds: 1));
+
+      SharedPreferences sharedPreferences =
+      await SharedPreferences.getInstance();
+
+      int userId =
+          sharedPreferences.getInt(SharedPreferencesHelper.USERID) ?? 0;
+      String avatar =
+          sharedPreferences.getString(SharedPreferencesHelper.AVATAR) ?? "";
+      String name =
+          sharedPreferences.getString(SharedPreferencesHelper.NAME) ?? "";
+
+      bool isContain = false;
+      for (var info in bean.chat!.users!) {
+        if (info.id == userId) {
+          isContain = true;
+        }
+      }
+      if (!isContain) {
+        bean.chat!.users!
+            .add(Users(avatar: avatar, id: userId, nickname: name));
+        bean.chat!.count = bean.chat!.count! + 1;
+        // widget.logic.update();
+      }
+    }
+  }
+
+  ///普通图文喊话
+  normalDynamicItem(Lists lists) {
+    int type = (lists.topInteractType?['type'] ?? 1) - 1;
+    Widget descText = logic.isOpen
+        ? Text(
+      lists.content!,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+    )
+        : HideText(
+      text: lists.content!,
+      maxWidth: Get.currentRoute == Routes.Home
+          ? Get.width - 90.sp
+          : Get.width - 20.sp,
+      additionText: '查看更多',
+      maxLines: 10,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+      additionStyle:
+      TextStyle(color: const Color(0xFFFF4DF6), fontSize: 15.sp),
+      onTap: () {
+        logic.isOpen = true;
+        logic.update();
+      },
+    );
+
+
+    if (lists.user!.nickname! == '乐园园长') {
+      int i = 10;
+    }
+    double picHeight = 0.0;
+    double ratio = 0;
+    double picWidth =
+        (Get.width -  60.sp) /
+            3 +
+            45;
+    if (lists.album != null) {
+      if (lists.album!.isNotEmpty) {
+        Album info = lists.album!.first;
+        ratio = ((Get.width -
+             60.sp) /
+            3) /
+            picWidth;
+        if (info.type == 1) {
+          if (lists.album!.length > 3) {
+            picHeight = picWidth * 2;
+          } else {
+            if (lists.album!.length == 1) {
+              picHeight = 250;
+            } else {
+              picHeight = picWidth;
+            }
+          }
+        } else {
+          picHeight = 200.sp;
+        }
+      }
+    }
+
+    List<Widget> widgets = [];
+    int index = 0;
+    lists.chat!.users!.forEach((element) {
+      widgets.add(Positioned(
+        left: 12.sp * index,
+        child: circleWidget(element.avatar!, element.id.toString(), width: 24),
+      ));
+      index++;
+    });
+    if (widgets.isNotEmpty) {
+      widgets.add(Positioned(
+          left: 12.sp * lists.chat!.users!.length,
+          child: Image.asset(
+            getCircleImage('more'),
+            width: 24.sp,
+          )));
+    }
+
+    Widget atWidget = Container();
+
+    List<Widget> atList = [];
+    if (lists.at!.isNotEmpty) {
+      List infoList = jsonDecode(lists.at!);
+      infoList.forEach((element) {
+        atList.add(GestureDetector(
+          onTap: () {
+            Get.toNamed(Routes.UserInfoPage,
+                arguments: element['userId'].toString(),
+                preventDuplicates: false);
+          },
+          child: Container(
+            margin: EdgeInsets.only(right: 4.sp),
+            child: Text(
+              '@${element['nickName']}',
+              style: TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+            ),
+          ),
+        ));
+      });
+      atWidget = Container(
+          padding: EdgeInsets.only(bottom: 5.sp),
+          child: Row(
+            children: [
+              Wrap(
+                children: atList,
+              ),
+            ],
+          ));
+    }
+
+    return Container(
+        margin: EdgeInsets.only(bottom: 10.sp),
+        width: Get.width,
+        // height: 120.sp + contentHeight(lists.content!) + picHeight,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage(
+                  getCircleImage('normal_bg'),
+                ))),
+        child: Stack(
+          children: [
+            Positioned(
+              right: 2.sp,
+              top: 2.sp,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  // Image.asset(
+                  //   getCircleImage('location'),
+                  //   height: 30.sp,
+                  // ),
+                  Container(
+                    // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
+                    padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                    alignment: Alignment.center,
+                    height: 24.sp,
+                    decoration: BoxDecoration(
+                        color: Color.fromRGBO(52, 41, 67, 1),
+                        borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(0),
+                            bottomRight: Radius.circular(0),
+                            topRight: Radius.circular(12.sp),
+                            bottomLeft: Radius.circular(12.sp))),
+                    child: Text(
+                      (lists.user!.city ?? '外星').length > 4
+                          ? (lists.user!.city ?? '外星').substring(0, 4) + '...'
+                          : (lists.user!.city ?? '外星'),
+                      style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                    ),
+                  )
+                ],
+              ),
+              // height: 18.sp,
+            ),
+            Container(
+              width: Get.width,
+              padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(
+                    height: 72.sp,
+                    child: Row(
+                      // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        GestureDetector(
+                            onTap: () async {
+                              // var sp =
+                              //     await SharedPreferencesHelper.getInstance();
+                              // String myUserId = sp.getMyUserId();
+                              // if (lists.user?.id!.toString() == myUserId) {
+                              Get.toNamed(Routes.UserInfoPage,
+                                  arguments: lists.user?.id!.toString());
+                              //   return;
+                              // }
+                            },
+                            child: Stack(
+                              alignment: Alignment.center,
+                              children: [
+                                Container(
+                                  width: 60.sp,
+                                  height: 50.sp,
+                                ),
+                                Container(
+                                  // margin: EdgeInsets.only(top: 6.sp, ),
+                                  width: 41.sp,
+                                  height: 41.sp,
+                                  decoration: BoxDecoration(
+                                    borderRadius:
+                                    BorderRadius.circular(20.5.sp),
+                                    gradient: const LinearGradient(
+                                      begin: Alignment.topCenter,
+                                      end: Alignment.bottomCenter,
+                                      colors: [
+                                        Color(0xFF71F3F2),
+                                        Color(0xFFF558FF),
+                                      ],
+                                      stops: [0.0365, 0.9427],
+                                    ),
+                                  ),
+                                  padding: EdgeInsets.all(2.sp),
+                                  child: ClipRRect(
+                                    borderRadius: BorderRadius.circular(30.sp),
+                                    child: Image.network(
+                                        lists.user!.avatar_thumb!,
+                                        width: 40.sp,
+                                        height: 40.sp,
+                                        fit: BoxFit.cover),
+                                  ),
+                                ),
+                                if ((lists.user!.onlineFlag ?? '').isNotEmpty)
+                                  Positioned(
+                                      bottom: 0,
+                                      child: Container(
+                                          height: 20.sp,
+                                          padding: EdgeInsets.only(
+                                              left: 4.sp, right: 4.sp),
+                                          decoration: BoxDecoration(
+                                            borderRadius:
+                                            BorderRadius.circular(10.sp),
+                                            color: AppColor.bgColor,
+                                            border: GradientBoxBorder(
+                                              gradient: AppColor
+                                                  .mainVerLinearGradient,
+                                              width: 1.sp,
+                                            ),
+                                          ),
+                                          alignment: Alignment.center,
+                                          child: Text(
+                                            lists.user!.onlineFlag ?? '',
+                                            style: TextStyle(
+                                              color: const Color.fromRGBO(
+                                                  247, 250, 250, 1.0),
+                                              fontSize: 10.sp,
+                                            ),
+                                          )))
+                              ],
+                            )),
+                        Expanded(
+                            child: Container(
+                              padding: EdgeInsets.only(left: 0.sp, top: 12.sp),
+                              alignment: Alignment.centerLeft,
+                              height: 72.sp,
+                              child: Column(
+                                children: [
+                                  Row(
+                                    children: [
+                                      Text(
+                                        lists.user!.nickname!,
+                                        style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 18.sp,
+                                            fontWeight: FontWeight.w600),
+                                      ),
+                                      SizedBox(
+                                        width: 8.sp,
+                                      ),
+                                      UserTagWidget(lists.user!.mark!),
+                                    ],
+                                  ),
+                                  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),
+                                            gradient: sexBgGradient(
+                                                lists.user!.gender ?? 0)),
+                                        child: Text(
+                                          getAgeCOntent(
+                                              lists.user!.gender ?? 0,
+                                              lists.user!.age ?? 0,
+                                              lists.user!.role ?? 0,
+                                              lists.user!.orientation ?? 0),
+                                          style: TextStyle(
+                                            color:
+                                            sexBgColor(lists.user!.gender ?? 0),
+                                            fontSize: 12.sp,
+                                          ),
+                                        ),
+                                      )
+                                    ],
+                                  ),
+                                ],
+                              ),
+                            )),
+                      ],
+                    ),
+                  ),
+                  atWidget,
+                  Container(
+                    alignment: Alignment.topLeft,
+                    // margin: EdgeInsets.only(top: 4.sp),
+                    child: descText,
+                  ),
+                  picHeight > 0
+                      ? Container(
+                      height: picHeight,
+                      // alignment: Alignment.centerLeft,
+                      margin: EdgeInsets.only(top: 5.sp),
+                      child: picHeight == 200.sp
+                          ? ClipRRect(
+                          borderRadius: BorderRadius.circular(6.sp),
+                          child: VideoItemWidget(
+                              lists.album![0].url!,
+                              lists.id!.toString(),
+                              lists.user!.id.toString()))
+                          : picHeight == 250
+                          ? GestureDetector(
+                        onTap: () async {
+                          var imgList = <String>[];
+                          for (var element in lists.album!) {
+                            imgList.add(element.url!);
+                          }
+
+                          Get.toNamed(Routes.SwiperPage,
+                              arguments: {
+                                'imaglist': imgList,
+                                'index': 0,
+                              });
+                        },
+                        child: ClipRRect(
+                          borderRadius:
+                          BorderRadius.circular(6.sp),
+                          child: CachedImg(
+                            imageUrl: lists.album!.first.url!,
+                            fit: BoxFit.cover,
+                          ),
+                        ),
+                      )
+                          : GridView.builder(
+                          // controller: GridScrollController,
+                          itemCount: lists.album!.length,
+                          physics:
+                          const NeverScrollableScrollPhysics(),
+                          gridDelegate:
+                          SliverGridDelegateWithFixedCrossAxisCount(
+                              crossAxisCount: 3, //横轴三个子widget
+                              crossAxisSpacing: 4.sp,
+                              mainAxisSpacing: 4.sp,
+                              childAspectRatio:
+                              ratio //宽高比为1时，子widget
+                          ),
+                          itemBuilder: (contentxt, currentIndex) {
+                            Album album =
+                            lists.album![currentIndex];
+                            return GestureDetector(
+                              onTap: () {
+                                var imgList = <String>[];
+                                for (var element in lists.album!) {
+                                  imgList.add(element.url!);
+                                }
+                                Get.toNamed(Routes.SwiperPage,
+                                    arguments: {
+                                      'imaglist': imgList,
+                                      'index': currentIndex
+                                    });
+                              },
+                              child: ClipRRect(
+                                borderRadius:
+                                BorderRadius.circular(6.sp),
+                                child: CachedImg(
+                                  imageUrl: album.url!,
+                                  fit: BoxFit.cover,
+                                ),
+                              ),
+                            );
+                          }))
+                      : Container(),
+                  Row(
+                    children: [
+                      InkWell(
+                        onTap: () {
+                          Get.bottomSheet(
+                              CallOutShareDialog('','',lists), isScrollControlled: true,
+                              enableDrag: false
+                          );
+
+                        },
+                        child: Container(
+                          margin: EdgeInsets.only(right: 5.sp),
+                          child: Image.asset(
+                            getCircleImage('forward'),
+                            width: 20.sp,
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
+                          height: 30.sp,
+                          padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
+                          margin: EdgeInsets.only(
+                              top: picHeight > 0 ? 5.sp : 5.sp, bottom: 10.sp),
+                          decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(15.sp),
+                              color: Color(0x33000000)),
+                          child: Row(
+                            children: [
+                              widgets.isNotEmpty
+                                  ? SizedBox(
+                                width: 24 + 12.sp * widgets.length - 8.sp,
+                                height: 24.sp,
+                                child: Stack(children: widgets),
+                              )
+                                  : Container(),
+                              SizedBox(
+                                width: 4.sp,
+                              ),
+                              widgets.isNotEmpty
+                                  ? Expanded(
+                                  child: Text(
+                                    '${lists.chat!.count!}位圈友已私聊',
+                                    style: TextStyle(
+                                        color: Colors.white.withOpacity(0.75),
+                                        fontSize: 13.sp),
+                                  ))
+                                  : Expanded(
+                                  child: Text(
+                                    '赶紧成为第一位私聊ta的人吧',
+                                    style: TextStyle(
+                                        color: Colors.white.withOpacity(0.75),
+                                        fontSize: 13.sp),
+                                  )),
+                              GestureDetector(
+                                onTap: () {
+                                  pushMsgPage(lists, '');
+                                },
+                                child: Image.asset(
+                                  getCircleImage('chat'),
+                                  width: 50.sp,
+                                ),
+                              )
+                            ],
+                          ),
+                        ),
+                      ),
+                      GestureDetector(
+                        onTapUp: (TapUpDetails details) {
+                          if (lists.isInteract! > 0) {
+                            showOKToast('这个喊话已经点过了哦');
+                            return;
+                          }
+
+                          _showEmojiPicker(lists, lists.id!, context,
+                              details.globalPosition);
+                        },
+                        child: Container(
+                          margin: EdgeInsets.only(
+                              left: 10.sp,
+                              bottom:
+                              (lists.topInteractType!['userCount'] ?? 0) > 0
+                                  ? 5.sp
+                                  : 5.sp),
+                          // height: 40.sp,
+                          alignment: Alignment.center,
+                          child: Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              Container(
+                                height: 43.sp,
+                              ),
+                              Text(
+                                lists.interactedTypeEmote ?? '❤',
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 20.sp),
+                              ),
+                              if ((lists.topInteractType!['userCount'] ?? 0) >
+                                  0)
+                                Positioned(
+                                  bottom: 0,
+                                  child: Text(
+                                    '${lists.topInteractType!['userCount']}',
+                                    style: TextStyle(
+                                        color: Colors.white, fontSize: 10.sp),
+                                  ),
+                                ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  if (lists.interest?.isNotEmpty ?? false)
+                    Container(
+                      width: Get.width - 26.sp,
+                      margin: EdgeInsets.only(bottom: 15.sp),
+                      child: circleInfoItem(lists.interest!),
+                    )
+                ],
+              ),
+            ),
+            // Positioned(
+            //   bottom: 0,
+            //     child: Container(
+            //       width: Get.width - 26.sp,
+            //       child: circleInfoItem(lists.interest!),
+            //     ))
+          ],
+        ));
+  }
+
+  circleInfoItem(var bean) {
+    Circle list = Circle.fromJson(bean);
+    return GestureDetector(
+      onTap: () {
+        Get.toNamed(Routes.SignalCircleListPage, arguments: list.id.toString());
+      },
+      child: ClipRRect(
+          borderRadius: BorderRadius.circular(12.sp),
+          child: Container(
+            padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
+            height: 30.sp,
+            decoration: BoxDecoration(
+              // color: Colors.red,
+                image: DecorationImage(
+                    fit: BoxFit.fill,
+                    image: AssetImage(getCircleImage('top_circle_bg')))),
+            child: Row(
+              // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  width: 22.sp,
+                  height: 22.sp,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(8.0),
+                    gradient: const LinearGradient(
+                      begin: Alignment.topCenter,
+                      end: Alignment.bottomCenter,
+                      colors: [
+                        Color(0xFF71F3F2),
+                        Color(0xFFF558FF),
+                      ],
+                      stops: [0.0365, 0.9427],
+                    ),
+                  ),
+                  padding: EdgeInsets.all(1.sp),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(8.0),
+                    child: CachedImg(
+                        imageUrl: bean['image'],
+                        width: 20.sp,
+                        height: 20.sp,
+                        fit: BoxFit.cover),
+                  ),
+                ),
+                Expanded(
+                    child: Container(
+                      padding: EdgeInsets.only(
+                        left: 4.sp,
+                        // top: 12.sp,
+                      ),
+                      // alignment: Alignment.,
+                      // height: 50.sp,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Text(
+                            bean['title'],
+                            style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 14.sp,
+                                fontWeight: FontWeight.w600),
+                          ),
+                        ],
+                      ),
+                    )),
+                Row(
+                  children: [
+                    Text(
+                      '👁${convertToTenThousand(bean['view_total'])}',
+                      textAlign: TextAlign.left,
+                      style: TextStyle(
+                        color: const Color(0xff03FEFB),
+                        fontSize: 12.sp,
+                      ),
+                    ),
+                    Image.asset(
+                      getHomeImage("icon_in"),
+                      width: 16.sp,
+                    )
+                  ],
+                ),
+                // Container(
+                //   margin: EdgeInsets.only(right: 8.sp),
+                //   child: GestureDetector(
+                //     //加入圈子
+                //       onTap: () async {
+                //         CircleLogic cLogic = Get.find<CircleLogic>();
+                //         if (bean['is_join']) {
+                //           var data = await DioManager.instance.get(
+                //             url: "/up-service/interest/${bean['id']}",
+                //           );
+                //           if (data["code"] == 200) {
+                //             Circle info = Circle.fromJson(data['data']);
+                //             Get.bottomSheet(CircleShare('', '', info),
+                //                 isScrollControlled: true, enableDrag: false);
+                //           }
+                //         } else {
+                //           await cLogic.outCircle(
+                //               bean['id'].toString(), bean['is_join']);
+                //           bean['is_join'] = !bean['is_join'];
+                //           // if (recomanddlists.isNotEmpty) {
+                //           //   recomanddlists.forEach((element) {
+                //           //     if (element.interest!['id'].toString() ==
+                //           //         bean['id'].toString()) {
+                //           //       element.interest!['is_join'] = true;
+                //           //       element.interest = element.interest!;
+                //           //     }
+                //           //   });
+                //           // }
+                //
+                //           if (lists.isNotEmpty) {
+                //             lists.forEach((element) {
+                //               if (element.interest!['id'].toString() ==
+                //                   bean['id'].toString()) {
+                //                 element.interest!['is_join'] = true;
+                //                 element.interest = element.interest!;
+                //               }
+                //             });
+                //           }
+                //           // if (Get.isRegistered<LikeLogic>()) {
+                //           //   LikeLogic likeLogic = Get.find<LikeLogic>();
+                //           //   likeLogic.loadMyCircleData();
+                //           // }
+                //           setState(() {});
+                //         }
+                //       },
+                //       child: Stack(
+                //         alignment: Alignment.center,
+                //         children: [
+                //           Opacity(
+                //             opacity: 0.5,
+                //             child: Image.asset(
+                //               getCircleImage('add'),
+                //               width: 60.sp,
+                //             ),
+                //           ),
+                //           Text(
+                //             !bean['is_join'] ? '申请加入' : '分享有奖',
+                //             style:
+                //             TextStyle(color: Colors.white, fontSize: 12.sp),
+                //           )
+                //         ],
+                //       )),
+                // )
+              ],
+            ),
+          )),
+    );
+  }
+
+  void _showEmojiPicker(
+      Lists list, int id, BuildContext context, Offset position) {
+    if (isShowEmoji) return;
+    isShowEmoji = true;
+    _overlayEntry = OverlayEntry(
+      builder: (context) => Stack(
+        children: [
+          // 遮罩层，点击关闭
+          Positioned.fill(
+            child: GestureDetector(
+              onTap: () {
+                _removeOverlay();
+                isShowEmoji = false;
+              },
+              child: Container(
+                color: Colors.black.withOpacity(0.3),
+              ),
+            ),
+          ),
+          // 表情选择器
+          Positioned(
+              left: position.dx - 275.w,
+              top: position.dy - 15.w - 150.h,
+              child: Material(
+                color: Colors.transparent,
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    // 气泡框
+                    Container(
+                        width: 285.w, // 设置最大宽度，超出才会滚动
+                        height: 150.h,
+                        padding: EdgeInsets.all(8),
+                        decoration: BoxDecoration(
+                          color: Color(0xFFF5F5F5),
+                          borderRadius: BorderRadius.circular(10),
+                          boxShadow: [
+                            BoxShadow(
+                              color: Colors.black26,
+                              blurRadius: 10,
+                              spreadRadius: 2,
+                            ),
+                          ],
+                        ),
+                        child: MediaQuery.removePadding(
+                          removeTop: true,
+                          removeBottom: true,
+                          context: context,
+                          child: Scrollbar(
+                            child: GridView.builder(
+                              // controller: GridScrollController,
+                                itemCount: homeLogic.emojiList.length,
+                                gridDelegate:
+                                SliverGridDelegateWithFixedCrossAxisCount(
+                                  crossAxisCount: 7, //横轴
+                                  crossAxisSpacing: 4.w,
+                                  mainAxisSpacing: 4.w,
+                                  // childAspectRatio:
+                                  // ratio //宽高比为1时，子widget
+                                ),
+                                itemBuilder: (contentxt, currentIndex) {
+                                  return _emojiButton(
+                                      homeLogic.emojiList[currentIndex]
+                                      ['emote'],
+                                      id,
+                                      list,
+                                      currentIndex);
+                                }),
+                          ),
+                        )
+                    ),
+                    // 底部倒三角形
+                  ],
+                ),
+              )),
+          Positioned(
+            left: position.dx - 12.w,
+            top: position.dy - 18.w,
+            child: CustomPaint(
+              size: Size(20.w, 10.w),
+              painter: TrianglePainter(),
+            ),
+          )
+        ],
+      ),
+    );
+
+    Overlay.of(context).insert(_overlayEntry!);
+  }
+
+  Widget _emojiButton(String emoji, int id, Lists list, int currentIndex) {
+    return GestureDetector(
+      onTap: () async {
+        print("选择了表情: $emoji");
+        _removeOverlay();
+        isShowEmoji = false;
+
+        int index = homeLogic.emojiList[currentIndex]['type'];
+        var result = await DioManager.instance.post(
+            url: Api.interactEmoji, params: {"calloutId": id, "type": index});
+        if (result['code'] == 200) {
+          var data = await DioManager.instance
+              .get(url: Api.signInterestCalloutDetail, params: {
+            'calloutId': id,
+          });
+          if (data['code'] == 200) {
+            Lists bean = Lists.fromJson(data['data']);
+            // index = lists.indexOf(list);
+            // lists[index] = bean;
+            // if (mounted) {
+            //   setState(() {});
+            // }
+          }
+        }
+      },
+      child: Text(
+        emoji,
+        style: TextStyle(fontSize: 25),
+      ),
+    );
+  }
+
+  void _removeOverlay() {
+    _overlayEntry?.remove();
+    _overlayEntry = null;
+  }
+
+  void pushUserHome(String userId) {
+    Get.toNamed(Routes.UserInfoPage, arguments: userId);
+  }
+
+  circleWidget(String url, String userId, {double width = 24}) {
+    return GestureDetector(
+        onTap: () async {
+          pushUserHome(userId);
+        },
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            Image.asset(
+              getCircleImage('avatar_bg'),
+              width: width.sp,
+            ),
+            ClipOval(
+              child: CachedImg(
+                imageUrl: url ??
+                    "https://qiniuyun.leyuan666.com/quanzi/avatar/default.png",
+                width: (width - 1).sp,
+                height: (width - 1).sp,
+                fit: BoxFit.cover,
+              ),
+            )
+          ],
+        ));
+  }
+}
diff --git a/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart b/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart
index 13fd7d8..0e46769 100644
--- a/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart
+++ b/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart
@@ -14,6 +14,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:gradient_borders/box_borders/gradient_box_border.dart';
 import 'package:loading_animation_widget/loading_animation_widget.dart';
 import 'package:provider/provider.dart';
 import 'package:tencent_cloud_chat_uikit/data_services/core/tim_uikit_wide_modal_operation_key.dart';
@@ -45,11 +46,15 @@ import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart';
 import 'package:tencent_cloud_chat_uikit/ui/widgets/radio_button.dart';
 import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart';
 
+import '../../../../commons/Widgets/tag_widget.dart';
 import '../../../../commons/Widgets/text_more.dart';
+import '../../../../commons/colors/app_color.dart';
 import '../../../../net/api.dart';
 import '../../../../net/dio_manager.dart';
 import '../../../../utils/cache_img.dart';
 import '../../../circle/logic.dart';
+import '../../../circle/state.dart';
+import '../../../circle/widgets/video_item.dart';
 import '../../widget/chat_msg_get_gift_item.dart';
 import '../../widget/chat_msg_user_home_item.dart';
 import '../../widget/chat_realtion_type_item.dart';
@@ -502,7 +507,35 @@ class _TIMUIKItHistoryMessageListItemState
               )
             ],
           );
-        } else if (messageItem.customElem?.extension?.contains('userHomeData') ?? false) {
+        }  else if (messageItem.customElem?.extension?.contains('callOutData') ?? false) {
+          Map<String, dynamic> info = jsonDecode(messageItem.customElem?.data ?? '');
+          var bean = Lists.fromJson(info);
+          return Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SizedBox(
+                width: Get.width,
+                child: Center(
+                  child: Container(
+                    width: Get.width,
+                    margin: EdgeInsets.only(left: isFromSelf ? 16 : 0,right: isFromSelf ? 0 : 16),
+                    alignment: Alignment.center,
+                    child:bean.isQueen! ? InkWell(
+                      onTap: () {
+                        Get.toNamed(Routes.CallOutDetail,arguments: {'id':bean.id.toString()});
+                      },
+                        child:vipDynamicItem(bean)) : InkWell(
+                        onTap: () {
+                          Get.toNamed(Routes.CallOutDetail,arguments: {'id':bean.id.toString()});
+                        },
+                      child:normalDynamicItem(bean)),
+
+                  ),
+                ),
+              )
+            ],
+          );
+        }else if (messageItem.customElem?.extension?.contains('userHomeData') ?? false) {
             return ChatMsgUserHomeItem(messageItem);
         } else if (messageItem.customElem?.extension?.contains('applyRelationType') ?? false) {
           return ChatRealtionTypeItem(messageItem,isFromSelf);
@@ -913,6 +946,986 @@ class _TIMUIKItHistoryMessageListItemState
     );
   }
 
+  ///至尊喊话
+  vipDynamicItem(Lists lists) {
+    int type = (lists.topInteractType?['type'] ?? 1) - 1;
+    Widget descText = HideText(
+      text: lists.content!,
+      maxWidth: Get.width - 90.sp,
+      additionText: '查看更多',
+      maxLines: 10,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+      additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 15.sp),
+      onTap: () {},
+    );
+
+    // List<JoinUser> urlList = bean.lastJoinUsers;
+    List<Widget> widgets = [];
+    int index = 0;
+    for (var element in lists.chat!.users!) {
+      widgets.add(Positioned(
+        left: 12.sp * index,
+        child: circleWidget(element.avatar!, element.id.toString(), width: 24),
+      ));
+      index++;
+    }
+    if (widgets.isNotEmpty) {
+      widgets.add(Positioned(
+          left: 12.sp * lists.chat!.users!.length,
+          child: Image.asset(
+            getCircleImage('more'),
+            width: 24.sp,
+          )));
+    }
+
+    double picHeight = 0.0;
+
+    if (lists.album != null) {
+      if (lists.album!.isNotEmpty) {
+        Album info = lists.album!.first;
+
+        if (info.type == 1) {
+          double picWidth = (Get.width - 100.sp) / 3 + 45;
+          if (lists.album!.length > 3) {
+            picHeight = picWidth * 2;
+          } else {
+            if (lists.album!.length == 1) {
+              picHeight = 250;
+            } else {
+              picHeight = picWidth;
+            }
+          }
+        } else {
+          picHeight = 200.sp;
+        }
+      }
+    }
+
+    Widget atWidget = Container();
+
+    List<Widget> atList = [];
+    if (lists.at!.isNotEmpty) {
+      List infoList = jsonDecode(lists.at!);
+      infoList.forEach((element) {
+        atList.add(GestureDetector(
+          onTap: () {
+            // Get.toNamed(Routes.UserInfoPage,
+            //     arguments: element['userId'].toString(),
+            //     preventDuplicates: false);
+          },
+          child: Container(
+            margin: EdgeInsets.only(right: 4.sp),
+            child: Text(
+              '@${element['nickName']}',
+              style: TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+            ),
+          ),
+        ));
+      });
+      atWidget = Container(
+          padding: EdgeInsets.only(bottom: 5.sp),
+          child: Row(
+            children: [
+              Wrap(
+                children: atList,
+              ),
+            ],
+          ));
+    }
+
+    // double widgetHeight = 130.sp + contentHeight(lists.content!) + picHeight;
+
+    return Container(
+        margin: EdgeInsets.only(bottom: 10.sp),
+        width: Get.width,
+        // height: widgetHeight,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage(
+                  getCircleImage('pic_bg'),
+                ))),
+        child: Stack(children: [
+          Positioned(
+            left: 0,
+            top: 2.sp,
+            height: 21.sp,
+            child: Image.asset(getCircleImage('vip_say')),
+          ),
+          Positioned(
+            right: 2.sp,
+            top: 2.sp,
+            child: Stack(
+              alignment: Alignment.center,
+              children: [
+                Container(
+                  // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
+                  padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                  alignment: Alignment.center,
+                  height: 24.sp,
+                  decoration: BoxDecoration(
+                      color: Color.fromRGBO(52, 41, 67, 1),
+                      borderRadius: BorderRadius.only(
+                          topLeft: Radius.circular(0),
+                          bottomRight: Radius.circular(0),
+                          topRight: Radius.circular(12.sp),
+                          bottomLeft: Radius.circular(12.sp))),
+                  child: Text(
+                    (lists.user!.city ?? '外星').length > 4
+                        ? (lists.user!.city ?? '外星').substring(0, 4) + '...'
+                        : (lists.user!.city ?? '外星'),
+                    style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                  ),
+                )
+              ],
+            ),
+          ),
+          Container(
+            // height: widgetHeight,
+            width: Get.width,
+            padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                SizedBox(
+                  height: 72.sp,
+                  child: Row(
+                    // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      GestureDetector(
+                          onTap: () async {},
+                          child: Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              Container(
+                                width: 60.sp,
+                                height: 50.sp,
+                              ),
+                              Container(
+                                // margin: EdgeInsets.only(top: 6.sp, ),
+                                width: 41.sp,
+                                height: 41.sp,
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(20.5.sp),
+                                  gradient: const LinearGradient(
+                                    begin: Alignment.topCenter,
+                                    end: Alignment.bottomCenter,
+                                    colors: [
+                                      Color(0xFF71F3F2),
+                                      Color(0xFFF558FF),
+                                    ],
+                                    stops: [0.0365, 0.9427],
+                                  ),
+                                ),
+                                padding: EdgeInsets.all(2.sp),
+                                child: ClipRRect(
+                                  borderRadius: BorderRadius.circular(30.sp),
+                                  child: Image.network(
+                                      lists.user!.avatar_thumb!,
+                                      width: 40.sp,
+                                      height: 40.sp,
+                                      fit: BoxFit.cover),
+                                ),
+                              ),
+                              if ((lists.user!.onlineFlag ?? '').isNotEmpty)
+                                Positioned(
+                                    bottom: 0,
+                                    child: Container(
+                                        height: 20.sp,
+                                        padding: EdgeInsets.only(
+                                            left: 4.sp, right: 4.sp),
+                                        decoration: BoxDecoration(
+                                          borderRadius:
+                                          BorderRadius.circular(10.sp),
+                                          color: AppColor.bgColor,
+                                          border: GradientBoxBorder(
+                                            gradient:
+                                            AppColor.mainVerLinearGradient,
+                                            width: 1.sp,
+                                          ),
+                                        ),
+                                        alignment: Alignment.center,
+                                        child: Text(
+                                          lists.user!.onlineFlag ?? '',
+                                          style: TextStyle(
+                                            color: const Color.fromRGBO(
+                                                247, 250, 250, 1.0),
+                                            fontSize: 10.sp,
+                                          ),
+                                        )))
+                            ],
+                          )),
+                      Expanded(
+                          child: Container(
+                            padding: EdgeInsets.only(left: 0.sp, top: 12.sp),
+                            alignment: Alignment.centerLeft,
+                            height: 72.sp,
+                            child: Column(
+                              children: [
+                                Row(
+                                  children: [
+                                    Text(
+                                      lists.user!.nickname!,
+                                      style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 18.sp,
+                                          fontWeight: FontWeight.w600),
+                                    ),
+                                    SizedBox(
+                                      width: 8.sp,
+                                    ),
+                                    UserTagWidget(lists.user!.mark!),
+                                  ],
+                                ),
+                                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),
+                                          gradient: sexBgGradient(
+                                              lists.user!.gender ?? 0)),
+                                      child: Text(
+                                        getAgeCOntent(
+                                            lists.user!.gender ?? 0,
+                                            lists.user!.age ?? 0,
+                                            lists.user!.role ?? 0,
+                                            lists.user!.orientation ?? 0),
+                                        //  '${genderList[lists.user!.gender!]}.${lists.user!.age}.${roleList[lists.user!.role!]}.${orientationList[lists.user!.orientation!]}',
+                                        style: TextStyle(
+                                          color:
+                                          sexBgColor(lists.user!.gender ?? 0),
+                                          fontSize: 12.sp,
+                                        ),
+                                      ),
+                                    )
+                                  ],
+                                ),
+                              ],
+                            ),
+                          )),
+                    ],
+                  ),
+                ),
+                atWidget,
+                Container(
+                  alignment: Alignment.topLeft,
+                  // margin: EdgeInsets.only(top: 4.sp),
+                  child: descText,
+                ),
+                Listener(
+                  child: Container(
+                    height: picHeight,
+                    margin: EdgeInsets.only(top: 5.sp),
+                    child: picHeight == 200.sp
+                        ? ClipRRect(
+                        borderRadius: BorderRadius.circular(6.sp),
+                        child: VideoItemWidget(
+                            lists.album![0].url!,
+                            lists.id!.toString(),
+                            lists.user!.id.toString()))
+                        : picHeight == 250
+                        ? GestureDetector(
+                      onTap: () async {
+                        // var imgList = <String>[];
+                        // for (var element in lists.album!) {
+                        //   imgList.add(element.url!);
+                        // }
+                        //
+                        // Get.toNamed(Routes.SwiperPage, arguments: {
+                        //   'imaglist': imgList,
+                        //   'index': 0,
+                        //   'userId': lists.user?.id!.toString()
+                        // });
+                      },
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(6.sp),
+                        child: CachedImg(
+                          imageUrl: lists.album!.first.url!,
+                          fit: BoxFit.cover,
+                        ),
+                      ),
+                    )
+                        : GridView.builder(
+                        // controller: GridScrollController,
+                        itemCount: lists.album!.length,
+                        scrollDirection: Axis.vertical,
+                        physics: const NeverScrollableScrollPhysics(),
+                        gridDelegate:
+                        SliverGridDelegateWithFixedCrossAxisCount(
+                            crossAxisCount: 3, //横轴三个子widget
+                            crossAxisSpacing: 8.sp,
+                            mainAxisSpacing: 8.sp,
+                            childAspectRatio: 0.6 //宽高比为1时，子widget
+                        ),
+                        itemBuilder: (contentxt, currentIndex) {
+                          Album album = lists.album![currentIndex];
+                          return ClipRRect(
+                            borderRadius: BorderRadius.circular(6.sp),
+                            child: CachedImg(
+                              imageUrl: album.url!,
+                              fit: BoxFit.cover,
+                            ),
+                          );
+                        }),
+                  ),
+                ),
+                Row(
+                  children: [
+                    Expanded(
+                      child: Container(
+                        height: 30.sp,
+                        padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
+                        margin: EdgeInsets.only(
+                            top: picHeight > 0 ? 5.sp : 5.sp, bottom: 10.sp),
+                        decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(15.sp),
+                            color: Color(0x33000000)),
+                        child: Row(
+                          children: [
+                            widgets.isNotEmpty
+                                ? SizedBox(
+                              width: 24 + 12.sp * widgets.length - 8.sp,
+                              height: 24.sp,
+                              child: Stack(children: widgets),
+                            )
+                                : Container(),
+                            SizedBox(
+                              width: 4.sp,
+                            ),
+                            widgets.isNotEmpty
+                                ? Expanded(
+                                child: Text(
+                                  '${lists.chat!.count!}位圈友已私聊',
+                                  style: TextStyle(
+                                      color: Colors.white.withOpacity(0.75),
+                                      fontSize: 13.sp),
+                                ))
+                                : Expanded(
+                                child: Text(
+                                  '赶紧成为第一位私聊ta的人吧',
+                                  style: TextStyle(
+                                      color: Colors.white.withOpacity(0.75),
+                                      fontSize: 13.sp),
+                                )),
+                            GestureDetector(
+                              onTap: () {},
+                              child: Image.asset(
+                                getCircleImage('chat'),
+                                width: 50.sp,
+                              ),
+                            )
+                          ],
+                        ),
+                      ),
+                    ),
+                    Container(
+                      margin: EdgeInsets.only(
+                          left: 10.sp,
+                          bottom: (lists.topInteractType!['userCount'] ?? 0) > 0
+                              ? 5.sp
+                              : 5.sp),
+                      // height: 40.sp,
+                      alignment: Alignment.center,
+                      child: Stack(
+                        alignment: Alignment.center,
+                        children: [
+                          Container(
+                            height: 43.sp,
+                          ),
+                          Text(
+                            lists.interactedTypeEmote ?? '❤',
+                            style:
+                            TextStyle(color: Colors.white, fontSize: 20.sp),
+                          ),
+                          if ((lists.topInteractType!['userCount'] ?? 0) > 0)
+                            Positioned(
+                              bottom: 0,
+                              child: Text(
+                                '${lists.topInteractType!['userCount']}',
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 10.sp),
+                              ),
+                            ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+                if (lists.interest?.isNotEmpty ?? false)
+                  Container(
+                    width: Get.width - 26.sp,
+                    margin: EdgeInsets.only(bottom: 15.sp),
+                    child: shareCircleInfoItem(lists.interest!),
+                  )
+              ],
+            ),
+          )
+        ]));
+  }
+
+  ///普通图文喊话
+  normalDynamicItem(Lists lists) {
+    int type = (lists.topInteractType?['type'] ?? 1) - 1;
+    Widget descText = HideText(
+      text: lists.content ?? '',
+      maxWidth: Get.width - 90.sp,
+      additionText: '查看更多',
+      maxLines: 10,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+      additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 15.sp),
+      onTap: () {
+        // widget.logic.openCallOutIdList.add(lists.id);
+        // setState(() {});
+      },
+    );
+
+    if (lists.user!.nickname! == '乐园园长') {
+      int i = 10;
+    }
+    double picHeight = 0.0;
+    double ratio = 0;
+    double picWidth = (Get.width - 100.sp) / 3 + 45;
+    if (lists.album != null) {
+      if (lists.album!.isNotEmpty) {
+        Album info = lists.album!.first;
+        ratio = ((Get.width - 100.sp) / 3) / picWidth;
+        if (info.type == 1) {
+          if (lists.album!.length > 3) {
+            picHeight = picWidth * 2;
+          } else {
+            if (lists.album!.length == 1) {
+              picHeight = 250;
+            } else {
+              picHeight = picWidth;
+            }
+          }
+        } else {
+          picHeight = 200.sp;
+        }
+      }
+    }
+
+    List<Widget> widgets = [];
+    int index = 0;
+    lists.chat!.users!.forEach((element) {
+      widgets.add(Positioned(
+        left: 12.sp * index,
+        child: circleWidget(element.avatar!, element.id.toString(), width: 24),
+      ));
+      index++;
+    });
+    if (widgets.isNotEmpty) {
+      widgets.add(Positioned(
+          left: 12.sp * lists.chat!.users!.length,
+          child: Image.asset(
+            getCircleImage('more'),
+            width: 24.sp,
+          )));
+    }
+
+    Widget atWidget = Container();
+
+    List<Widget> atList = [];
+    if (lists.at!.isNotEmpty) {
+      List infoList = jsonDecode(lists.at!);
+      infoList.forEach((element) {
+        atList.add(Container(
+          margin: EdgeInsets.only(right: 4.sp),
+          child: Text(
+            '@${element['nickName']}',
+            style: TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+          ),
+        ));
+      });
+      atWidget = Container(
+          padding: EdgeInsets.only(bottom: 5.sp),
+          child: Row(
+            children: [
+              Wrap(
+                children: atList,
+              ),
+            ],
+          ));
+    }
+
+    return Container(
+        margin: EdgeInsets.only(bottom: 10.sp),
+        width: Get.width,
+        // height: 120.sp + contentHeight(lists.content!) + picHeight,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage(
+                  getCircleImage('normal_bg'),
+                ))),
+        child: Stack(
+          children: [
+            Positioned(
+              right: 2.sp,
+              top: 2.sp,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  // Image.asset(
+                  //   getCircleImage('location'),
+                  //   height: 30.sp,
+                  // ),
+                  Container(
+                    // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
+                    padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                    alignment: Alignment.center,
+                    height: 24.sp,
+                    decoration: BoxDecoration(
+                        color: Color.fromRGBO(52, 41, 67, 1),
+                        borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(0),
+                            bottomRight: Radius.circular(0),
+                            topRight: Radius.circular(12.sp),
+                            bottomLeft: Radius.circular(12.sp))),
+                    child: Text(
+                      (lists.user!.city ?? '外星').length > 4
+                          ? (lists.user!.city ?? '外星').substring(0, 4) + '...'
+                          : (lists.user!.city ?? '外星'),
+                      style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                    ),
+                  )
+                ],
+              ),
+              // height: 18.sp,
+            ),
+            Container(
+              width: Get.width,
+              padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(
+                    height: 72.sp,
+                    child: Row(
+                      // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Stack(
+                          alignment: Alignment.center,
+                          children: [
+                            Container(
+                              width: 60.sp,
+                              height: 50.sp,
+                            ),
+                            Container(
+                              // margin: EdgeInsets.only(top: 6.sp, ),
+                              width: 41.sp,
+                              height: 41.sp,
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.circular(20.5.sp),
+                                gradient: const LinearGradient(
+                                  begin: Alignment.topCenter,
+                                  end: Alignment.bottomCenter,
+                                  colors: [
+                                    Color(0xFF71F3F2),
+                                    Color(0xFFF558FF),
+                                  ],
+                                  stops: [0.0365, 0.9427],
+                                ),
+                              ),
+                              padding: EdgeInsets.all(2.sp),
+                              child: ClipRRect(
+                                borderRadius: BorderRadius.circular(30.sp),
+                                child: CachedImg(imageUrl:lists.user!.avatar!,
+                                    width: 40.sp,
+                                    height: 40.sp,
+                                    fit: BoxFit.cover),
+                              ),
+                            ),
+                            if ((lists.user!.onlineFlag ?? '').isNotEmpty)
+                              Positioned(
+                                  bottom: 0,
+                                  child: Container(
+                                      height: 20.sp,
+                                      padding: EdgeInsets.only(
+                                          left: 4.sp, right: 4.sp),
+                                      decoration: BoxDecoration(
+                                        borderRadius:
+                                        BorderRadius.circular(10.sp),
+                                        color: AppColor.bgColor,
+                                        border: GradientBoxBorder(
+                                          gradient:
+                                          AppColor.mainVerLinearGradient,
+                                          width: 1.sp,
+                                        ),
+                                      ),
+                                      alignment: Alignment.center,
+                                      child: Text(
+                                        lists.user!.onlineFlag ?? '',
+                                        style: TextStyle(
+                                          color: const Color.fromRGBO(
+                                              247, 250, 250, 1.0),
+                                          fontSize: 10.sp,
+                                        ),
+                                      )))
+                          ],
+                        ),
+                        Expanded(
+                            child: Container(
+                              padding: EdgeInsets.only(left: 0.sp, top: 12.sp),
+                              alignment: Alignment.centerLeft,
+                              height: 72.sp,
+                              child: Column(
+                                children: [
+                                  Row(
+                                    children: [
+                                      Text(
+                                        lists.user!.nickname!,
+                                        style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 18.sp,
+                                            fontWeight: FontWeight.w600),
+                                      ),
+                                      SizedBox(
+                                        width: 8.sp,
+                                      ),
+                                      UserTagWidget(lists.user!.mark!),
+                                    ],
+                                  ),
+                                  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),
+                                            gradient: sexBgGradient(
+                                                lists.user!.gender ?? 0)),
+                                        child: Text(
+                                          getAgeCOntent(
+                                              lists.user!.gender ?? 0,
+                                              lists.user!.age ?? 0,
+                                              lists.user!.role ?? 0,
+                                              lists.user!.orientation ?? 0),
+                                          style: TextStyle(
+                                            color:
+                                            sexBgColor(lists.user!.gender ?? 0),
+                                            fontSize: 12.sp,
+                                          ),
+                                        ),
+                                      )
+                                    ],
+                                  ),
+                                ],
+                              ),
+                            )),
+                      ],
+                    ),
+                  ),
+                  atWidget,
+                  Container(
+                    alignment: Alignment.topLeft,
+                    // margin: EdgeInsets.only(top: 4.sp),
+                    child: descText,
+                  ),
+                  picHeight > 0
+                      ? Container(
+                      height: picHeight,
+                      // alignment: Alignment.centerLeft,
+                      margin: EdgeInsets.only(top: 5.sp),
+                      child: picHeight == 200.sp
+                          ? ClipRRect(
+                          borderRadius: BorderRadius.circular(6.sp),
+                          child: VideoItemWidget(
+                              lists.album![0].url!,
+                              lists.id!.toString(),
+                              lists.user!.id.toString()))
+                          : picHeight == 250
+                          ? ClipRRect(
+                        borderRadius: BorderRadius.circular(6.sp),
+                        child: CachedImg(
+                          imageUrl: lists.album!.first.url!,
+                          fit: BoxFit.cover,
+                        ),
+                      )
+                          : GridView.builder(
+                          // controller: GridScrollController,
+                          itemCount: lists.album!.length,
+                          physics:
+                          const NeverScrollableScrollPhysics(),
+                          gridDelegate:
+                          SliverGridDelegateWithFixedCrossAxisCount(
+                              crossAxisCount: 3, //横轴三个子widget
+                              crossAxisSpacing: 4.sp,
+                              mainAxisSpacing: 4.sp,
+                              childAspectRatio:
+                              ratio //宽高比为1时，子widget
+                          ),
+                          itemBuilder: (contentxt, currentIndex) {
+                            Album album =
+                            lists.album![currentIndex];
+                            return ClipRRect(
+                              borderRadius:
+                              BorderRadius.circular(6.sp),
+                              child: CachedImg(
+                                imageUrl: album.url!,
+                                fit: BoxFit.cover,
+                              ),
+                            );
+                          }))
+                      : Container(),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: Container(
+                          height: 30.sp,
+                          padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
+                          margin: EdgeInsets.only(
+                              top: picHeight > 0 ? 5.sp : 5.sp, bottom: 10.sp),
+                          decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(15.sp),
+                              color: Color(0x33000000)),
+                          child: Row(
+                            children: [
+                              widgets.isNotEmpty
+                                  ? SizedBox(
+                                width: 24 + 12.sp * widgets.length - 8.sp,
+                                height: 24.sp,
+                                child: Stack(children: widgets),
+                              )
+                                  : Container(),
+                              SizedBox(
+                                width: 4.sp,
+                              ),
+                              widgets.isNotEmpty
+                                  ? Expanded(
+                                  child: Text(
+                                    '${lists.chat!.count!}位圈友已私聊',
+                                    style: TextStyle(
+                                        color: Colors.white.withOpacity(0.75),
+                                        fontSize: 13.sp),
+                                  ))
+                                  : Expanded(
+                                  child: Text(
+                                    '赶紧成为第一位私聊ta的人吧',
+                                    style: TextStyle(
+                                        color: Colors.white.withOpacity(0.75),
+                                        fontSize: 13.sp),
+                                  )),
+                              Image.asset(
+                                getCircleImage('chat'),
+                                width: 50.sp,
+                              )
+                            ],
+                          ),
+                        ),
+                      ),
+                      Container(
+                        margin: EdgeInsets.only(
+                            left: 10.sp,
+                            bottom:
+                            (lists.topInteractType!['userCount'] ?? 0) > 0
+                                ? 5.sp
+                                : 5.sp),
+                        // height: 40.sp,
+                        alignment: Alignment.center,
+                        child: Stack(
+                          alignment: Alignment.center,
+                          children: [
+                            Container(
+                              height: 43.sp,
+                            ),
+                            Text(
+                              lists.interactedTypeEmote ?? '❤',
+                              style: TextStyle(
+                                  color: Colors.white, fontSize: 20.sp),
+                            ),
+                            if ((lists.topInteractType!['userCount'] ?? 0) > 0)
+                              Positioned(
+                                bottom: 0,
+                                child: Text(
+                                  '${lists.topInteractType!['userCount']}',
+                                  style: TextStyle(
+                                      color: Colors.white, fontSize: 10.sp),
+                                ),
+                              ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                  if (lists.interest?.isNotEmpty ?? false)
+                    Container(
+                      width: Get.width - 26.sp,
+                      margin: EdgeInsets.only(bottom: 15.sp),
+                      child: shareCircleInfoItem(lists.interest!),
+                    )
+                ],
+              ),
+            ),
+            // Positioned(
+            //   bottom: 0,
+            //     child: Container(
+            //       width: Get.width - 26.sp,
+            //       child: circleInfoItem(lists.interest!),
+            //     ))
+          ],
+        ));
+  }
+
+  shareCircleInfoItem(var bean) {
+    Circle info = Circle.fromJson(bean);
+    return ClipRRect(
+        borderRadius: BorderRadius.circular(12.sp),
+        child: Container(
+          padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
+          height: 30.sp,
+          decoration: BoxDecoration(
+            // color: Colors.red,
+              image: DecorationImage(
+                  fit: BoxFit.fill,
+                  image: AssetImage(getCircleImage('top_circle_bg')))),
+          child: Row(
+            // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Container(
+                width: 22.sp,
+                height: 22.sp,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(8.0),
+                  gradient: const LinearGradient(
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                    colors: [
+                      Color(0xFF71F3F2),
+                      Color(0xFFF558FF),
+                    ],
+                    stops: [0.0365, 0.9427],
+                  ),
+                ),
+                padding: EdgeInsets.all(1.sp),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(8.0),
+                  child: CachedImg(
+                      imageUrl: bean['image'],
+                      width: 20.sp,
+                      height: 20.sp,
+                      fit: BoxFit.cover),
+                ),
+              ),
+              Expanded(
+                  child: Container(
+                    padding: EdgeInsets.only(
+                      left: 4.sp,
+                      // top: 12.sp,
+                    ),
+                    // alignment: Alignment.,
+                    // height: 50.sp,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Text(
+                          bean['title'],
+                          style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 14.sp,
+                              fontWeight: FontWeight.w600),
+                        ),
+                      ],
+                    ),
+                  )),
+              Row(
+                children: [
+                  Text(
+                    '👁${convertToTenThousand(bean['view_total'])}',
+                    textAlign: TextAlign.left,
+                    style: TextStyle(
+                      color: const Color(0xff03FEFB),
+                      fontSize: 12.sp,
+                    ),
+                  ),
+                  Image.asset(
+                    getHomeImage("icon_in"),
+                    width: 16.sp,
+                  )
+                ],
+              ),
+              // Container(
+              //   margin: EdgeInsets.only(right: 8.sp),
+              //   child: GestureDetector(
+              //     //加入圈子
+              //       onTap: () async {
+              //         CircleLogic cLogic = Get.find<CircleLogic>();
+              //         if (bean['is_join']) {
+              //           var data = await DioManager.instance.get(
+              //             url: "/up-service/interest/${bean['id']}",
+              //           );
+              //           if (data["code"] == 200) {
+              //             Circle info = Circle.fromJson(data['data']);
+              //             Get.bottomSheet(CircleShare('', '', info),
+              //                 isScrollControlled: true, enableDrag: false);
+              //           }
+              //         } else {
+              //           await cLogic.outCircle(
+              //               bean['id'].toString(), bean['is_join']);
+              //           bean['is_join'] = !bean['is_join'];
+              //           // if (recomanddlists.isNotEmpty) {
+              //           //   recomanddlists.forEach((element) {
+              //           //     if (element.interest!['id'].toString() ==
+              //           //         bean['id'].toString()) {
+              //           //       element.interest!['is_join'] = true;
+              //           //       element.interest = element.interest!;
+              //           //     }
+              //           //   });
+              //           // }
+              //
+              //           if (lists.isNotEmpty) {
+              //             lists.forEach((element) {
+              //               if (element.interest!['id'].toString() ==
+              //                   bean['id'].toString()) {
+              //                 element.interest!['is_join'] = true;
+              //                 element.interest = element.interest!;
+              //               }
+              //             });
+              //           }
+              //           // if (Get.isRegistered<LikeLogic>()) {
+              //           //   LikeLogic likeLogic = Get.find<LikeLogic>();
+              //           //   likeLogic.loadMyCircleData();
+              //           // }
+              //           setState(() {});
+              //         }
+              //       },
+              //       child: Stack(
+              //         alignment: Alignment.center,
+              //         children: [
+              //           Opacity(
+              //             opacity: 0.5,
+              //             child: Image.asset(
+              //               getCircleImage('add'),
+              //               width: 60.sp,
+              //             ),
+              //           ),
+              //           Text(
+              //             !bean['is_join'] ? '申请加入' : '分享有奖',
+              //             style:
+              //             TextStyle(color: Colors.white, fontSize: 12.sp),
+              //           )
+              //         ],
+              //       )),
+              // )
+            ],
+          ),
+        ));
+  }
+
   interestWdiget(List data) {
     if (!data.isNotEmpty) return Container(height: 0,);
     return Container(
diff --git a/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_text_elem.dart b/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_text_elem.dart
index 06f422c..85741c6 100644
--- a/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_text_elem.dart
+++ b/circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_text_elem.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:circle_app/commons/colors/app_color.dart';
+import 'package:circle_app/utils/util.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:tencent_cloud_chat_uikit/ui/utils/screen_utils.dart';
 import 'package:tencent_extended_text/extended_text.dart';
@@ -196,7 +198,16 @@ class _TIMTextElemState extends TIMUIKitState<TIMTextElem> {
         }
       }
     }
-
+    Map jumpInfo = {};
+    if (widget.message.cloudCustomData?.isNotEmpty ?? false) {
+      try {
+        Map info = jsonDecode(widget.message.cloudCustomData!);
+        if (info.containsKey('jumpInfo')) {
+          jumpInfo = info['jumpInfo'];
+        }
+      } catch (e) {
+      }
+    }
     final defaultStyle = widget.isFromSelf
         ? (theme.chatMessageItemFromSelfBgColor ??
             theme.lightPrimaryMaterialColor.shade50)
@@ -208,106 +219,129 @@ class _TIMTextElemState extends TIMUIKitState<TIMTextElem> {
 
     if (!widget.isFromSelf) {
       return
-          Container(
-            decoration: BoxDecoration(
-              gradient:
-              LinearGradient(colors: [Color(0xFF04FCFB), Color(0xFFE540FE)]),
-              // color: backgroundColor,
-              borderRadius: widget.borderRadius ?? borderRadius,
-            ),
-            child:Container(
-              margin: EdgeInsets.all(1),
-              padding:
-              widget.textPadding ?? EdgeInsets.all(isDesktopScreen ? 11 : 9),
-              decoration: BoxDecoration(
-                color: const Color(0xFF493E5C),
-                // color: backgroundColor,
-                borderRadius: widget.borderRadius ?? borderRadius,
-              ),
-              constraints:
-              BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.6),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  // If the [elemType] is text message, it will not be null here.
-                  // You can render the widget from extension directly, with a [TextStyle] optionally.
-                  widget.chatModel.chatConfig.urlPreviewType != UrlPreviewType.none
-                      ? textWithLink!(
-                      style: TextStyle(
-                          fontSize: isDesktopScreen ? 14 : 16,
-                          color:
-                          widget.isFromSelf ? Colors.black : Colors.white,
-                          textBaseline: TextBaseline.ideographic,
-                          height: widget.chatModel.chatConfig.textHeight))
-                      : ExtendedText(widget.message.textElem?.text ?? "",
-                      softWrap: true,
-                      style: TextStyle(
-                          fontSize: isDesktopScreen ? 14 : 16,
-                          color:
-                          widget.isFromSelf ? Colors.black : Colors.white,
-                          height: widget.chatModel.chatConfig.textHeight),
-                      specialTextSpanBuilder: DefaultSpecialTextSpanBuilder(
-                        isUseDefaultEmoji: widget.isUseDefaultEmoji,
-                        customEmojiStickerList: widget.customEmojiStickerList,
-                        showAtBackground: true,
-                      )),
-                  // If the link preview info is available, render the preview card.
-                  if (_renderPreviewWidget() != null &&
-                      widget.chatModel.chatConfig.urlPreviewType ==
-                          UrlPreviewType.previewCardAndHyperlink)
-                    _renderPreviewWidget()!,
-                  if (widget.isShowMessageReaction ?? true)
-                    TIMUIKitMessageReactionShowPanel(message: widget.message)
-                ],
-              ),
-            ),
-      );
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                decoration: BoxDecoration(
+                  gradient:
+                  LinearGradient(colors: [Color(0xFF04FCFB), Color(0xFFE540FE)]),
+                  // color: backgroundColor,
+                  borderRadius: widget.borderRadius ?? borderRadius,
+                ),
+                child:Container(
+                  margin: EdgeInsets.all(1),
+                  padding:
+                  widget.textPadding ?? EdgeInsets.all(isDesktopScreen ? 11 : 9),
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF493E5C),
+                    // color: backgroundColor,
+                    borderRadius: widget.borderRadius ?? borderRadius,
+                  ),
+                  constraints:
+                  BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.6),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      // If the [elemType] is text message, it will not be null here.
+                      // You can render the widget from extension directly, with a [TextStyle] optionally.
+                      widget.chatModel.chatConfig.urlPreviewType != UrlPreviewType.none
+                          ? textWithLink!(
+                          style: TextStyle(
+                              fontSize: isDesktopScreen ? 14 : 16,
+                              color:
+                              widget.isFromSelf ? Colors.black : Colors.white,
+                              textBaseline: TextBaseline.ideographic,
+                              height: widget.chatModel.chatConfig.textHeight))
+                          : ExtendedText(widget.message.textElem?.text ?? "",
+                          softWrap: true,
+                          style: TextStyle(
+                              fontSize: isDesktopScreen ? 14 : 16,
+                              color:
+                              widget.isFromSelf ? Colors.black : Colors.white,
+                              height: widget.chatModel.chatConfig.textHeight),
+                          specialTextSpanBuilder: DefaultSpecialTextSpanBuilder(
+                            isUseDefaultEmoji: widget.isUseDefaultEmoji,
+                            customEmojiStickerList: widget.customEmojiStickerList,
+                            showAtBackground: true,
+                          )),
+                      // If the link preview info is available, render the preview card.
+                      if (_renderPreviewWidget() != null &&
+                          widget.chatModel.chatConfig.urlPreviewType ==
+                              UrlPreviewType.previewCardAndHyperlink)
+                        _renderPreviewWidget()!,
+                      if (widget.isShowMessageReaction ?? true)
+                        TIMUIKitMessageReactionShowPanel(message: widget.message)
+                    ],
+                  ),
+                ),
+      ),
+              if (jumpInfo.containsKey('btnText'))
+                InkWell(
+                  onTap: () {
+                    pushPage(jumpInfo['scene'], jumpInfo['param'].toString());
+                  },
+                  child: Container(margin: EdgeInsets.only(top: 8.sp),child: Text(jumpInfo['btnText'],style: TextStyle(color: AppColor.mainColor,fontSize: 16.sp),)),
+                )
+            ],
+          );
     }
-    return Container(
-      padding:
-      widget.textPadding ?? EdgeInsets.all(isDesktopScreen ? 12 : 10),
-      decoration: BoxDecoration(
-        gradient:
-        LinearGradient(colors: [Color(0xFF04FCFB), Color(0xFFE540FE)]),
-        // color: backgroundColor,
-        borderRadius: widget.borderRadius ?? borderRadius,
-      ),
-      constraints:
-      BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.6),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // If the [elemType] is text message, it will not be null here.
-          // You can render the widget from extension directly, with a [TextStyle] optionally.
-          widget.chatModel.chatConfig.urlPreviewType != UrlPreviewType.none
-              ? textWithLink!(
-              style: TextStyle(
-                  fontSize: isDesktopScreen ? 14 : 16,
-                  color:
-                  widget.isFromSelf ? Colors.black : Colors.white,
-                  textBaseline: TextBaseline.ideographic,
-                  height: widget.chatModel.chatConfig.textHeight))
-              : ExtendedText(widget.message.textElem?.text ?? "",
-              softWrap: true,
-              style: TextStyle(
-                  fontSize: isDesktopScreen ? 14 : 16,
-                  color:
-                  widget.isFromSelf ? Colors.black : Colors.white,
-                  height: widget.chatModel.chatConfig.textHeight),
-              specialTextSpanBuilder: DefaultSpecialTextSpanBuilder(
-                isUseDefaultEmoji: widget.isUseDefaultEmoji,
-                customEmojiStickerList: widget.customEmojiStickerList,
-                showAtBackground: true,
-              )),
-          // If the link preview info is available, render the preview card.
-          if (_renderPreviewWidget() != null &&
-              widget.chatModel.chatConfig.urlPreviewType ==
-                  UrlPreviewType.previewCardAndHyperlink)
-            _renderPreviewWidget()!,
-          if (widget.isShowMessageReaction ?? true)
-            TIMUIKitMessageReactionShowPanel(message: widget.message)
-        ],
-      ),
+    return Column(
+      children: [
+        Container(
+          padding:
+          widget.textPadding ?? EdgeInsets.all(isDesktopScreen ? 12 : 10),
+          decoration: BoxDecoration(
+            gradient:
+            LinearGradient(colors: [Color(0xFF04FCFB), Color(0xFFE540FE)]),
+            // color: backgroundColor,
+            borderRadius: widget.borderRadius ?? borderRadius,
+          ),
+          constraints:
+          BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.6),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // If the [elemType] is text message, it will not be null here.
+              // You can render the widget from extension directly, with a [TextStyle] optionally.
+              widget.chatModel.chatConfig.urlPreviewType != UrlPreviewType.none
+                  ? textWithLink!(
+                  style: TextStyle(
+                      fontSize: isDesktopScreen ? 14 : 16,
+                      color:
+                      widget.isFromSelf ? Colors.black : Colors.white,
+                      textBaseline: TextBaseline.ideographic,
+                      height: widget.chatModel.chatConfig.textHeight))
+                  : ExtendedText(widget.message.textElem?.text ?? "",
+                  softWrap: true,
+                  style: TextStyle(
+                      fontSize: isDesktopScreen ? 14 : 16,
+                      color:
+                      widget.isFromSelf ? Colors.black : Colors.white,
+                      height: widget.chatModel.chatConfig.textHeight),
+                  specialTextSpanBuilder: DefaultSpecialTextSpanBuilder(
+                    isUseDefaultEmoji: widget.isUseDefaultEmoji,
+                    customEmojiStickerList: widget.customEmojiStickerList,
+                    showAtBackground: true,
+                  )),
+              // If the link preview info is available, render the preview card.
+              if (_renderPreviewWidget() != null &&
+                  widget.chatModel.chatConfig.urlPreviewType ==
+                      UrlPreviewType.previewCardAndHyperlink)
+                _renderPreviewWidget()!,
+              if (widget.isShowMessageReaction ?? true)
+                TIMUIKitMessageReactionShowPanel(message: widget.message)
+            ],
+          ),
+        ),
+        if (jumpInfo.containsKey('jump'))
+        InkWell(
+          onTap: () {
+            pushPage(jumpInfo['scene'], jumpInfo['param'].toString());
+          },
+          child: Text(jumpInfo['btnText'],style: TextStyle(color: AppColor.mainColor,fontSize: 15.sp),),
+        )
+      ],
     );
 
   }
diff --git a/circle_app/lib/circle_app/chat/widget/more_dialog.dart b/circle_app/lib/circle_app/chat/widget/more_dialog.dart
index c9a01d8..fbc3a6d 100644
--- a/circle_app/lib/circle_app/chat/widget/more_dialog.dart
+++ b/circle_app/lib/circle_app/chat/widget/more_dialog.dart
@@ -264,7 +264,7 @@ class _MoreDialogState extends State<MoreDialog> {
                             top: 12.sp, left: 14.sp, right: 14.sp),
                         alignment: Alignment.center,
                         child: Text(
-                          "拉黑后，你将屏蔽对方的任何信息若您关注了对方，将自动取消关注。",
+                          "拉黑后，你将屏蔽对方的任何信息。若您喜欢了对方，将自动取消喜欢。",
                           textAlign: TextAlign.center,
                           style: TextStyle(
                               color: const Color(0xCCF7FAFA), fontSize: 16.sp),
diff --git a/circle_app/lib/circle_app/circle/view.dart b/circle_app/lib/circle_app/circle/view.dart
index c6da28e..80b215d 100644
--- a/circle_app/lib/circle_app/circle/view.dart
+++ b/circle_app/lib/circle_app/circle/view.dart
@@ -205,47 +205,56 @@ class _CirclePageState extends State<CirclePage>
 
               ],
             )),
-            if (logic.isShowTip)
+            if (logic.isShowTip && homelogic.isProd)
               Positioned(
-                  child: Container(
-                    width: Get.width,
-                    height: Get.height,
-                    color: Colors.black.withOpacity(0.7),
-                    child: Stack(
-                      children: [
-                        Positioned(
-                            top: MediaQuery.of(context).padding.top + 40.sp,
-                            right: 0.sp,
+                  child: InkWell(
+                    onTap: () {
+                      logic.isShowTip = false;
+                      logic.update();
+                      logic.setSpTip();
+                    },
 
-                            child: Column(
-                              children: [
+                    child: Container(
+                      width: Get.width,
+                      height: Get.height,
+                      color: Colors.black.withOpacity(0.7),
+                      child: Stack(
+                        children: [
+                          Positioned(
+                              top: MediaQuery.of(context).padding.top + 40.sp,
+                              right: 0.sp,
 
-                                Image.asset(
-                                  getBaseImage('pop_top_right'),
-                                  width: 150.sp,
-                                ),
-                                Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('筛选城市/角色/属性/取向',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),)),
-                              ],
-                            )),
-                        Positioned(
-                          top: MediaQuery.of(context).padding.top + 10.sp,
-                          right: 10.sp,
-                          child:  GestureDetector(
-                            onTap: () {
-                              logic.isShowTip = false;
-                              logic.update();
-                              logic.setSpTip();
-                              _showBottomSheet(context);
-                            },
-                            child: Image.asset(
-                              getCircleImage('icon_screen'),
-                              width: 30.sp,
+                              child: Column(
+                                children: [
+
+                                  Image.asset(
+                                    getBaseImage('pop_top_right'),
+                                    width: 150.sp,
+                                  ),
+                                  Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('筛选城市/角色/属性/取向',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),)),
+                                ],
+                              )),
+                          Positioned(
+                            top: MediaQuery.of(context).padding.top + 10.sp,
+                            right: 10.sp,
+                            child:  GestureDetector(
+                              onTap: () {
+                                logic.isShowTip = false;
+                                logic.update();
+                                logic.setSpTip();
+                                _showBottomSheet(context);
+                              },
+                              child: Image.asset(
+                                getCircleImage('icon_screen'),
+                                width: 30.sp,
+                              ),
                             ),
                           ),
-                        ),
-                      ],
+                        ],
+                      ),
                     ),
                   )),
+
           ],
         ),
       );
@@ -977,21 +986,11 @@ class _CirclePageState extends State<CirclePage>
                         InkWell(
                           onTap: () async {
                             if (_tabController.index == 2) {
-                              var data = await DioManager.instance
-                                  .get(url: Api.getUserMine);
-                              var bean =
-                                  BaseResponse<MineResponseBean>.fromJson(
-                                      data,
-                                      (data) =>
-                                          MineResponseBean.fromJson(data));
-                              User userInfoBean = bean.data.user;
-
-                              if (userInfoBean.vip > 0) {
-                                navigateToQueen();
-                              } else {
-                                showOKToast('领取特权之后更容易上精选');
-                                showOepnVipDialog('');
-                              }
+                              Get.bottomSheet(
+                                TodayPeopleDialog(isShow: true,source:'fate_match'),
+                                isScrollControlled: true,
+                                enableDrag: false,
+                              );
                             } else {
                               Get.toNamed(Routes.Search);
                             }
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 100b1f2..7efc18f 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
@@ -372,8 +372,6 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
         borderRadius: BorderRadius.circular(10.sp),
         child: Container(
             width: Get.width,
-            // margin:
-
             child: Stack(
               children: [
                 ClipRRect(
@@ -1345,6 +1343,22 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
                 ),
                 Row(
                   children: [
+                    InkWell(
+                      onTap: () {
+                        Get.bottomSheet(
+                            CallOutShareDialog('','',lists), isScrollControlled: true,
+                            enableDrag: false
+                        );
+
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(right: 5.sp),
+                        child: Image.asset(
+                          getCircleImage('forward'),
+                          width: 20.sp,
+                        ),
+                      ),
+                    ),
                     Expanded(
                       child: Container(
                         height: 30.sp,
@@ -1767,6 +1781,22 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
                       : Container(),
                   Row(
                     children: [
+                      InkWell(
+                        onTap: () {
+                          Get.bottomSheet(
+                              CallOutShareDialog('','',lists), isScrollControlled: true,
+                              enableDrag: false
+                          );
+
+                        },
+                        child: Container(
+                          margin: EdgeInsets.only(right: 5.sp),
+                          child: Image.asset(
+                            getCircleImage('forward'),
+                            width: 20.sp,
+                          ),
+                        ),
+                      ),
                       Expanded(
                         child: Container(
                           height: 30.sp,
diff --git a/circle_app/lib/circle_app/circle/widgets/like_view.dart b/circle_app/lib/circle_app/circle/widgets/like_view.dart
index 8b7bd9f..8ba615d 100644
--- a/circle_app/lib/circle_app/circle/widgets/like_view.dart
+++ b/circle_app/lib/circle_app/circle/widgets/like_view.dart
@@ -1138,59 +1138,24 @@ class _LikeViewState extends State<LikeView>
                               );
                             }),
                   ),
-                  // Container(
-                  //   height: 30.sp,
-                  //   padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
-                  //   margin: EdgeInsets.only(top: picHeight == 0 ? 15.sp : 5.sp),
-                  //   decoration: BoxDecoration(
-                  //       borderRadius: BorderRadius.circular(15.sp),
-                  //       color: Color(0x33000000)),
-                  //   child: Row(
-                  //     children: [
-                  //       widgets.isNotEmpty
-                  //           ? SizedBox(
-                  //               width: 24 + 12.sp * widgets.length - 8.sp,
-                  //               height: 24.sp,
-                  //               child: Stack(children: widgets),
-                  //             )
-                  //           : Container(),
-                  //       SizedBox(
-                  //         width: 4.sp,
-                  //       ),
-                  //       widgets.isNotEmpty
-                  //           ? Expanded(
-                  //               child: Text(
-                  //               '${lists.chat!.count!}位圈友已私聊',
-                  //               style: TextStyle(
-                  //                   color: Colors.white.withOpacity(0.75),
-                  //                   fontSize: 14.sp),
-                  //             ))
-                  //           : Expanded(
-                  //               child: Text(
-                  //               '赶紧成为第一位私聊ta的圈友吧',
-                  //               style: TextStyle(
-                  //                   color: Colors.white.withOpacity(0.75),
-                  //                   fontSize: 14.sp),
-                  //             )),
-                  //       GestureDetector(
-                  //         onTap: () {
-                  //           pushMsgPage(
-                  //             lists,
-                  //             lists.interest!['id'].toString(),
-                  //           );
-                  //           // pushHomePage(
-                  //           //     lists, widget.bean.id.toString());
-                  //         },
-                  //         child: Image.asset(
-                  //           getCircleImage('chat'),
-                  //           width: 60.sp,
-                  //         ),
-                  //       )
-                  //     ],
-                  //   ),
-                  // ),
                   Row(
                     children: [
+                      InkWell(
+                        onTap: () {
+                          Get.bottomSheet(
+                              CallOutShareDialog('','',lists), isScrollControlled: true,
+                              enableDrag: false
+                          );
+
+                        },
+                        child: Container(
+                          margin: EdgeInsets.only(right: 5.sp),
+                          child: Image.asset(
+                            getCircleImage('forward'),
+                            width: 20.sp,
+                          ),
+                        ),
+                      ),
                       Expanded(
                         child: Container(
                           height: 30.sp,
@@ -1236,7 +1201,7 @@ class _LikeViewState extends State<LikeView>
                                 },
                                 child: Image.asset(
                                   getCircleImage('chat'),
-                                  width: 60.sp,
+                                  width: 50.sp,
                                 ),
                               )
                             ],
@@ -1577,6 +1542,22 @@ class _LikeViewState extends State<LikeView>
 
                     Row(
                       children: [
+                        InkWell(
+                          onTap: () {
+                            Get.bottomSheet(
+                                CallOutShareDialog('','',lists), isScrollControlled: true,
+                                enableDrag: false
+                            );
+
+                          },
+                          child: Container(
+                            margin: EdgeInsets.only(right: 5.sp),
+                            child: Image.asset(
+                              getCircleImage('forward'),
+                              width: 20.sp,
+                            ),
+                          ),
+                        ),
                         Expanded(
                           child: Container(
                             height: 30.sp,
@@ -1622,7 +1603,7 @@ class _LikeViewState extends State<LikeView>
                                   },
                                   child: Image.asset(
                                     getCircleImage('chat'),
-                                    width: 60.sp,
+                                    width: 50.sp,
                                   ),
                                 )
                               ],
diff --git a/circle_app/lib/circle_app/circle_list/view.dart b/circle_app/lib/circle_app/circle_list/view.dart
index c4c6481..cb2cb7c 100644
--- a/circle_app/lib/circle_app/circle_list/view.dart
+++ b/circle_app/lib/circle_app/circle_list/view.dart
@@ -23,6 +23,7 @@ import '../../commons/colors/app_color.dart';
 import '../../net/api.dart';
 import '../../utils/cache_img.dart';
 import '../../utils/eventBus.dart';
+import '../home/logic.dart';
 import 'logic.dart';
 import 'widgets/all_circle_item.dart';
 
@@ -42,6 +43,8 @@ class _CircleListPageState extends State<CircleListPage>
 
   final logic = Get.find<LikeLogic>();
 
+  final homeLogic = Get.find<HomeLogic>();
+
   int currentIndex = 1;
 
   List<String> tipList = [
@@ -203,96 +206,111 @@ class _CircleListPageState extends State<CircleListPage>
                             ),
                           ),
               ),
-              if (logic.isShowCallOutTip)
+              if (logic.isShowCallOutTip && homeLogic.isProd)
                 Positioned(
-                    child: Container(
-                      width: Get.width,
-                      height: Get.height,
-                      color: Colors.black.withOpacity(0.7),
-                      child: Stack(
-                        children: [
-                          Positioned(
-                              bottom: 36.sp + 70.sp,
-                              right: 30.sp,
-                              child: Column(
-                                children: [
-                                  Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('发圈内动态吸引圈友',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),)),
-                                  Transform(
-                                    alignment: Alignment.center,
-                                    transform:  Matrix4.rotationX(3.1416), // π radians = 180 degrees
-                                    child: Image.asset(
-                                      getBaseImage('pop_top_left'),
-                                      width: 150.sp,
+                    child: InkWell(
+                      onTap: () {
+                        logic.isShowCallOutTip = false;
+                        logic.update();
+                        logic.setSpCallOpTip();
+                        logic.isShowLikeTip = true;
+                        logic.update();
+                      },
+                      child: Container(
+                        width: Get.width,
+                        height: Get.height,
+                        color: Colors.black.withOpacity(0.7),
+                        child: Stack(
+                          children: [
+                            Positioned(
+                                bottom: 36.sp + 70.sp,
+                                right: 30.sp,
+                                child: Column(
+                                  children: [
+                                    Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('发圈内动态吸引圈友',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),)),
+                                    Transform(
+                                      alignment: Alignment.center,
+                                      transform:  Matrix4.rotationX(3.1416), // π radians = 180 degrees
+                                      child: Image.asset(
+                                        getBaseImage('pop_top_left'),
+                                        width: 150.sp,
+                                      ),
                                     ),
-                                  ),
 
-                                ],
-                              )),
-                          Positioned(
-                              bottom: 36.sp,
-                              right: 10.sp,
-                              child: GestureDetector(
-                                  onTap: () async {
-                                    logic.isShowCallOutTip = false;
-                                    logic.update();
-                                    logic.setSpCallOpTip();
-                                    // addUmengTag('点击圈子喊话');
-                                    var result = Get.toNamed(
-                                      Routes.CallOutPage,
-                                    );
-                                    logic.isShowLikeTip = true;
-                                    logic.update();
+                                  ],
+                                )),
+                            Positioned(
+                                bottom: 36.sp,
+                                right: 10.sp,
+                                child: GestureDetector(
+                                    onTap: () async {
+                                      logic.isShowCallOutTip = false;
+                                      logic.update();
+                                      logic.setSpCallOpTip();
+                                      var result = Get.toNamed(
+                                        Routes.CallOutPage,
+                                      );
+                                      logic.isShowLikeTip = true;
+                                      logic.update();
 
-                                  },
-                                  child: Image.asset(
-                                    getCircleImage('send_msg'),
-                                    width: 70.sp,
-                                  ))),
-                        ],
+                                    },
+                                    child: Image.asset(
+                                      getCircleImage('send_msg'),
+                                      width: 70.sp,
+                                    ))),
+                          ],
+                        ),
                       ),
                     )),
-              if (logic.isShowLikeTip)
+              if (logic.isShowLikeTip && homeLogic.isProd)
                 Positioned(
-                    child: Container(
-                      width: Get.width,
-                      height: Get.height,
-                      color: Colors.black.withOpacity(0.7),
-                      child: Stack(
-                        children: [
-                          Positioned(
-                              top: 36.sp + 130.sp,
-                              left: 30.sp,
-                              child: Column(
-                                children: [
+                    child: InkWell(
+                      onTap: () {
+                        logic.isShowLikeTip = false;
+                        logic.update();
+                        logic.setSpLikeOpTip();
+                      },
+                      child: Container(
+                        width: Get.width,
+                        height: Get.height,
+                        color: Colors.black.withOpacity(0.7),
+                        child: Stack(
+                          children: [
+                            Positioned(
+                                top: 36.sp + 130.sp,
+                                left: 30.sp,
+                                child: Column(
+                                  children: [
 
-                                  Transform(
-                                    alignment: Alignment.center,
-                                    transform:  Matrix4.rotationY(3.1416), // π radians = 180 degrees
-                                    child: Image.asset(
-                                      getBaseImage('pop_top_left'),
-                                      width: 150.sp,
+                                    Transform(
+                                      alignment: Alignment.center,
+                                      transform:  Matrix4.rotationY(3.1416), // π radians = 180 degrees
+                                      child: Image.asset(
+                                        getBaseImage('pop_top_left'),
+                                        width: 150.sp,
+                                      ),
                                     ),
-                                  ),
-                                  Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('👀喜欢的圈友动态',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),)),
-                                ],
-                              )),
-                          Positioned(
-                              top: 120.sp,
-                              left: 10.sp,
-                              child: GestureDetector(
-                                  onTap: () async {
-                                    logic.isShowLikeTip = false;
-                                    logic.currentIndex = -2;
-                                    logic.update();
-                                    logic.setSpLikeOpTip();
-                                  },
-                                  child:  topCicleStatusItem(
-                                      true,
-                                      Image.asset(
-                                        getCircleImage('like_icon'),
-                                        width: 32.sp,
-                                      )),)),
-                        ],
+                                    Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('👀喜欢的圈友动态',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),)),
+                                  ],
+                                )),
+                            Positioned(
+                                top: 120.sp,
+                                left: 10.sp,
+                                child: GestureDetector(
+                                    onTap: () async {
+                                      logic.isShowLikeTip = false;
+                                      logic.currentIndex = -2;
+                                      logic.update();
+                                      logic.setSpLikeOpTip();
+                                    },
+                                    child:  topCicleStatusItem(
+                                        true,
+                                        Image.asset(
+                                          getCircleImage('like_icon'),
+                                          width: 32.sp,
+                                        )),)),
+                          ],
+                        ),
                       ),
                     ))
             ],
diff --git a/circle_app/lib/circle_app/circle_list/widgets/all_circle_item.dart b/circle_app/lib/circle_app/circle_list/widgets/all_circle_item.dart
index 9d1b0f6..fe2bfdc 100644
--- a/circle_app/lib/circle_app/circle_list/widgets/all_circle_item.dart
+++ b/circle_app/lib/circle_app/circle_list/widgets/all_circle_item.dart
@@ -21,9 +21,9 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
-import '../../../commons/Widgets/circle_share.dart';
 import '../../../commons/Widgets/tag_widget.dart';
 import '../../../commons/colors/app_color.dart';
+import '../../../commons/widgets/circle_share.dart';
 import '../../../commons/widgets/more_dynamic_tip.dart';
 import '../../../net/api.dart';
 import '../../../utils/SharedPreferencesHelper.dart';
@@ -880,38 +880,8 @@ class _AllCircleItemState extends State<AllCircleItem>
                                 await SharedPreferencesHelper.getInstance();
                             String myUserId = sp.getMyUserId();
 
-                            // if (lists.user?.id!.toString() == myUserId) {
                             Get.toNamed(Routes.UserInfoPage,
                                 arguments: lists.user?.id!.toString());
-                            // return;
-                            // }
-                            // if (widget.bean.is_limit &&
-                            //     widget.bean.amount > 0) {
-                            //   await refreshCircleData();
-                            // }
-                            // if (widget.bean.is_limit &&
-                            //     widget.bean.amount > 0) {
-                            //   showJoinCiclePiker(
-                            //       widget.bean.id.toString(),
-                            //       widget.bean.amount.toString(),
-                            //       widget.bean.oldAmount.toString(),
-                            //       1, (payResult) {
-                            //     widget.bean.is_limit = false;
-                            //     if (Get.isRegistered<CircleLogic>()) {
-                            //       var logic = Get.find<CircleLogic>();
-                            //       for (var element in logic.circle.lists) {
-                            //         if (element.id == widget.bean.id) {
-                            //           element.is_limit = false;
-                            //           element.isJoin = true;
-                            //         }
-                            //       }
-                            //       logic.update();
-                            //     }
-                            //     Get.back();
-                            //   }, widget.bean.ios_item);
-                            //   return;
-                            // }
-                            // pushHomePage(lists, lists.id.toString());
                           },
                           child: Stack(
                             alignment: Alignment.center,
@@ -1123,6 +1093,22 @@ class _AllCircleItemState extends State<AllCircleItem>
                 ),
                 Row(
                   children: [
+                    InkWell(
+                      onTap: () {
+                        Get.bottomSheet(
+                            CallOutShareDialog('','',lists), isScrollControlled: true,
+                            enableDrag: false
+                        );
+
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(right: 5.sp),
+                        child: Image.asset(
+                          getCircleImage('forward'),
+                          width: 20.sp,
+                        ),
+                      ),
+                    ),
                     Expanded(
                       child: Container(
                         height: 30.sp,
@@ -1165,7 +1151,7 @@ class _AllCircleItemState extends State<AllCircleItem>
                               },
                               child: Image.asset(
                                 getCircleImage('chat'),
-                                width: 60.sp,
+                                width: 50.sp,
                               ),
                             )
                           ],
@@ -1604,6 +1590,22 @@ class _AllCircleItemState extends State<AllCircleItem>
                       : Container(),
                   Row(
                     children: [
+                      InkWell(
+                        onTap: () {
+                          Get.bottomSheet(
+                              CallOutShareDialog('','',lists), isScrollControlled: true,
+                              enableDrag: false
+                          );
+
+                        },
+                        child: Container(
+                          margin: EdgeInsets.only(right: 5.sp),
+                          child: Image.asset(
+                            getCircleImage('forward'),
+                            width: 20.sp,
+                          ),
+                        ),
+                      ),
                       Expanded(
                         child: Container(
                           height: 30.sp,
@@ -1646,7 +1648,7 @@ class _AllCircleItemState extends State<AllCircleItem>
                                 },
                                 child: Image.asset(
                                   getCircleImage('chat'),
-                                  width: 60.sp,
+                                  width: 50.sp,
                                 ),
                               )
                             ],
diff --git a/circle_app/lib/circle_app/circle_list/widgets/right_circle_iten.dart b/circle_app/lib/circle_app/circle_list/widgets/right_circle_iten.dart
index de4e61c..f85e32d 100644
--- a/circle_app/lib/circle_app/circle_list/widgets/right_circle_iten.dart
+++ b/circle_app/lib/circle_app/circle_list/widgets/right_circle_iten.dart
@@ -2330,6 +2330,22 @@ class _RightCircleListWidgetState extends State<RightCircleListWidget>
                 ),
                 Row(
                   children: [
+                    InkWell(
+                      onTap: () {
+                        Get.bottomSheet(
+                            CallOutShareDialog('','',lists), isScrollControlled: true,
+                            enableDrag: false
+                        );
+
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(right: 5.sp),
+                        child: Image.asset(
+                          getCircleImage('forward'),
+                          width: 20.sp,
+                        ),
+                      ),
+                    ),
                     Expanded(
                       child: Container(
                         height: 30.sp,
@@ -2375,7 +2391,7 @@ class _RightCircleListWidgetState extends State<RightCircleListWidget>
                               },
                               child: Image.asset(
                                 getCircleImage('chat'),
-                                width: 60.sp,
+                                width: 50.sp,
                               ),
                             )
                           ],
@@ -2902,6 +2918,22 @@ class _RightCircleListWidgetState extends State<RightCircleListWidget>
                       : Container(),
                   Row(
                     children: [
+                      InkWell(
+                        onTap: () {
+                          Get.bottomSheet(
+                              CallOutShareDialog('','',lists), isScrollControlled: true,
+                              enableDrag: false
+                          );
+
+                        },
+                        child: Container(
+                          margin: EdgeInsets.only(right: 5.sp),
+                          child: Image.asset(
+                            getCircleImage('forward'),
+                            width: 20.sp,
+                          ),
+                        ),
+                      ),
                       Expanded(
                         child: Container(
                           height: 30.sp,
diff --git a/circle_app/lib/circle_app/help_back/logic.dart b/circle_app/lib/circle_app/help_back/logic.dart
index a0f1a3d..247cde9 100644
--- a/circle_app/lib/circle_app/help_back/logic.dart
+++ b/circle_app/lib/circle_app/help_back/logic.dart
@@ -30,12 +30,10 @@ class Help_BackLogic extends GetxController {
   }
 
   getToken() async {
-    // var data = await DioManager.instance.get(url: Api.tokenNoLogin, params: {});
-    // var bean = BaseResponse<QnTokenData>.fromJson(
-    //     data, (data) => QnTokenData.fromJson(data));
-    // if(data['code'] == 200){
-    //   quToken = data['data']['token'];
-    // }
+    var data = await DioManager.instance.get(url: Api.tokenNoLogin, params: {});
+    if(data['code'] == 200){
+      quToken = data['data']['token'];
+    }
   }
 
   Future getImageFile() async {
@@ -66,18 +64,20 @@ class Help_BackLogic extends GetxController {
       showOKToast('请输入手机号');
     } else if (textEditingController.text.isEmpty) {
       showOKToast('请输入您的问题');
+    } else if (photoController.text.length != 11) {
+      showOKToast('请输入正确的手机号');
     } else {
-      // var result = await DioManager.instance.postBody(url: Api.registerFeedback, params: {
-      //   "content": textEditingController.text,
-      //   "images": imaglist,
-      //   "mobile": photoController.text
-      // });
-      // if (result['code'] == 200) {
-      //   showOKToast('提交成功');
-      //   Get.back();
-      // } else {
-      //   showOKToast(result['msg']);
-      // }
+      var result = await DioManager.instance.postBody(url: Api.registerFeedback, params: {
+        "content": textEditingController.text,
+        "images": imaglist,
+        "mobile": photoController.text
+      });
+      if (result['code'] == 200) {
+        showOKToast('提交成功');
+        Get.back();
+      } else {
+        showOKToast(result['msg']);
+      }
     }
 
   }
diff --git a/circle_app/lib/circle_app/help_back/view.dart b/circle_app/lib/circle_app/help_back/view.dart
index 3abe820..c5b4936 100644
--- a/circle_app/lib/circle_app/help_back/view.dart
+++ b/circle_app/lib/circle_app/help_back/view.dart
@@ -55,7 +55,7 @@ class Help_BackPage extends StatelessWidget {
                             Container(
                                 alignment: Alignment.centerLeft,
                                 padding:
-                                EdgeInsets.only(left: 16.0.sp, right: 10.sp,top: 4.sp),
+                                EdgeInsets.only(left: 16.0.sp, right: 10.sp),
                                 child: Text(
                                   "+86",
                                   style: TextStyle(
@@ -71,6 +71,8 @@ class Help_BackPage extends StatelessWidget {
                                   controller: logic.photoController,
                                   textAlignVertical: TextAlignVertical.center,
                                   maxLines: 1,
+                                  keyboardType: TextInputType.phone,
+                                  maxLength: 11,
                                   decoration: InputDecoration(
                                     hintText: '请输入手机号，方便我们联系您',
                                     counterText:"",
diff --git a/circle_app/lib/circle_app/home/logic.dart b/circle_app/lib/circle_app/home/logic.dart
index 3f388b5..6853ee1 100644
--- a/circle_app/lib/circle_app/home/logic.dart
+++ b/circle_app/lib/circle_app/home/logic.dart
@@ -59,7 +59,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
   String inventStr = '邀请好友';
   String inventTipStr = '邀请更多圈友一起玩';
   Widget currentPage = Container();
-
+  final GlobalKey widgetKey = GlobalKey();
   final HomeState state = HomeState();
 
   DateTime now = DateTime.now();
@@ -116,7 +116,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
     SharedPreferencesHelper  sp = await SharedPreferencesHelper.getInstance();
     sp.setFirstPeopleSendCallOut();
     loadEnvTypeData();
-    await checkInfo();
+    checkInfo();
     // 设置网络变化监听
     connectListener();
     getIMData();
@@ -184,19 +184,20 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
         Map<String, dynamic> jsonData = json.decode(customData);
         int event = jsonData['event'];
         Map<String, dynamic> content = jsonData['content'] ?? [];
+        BuildContext? context = widgetKey.currentContext;
         switch (event) {
           case 1: //关注
             String ageMsg =
                 "${content['genderName']}·${content['age']}·${content['roleName']}·${content['orientationName']}";
             if (content['isFollow'] == 1) {
               //互关
-              showFloatingButtonOverlay(Get.context!, content['nickname'],
+              showFloatingButtonOverlay(context!, content['nickname'],
                   ageMsg, content['avatarThumb'], 3, () {
                 pushChatPage(content['id'].toString(), content['imId'],
                     content['nickname']);
               });
             } else {
-              showFloatingButtonOverlay(Get.context!, content['nickname'],
+              showFloatingButtonOverlay(context!, content['nickname'],
                   ageMsg, content['avatarThumb'], 1, () {
                 setLike(content['id'].toString());
               });
@@ -208,7 +209,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
             String ageMsg =
                 "${content['genderName']}·${content['age']}·${content['roleName']}·${content['orientationName']}";
 
-            showFloatingButtonOverlay(Get.context!, content['nickname'], ageMsg,
+            showFloatingButtonOverlay(context!, content['nickname'], ageMsg,
                 content['avatarThumb'], 2, () {
               pushChatPage(content['id'].toString(), content['imId'],
                   content['nickname']);
@@ -249,20 +250,21 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
           Map jsonData = jsonDecode(message.customElem!.data!);
           if (jsonData.containsKey('event')) {
             String event = jsonData['event'].toString();
-
+            BuildContext? context = widgetKey.currentContext;
             if (int.parse(event) == 1) {
               Map content = jsonData['content'];
               String ageMsg =
                   "${content['genderName']}·${content['age']}·${content['roleName']}·${content['orientationName']}";
+
               if (content['isFollow'] == 1) {
                 //互关
-                showFloatingButtonOverlay(Get.context!, content['nickname'],
+                showFloatingButtonOverlay(context!, content['nickname'],
                     ageMsg, content['avatarThumb'], 3, () {
                   pushChatPage(content['id'].toString(), content['imId'],
                       content['nickname']);
                 });
               } else {
-                showFloatingButtonOverlay(Get.context!, content['nickname'],
+                showFloatingButtonOverlay(context!, content['nickname'],
                     ageMsg, content['avatarThumb'], 1, () {
                   setLike(content['id'].toString());
                 });
@@ -272,7 +274,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
               String ageMsg =
                   "${content['genderName']}·${content['age']}·${content['roleName']}·${content['orientationName']}";
 
-              showFloatingButtonOverlay(Get.context!, content['nickname'],
+              showFloatingButtonOverlay(context!, content['nickname'],
                   ageMsg, content['avatarThumb'], 2, () {
                 pushChatPage(content['id'].toString(), content['imId'],
                     content['nickname']);
@@ -665,10 +667,10 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
       final logic = Get.put(MinefragmentLogic());
       logic.loadData();
     } else if (index == 3) {
-      final logic = Get.find<MsgLogic>();
-      EventBusManager.fire(MsgRecommendCardRefresh());
-      logic.loadChatData();
-      logic.getVisitorMsgsData();
+      if (Get.isRegistered<MsgLogic>()) {
+        final logic = Get.find<MsgLogic>();
+       logic.loadData();
+      }
     }
     update();
   }
@@ -747,7 +749,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
     });
   }
 
-  void loadEnvTypeData() async {
+  loadEnvTypeData() async {
     var data = await DioManager.instance.get(url: Api.getAppEnv);
     if (data['code'] == 200) {
       isProd = data['data'] == 0;
diff --git a/circle_app/lib/circle_app/home/view.dart b/circle_app/lib/circle_app/home/view.dart
index 9d01951..b747031 100644
--- a/circle_app/lib/circle_app/home/view.dart
+++ b/circle_app/lib/circle_app/home/view.dart
@@ -155,6 +155,7 @@ class _HomePageState extends State<HomePage>
     return GetBuilder(builder: (HomeLogic controller) {
       return ExitAppConfirmation(
         child: Scaffold(
+          key: logic.widgetKey,
           resizeToAvoidBottomInset: false,
           backgroundColor: const Color.fromRGBO(15, 10, 31, 1.0),
           bottomNavigationBar: Container(
diff --git a/circle_app/lib/circle_app/invite/share.dart b/circle_app/lib/circle_app/invite/share.dart
index 9f8e737..230e55b 100644
--- a/circle_app/lib/circle_app/invite/share.dart
+++ b/circle_app/lib/circle_app/invite/share.dart
@@ -420,7 +420,7 @@ class _ShareState extends State<Share> {
   _saveLocalImage() async {
     RenderRepaintBoundary boundary =
         _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
-    ui.Image image = await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+    ui.Image image = await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
         await (image.toByteData(format: ui.ImageByteFormat.png));
     if (byteData != null) {
@@ -457,7 +457,7 @@ class _ShareState extends State<Share> {
     SmartDialog.showLoading(msg:'正在生成分享图片...');
     RenderRepaintBoundary boundary =
     _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
-    ui.Image image = await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+    ui.Image image = await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
     await (image.toByteData(format: ui.ImageByteFormat.png));
     String filePath = '';
diff --git a/circle_app/lib/circle_app/login/login/view.dart b/circle_app/lib/circle_app/login/login/view.dart
index df7490e..c4b94fb 100644
--- a/circle_app/lib/circle_app/login/login/view.dart
+++ b/circle_app/lib/circle_app/login/login/view.dart
@@ -511,11 +511,14 @@ class LoginPage extends StatelessWidget {
                         )),
                     Positioned(top: MediaQuery.of(context).padding.top + 15.sp,right: 15.sp,child: InkWell(
                       onTap: () {
-
-                        navigateToReport();
-
+                        Get.toNamed(Routes.HelpBack);
                       },
-                      child: Text('❓在线反馈',style: TextStyle(color: AppColor.mainColor,fontSize: 15.sp),),
+                      child: Row(
+                        children: [
+                          Icon(Icons.question_mark,color: AppColor.mainColor,size: 15.sp,),
+                          Text('在线反馈',style: TextStyle(color: AppColor.mainColor,fontSize: 15.sp),),
+                        ],
+                      ),
                     )),
                   ],
                 );
diff --git a/circle_app/lib/circle_app/minefragment/logic.dart b/circle_app/lib/circle_app/minefragment/logic.dart
index 609d928..e63991d 100644
--- a/circle_app/lib/circle_app/minefragment/logic.dart
+++ b/circle_app/lib/circle_app/minefragment/logic.dart
@@ -183,7 +183,7 @@ class MinefragmentLogic extends GetxController {
     requestUserId = homeLogic.model!.id.toString();
 
     var result = await DioManager.instance.get(
-        url: Api.userTrends,
+        url: Api.trends,
         params: {'userId': requestUserId, 'page': dynamicPage, 'pageSize': 10});
     if (result['code'] == 200) {
       if (dynamicPage == 1) {
diff --git a/circle_app/lib/circle_app/minefragment/view.dart b/circle_app/lib/circle_app/minefragment/view.dart
index ec56142..c4c0d45 100644
--- a/circle_app/lib/circle_app/minefragment/view.dart
+++ b/circle_app/lib/circle_app/minefragment/view.dart
@@ -370,37 +370,46 @@ class _MinefragmentPageState extends State<MinefragmentPage>
             isShowMenu = false;
             logic.update();
           }),
-        if (logic.isShowserveTip)
+        if (logic.isShowserveTip && homelogic.isProd)
         Positioned(
-            child: Container(
+            child: InkWell(
+              onTap: () {
+                logic.isShowserveTip = false;
+                logic.setSpServeTip();
+                logic.update();
+                logic.isShowMoreTip = true;
+                logic.update();
+              },
+              child: Container(
           width: Get.width,
           height: Get.height,
           color: Colors.black.withOpacity(0.7),
           child: Stack(
-            children: [
-              Positioned(
-                  bottom: 130.sp,
-                  right: 30.sp,
-                  child: Stack(
-                    alignment: Alignment.center,
-                    children: [
-                      Image.asset(
-                        getMineImage('bubble_icon'),
-                        width: 174.sp,
-                      ),
-                      Container(margin: EdgeInsets.only(bottom: 10.sp),child: Text('产品反馈或在线客服',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),))
-                    ],
-                  )),
-              Positioned(
-                  bottom: 95.sp,
-                  right: 40.sp,
-                  child: Image.asset(
-                    getMineImage('hand_icon'),
-                    width: 32.sp,
-                  )),
-            ],
+              children: [
+                Positioned(
+                    bottom: 130.sp,
+                    right: 30.sp,
+                    child: Stack(
+                      alignment: Alignment.center,
+                      children: [
+                        Image.asset(
+                          getMineImage('bubble_icon'),
+                          width: 174.sp,
+                        ),
+                        Container(margin: EdgeInsets.only(bottom: 10.sp),child: Text('产品反馈或在线客服',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),))
+                      ],
+                    )),
+                Positioned(
+                    bottom: 95.sp,
+                    right: 40.sp,
+                    child: Image.asset(
+                      getMineImage('hand_icon'),
+                      width: 32.sp,
+                    )),
+              ],
           ),
-        )),
+        ),
+            )),
 
         Positioned(
           bottom: 20.sp,
@@ -452,43 +461,50 @@ class _MinefragmentPageState extends State<MinefragmentPage>
             ),
           ),
         ),
-        if (logic.isShowMoreTip)
+        if (logic.isShowMoreTip && homelogic.isProd)
           Positioned(
-              child: Container(
-                width: Get.width,
-                height: Get.height,
-                color: Colors.black.withOpacity(0.7),
-                child: Stack(
-                  children: [
-                    Positioned(
-                        top: 20.sp + MediaQuery.of(context).padding.top,
-                        right: 10.sp,
-                        child: Column(
+              child: InkWell(
+                onTap: () {
+                  logic.isShowMoreTip = false;
+                  logic.setSpMoreTip();
+                  logic.update();
+                },
+                child: Container(
+                  width: Get.width,
+                  height: Get.height,
+                  color: Colors.black.withOpacity(0.7),
+                  child: Stack(
+                    children: [
+                      Positioned(
+                          top: 20.sp + MediaQuery.of(context).padding.top,
+                          right: 10.sp,
+                          child: Column(
 
-                          children: [
-                            Image.asset(
-                              getBaseImage('pop_top_right'),
-                              width: 174.sp,
+                            children: [
+                              Image.asset(
+                                getBaseImage('pop_top_right'),
+                                width: 174.sp,
+                              ),
+                              Container(margin: EdgeInsets.only(bottom: 10.sp),child: Text('更多功能等你体验',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),))
+                            ],
+                          )),
+                      Positioned(
+                          top: 5.sp + MediaQuery.of(context).padding.top,
+                          right: 10.sp,
+                          child: GestureDetector(
+                            onTap: () {
+                              logic.isShowMoreTip = false;
+                              logic.setSpMoreTip();
+                              isShowMenu = true;
+                              logic.update();
+                            },
+                            child: Image.asset(
+                              getMineImage('my_more_icon'),
+                              width: 24.sp,
                             ),
-                            Container(margin: EdgeInsets.only(bottom: 10.sp),child: Text('更多功能等你体验',style: TextStyle(color: Colors.white,fontSize: 16.sp,fontWeight: FontWeight.bold),))
-                          ],
-                        )),
-                    Positioned(
-                        top: 5.sp + MediaQuery.of(context).padding.top,
-                        right: 10.sp,
-                        child: GestureDetector(
-                          onTap: () {
-                            logic.isShowMoreTip = false;
-                            logic.setSpMoreTip();
-                            isShowMenu = true;
-                            logic.update();
-                          },
-                          child: Image.asset(
-                            getMineImage('my_more_icon'),
-                            width: 24.sp,
-                          ),
-                        )),
-                  ],
+                          )),
+                    ],
+                  ),
                 ),
               )),
       ],
diff --git a/circle_app/lib/circle_app/msg/logic.dart b/circle_app/lib/circle_app/msg/logic.dart
index 1aaa490..c926f9d 100644
--- a/circle_app/lib/circle_app/msg/logic.dart
+++ b/circle_app/lib/circle_app/msg/logic.dart
@@ -6,8 +6,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:notification_permissions/notification_permissions.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:scroll_to_index/scroll_to_index.dart';
 import '../../commons/Widgets/base_tip_widget.dart';
 import '../../utils/SharedPreferencesHelper.dart';
 import '../circle/logic.dart';
@@ -19,13 +18,14 @@ class MsgLogic extends GetxController {
   List<UserListItem> lists = [];
 
   ScrollController listScrollController = ScrollController();
+  AutoScrollController scrollController = AutoScrollController();
   List chatList = [];
 
   int total = 0;
 
-  bool  isStart = false;
+  bool isStart = false;
 
-  bool  isShowNotifyTip = false;
+  bool isShowNotifyTip = false;
 
   String tip = '';
 
@@ -43,77 +43,76 @@ class MsgLogic extends GetxController {
   bool isShowTip = false;
 
   @override
-  void onInit() async {
+  void onInit() {
     // TODO: implement onInit
     super.onInit();
     checkNotificationPermission();
     loadMyInfoData();
-    // loadChatData();
+    loadChatData();
     loadLikeData();
     loadStatusData();
     getVisitorMsgsData();
     getBannerData();
 
+    getSpData();
+  }
+
+  Future<void> getSpData() async {
     SharedPreferencesHelper sp = await SharedPreferencesHelper.getInstance();
     isShowTip = sp.getBool(SharedPreferencesHelper.msgOpTip) ?? true;
-  }
-
-  loadData() {
-    loadMyInfoData();
-    loadChatData();
-    loadLikeData();
-    loadStatusData();
-  }
-
-  loadLikeData() async {
-    var data =
-        await DioManager.instance.get(url: Api.fansList, params: {
-      'page':1,
-          'page_size':3
-
-    });
-    var bean = BaseResponse<UserList>.fromJson(data, (data) => UserList.fromJson(data));
-    if (bean.isSuccess()) {
-      lists.addAll(bean.data.lists);
-    }
     update();
   }
 
-  checkNotificationPermission() async {
+  loadData() async {
+    await loadMyInfoData();
+    await loadChatData(isFresh: false);
+    await loadLikeData(isFresh: false);
+    await loadStatusData(isFresh: false);
+    await getVisitorMsgsData(isFresh: false);
+    update();
+  }
 
-    var status = await NotificationPermissions.getNotificationPermissionStatus();
+  loadLikeData({bool isFresh = true}) async {
+    var data = await DioManager.instance
+        .get(url: Api.fansList, params: {'page': 1, 'page_size': 3});
+    var bean = BaseResponse<UserList>.fromJson(
+        data, (data) => UserList.fromJson(data));
+    if (bean.isSuccess()) {
+      lists.addAll(bean.data.lists);
+    }
+    if (isFresh) {
+      update();
+    }
+  }
+
+  checkNotificationPermission() async {
+    var status =
+        await NotificationPermissions.getNotificationPermissionStatus();
     if (status.index == 2) {
       isShowNotifyTip = true;
       update();
     }
   }
 
-  void loadChatData() async {
-    var data =
-    await DioManager.instance.post(url: Api.recommendQuickChatUser, params: {
-      'page':1,
-      'pageSize':8
-    });
+  loadChatData({bool isFresh = true}) async {
+    var data = await DioManager.instance.post(
+        url: Api.recommendQuickChatUser, params: {'page': 1, 'pageSize': 8});
     if (data['code'] == 200) {
       total = data['data']['total'];
       chatList = data['data']['lists'];
     } else if (data['code'] == 404) {
       // showOKToast('网络不流畅哦，请检查网络情况');
     }
-
-    // vicinityList = bean.data.lists;
-    update();
+    if (isFresh) {
+      update();
+    }
   }
 
-
-
   Future<bool> queryQuickStart() async {
-    var data =
-    await DioManager.getInstance().get(url: Api.queryQuickStart);
+    var data = await DioManager.getInstance().get(url: Api.queryQuickStart);
     if (data["code"] == 200) {
       if (data["data"] == 2 || data["data"] == 0) {
-        var data = await DioManager.getInstance()
-            .get(url: Api.startQuick);
+        var data = await DioManager.getInstance().get(url: Api.startQuick);
         if (data["code"] == 200) {
           showOKToast("已冲到第一");
           isStart = true;
@@ -123,7 +122,6 @@ class MsgLogic extends GetxController {
           showRechargeScreenDialog('quick_chat_open');
         }
       } else if (data["data"] == 1) {
-
         showOKToast("速聊开启中");
         return false;
       }
@@ -131,15 +129,13 @@ class MsgLogic extends GetxController {
     return false;
   }
 
-  stopQueryQuick()async{
-    var data =
-    await DioManager.getInstance().get(url: Api.stopQuick);
+  stopQueryQuick() async {
+    var data = await DioManager.getInstance().get(url: Api.stopQuick);
     if (data["code"] == 200) {
       showOKToast('操作成功');
       isStart = false;
       loadChatData();
     }
-
   }
 
   Future<bool> callOrhers() async {
@@ -150,13 +146,12 @@ class MsgLogic extends GetxController {
       return true;
     } else if (data["code"] == 31201) {
       showRechargeScreenDialog('quick_chat_call');
-    } else{
+    } else {
       showOKToast(data["msg"]);
     }
     return false;
   }
 
-
   showTipPop() {
     Get.bottomSheet(
         CupertinoActionSheet(
@@ -181,7 +176,7 @@ class MsgLogic extends GetxController {
                 Get.back();
                 addUmengTag('弹窗-一键呼唤三十位您想认识的人');
               },
-              child: const Text('一键呼唤三十位您想认识的人'),
+              child: const Text('一键召唤30位想认识的人/10元'),
             ),
             CupertinoActionSheetAction(
               onPressed: () {
@@ -203,11 +198,10 @@ class MsgLogic extends GetxController {
         isScrollControlled: true);
   }
 
-  void getVisitorMsgsData() async {
+  getVisitorMsgsData({bool isFresh = true}) async {
     if (isMsgCountLoad) return;
     isMsgCountLoad = true;
-    var data =
-    await DioManager.getInstance().get(url: Api.getVisitorMsgs);
+    var data = await DioManager.getInstance().get(url: Api.getVisitorMsgs);
     if (data["code"] == 200) {
       visitorMsgs = data['data']['msgs'] ?? [];
       recent_visit_count_new = data['data']['unreadCount'] ?? 0;
@@ -215,12 +209,13 @@ class MsgLogic extends GetxController {
       await loadInterestedInMeUsersData();
     }
     isMsgCountLoad = false;
-    update();
+    if (isFresh) {
+      update();
+    }
   }
 
   void getBannerData() async {
-    var data =
-    await DioManager.getInstance().get(url: Api.messageBanner);
+    var data = await DioManager.getInstance().get(url: Api.messageBanner);
     if (data["code"] == 200) {
       bannerList = data['data'];
       update();
@@ -228,10 +223,10 @@ class MsgLogic extends GetxController {
     update();
   }
 
-
   loadVisitorTotalData() async {
-    var data =
-    await DioManager.instance.get(url: Api.getVisitorTotal,);
+    var data = await DioManager.instance.get(
+      url: Api.getVisitorTotal,
+    );
     if (data['code'] == 200) {
       int sameCityCount = data['data']['sameCityCount'];
       int wantMeetCount = data['data']['wantMeetCount'];
@@ -242,25 +237,21 @@ class MsgLogic extends GetxController {
       } else if (wantMeetCount > 0) {
         bannerTip = '${wantMeetCount}人是你想认识的圈友';
       }
-      update();
     }
   }
 
   loadInterestedInMeUsersData() async {
-    var data =
-    await DioManager.instance.get(url: Api.interestedInMeUsers);
+    var data = await DioManager.instance.get(url: Api.interestedInMeUsers);
     if (data['code'] == 200) {
       List infoList = data['data']['lists'];
       if (infoList.isNotEmpty) {
         moreCount = data['data']['total'];
       }
-      update();
     }
   }
 
-  void loadStatusData() async {
-    var data =
-    await DioManager.getInstance().get(url: Api.queryQuickStart);
+  loadStatusData({bool isFresh = true}) async {
+    var data = await DioManager.getInstance().get(url: Api.queryQuickStart);
     if (data["code"] == 200) {
       if (data["data"] == 0 || data["data"] == 2) {
         isStart = false;
@@ -268,10 +259,12 @@ class MsgLogic extends GetxController {
         isStart = true;
       }
     }
-    update();
+    if (isFresh) {
+      update();
+    }
   }
 
-  void loadMyInfoData() async {
+  loadMyInfoData() async {
     var data = await DioManager.instance.get(url: Api.getUserMine);
     var bean = BaseResponse<MineResponseBean>.fromJson(
         data, (data) => MineResponseBean.fromJson(data));
diff --git a/circle_app/lib/circle_app/msg/view.dart b/circle_app/lib/circle_app/msg/view.dart
index 9469c7c..764ef93 100644
--- a/circle_app/lib/circle_app/msg/view.dart
+++ b/circle_app/lib/circle_app/msg/view.dart
@@ -19,6 +19,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../commons/Widgets/today_people_dialog.dart';
 import '../../utils/cache_img.dart';
+import '../home/logic.dart';
 import 'TIMUIKitConversation/tim_uikit_conversation.dart';
 import 'logic.dart';
 
@@ -34,18 +35,18 @@ class MsgPage extends StatefulWidget {
 
 class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
   final ctr = Get.lazyPut(() => MsgLogic());
+
   // final controller = Get.find<MsgLogic>();
-  var logic = Get.find<CircleLogic>();
+  var logic = Get.find<MsgLogic>();
+
+  var homeLogic = Get.find<HomeLogic>();
 
   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'].toString().split('_').last,
           data['data']['account_id']);
       if (!isSuccess) {
         await sendTextMsg(data['data']['account_id']);
@@ -76,158 +77,168 @@ class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
     return Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: Colors.transparent,
-        body: Stack(
-          fit: StackFit.expand,
-          children: [
-            SafeArea(
-                child: Column(
-                  children: [
-                    GetBuilder(builder: (MsgLogic controller) {
-                      return Column(
-                        children: [
-                          navigatorItem(controller),
-                          if (controller.isShowNotifyTip) notifyWidget(
-                              controller),
-                          tipWidget(controller),
-                          reconmandWidget(controller),
-                        ],
-                      );
-                    }),
-                    Expanded(
-                        child: TIMConversation(
-                          autoScrollController: logic.scrollController,
-                          scrollController: logic.listScrollController,
-                          onTapItem: (selectedConv) async {
-                            String type = selectedConv.userID!.split('_')[2];
-                            if (int.parse(type) == 11) {
-                              Get.toNamed(Routes.SysNotifyListPage,
-                                  arguments: selectedConv);
-                              return;
-                            }
-                            await Get.toNamed(
-                                Routes.Chat, arguments: selectedConv);
-                          },
-                        ))
-                  ],
-                )),
-            Positioned(
-                bottom: 20.sp,
-                right: 10.sp,
-                child: GetBuilder(builder: (MsgLogic controller) {
-                  return controller.bannerList.isNotEmpty ? Container(
-                    width: 75.sp,
-                    height: 80.sp,
-                    child: Swiper(
-                      autoplay: true,
-                      loop: true,
-                      autoplayDelay: 6000,
-                      scrollDirection: Axis.vertical,
-                      itemBuilder: (BuildContext context, int index) {
-                        Map item = controller.bannerList[index];
-
-                        return GestureDetector(
-                          onTap: () {
-                            if (item['type'] == 1) {
-                              if (item['scene'] == 'internal') {
-                                Get.toNamed(Routes.WebViewPage, arguments: {
-                                  'title': "",
-                                  "url": item['param']
-                                });
-                              } else {
-                                launch(item['param'], forceSafariVC: false);
-                              }
-                            } else if (item['type'] > 1) {
-                              pushPage(item['scene'], item['param']);
-                            }
-                          },
-                          child: ClipRRect(
-                            borderRadius: BorderRadius.circular(6.sp),
-                            child: CachedImg(
-                              imageUrl: item['pic_url'],
-                              fit: BoxFit.cover,
-                            ),
-                          ),
-                        );
-                      },
-                      itemCount: controller.bannerList.length,
-                    ),
-                  ) : Container();
-                })),
-
+        body: GetBuilder(builder: (MsgLogic controller) {
+          return Stack(
+            fit: StackFit.expand,
+            children: [
+              SafeArea(
+                  child: Column(
+                children: [
+                  Column(
+                    children: [
+                      navigatorItem(controller),
+                      if (controller.isShowNotifyTip) notifyWidget(controller),
+                      tipWidget(controller),
+                      reconmandWidget(controller),
+                    ],
+                  ),
+                  Expanded(
+                      child: TIMConversation(
+                    autoScrollController: controller.scrollController,
+                    scrollController: controller.listScrollController,
+                    onTapItem: (selectedConv) async {
+                      String type = selectedConv.userID!.split('_')[2];
+                      if (int.parse(type) == 11) {
+                        Get.toNamed(Routes.SysNotifyListPage,
+                            arguments: selectedConv);
+                        return;
+                      }
+                      await Get.toNamed(Routes.Chat, arguments: selectedConv);
+                    },
+                  ))
+                ],
+              )),
               Positioned(
-                  child: GetBuilder<MsgLogic>(builder: (logic) {
-                    if (!logic.isShowTip) {
-                      return Container();
-                    } 
-                    return Container(
-                      width: Get.width,
-                      height: Get.height,
-                      color: Colors.black.withOpacity(0.7),
-                      child: Stack(
-                        children: [
-                          Positioned(
-                              top: MediaQuery
-                                  .of(context)
-                                  .padding
-                                  .top + 88.sp + 70.sp + (logic.isShowNotifyTip ? 40.sp : 0.0),
-                              left: 0.sp,
-                              child: Column(
-                                children: [
+                  bottom: 20.sp,
+                  right: 10.sp,
+                  child: controller.bannerList.isNotEmpty
+                      ? Container(
+                          width: 75.sp,
+                          height: 80.sp,
+                          child: Swiper(
+                            autoplay: true,
+                            loop: true,
+                            autoplayDelay: 6000,
+                            scrollDirection: Axis.vertical,
+                            itemBuilder: (BuildContext context, int index) {
+                              Map item = controller.bannerList[index];
 
-                                  Transform(
-                                    alignment: Alignment.center,
-                                    transform: Matrix4.rotationY(3.1416), // π radians = 180 degrees
-                                    child: Image.asset(
-                                      getBaseImage('pop_top_right'),
-                                      width: 150.sp,
+                              return GestureDetector(
+                                onTap: () {
+                                  if (item['type'] == 1) {
+                                    if (item['scene'] == 'internal') {
+                                      Get.toNamed(Routes.WebViewPage,
+                                          arguments: {
+                                            'title': "",
+                                            "url": item['param']
+                                          });
+                                    } else {
+                                      launch(item['param'],
+                                          forceSafariVC: false);
+                                    }
+                                  } else if (item['type'] > 1) {
+                                    pushPage(item['scene'], item['param']);
+                                  }
+                                },
+                                child: ClipRRect(
+                                  borderRadius: BorderRadius.circular(6.sp),
+                                  child: CachedImg(
+                                    imageUrl: item['pic_url'],
+                                    fit: BoxFit.cover,
+                                  ),
+                                ),
+                              );
+                            },
+                            itemCount: controller.bannerList.length,
+                          ),
+                        )
+                      : Container()),
+              Positioned(
+                  child: !controller.isShowTip || !homeLogic.isProd
+                      ? Container()
+                      : InkWell(
+                          onTap: () {
+                            controller.isShowTip = false;
+                            controller.update();
+                            controller.setSpTip();
+                          },
+                          child: Container(
+                            width: Get.width,
+                            height: Get.height,
+                            color: Colors.black.withOpacity(0.7),
+                            child: Stack(
+                              children: [
+                                Positioned(
+                                    top: MediaQuery.of(context).padding.top +
+                                        88.sp +
+                                        70.sp +
+                                        (controller.isShowNotifyTip
+                                            ? 40.sp
+                                            : 0.0),
+                                    left: 0.sp,
+                                    child: Column(
+                                      children: [
+                                        Transform(
+                                          alignment: Alignment.center,
+                                          transform: Matrix4.rotationY(
+                                              3.1416), // π radians = 180 degrees
+                                          child: Image.asset(
+                                            getBaseImage('pop_top_right'),
+                                            width: 150.sp,
+                                          ),
+                                        ),
+                                        Container(
+                                            margin:
+                                                EdgeInsets.only(bottom: 0.sp),
+                                            child: Text(
+                                              '开启吸引更多人找您聊天',
+                                              style: TextStyle(
+                                                  color: Colors.white,
+                                                  fontSize: 16.sp,
+                                                  fontWeight: FontWeight.bold),
+                                            )),
+                                      ],
+                                    )),
+                                Positioned(
+                                  top: MediaQuery.of(context).padding.top +
+                                      88.sp +
+                                      (controller.isShowNotifyTip
+                                          ? 40.sp
+                                          : 0.0),
+                                  left: 10.sp,
+                                  child: GestureDetector(
+                                    onTap: () {
+                                      controller.isShowTip = false;
+                                      controller.update();
+                                      controller.setSpTip();
+                                      controller.showTipPop();
+                                    },
+                                    child: Column(
+                                      children: [
+                                        Image.asset(
+                                          getMsgImage('msg_first'),
+                                          width: 50.sp,
+                                        ),
+                                        SizedBox(
+                                          height: 4.sp,
+                                        ),
+                                        Text(
+                                          '冲到第一',
+                                          style: TextStyle(
+                                              color: Colors.white,
+                                              fontSize: 12.sp),
+                                        ),
+                                      ],
                                     ),
                                   ),
-                                  Container(
-                                      margin: EdgeInsets.only(bottom: 0.sp),
-                                      child: Text('开启吸引更多人找您聊天',
-                                        style: TextStyle(color: Colors.white,
-                                            fontSize: 16.sp,
-                                            fontWeight: FontWeight.bold),)),
-                                ],
-                              )),
-                          Positioned(
-                            top: MediaQuery
-                                .of(context)
-                                .padding
-                                .top + 88.sp + (logic.isShowNotifyTip ? 40.sp : 0.0),
-                            left: 10.sp,
-                            child: GestureDetector(
-                              onTap: () {
-                                logic.isShowTip = false;
-                                logic.update();
-                                logic.setSpTip();
-                                logic.showTipPop();
-                                // _showBottomSheet(context);
-                              },
-                              child: Column(
-                                children: [
-                                  Image.asset(
-                                    getMsgImage('msg_first'),
-                                    width: 50.sp,
-                                  ),
-                                  SizedBox(
-                                    height: 4.sp,
-                                  ),
-                                  Text('冲到第一',
-                                    style: TextStyle(
-                                        color: Colors.white, fontSize: 12.sp),
-                                  ),
-                                ],
-                              ),
-
+                                ),
+                              ],
                             ),
                           ),
-                        ],
-                      ),
-                    );
-                  })),
-          ],
-        ));
+                        )),
+            ],
+          );
+        }));
   }
 
   circleWidget(String url, String userId, {double width = 30}) {
@@ -321,12 +332,12 @@ class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
                 },
                 child: ctr.lists.isNotEmpty
                     ? SizedBox(
-                  height: 30.sp,
-                  width: 30.0.sp + 15.sp * (widgets.length),
-                  child: Stack(
-                    children: widgets,
-                  ),
-                )
+                        height: 30.sp,
+                        width: 30.0.sp + 15.sp * (widgets.length),
+                        child: Stack(
+                          children: widgets,
+                        ),
+                      )
                     : Container(),
               )),
           GestureDetector(
@@ -404,7 +415,7 @@ class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
                   child: Text(
                     '去开启',
                     style:
-                    TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+                        TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
                   )),
               SizedBox(
                 width: 4.sp,
@@ -507,15 +518,15 @@ class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
           ),
           Expanded(
               child: ListView.builder(
-                scrollDirection: Axis.horizontal,
-                itemBuilder: (contenxt, index) {
-                  if (index == controller.chatList.length) {
-                    return MoreItem();
-                  }
-                  return peopleWidget(controller.chatList[index]);
-                },
-                itemCount: controller.chatList.length + 1,
-              ))
+            scrollDirection: Axis.horizontal,
+            itemBuilder: (contenxt, index) {
+              if (index == controller.chatList.length) {
+                return MoreItem();
+              }
+              return peopleWidget(controller.chatList[index]);
+            },
+            itemCount: controller.chatList.length + 1,
+          ))
         ],
       ),
     );
@@ -642,22 +653,23 @@ class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
           ),
           (info['gender'] ?? 0) > 0
               ? Positioned(
-              bottom: 28.sp,
-              right: 0.sp,
-              child: Container(
-                height: 13.sp,
-                width: 25.sp,
-                alignment: Alignment.center,
-                decoration: BoxDecoration(
-                    borderRadius:
-                    BorderRadius.circular(6.5.sp),
-                    gradient: sexBgGradient(info['gender'] ?? 0)),
-                child: Text(getGenderStr(info['gender'] ?? 0),
-                  style: TextStyle(
-                    color: sexBgColor(info['gender'] ?? 0),
-                    fontSize: 9.sp,
-                  ),),
-              ))
+                  bottom: 28.sp,
+                  right: 0.sp,
+                  child: Container(
+                    height: 13.sp,
+                    width: 25.sp,
+                    alignment: Alignment.center,
+                    decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(6.5.sp),
+                        gradient: sexBgGradient(info['gender'] ?? 0)),
+                    child: Text(
+                      getGenderStr(info['gender'] ?? 0),
+                      style: TextStyle(
+                        color: sexBgColor(info['gender'] ?? 0),
+                        fontSize: 9.sp,
+                      ),
+                    ),
+                  ))
               : Container()
         ],
       ),
diff --git a/circle_app/lib/circle_app/photoinfo/logic.dart b/circle_app/lib/circle_app/photoinfo/logic.dart
index 0c40bd9..29f67e6 100644
--- a/circle_app/lib/circle_app/photoinfo/logic.dart
+++ b/circle_app/lib/circle_app/photoinfo/logic.dart
@@ -110,31 +110,37 @@ class PhotoinfoLogic extends GetxController {
       } else {
         isCountingDown = false;
         timer?.cancel();
+        update();
       }
     });
   }
 
   Future<void> getCode() async {
-    if (newPhotoController.text.contains('@')) {
+    if (type > 1) {
+      if (newPhotoController.text.isEmpty) {
+        showOKToast("请输入邮箱");
+        return;
+      }
       if (!newPhotoController.text.isEmail) {
         showOKToast("邮箱输入有误");
         return;
       }
-    } else if(!GetUtils.isPhoneNumber(newPhotoController.text)){
-      showOKToast("手机号输入有误");
-      return;
+    } else if(type <= 1){
+      if (newPhotoController.text.isEmpty) {
+        showOKToast("请输入手机号");
+        return;
+      }
     }
 
     var data = await DioManager.instance.post(url: newPhotoController.text.contains('@') ? Api.sendEmailCode : Api.sendCode, params: {newPhotoController.text.contains('@') ? 'email': "phone": newPhotoController.text});
     var bean = BaseResponse<Data>.fromJson(data, (data) => Data.fromJson(data));
     showOKToast(bean.msg);
-    if(kDebugMode){
       if(bean.code==200){
-        codeController.text = bean.data!.code.toString();
+        // codeController.text = bean.data!.code.toString();
         startCountdown();
         update();
       }
-    }
+
   }
 
 
diff --git a/circle_app/lib/circle_app/photoinfo/view.dart b/circle_app/lib/circle_app/photoinfo/view.dart
index 6271f74..b878785 100644
--- a/circle_app/lib/circle_app/photoinfo/view.dart
+++ b/circle_app/lib/circle_app/photoinfo/view.dart
@@ -297,16 +297,13 @@ class PhotoinfoPage extends StatelessWidget {
                       //  String password = logic.state.passwordController.text;
                       String newphoto = logic.newPhotoController.text;
                       String code = logic.codeController.text;
-                      if (photo == "" || photo.length < 11) {
-                        showOKToast("已绑定的手机号输入有误");
+                      if (photo == "") {
+                        showOKToast(type == 0 || type == 2 ?  "请输入已绑定手机号" : '请输入已绑定邮箱');
                         return;
                       }
-                      // if(password==""){
-                      //   showToast("请输入密码");
-                      //   return ;
-                      // }
-                      if (newphoto == "" || newphoto.length < 11) {
-                        showOKToast("新手机号输入有误");
+
+                      if (newphoto == "") {
+                        showOKToast(type == 0 ?  "请输入新手机号" : type == 1 ? '请输入手机号' : type == 2 ? '请输入新邮箱' : '请输入邮箱');
                         return;
                       }
                       if (code == "") {
diff --git a/circle_app/lib/circle_app/quick/view.dart b/circle_app/lib/circle_app/quick/view.dart
index 1b1622d..480ff44 100644
--- a/circle_app/lib/circle_app/quick/view.dart
+++ b/circle_app/lib/circle_app/quick/view.dart
@@ -251,7 +251,7 @@ class _QuickPageState extends State<QuickPage>
                 logic.callOrhers();
                 Get.back();
               },
-              child: Text('一键召唤三十位您想认识的人'),
+              child: Text('一键召唤30位想认识的人/10元'),
             ),
             CupertinoActionSheetAction(
               onPressed: () {
diff --git a/circle_app/lib/circle_app/report/logic.dart b/circle_app/lib/circle_app/report/logic.dart
index 1e0ed7b..bf0685d 100644
--- a/circle_app/lib/circle_app/report/logic.dart
+++ b/circle_app/lib/circle_app/report/logic.dart
@@ -14,6 +14,7 @@ import 'state.dart';
 class ReportLogic extends GetxController {
   final ReportState state = ReportState();
   var userId = Get.arguments["userId"] ?? "";
+  Map arg = Get.arguments;
   int myPosition = -1;
   TextEditingController textEditingController = TextEditingController();
   List<MyObject> arrList = <MyObject>[
@@ -48,8 +49,8 @@ class ReportLogic extends GetxController {
     var data = await DioManager.instance.post(url: Api.postReport, params: {
       "user_id": userId,
       "words": textEditingController.text,
-      "obj_type": 1,
-      "obj_id": userId,
+      "obj_type": arg.containsKey('type') ? 2 : 1,
+      "obj_id": arg.containsKey('objId') ? arg['objId']: userId,
       "reason": arrList[myPosition].name,
       "album": myBean
     });
diff --git a/circle_app/lib/circle_app/swiper/view.dart b/circle_app/lib/circle_app/swiper/view.dart
index 4ee0066..0dc8bb8 100644
--- a/circle_app/lib/circle_app/swiper/view.dart
+++ b/circle_app/lib/circle_app/swiper/view.dart
@@ -400,7 +400,7 @@ class _SwiperPageState extends State<SwiperPage> {
     RenderRepaintBoundary boundary =
         _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
     ui.Image image =
-        await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
         await (image.toByteData(format: ui.ImageByteFormat.png));
     if (byteData != null) {
diff --git a/circle_app/lib/circle_app/userinfo/logic.dart b/circle_app/lib/circle_app/userinfo/logic.dart
index 751bb11..6e24d0e 100644
--- a/circle_app/lib/circle_app/userinfo/logic.dart
+++ b/circle_app/lib/circle_app/userinfo/logic.dart
@@ -57,6 +57,8 @@ class UserinfoLogic extends GetxController {
   bool isBlackBeen = false;
   bool isDestroy = false;
 
+  bool isShowTime = false;
+
   bool isFee = false;
 
   List giftList = [];
@@ -154,6 +156,7 @@ class UserinfoLogic extends GetxController {
       fetchMyAlbum(Api.getMyAlbum);
       loadDyanmicListData();
       loadBabyData();
+      loadMyTimeData();
     } else {
       sendHotAction(8, userId);
 
@@ -163,14 +166,12 @@ class UserinfoLogic extends GetxController {
       fetchUrgeStatus("${Api.getUrgeStatus + userId}/urge/album/status");
       fetchIsBlack("${Api.setBlock + userId}/block");
       loadScoreData(userId);
-
     }
     // SmartDialog.dismiss();
     fetchQnToken(Api.getqiniuToken);
     loadGiftListData();
     loadRelationTypeFirstListData();
     loadMasterData();
-
   }
 
   loadDyanmicListData() async {
@@ -395,10 +396,10 @@ class UserinfoLogic extends GetxController {
   }
 
   setLike() async {
-    if (isBlack || isDestroy) {
-      showOKToast("喜欢失败,存在拉黑关系或者该账户已注销");
-      return;
-    }
+    // if (isBlack || isDestroy) {
+    //   showOKToast("喜欢失败,存在拉黑关系或者该账户已注销");
+    //   return;
+    // }
 
     var data = await DioManager.instance.post(
         url: "${Api.setLike + userId}/follow",
@@ -625,8 +626,7 @@ class UserinfoLogic extends GetxController {
     }
   }
 
-   showMasterPop(textEditingController) async {
-
+  showMasterPop(textEditingController) async {
     var myResult = await DioManager.instance
         .get(url: Api.getMaster, params: {'userId': homeLogic.model!.id!});
     if (myResult['code'] == 200) {
@@ -637,6 +637,7 @@ class UserinfoLogic extends GetxController {
         }
       }
     }
+
     bool isHave = false;
     if (masterInfo.isEmpty) {
       var myResult = await DioManager.instance
@@ -647,7 +648,11 @@ class UserinfoLogic extends GetxController {
     }
 
     var result = await DioManager.instance.get(
-        url: masterInfo.isEmpty ? isHave ?  Api.bindBabyMore : Api.popBindBaby : Api.popLootBaby,
+        url: masterInfo.isEmpty
+            ? isHave
+                ? Api.bindBabyMore
+                : Api.popBindBaby
+            : Api.popLootBaby,
         params: {'userId': userId});
     if (result['code'] == 10000) {
       if (masterInfo.isEmpty) {
@@ -668,7 +673,7 @@ class UserinfoLogic extends GetxController {
       String title, String content, String money, textEditingController) {
     Get.bottomSheet(
         isScrollControlled: true,
-        isDismissible:false,
+        isDismissible: false,
         InkWell(
           onTap: () {
             FocusManager.instance.primaryFocus?.unfocus();
@@ -888,7 +893,9 @@ class UserinfoLogic extends GetxController {
                                     child: Text(
                                       title.isEmpty
                                           ? '👑成为TA的新主人'
-                                          : title.contains('新主人') ? '👑成为TA的新主人' : "👑成为TA的第一任",
+                                          : title.contains('新主人')
+                                              ? '👑成为TA的新主人'
+                                              : "👑成为TA的第一任",
                                       style: TextStyle(
                                         color: Colors.white,
                                         fontSize: 15,
@@ -1197,6 +1204,35 @@ class UserinfoLogic extends GetxController {
       },
     );
   }
+
+  void loadMyTimeData() async {
+    var result = await DioManager.instance.get(
+      url: Api.getShowUserTrendsConf,
+    );
+    if (result['code'] == 200) {
+      isShowTime = result['data']['value'] == 1;
+      update();
+    }
+  }
+
+  void setTimeStatus() async {
+    var result = await DioManager.instance.post(
+        url: Api.setShowUserTrendsConf, params: {'value': isShowTime ? 0 : 1});
+    if (result['code'] == 200) {
+      isShowTime = !isShowTime;
+      dynamicPage = 1;
+      showOKToast('操作成功');
+      if (isShowTime) {
+
+
+        loadDyanmicListData();
+      } else {
+        // showOKToast('记录的时光已被隐藏，点击右上角眼睛可展示哦～');
+        loadDyanmicListData();
+      }
+      update();
+    }
+  }
 }
 
 class UserBean {
diff --git a/circle_app/lib/circle_app/userinfo/view.dart b/circle_app/lib/circle_app/userinfo/view.dart
index 5b03a07..a041b3f 100644
--- a/circle_app/lib/circle_app/userinfo/view.dart
+++ b/circle_app/lib/circle_app/userinfo/view.dart
@@ -1397,48 +1397,65 @@ class MyTabbedScreenState extends State<UserinfoPage>
             width: 4.sp,
           ),
           _tabController.index == 1
-              ? GestureDetector(
-                  onTap: () async {
-                    if (!logic.isMe) {
-                      await logic.sendWantSee();
-                      String source = logic.pageType == 1
-                          ? 'new_list'
-                          : logic.pageType == 2
-                              ? 'nearby_list'
-                              : 'chosen_list';
-                      pushChatPage(logic.userInfoBean!.id.toString(),
-                          logic.imId, logic.userInfoBean!.nickname,
-                          source: source);
-                    } else {
-                      showTimeRecordDialog(logic.userInfoBean!);
-                    }
-                  },
-                  child: Container(
-                    margin: EdgeInsets.only(left: 10.sp),
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(17),
-                      gradient: const LinearGradient(
-                        colors: [
-                          Color(0xFF06F9FA),
-                          Color(0xFFDC5BFD),
-                        ],
-                        begin: Alignment.centerLeft,
-                        end: Alignment.centerRight,
+              ? Row(
+                children: [
+                  if (logic.isMe)
+                    InkWell(
+                      onTap: () {
+                        logic.setTimeStatus();
+                      },
+                      child: Image.asset(
+                        getMineImage(
+                            !logic.isShowTime
+                                ? 'no_show_icon'
+                                : 'show_icon'),
+                        width: 30.sp,
                       ),
                     ),
-                    padding: EdgeInsets.symmetric(
-                      vertical: 2.sp,
-                      horizontal: 12.sp,
-                    ),
-                    child: Text(
-                      !logic.isMe ? '想看' : '记录时光',
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 12,
+                  GestureDetector(
+                      onTap: () async {
+                        if (!logic.isMe) {
+                          await logic.sendWantSee();
+                          String source = logic.pageType == 1
+                              ? 'new_list'
+                              : logic.pageType == 2
+                                  ? 'nearby_list'
+                                  : 'chosen_list';
+                          pushChatPage(logic.userInfoBean!.id.toString(),
+                              logic.imId, logic.userInfoBean!.nickname,
+                              source: source);
+                        } else {
+                          showTimeRecordDialog(logic.userInfoBean!);
+                        }
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(left: 10.sp),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(17),
+                          gradient: const LinearGradient(
+                            colors: [
+                              Color(0xFF06F9FA),
+                              Color(0xFFDC5BFD),
+                            ],
+                            begin: Alignment.centerLeft,
+                            end: Alignment.centerRight,
+                          ),
+                        ),
+                        padding: EdgeInsets.symmetric(
+                          vertical: 2.sp,
+                          horizontal: 12.sp,
+                        ),
+                        child: Text(
+                          !logic.isMe ? '想看' : '记录时光',
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 12,
+                          ),
+                        ),
                       ),
                     ),
-                  ),
-                )
+                ],
+              )
               : Container(),
           logic.isBlack || logic.isDestroy || logic.isBlackBeen
               ? Container()
@@ -2493,7 +2510,7 @@ class MyTabbedScreenState extends State<UserinfoPage>
                             top: 12.sp, left: 14.sp, right: 14.sp),
                         alignment: Alignment.center,
                         child: Text(
-                          "拉黑后，你将屏蔽对方的任何信息若您关注了对方，将自动取消关注。",
+                          "拉黑后，你将屏蔽对方的任何信息。若您喜欢了对方，将自动取消喜欢。",
                           textAlign: TextAlign.center,
                           style: TextStyle(
                               color: const Color(0xCCF7FAFA), fontSize: 16.sp),
diff --git a/circle_app/lib/circle_app/userinfo/widgets/dyanmic.dart b/circle_app/lib/circle_app/userinfo/widgets/dyanmic.dart
index 9b84230..71f1966 100644
--- a/circle_app/lib/circle_app/userinfo/widgets/dyanmic.dart
+++ b/circle_app/lib/circle_app/userinfo/widgets/dyanmic.dart
@@ -60,7 +60,7 @@ class _DynamicState extends State<Dynamic> with AutomaticKeepAliveClientMixin {
   Widget build(BuildContext context) {
     return GetBuilder<UserinfoLogic>(tag:Get.arguments.toString(),builder: (listLogic) {
       return listLogic.dynamicList.isEmpty
-          ? noResultWidget()
+          ? noResultWidget(tip:logic.isMe && !listLogic.isShowTime ? '记录的时光已被隐藏，点击右上角眼睛可展示哦～' : '正在等待被填充~')
           : Container(
               width: Get.width,
               // padding: EdgeInsets.only(
diff --git a/circle_app/lib/circle_app/userinfo/widgets/home_call_out.dart b/circle_app/lib/circle_app/userinfo/widgets/home_call_out.dart
index 81452e5..fe194fb 100644
--- a/circle_app/lib/circle_app/userinfo/widgets/home_call_out.dart
+++ b/circle_app/lib/circle_app/userinfo/widgets/home_call_out.dart
@@ -377,7 +377,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView>
                     ),
                     Container(
                       height: picHeight,
-                      margin: EdgeInsets.only(top: 5.sp),
+                      margin: EdgeInsets.only(top: 5.sp,bottom: 10.sp),
                       child: picHeight == 200.sp
                           ? ClipRRect(
                               borderRadius: BorderRadius.circular(6.sp),
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 6a4f45a..45d3a69 100644
--- a/circle_app/lib/circle_app/world_call_out/logic.dart
+++ b/circle_app/lib/circle_app/world_call_out/logic.dart
@@ -301,6 +301,17 @@ class World_call_outLogic extends GetxController {
     }
   }
 
+  readTipBannerData(Map info) async {
+    var result =
+    await DioManager.instance.post(url: Api.noticeRead,params: {
+      "id": info['id'],
+      "type": info['type']
+    });
+    if (result['code'] == 200) {
+
+    }
+  }
+
   void getWelfareDetailData(String id,int index) async {
     var result =
     await DioManager.instance.get(url: Api.getWelfareDetail+id);
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 ae13c99..250ba16 100644
--- a/circle_app/lib/circle_app/world_call_out/view.dart
+++ b/circle_app/lib/circle_app/world_call_out/view.dart
@@ -295,9 +295,14 @@ class _WorldCallOutPageState extends State<WorldCallOutPage>
                                   action = '前往观赏';
                                   tip =
                                       '邀请大家免费观赏「${logic.bannerList[index]['gift']['name']}」';
-                                } else {
+                                } else if (jump['scene'] == 'visit_big_backer'){
+                                  type = 2;
                                   action = '立即拜访';
                                   tip = '通过充值成为【乐园大金主】';
+                                } else {
+                                   type = 3;
+                                  action = jump['btnText'];
+                                  tip = data['msg'];
                                 }
                                 return Container(
                                   // margin: EdgeInsets.only(left: 10.sp, right: 10.sp),
@@ -326,7 +331,7 @@ class _WorldCallOutPageState extends State<WorldCallOutPage>
                                       } else if (type == 1) {
                                         logic.treatWatch(
                                             jump['param'].toString());
-                                      } else {
+                                      } else if (type == 2){
                                         Get.toNamed(Routes.UserInfoPage,
                                             arguments:
                                                 data['user']['id'].toString(),
@@ -335,6 +340,10 @@ class _WorldCallOutPageState extends State<WorldCallOutPage>
                                             });
                                         logic.bigBackerVisit(
                                             jump['param'].toString());
+                                      } else {
+                                        // homelogic.
+                                        pushPage(jump['scene'].toString(),jump['param'].toString());
+                                        logic.readTipBannerData(data);
                                       }
                                       if (logic.bannerList.isEmpty) {
                                         logic.loadBannerData();
@@ -414,53 +423,60 @@ class _WorldCallOutPageState extends State<WorldCallOutPage>
                             ),
                           )),
 
-                    if (logic.isShowTip)
+                    if (logic.isShowTip && homelogic.isProd)
                       Positioned(
-                          child: Container(
-                            width: Get.width,
-                            height: Get.height,
-                            color: Colors.black.withOpacity(0.7),
-                            child: Stack(
-                              alignment: Alignment.center,
-                              children: [
-                                Positioned(
-                                    bottom:  40.sp,
-                                    child: Column(
-                                      children: [
-                                        Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('同时邀请数万人看烟花/庄园/婚礼/火箭/城堡/弹幕',style: TextStyle(color: Colors.white,fontSize: 14.sp,fontWeight: FontWeight.bold),)),
-                                        Transform(
-                                          alignment: Alignment.center,
-                                          transform:  Matrix4.rotationZ(3.1416), // π radians = 180 degrees
-                                          child: Container(
-                                            margin: EdgeInsets.only(right: 125.sp),
-                                            child: Image.asset(
-                                              getBaseImage('pop_top_right'),
-                                              width: 150.sp,
+                          child: InkWell(
+                            onTap: () {
+                              logic.isShowTip = false;
+                              logic.update();
+                              logic.setSpTip();
+                            },
+                            child: Container(
+                              width: Get.width,
+                              height: Get.height,
+                              color: Colors.black.withOpacity(0.7),
+                              child: Stack(
+                                alignment: Alignment.center,
+                                children: [
+                                  Positioned(
+                                      bottom:  40.sp,
+                                      child: Column(
+                                        children: [
+                                          Container(margin: EdgeInsets.only(bottom: 0.sp),child: Text('同时邀请数万人看烟花/庄园/婚礼/火箭/城堡/弹幕',style: TextStyle(color: Colors.white,fontSize: 14.sp,fontWeight: FontWeight.bold),)),
+                                          Transform(
+                                            alignment: Alignment.center,
+                                            transform:  Matrix4.rotationZ(3.1416), // π radians = 180 degrees
+                                            child: Container(
+                                              margin: EdgeInsets.only(right: 125.sp),
+                                              child: Image.asset(
+                                                getBaseImage('pop_top_right'),
+                                                width: 150.sp,
+                                              ),
                                             ),
                                           ),
-                                        ),
 
-                                      ],
-                                    )),
-                                Positioned(
-                                  bottom: 10.sp,
-                                  // right: 10.sp,
-                                  child:  chatActionWidget(getBaseImage('qz_gift_8'), '万人展',
-                                          () {
-                                        logic.isShowTip = false;
-                                        logic.update();
-                                        logic.setSpTip();
-                                        Get.bottomSheet(SendCastleDialog(),
-                                            isScrollControlled: true)
-                                            .then((value) {
-                                          if (value != null) {
-                                            logic.loadBannerData();
-                                            refreshData(logic);
-                                          }
-                                        });
-                                      }),
-                                ),
-                              ],
+                                        ],
+                                      )),
+                                  Positioned(
+                                    bottom: 10.sp,
+                                    // right: 10.sp,
+                                    child:  chatActionWidget(getBaseImage('qz_gift_8'), '万人展',
+                                            () {
+                                          logic.isShowTip = false;
+                                          logic.update();
+                                          logic.setSpTip();
+                                          Get.bottomSheet(SendCastleDialog(),
+                                              isScrollControlled: true)
+                                              .then((value) {
+                                            if (value != null) {
+                                              logic.loadBannerData();
+                                              refreshData(logic);
+                                            }
+                                          });
+                                        }),
+                                  ),
+                                ],
+                              ),
                             ),
                           )),
                   ],
diff --git a/circle_app/lib/commons/widgets/base_tip_widget.dart b/circle_app/lib/commons/widgets/base_tip_widget.dart
index c829a68..0eb57b0 100644
--- a/circle_app/lib/commons/widgets/base_tip_widget.dart
+++ b/circle_app/lib/commons/widgets/base_tip_widget.dart
@@ -243,7 +243,6 @@ unlockingPayment(String cicleId, MyCallback myCallback) async {
           myCallback(true);
         }
       });
-      //  showToast(data.toString());
     } else {
       showOKToast(bean.msg);
     }
diff --git a/circle_app/lib/commons/widgets/circle_share.dart b/circle_app/lib/commons/widgets/circle_share.dart
index 7994961..dbf5b48 100644
--- a/circle_app/lib/commons/widgets/circle_share.dart
+++ b/circle_app/lib/commons/widgets/circle_share.dart
@@ -1,11 +1,9 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:circle_app/circle_app/circle/logic.dart';
 import 'package:circle_app/circle_app/invite/logic.dart';
 import 'package:circle_app/circle_app/minefragment/logic.dart';
-import 'package:circle_app/commons/Widgets/follow_me_dialog.dart';
 import 'package:circle_app/commons/Widgets/text_more.dart';
 import 'package:circle_app/net/api.dart';
 import 'package:circle_app/net/dio_manager.dart';
@@ -18,6 +16,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
+import 'package:gradient_borders/box_borders/gradient_box_border.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'dart:ui' as ui;
 import 'package:fluwx/fluwx.dart' as fluwx;
@@ -25,18 +24,22 @@ import 'package:path_provider/path_provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart';
 
+import '../../circle_app/circle/state.dart';
+import '../../circle_app/circle/widgets/video_item.dart';
 import '../../circle_app/likelist/logic.dart';
+import '../../router/routers.dart';
 import '../../utils/cache_img.dart';
-
+import '../Widgets/tag_widget.dart';
+import '../colors/app_color.dart';
+import 'follow_me_dialog.dart';
 
 class CircleShare extends StatefulWidget {
   Circle bean;
   String code;
   String link;
-  CircleShare(this.code, this.link,this.bean);
+  CircleShare(this.code, this.link, this.bean);
   @override
   _CircleShareState createState() => new _CircleShareState();
-
 }
 
 class _CircleShareState extends State<CircleShare> {
@@ -57,7 +60,6 @@ class _CircleShareState extends State<CircleShare> {
   }
 
   loadInviteData() async {
-
     var data = await DioManager.instance.get(url: Api.inviteMainPage);
     if (data['code'] == 200) {
       Autogenerated result = Autogenerated.fromJson(data);
@@ -66,10 +68,7 @@ class _CircleShareState extends State<CircleShare> {
       widget.code = homeData.inviteCode!;
 
       widget.link = homeData.link!;
-      setState(() {
-
-      });
-
+      setState(() {});
     }
   }
 
@@ -85,7 +84,7 @@ class _CircleShareState extends State<CircleShare> {
             Container(
               width: Get.width - 40.sp,
               // height: Get.height - Get.bottomBarHeight - 164.sp - 10.sp,
-              child:SingleChildScrollView(
+              child: SingleChildScrollView(
                   child: RepaintBoundary(
                       key: _globalKey,
                       child: Container(
@@ -100,7 +99,8 @@ class _CircleShareState extends State<CircleShare> {
                             Container(
                               width: Get.width,
                               height: 65.sp,
-                              margin: EdgeInsets.only(left: 15.sp, top: 20.sp,right: 15.sp),
+                              margin: EdgeInsets.only(
+                                  left: 15.sp, top: 20.sp, right: 15.sp),
                               child: Row(
                                 children: [
                                   Center(
@@ -135,7 +135,7 @@ class _CircleShareState extends State<CircleShare> {
                                       padding: EdgeInsets.only(left: 10.sp),
                                       child: Column(
                                         crossAxisAlignment:
-                                        CrossAxisAlignment.start,
+                                            CrossAxisAlignment.start,
                                         children: [
                                           _buildNameRow(logic),
                                           SizedBox(height: 10.sp),
@@ -155,7 +155,8 @@ class _CircleShareState extends State<CircleShare> {
                             // Expanded(
                             //     child:
                             Container(
-                              padding: EdgeInsets.only(left: 10.sp,right: 10.sp),
+                              padding:
+                                  EdgeInsets.only(left: 10.sp, right: 10.sp),
                               // color: Colors.red,
                               //     height: 310.sp,
                               child: Column(
@@ -164,7 +165,8 @@ class _CircleShareState extends State<CircleShare> {
                                     height: 5.sp,
                                   ),
                                   Container(
-                                    padding: EdgeInsets.only(left: 15.sp,right: 15.sp),
+                                    padding: EdgeInsets.only(
+                                        left: 15.sp, right: 15.sp),
                                     child: Image.asset(
                                       getMineImage('share_title'),
                                     ),
@@ -182,17 +184,18 @@ class _CircleShareState extends State<CircleShare> {
                               alignment: Alignment.center,
                               // color: Colors.yellow,
                               // width: Get.width-40.sp,
-                              margin: EdgeInsets.only(bottom: 15.sp,top: 10.sp),
-                              padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                              margin:
+                                  EdgeInsets.only(bottom: 15.sp, top: 10.sp),
+                              padding:
+                                  EdgeInsets.only(left: 15.sp, right: 15.sp),
                               child: Row(
-
                                 children: [
                                   Expanded(
                                     child: Container(
                                       // color: Colors.red,
                                       child: Column(
                                         crossAxisAlignment:
-                                        CrossAxisAlignment.start,
+                                            CrossAxisAlignment.start,
                                         children: [
                                           Container(
                                             // color: Colors.blue,
@@ -210,24 +213,25 @@ class _CircleShareState extends State<CircleShare> {
                                                 Container(
                                                   alignment: Alignment.center,
                                                   padding: EdgeInsets.only(
-                                                      left: 10.sp, right: 10.sp),
+                                                      left: 10.sp,
+                                                      right: 10.sp),
                                                   height: 25.sp,
                                                   decoration: BoxDecoration(
-                                                    // color:  Color(0xFFDC5BFD),
+                                                      // color:  Color(0xFFDC5BFD),
                                                       gradient:
-                                                      const LinearGradient(
+                                                          const LinearGradient(
                                                         colors: [
                                                           Color(0xFF0DF5F7),
                                                           Color(0xFFD263FB)
                                                         ],
-                                                        begin:
-                                                        Alignment.centerLeft,
-                                                        end:
-                                                        Alignment.centerRight,
+                                                        begin: Alignment
+                                                            .centerLeft,
+                                                        end: Alignment
+                                                            .centerRight,
                                                       ),
                                                       borderRadius:
-                                                      BorderRadius.circular(
-                                                          12.5.sp)),
+                                                          BorderRadius.circular(
+                                                              12.5.sp)),
                                                   child: Text(
                                                     widget.code,
                                                     style: TextStyle(
@@ -275,10 +279,11 @@ class _CircleShareState extends State<CircleShare> {
                             )
                           ],
                         ),
-                      ))
-              ),
+                      ))),
+            ),
+            SizedBox(
+              height: 10.sp,
             ),
-            SizedBox(height: 10.sp,),
             Container(
               height: lists.isNotEmpty || conList.isNotEmpty ? 264.sp : 164.sp,
               width: Get.width,
@@ -290,12 +295,52 @@ class _CircleShareState extends State<CircleShare> {
                       height: 100.sp,
                       child: ListView.builder(
                         scrollDirection: Axis.horizontal,
-                        itemBuilder: (context,index) {
-                        if (index == 4) {
+                        itemBuilder: (context, index) {
+                          if (index == 4) {
+                            return GestureDetector(
+                              onTap: () {
+                                Get.bottomSheet(
+                                    FollowMeDialog(
+                                      bean: widget.bean,
+                                    ),
+                                    isScrollControlled: true,
+                                    enableDrag: false);
+                              },
+                              behavior: HitTestBehavior.opaque,
+                              child: Container(
+                                width: Get.width / 5,
+                                child: Column(
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: [
+                                    Image.asset(
+                                      getCircleImage('share_more'),
+                                      width: 51.sp,
+                                    ),
+                                    SizedBox(
+                                      height: 4.sp,
+                                    ),
+                                    Text(
+                                      '更多',
+                                      style: TextStyle(
+                                          color: Colors.white, fontSize: 14.sp),
+                                    )
+                                  ],
+                                ),
+                              ),
+                            );
+                          }
+                          var info;
+                          if (conList.length > index) {
+                            info = conList[index];
+                          } else {
+                            info = lists[index];
+                          }
                           return GestureDetector(
                             onTap: () {
-                              Get.bottomSheet(FollowMeDialog( bean: widget.bean,), isScrollControlled: true,
-                                  enableDrag: false);
+                              sendCircleCustomMsg(
+                                  info.userID ?? info.user.imId,
+                                  jsonEncode(widget.bean.toJson()),
+                                  '分享[${widget.bean.title}]');
                             },
                             behavior: HitTestBehavior.opaque,
                             child: Container(
@@ -303,63 +348,59 @@ class _CircleShareState extends State<CircleShare> {
                               child: Column(
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
-                                  Image.asset(getCircleImage('share_more'),width: 51.sp,),
-                                  SizedBox(height: 4.sp,),
-                                  Text('更多',style: TextStyle(color: Colors.white,fontSize: 14.sp),)
+                                  ClipOval(
+                                    child: Image.network(
+                                      info.faceUrl ?? info.user.avatar,
+                                      width: 51.sp,
+                                      height: 51.sp,
+                                      fit: BoxFit.cover,
+                                    ),
+                                  ),
+                                  SizedBox(
+                                    height: 4.sp,
+                                  ),
+                                  Text(
+                                    info.nickName ?? info.user.nickname,
+                                    style: TextStyle(
+                                        color: Colors.white, fontSize: 14.sp),
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                  )
                                 ],
                               ),
                             ),
                           );
-                        }
-                        var info;
-                        if (conList.length > index) {
-                          info =  conList[index];
-                        } else {
-                          info =  lists[index];
-                        }
-                        return GestureDetector(
-                          onTap: () {
-                            sendCircleCustomMsg(info.userID ?? info.user.imId,
-                                  jsonEncode(widget.bean.toJson()), '分享[${widget.bean.title}]');
-                          },
-                          behavior: HitTestBehavior.opaque,
-                          child: Container(
-                            width: Get.width / 5,
-                            child: Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: [
-                                ClipOval(child: Image.network(info.faceUrl ?? info.user.avatar,width: 51.sp,height: 51.sp,fit: BoxFit.cover,),),
-                                SizedBox(height: 4.sp,),
-                                Text(info.nickName ?? info.user.nickname,style: TextStyle(color: Colors.white,fontSize: 14.sp),maxLines: 1,overflow: TextOverflow.ellipsis,)
-                              ],
-                            ),
-                          ),
-                        );
-                      },itemCount: conList.length + lists.length > 5 ? 5 : conList.isNotEmpty ? conList.length : lists.length,),
+                        },
+                        itemCount: conList.length + lists.length > 5
+                            ? 5
+                            : conList.isNotEmpty
+                                ? conList.length
+                                : lists.length,
+                      ),
                     ),
                   Expanded(
                       child: Container(
-                        padding: EdgeInsets.only(
-                            top: 15.sp, left: 15.sp, right: 15.sp),
-                        alignment: Alignment.center,
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            shareAction('wx', '微信', () {
-                              shareWxData(1);
-                            }),
-                            shareAction('wxq', '朋友圈', () {
-                              shareWxData(2);
-                            }),
-                            shareAction('save', '复制邀请链接', () {
-                              copyInviteText(logic.name);
-                            }),
-                            shareAction('hb', '保存邀请海报', () {
-                              _saveLocalImage();
-                            }),
-                          ],
-                        ),
-                      )),
+                    padding:
+                        EdgeInsets.only(top: 15.sp, left: 15.sp, right: 15.sp),
+                    alignment: Alignment.center,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        shareAction('wx', '微信', () {
+                          shareWxData(1);
+                        }),
+                        shareAction('wxq', '朋友圈', () {
+                          shareWxData(2);
+                        }),
+                        shareAction('save', '复制邀请链接', () {
+                          copyInviteText(logic.name);
+                        }),
+                        shareAction('hb', '保存邀请海报', () {
+                          _saveLocalImage();
+                        }),
+                      ],
+                    ),
+                  )),
                   Container(
                     height: 1.sp,
                     color: Color(0x33FFFFFF),
@@ -374,8 +415,7 @@ class _CircleShareState extends State<CircleShare> {
                       alignment: Alignment.center,
                       child: Text(
                         '取消',
-                        style: TextStyle(
-                            color: Colors.white, fontSize: 14.sp),
+                        style: TextStyle(color: Colors.white, fontSize: 14.sp),
                       ),
                     ),
                   )
@@ -404,15 +444,15 @@ class _CircleShareState extends State<CircleShare> {
         },
         child: logic.userInfoBean == null
             ? SizedBox(
-          width: 63.sp,
-          height: 63.sp,
-        )
+                width: 63.sp,
+                height: 63.sp,
+              )
             : CachedImg(
-          fit: BoxFit.cover,
-          imageUrl: logic.avatar,
-          width: 63.sp,
-          height: 63.sp,
-        ),
+                fit: BoxFit.cover,
+                imageUrl: logic.avatar,
+                width: 63.sp,
+                height: 63.sp,
+              ),
       ),
     );
   }
@@ -469,6 +509,7 @@ class _CircleShareState extends State<CircleShare> {
       ],
     );
   }
+
   circleWidget(String url, String userId, {double width = 24}) {
     return Stack(
       alignment: Alignment.center,
@@ -489,6 +530,7 @@ class _CircleShareState extends State<CircleShare> {
       ],
     );
   }
+
   circleInfoItem(Circle bean) {
     List<JoinUser> urlList = bean.lastJoinUsers;
     List<Widget> widgets = [];
@@ -513,8 +555,10 @@ class _CircleShareState extends State<CircleShare> {
       margin: EdgeInsets.only(bottom: 10.sp),
       decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(10.sp),
-          gradient: LinearGradient(colors: [Color(0xFF261240),Color(0xFF132C40),])
-      ),
+          gradient: LinearGradient(colors: [
+            Color(0xFF261240),
+            Color(0xFF132C40),
+          ])),
       child: Column(
         children: [
           ClipRRect(
@@ -525,10 +569,11 @@ class _CircleShareState extends State<CircleShare> {
                 padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
                 height: 72.sp,
                 decoration: BoxDecoration(
-    
-    gradient: LinearGradient(colors: [Color(0xFF261240),Color(0xFF132C40),]),
-
-                   ),
+                  gradient: LinearGradient(colors: [
+                    Color(0xFF261240),
+                    Color(0xFF132C40),
+                  ]),
+                ),
                 child: Row(
                   // mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
@@ -559,34 +604,33 @@ class _CircleShareState extends State<CircleShare> {
                     ),
                     Expanded(
                         child: Container(
-                          padding: EdgeInsets.only(left: 8.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(
-                                height: 4.sp,
-                              ),
-                              Text(
-                                '👁${convertToTenThousand(bean.viewTotal)}',
-                                textAlign: TextAlign.left,
-                                style: TextStyle(
-                                  color: const Color(0xff03FEFB),
-                                  fontSize: 12.sp,
-                                ),
-                              ),
-                            ],
+                      padding: EdgeInsets.only(left: 8.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(
+                            height: 4.sp,
+                          ),
+                          Text(
+                            '👁${convertToTenThousand(bean.viewTotal)}',
+                            textAlign: TextAlign.left,
+                            style: TextStyle(
+                              color: const Color(0xff03FEFB),
+                              fontSize: 12.sp,
+                            ),
+                          ),
+                        ],
+                      ),
+                    )),
                     Stack(
                       alignment: Alignment.center,
                       children: [
@@ -596,8 +640,8 @@ class _CircleShareState extends State<CircleShare> {
                         ),
                         Text(
                           !bean.isJoin ? '申请加入' : '分享有奖',
-                          style: TextStyle(
-                              color: Colors.white, fontSize: 12.sp),
+                          style:
+                              TextStyle(color: Colors.white, fontSize: 12.sp),
                         )
                       ],
                     )
@@ -607,9 +651,7 @@ class _CircleShareState extends State<CircleShare> {
           Container(
             padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
             // height:urlList.length==0?47.sp: 118.sp,
-            decoration: BoxDecoration(
-
-               ),
+            decoration: BoxDecoration(),
             child: Container(
               margin: EdgeInsets.only(top: 10.sp, bottom: 10.sp),
               child: Column(
@@ -626,9 +668,7 @@ class _CircleShareState extends State<CircleShare> {
                         style: TextStyle(color: Colors.white, fontSize: 14.sp),
                         additionStyle: TextStyle(
                             color: const Color(0xFFFF4DF6), fontSize: 14.sp),
-                        onTap: () {
-
-                        },
+                        onTap: () {},
                       )),
                   GestureDetector(
                     behavior: HitTestBehavior.opaque,
@@ -639,46 +679,46 @@ class _CircleShareState extends State<CircleShare> {
                     child: urlList.length == 0
                         ? Container()
                         : Row(
-                      children: [
-                        SizedBox(
-                          height: 30.sp,
-                          width:
-                          30.0.sp + 14.sp * (widgets.length - 1.sp),
-                          child: Stack(
-                            alignment: Alignment.center,
-                            children: widgets,
+                            children: [
+                              SizedBox(
+                                height: 30.sp,
+                                width:
+                                    30.0.sp + 14.sp * (widgets.length - 1.sp),
+                                child: Stack(
+                                  alignment: Alignment.center,
+                                  children: widgets,
+                                ),
+                              ),
+                              SizedBox(
+                                width: 4.sp,
+                              ),
+                              Text(
+                                '${convertToTenThousand(bean.joinTotal)}圈友加入',
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 12.sp),
+                              ),
+                              SizedBox(
+                                width: 4.sp,
+                              ),
+                              // GestureDetector(
+                              //   onTap: () {
+                              //     Get.bottomSheet(
+                              //         CircleShare('code','link,',bean), isScrollControlled: true,
+                              //         enableDrag: false
+                              //     );
+                              //   },
+                              //   behavior: HitTestBehavior.opaque,
+                              //   child: Container(
+                              //     height: 30.sp,
+                              //     alignment: Alignment.center,
+                              //     child: Image.asset(
+                              //       getCircleImage('play'),
+                              //       width: 20.sp,
+                              //     ),
+                              //   ),
+                              // )
+                            ],
                           ),
-                        ),
-                        SizedBox(
-                          width: 4.sp,
-                        ),
-                        Text(
-                          '${convertToTenThousand(bean.joinTotal)}圈友加入',
-                          style: TextStyle(
-                              color: Colors.white, fontSize: 12.sp),
-                        ),
-                        SizedBox(
-                          width: 4.sp,
-                        ),
-                        // GestureDetector(
-                        //   onTap: () {
-                        //     Get.bottomSheet(
-                        //         CircleShare('code','link,',bean), isScrollControlled: true,
-                        //         enableDrag: false
-                        //     );
-                        //   },
-                        //   behavior: HitTestBehavior.opaque,
-                        //   child: Container(
-                        //     height: 30.sp,
-                        //     alignment: Alignment.center,
-                        //     child: Image.asset(
-                        //       getCircleImage('play'),
-                        //       width: 20.sp,
-                        //     ),
-                        //   ),
-                        // )
-                      ],
-                    ),
                   ),
                 ],
               ),
@@ -714,13 +754,14 @@ class _CircleShareState extends State<CircleShare> {
 
   _saveLocalImage() async {
     RenderRepaintBoundary boundary =
-    _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
-    ui.Image image = await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
+    ui.Image image =
+        await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
-    await (image.toByteData(format: ui.ImageByteFormat.png));
+        await (image.toByteData(format: ui.ImageByteFormat.png));
     if (byteData != null) {
       final result =
-      await ImageGallerySaver.saveImage(byteData.buffer.asUint8List());
+          await ImageGallerySaver.saveImage(byteData.buffer.asUint8List());
       print(result);
       // isSuccess
       if (result['isSuccess']) {
@@ -732,14 +773,15 @@ class _CircleShareState extends State<CircleShare> {
   }
 
   copyInviteText(
-      String username,
-      ) {
+    String username,
+  ) {
     Clipboard.setData(ClipboardData(
         text: '【${username}】邀请你加入“微乐园”，邀请码为${widget.code}，点击进入${widget.link!} '
             '这是一款专为各种特色小众圈子爱好者打造的交友平台，资质齐全，安全正规。'
             '在这里，能看到很多没听说过的圈子，也能发现很多为数不多的真实情怀，还能见证小众亚文化在生活方式上的新体验。真实、安全、私密、走心，我和很多圈友都在玩哦～'));
     showOKToast('您已成功复制分享链接，前往对应平台粘贴发送即可～');
   }
+
   /**
    * 分享图片到微信，
    * file=本地路径
@@ -748,13 +790,13 @@ class _CircleShareState extends State<CircleShare> {
    * scene=分享场景，1好友会话，2朋友圈，3收藏
    */
   void shareWxData(int scene) async {
-
-    SmartDialog.showLoading(msg:'正在生成分享图片...');
+    SmartDialog.showLoading(msg: '正在生成分享图片...');
     RenderRepaintBoundary boundary =
-    _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
-    ui.Image image = await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
+    ui.Image image =
+        await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
-    await (image.toByteData(format: ui.ImageByteFormat.png));
+        await (image.toByteData(format: ui.ImageByteFormat.png));
     String filePath = '';
     if (byteData != null) {
       Uint8List pngBytes = byteData!.buffer.asUint8List();
@@ -771,27 +813,29 @@ class _CircleShareState extends State<CircleShare> {
     fluwx.WeChatShareImageModel? model;
 
     if (filePath.isNotEmpty) {
-      model = fluwx.WeChatShareImageModel(fluwx.WeChatImage.file(File(filePath)),
-          title: '', description: '', scene: wxScene);
+      model = fluwx.WeChatShareImageModel(
+          fluwx.WeChatImage.file(File(filePath)),
+          title: '',
+          description: '',
+          scene: wxScene);
     }
     if (model != null) {
       fluwx.shareToWeChat(model!);
     }
-
   }
 
   void loadFollowMeData() async {
     List<V2TimUserFullInfo> stataionList = [];
     if (conList.isEmpty) {
-      stataionList  = await loadConverstationListData();
+      stataionList = await loadConverstationListData();
     }
     Map typeMap = {
-      '官方通知':1,
-      '活动驿站':2,
-      '会员中心':3,
-      '资产中心':4,
-      '乐园圈子':5,
-      '互动通知':6,
+      '官方通知': 1,
+      '活动驿站': 2,
+      '会员中心': 3,
+      '资产中心': 4,
+      '乐园圈子': 5,
+      '互动通知': 6,
     };
 
     stataionList.forEach((element) {
@@ -800,11 +844,9 @@ class _CircleShareState extends State<CircleShare> {
       }
     });
 
-
-
     if (conList.length < 5) {
       var data = await DioManager.instance
-          .get(url: Api.fansList, params: {'page': 1,'page_size':6});
+          .get(url: Api.fansList, params: {'page': 1, 'page_size': 6});
       var bean = BaseResponse<UserList>.fromJson(
           data, (data) => UserList.fromJson(data));
       if (bean.isSuccess()) {
@@ -813,7 +855,6 @@ class _CircleShareState extends State<CircleShare> {
           conList.forEach((user) {
             if (element.user.imId == user.userID!) {
               isContain = true;
-
             }
           });
           if (!isContain) {
@@ -823,8 +864,1668 @@ class _CircleShareState extends State<CircleShare> {
       }
     }
 
-    setState(() {
-
-    });
+    setState(() {});
+  }
+}
+
+class CallOutShareDialog extends StatefulWidget {
+  Lists lists;
+  String code;
+  String link;
+  CallOutShareDialog(this.code, this.link, this.lists);
+  @override
+  _CallOutShareDialogState createState() => new _CallOutShareDialogState();
+}
+
+class _CallOutShareDialogState extends State<CallOutShareDialog> {
+  // TODO: add state variables and methods
+  GlobalKey _globalKey = GlobalKey();
+  List<UserListItem> lists = [];
+  late MinefragmentLogic logic;
+  List<V2TimUserFullInfo> conList = [];
+
+  final ScrollController GridScrollController = ScrollController();
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+    Get.lazyPut(() => MinefragmentLogic());
+    logic = Get.find<MinefragmentLogic>();
+    loadFollowMeData();
+    loadInviteData();
+  }
+
+  loadInviteData() async {
+    var data = await DioManager.instance.get(url: Api.inviteMainPage);
+    if (data['code'] == 200) {
+      Autogenerated result = Autogenerated.fromJson(data);
+
+      Data homeData = result.data!;
+      widget.code = homeData.inviteCode!;
+
+      widget.link = homeData.link!;
+      setState(() {});
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: add widget build method
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      body: Stack(
+        children: [
+          Container(
+            width: Get.width,
+            height: Get.height,
+            child: Column(
+              children: [
+
+                Container(height: MediaQuery.of(context).padding.top,),
+                Container(
+                  width: Get.width - 40.sp,
+                  child: SingleChildScrollView(
+                      child: RepaintBoundary(
+                          key: _globalKey,
+                          child: Container(
+                            decoration: BoxDecoration(
+                              image: DecorationImage(
+                                image:
+                                    AssetImage(getCircleImage("open_vip_bg")),
+                                fit: BoxFit.fill,
+                              ),
+                            ),
+                            child: Column(
+                              children: [
+                                Container(
+                                  width: Get.width,
+                                  height: 65.sp,
+                                  margin: EdgeInsets.only(
+                                      left: 15.sp, top: 20.sp, right: 15.sp),
+                                  child: Row(
+                                    children: [
+                                      Center(
+                                        child: Stack(
+                                          alignment: Alignment.center,
+                                          children: [
+                                            Container(
+                                              width: 47.sp,
+                                              height: 47.sp,
+                                              decoration: const BoxDecoration(
+                                                shape: BoxShape.circle,
+                                                gradient: LinearGradient(
+                                                  colors: [
+                                                    Color(0xFFDD3DF4),
+                                                    Color(0xFF30FFD9)
+                                                  ],
+                                                  begin: Alignment.topCenter,
+                                                  end: Alignment.bottomCenter,
+                                                ),
+                                              ),
+                                            ),
+                                            SizedBox(
+                                              width: 46.sp,
+                                              height: 46.sp,
+                                              child: _buildAvatar1(logic),
+                                            )
+                                          ],
+                                        ),
+                                      ),
+                                      Expanded(
+                                        child: Container(
+                                          padding: EdgeInsets.only(left: 10.sp),
+                                          child: Column(
+                                            crossAxisAlignment:
+                                                CrossAxisAlignment.start,
+                                            children: [
+                                              _buildNameRow(logic),
+                                              SizedBox(height: 10.sp),
+                                              _buildInfoRow(logic),
+                                            ],
+                                          ),
+                                        ),
+                                      ),
+                                      Image.asset(
+                                        getBaseImage("ic_launcher"),
+                                        width: 65.sp,
+                                        height: 65.sp,
+                                      )
+                                    ],
+                                  ),
+                                ),
+                                // Expanded(
+                                //     child:
+                                Container(
+                                  padding: EdgeInsets.only(
+                                      left: 10.sp, right: 10.sp),
+                                  // color: Colors.red,
+                                  //     height: 310.sp,
+                                  child: Column(
+                                    children: [
+                                      SizedBox(
+                                        height: 5.sp,
+                                      ),
+                                      // Container(
+                                      //   padding: EdgeInsets.only(left: 15.sp,right: 15.sp),
+                                      //   child: Image.asset(
+                                      //     getMineImage('share_title'),
+                                      //   ),
+                                      // ),
+                                      SizedBox(
+                                        height: 10.sp,
+                                      ),
+                                      if (widget.lists.isQueen!)
+                                        vipDynamicItem(widget.lists),
+                                      if (!widget.lists.isQueen!)
+                                        normalDynamicItem(widget.lists),
+                                    ],
+                                  ),
+                                ),
+                                Container(
+                                  // height: 90.sp,
+                                  // color: Color(0xFF334141),
+                                  alignment: Alignment.center,
+                                  // color: Colors.yellow,
+                                  // width: Get.width-40.sp,
+                                  margin: EdgeInsets.only(
+                                      bottom: 15.sp, top: 10.sp),
+                                  padding: EdgeInsets.only(
+                                      left: 15.sp, right: 15.sp),
+                                  child: Row(
+                                    children: [
+                                      Expanded(
+                                        child: Container(
+                                          // color: Colors.red,
+                                          child: Column(
+                                            crossAxisAlignment:
+                                                CrossAxisAlignment.start,
+                                            children: [
+                                              Container(
+                                                // color: Colors.blue,
+                                                child: Row(
+                                                  children: [
+                                                    Text(
+                                                      '专属邀请码',
+                                                      style: TextStyle(
+                                                          color: Colors.white,
+                                                          fontSize: 18.sp),
+                                                    ),
+                                                    SizedBox(
+                                                      width: 8.sp,
+                                                    ),
+                                                    Container(
+                                                      alignment:
+                                                          Alignment.center,
+                                                      padding: EdgeInsets.only(
+                                                          left: 10.sp,
+                                                          right: 10.sp),
+                                                      height: 25.sp,
+                                                      decoration: BoxDecoration(
+                                                          // color:  Color(0xFFDC5BFD),
+                                                          gradient:
+                                                              const LinearGradient(
+                                                            colors: [
+                                                              Color(0xFF0DF5F7),
+                                                              Color(0xFFD263FB)
+                                                            ],
+                                                            begin: Alignment
+                                                                .centerLeft,
+                                                            end: Alignment
+                                                                .centerRight,
+                                                          ),
+                                                          borderRadius:
+                                                              BorderRadius
+                                                                  .circular(
+                                                                      12.5.sp)),
+                                                      child: Text(
+                                                        widget.code,
+                                                        style: TextStyle(
+                                                            color: Colors.black,
+                                                            fontSize: 12.sp),
+                                                      ),
+                                                    )
+                                                  ],
+                                                ),
+                                              ),
+                                              Container(
+                                                margin:
+                                                    EdgeInsets.only(top: 10.sp),
+                                                width: Get.width - 200.sp,
+                                                child: Text(
+                                                    '扫码或长按识别下载APP，认识更多小众圈子里的人，给生活带来更多乐趣～',
+                                                    style: TextStyle(
+                                                        color: Colors.white,
+                                                        fontSize: 15.sp)),
+                                              )
+                                            ],
+                                          ),
+                                        ),
+                                      ),
+                                      // Image.asset(getBaseImage("ic_launcher"),width: 80.sp,height: 80.sp,)
+                                      Stack(
+                                        alignment: Alignment.center,
+                                        children: [
+                                          Container(
+                                            color: Colors.white,
+                                            width: 90.sp,
+                                            height: 90.sp,
+                                          ),
+                                          QrImageView(
+                                            data: widget.link,
+                                            padding: EdgeInsets.zero,
+                                            version: QrVersions.auto,
+                                            size: 80.sp,
+                                            gapless: false,
+                                            // backgroundColor: Colors.black,
+                                          )
+                                        ],
+                                      )
+                                    ],
+                                  ),
+                                )
+                              ],
+                            ),
+                          ))),
+                ),
+                SizedBox(
+                  height: 10.sp,
+                ),
+                Spacer()
+              ],
+            ),
+          ),
+          Positioned(
+              bottom: 0,
+              child: Container(
+                height:
+                    lists.isNotEmpty || conList.isNotEmpty ? 264.sp : 164.sp,
+                width: Get.width,
+                color: Color(0xFF292247),
+                child: Column(
+                  children: [
+                    if (lists.isNotEmpty || conList.isNotEmpty)
+                      Container(
+                        height: 100.sp,
+                        child: ListView.builder(
+                          scrollDirection: Axis.horizontal,
+                          itemBuilder: (context, index) {
+                            if (index == 4) {
+                              return GestureDetector(
+                                onTap: () {
+                                  Get.bottomSheet(FollowDialog(lists:widget.lists,), isScrollControlled: true,
+                                      enableDrag: false);
+                                },
+                                behavior: HitTestBehavior.opaque,
+                                child: Container(
+                                  width: Get.width / 5,
+                                  child: Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Image.asset(
+                                        getCircleImage('share_more'),
+                                        width: 51.sp,
+                                      ),
+                                      SizedBox(
+                                        height: 4.sp,
+                                      ),
+                                      Text(
+                                        '更多',
+                                        style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 14.sp),
+                                      )
+                                    ],
+                                  ),
+                                ),
+                              );
+                            }
+                            var info;
+                            if (conList.length > index) {
+                              info = conList[index];
+                            } else {
+                              info = lists[index];
+                            }
+                            return GestureDetector(
+                              onTap: () {
+                                sendCallOutCustomMsg(
+                                    conList.length <= index
+                                        ? info.user.imId : info.userID,
+                                    jsonEncode(widget.lists.toJson()),
+                                    '分享[${widget.lists.user?.nickname ?? ''}]的喊话');
+                              },
+                              behavior: HitTestBehavior.opaque,
+                              child: Container(
+                                width: Get.width / 5,
+                                child: Column(
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: [
+                                    ClipOval(
+                                      child: CachedImg(
+                                        imageUrl: conList.length <= index
+                                            ? info.user.avatar
+                                            : info.faceUrl,
+                                        width: 51.sp,
+                                        height: 51.sp,
+                                        fit: BoxFit.cover,
+                                      ),
+                                    ),
+                                    SizedBox(
+                                      height: 4.sp,
+                                    ),
+                                    Text(
+                                      conList.length <= index
+                                          ? info.user.nickname
+                                          : info.nickName,
+                                      style: TextStyle(
+                                          color: Colors.white, fontSize: 14.sp),
+                                      maxLines: 1,
+                                      overflow: TextOverflow.ellipsis,
+                                    )
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                          itemCount: conList.length + lists.length > 5
+                              ? 5
+                              : conList.isNotEmpty
+                                  ? conList.length
+                                  : lists.length,
+                        ),
+                      ),
+                    Expanded(
+                        child: Container(
+                      padding: EdgeInsets.only(
+                          top: 15.sp, left: 15.sp, right: 15.sp),
+                      alignment: Alignment.center,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          shareAction('wx', '微信', () {
+                            shareWxData(1);
+                          }),
+                          shareAction('wxq', '朋友圈', () {
+                            shareWxData(2);
+                          }),
+                          shareAction('save', '复制邀请链接', () {
+                            copyInviteText(logic.name);
+                          }),
+                          shareAction('hb', '保存邀请海报', () {
+                            _saveLocalImage();
+                          }),
+
+                          shareAction('icon_report', '举报', () {
+                            Get.toNamed(Routes.ReportPage,arguments: {"userId": widget.lists.user!.id!.toString(),"objId": widget.lists.id!.toString(),'type':2});
+                            // _saveLocalImage();
+                          }),
+                        ],
+                      ),
+                    )),
+                    Container(
+                      height: 1.sp,
+                      color: Color(0x33FFFFFF),
+                    ),
+                    GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: () {
+                        Get.back();
+                      },
+                      child: Container(
+                        height: 67.sp,
+                        alignment: Alignment.center,
+                        child: Text(
+                          '取消',
+                          style:
+                              TextStyle(color: Colors.white, fontSize: 14.sp),
+                        ),
+                      ),
+                    )
+                  ],
+                ),
+              ))
+        ],
+      ),
+    );
+  }
+
+  ///至尊喊话
+  vipDynamicItem(Lists lists) {
+    int type = (lists.topInteractType?['type'] ?? 1) - 1;
+    Widget descText = HideText(
+      text: lists.content!,
+      maxWidth: Get.width - 90.sp,
+      additionText: '查看更多',
+      maxLines: 10,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+      additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 15.sp),
+      onTap: () {},
+    );
+
+    // List<JoinUser> urlList = bean.lastJoinUsers;
+    List<Widget> widgets = [];
+    int index = 0;
+    for (var element in lists.chat!.users!) {
+      widgets.add(Positioned(
+        left: 12.sp * index,
+        child: circleWidget(element.avatar!, element.id.toString(), width: 24),
+      ));
+      index++;
+    }
+    if (widgets.isNotEmpty) {
+      widgets.add(Positioned(
+          left: 12.sp * lists.chat!.users!.length,
+          child: Image.asset(
+            getCircleImage('more'),
+            width: 24.sp,
+          )));
+    }
+
+    double picHeight = 0.0;
+
+    if (lists.album != null) {
+      if (lists.album!.isNotEmpty) {
+        Album info = lists.album!.first;
+
+        if (info.type == 1) {
+          double picWidth = (Get.width - 100.sp) / 3 + 45;
+          if (lists.album!.length > 3) {
+            picHeight = picWidth * 2;
+          } else {
+            if (lists.album!.length == 1) {
+              picHeight = 250;
+            } else {
+              picHeight = picWidth;
+            }
+          }
+        } else {
+          picHeight = 200.sp;
+        }
+      }
+    }
+
+    Widget atWidget = Container();
+
+    List<Widget> atList = [];
+    if (lists.at!.isNotEmpty) {
+      List infoList = jsonDecode(lists.at!);
+      infoList.forEach((element) {
+        atList.add(GestureDetector(
+          onTap: () {
+            // Get.toNamed(Routes.UserInfoPage,
+            //     arguments: element['userId'].toString(),
+            //     preventDuplicates: false);
+          },
+          child: Container(
+            margin: EdgeInsets.only(right: 4.sp),
+            child: Text(
+              '@${element['nickName']}',
+              style: TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+            ),
+          ),
+        ));
+      });
+      atWidget = Container(
+          padding: EdgeInsets.only(bottom: 5.sp),
+          child: Row(
+            children: [
+              Wrap(
+                children: atList,
+              ),
+            ],
+          ));
+    }
+
+    // double widgetHeight = 130.sp + contentHeight(lists.content!) + picHeight;
+
+    return Container(
+        margin: EdgeInsets.only(bottom: 10.sp),
+        width: Get.width,
+        // height: widgetHeight,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage(
+                  getCircleImage('pic_bg'),
+                ))),
+        child: Stack(children: [
+          Positioned(
+            left: 0,
+            top: 2.sp,
+            height: 21.sp,
+            child: Image.asset(getCircleImage('vip_say')),
+          ),
+          Positioned(
+            right: 2.sp,
+            top: 2.sp,
+            child: Stack(
+              alignment: Alignment.center,
+              children: [
+                Container(
+                  // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
+                  padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                  alignment: Alignment.center,
+                  height: 24.sp,
+                  decoration: BoxDecoration(
+                      color: Color.fromRGBO(52, 41, 67, 1),
+                      borderRadius: BorderRadius.only(
+                          topLeft: Radius.circular(0),
+                          bottomRight: Radius.circular(0),
+                          topRight: Radius.circular(12.sp),
+                          bottomLeft: Radius.circular(12.sp))),
+                  child: Text(
+                    (lists.user!.city ?? '外星').length > 4
+                        ? (lists.user!.city ?? '外星').substring(0, 4) + '...'
+                        : (lists.user!.city ?? '外星'),
+                    style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                  ),
+                )
+              ],
+            ),
+          ),
+          Container(
+            // height: widgetHeight,
+            width: Get.width,
+            padding: EdgeInsets.only(top: 12.sp, left: 12.sp, right: 12.sp),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                SizedBox(
+                  height: 72.sp,
+                  child: Row(
+                    // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      GestureDetector(
+                          onTap: () async {},
+                          child: Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              Container(
+                                width: 60.sp,
+                                height: 50.sp,
+                              ),
+                              Container(
+                                // margin: EdgeInsets.only(top: 6.sp, ),
+                                width: 41.sp,
+                                height: 41.sp,
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(20.5.sp),
+                                  gradient: const LinearGradient(
+                                    begin: Alignment.topCenter,
+                                    end: Alignment.bottomCenter,
+                                    colors: [
+                                      Color(0xFF71F3F2),
+                                      Color(0xFFF558FF),
+                                    ],
+                                    stops: [0.0365, 0.9427],
+                                  ),
+                                ),
+                                padding: EdgeInsets.all(2.sp),
+                                child: ClipRRect(
+                                  borderRadius: BorderRadius.circular(30.sp),
+                                  child: Image.network(
+                                      lists.user!.avatar_thumb!,
+                                      width: 40.sp,
+                                      height: 40.sp,
+                                      fit: BoxFit.cover),
+                                ),
+                              ),
+                              if ((lists.user!.onlineFlag ?? '').isNotEmpty)
+                                Positioned(
+                                    bottom: 0,
+                                    child: Container(
+                                        height: 20.sp,
+                                        padding: EdgeInsets.only(
+                                            left: 4.sp, right: 4.sp),
+                                        decoration: BoxDecoration(
+                                          borderRadius:
+                                              BorderRadius.circular(10.sp),
+                                          color: AppColor.bgColor,
+                                          border: GradientBoxBorder(
+                                            gradient:
+                                                AppColor.mainVerLinearGradient,
+                                            width: 1.sp,
+                                          ),
+                                        ),
+                                        alignment: Alignment.center,
+                                        child: Text(
+                                          lists.user!.onlineFlag ?? '',
+                                          style: TextStyle(
+                                            color: const Color.fromRGBO(
+                                                247, 250, 250, 1.0),
+                                            fontSize: 10.sp,
+                                          ),
+                                        )))
+                            ],
+                          )),
+                      Expanded(
+                          child: Container(
+                        padding: EdgeInsets.only(left: 0.sp, top: 12.sp),
+                        alignment: Alignment.centerLeft,
+                        height: 72.sp,
+                        child: Column(
+                          children: [
+                            Row(
+                              children: [
+                                Text(
+                                  lists.user!.nickname!,
+                                  style: TextStyle(
+                                      color: Colors.white,
+                                      fontSize: 18.sp,
+                                      fontWeight: FontWeight.w600),
+                                ),
+                                SizedBox(
+                                  width: 8.sp,
+                                ),
+                                UserTagWidget(lists.user!.mark!),
+                              ],
+                            ),
+                            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),
+                                      gradient: sexBgGradient(
+                                          lists.user!.gender ?? 0)),
+                                  child: Text(
+                                    getAgeCOntent(
+                                        lists.user!.gender ?? 0,
+                                        lists.user!.age ?? 0,
+                                        lists.user!.role ?? 0,
+                                        lists.user!.orientation ?? 0),
+                                    //  '${genderList[lists.user!.gender!]}.${lists.user!.age}.${roleList[lists.user!.role!]}.${orientationList[lists.user!.orientation!]}',
+                                    style: TextStyle(
+                                      color:
+                                          sexBgColor(lists.user!.gender ?? 0),
+                                      fontSize: 12.sp,
+                                    ),
+                                  ),
+                                )
+                              ],
+                            ),
+                          ],
+                        ),
+                      )),
+                    ],
+                  ),
+                ),
+                atWidget,
+                Container(
+                  alignment: Alignment.topLeft,
+                  // margin: EdgeInsets.only(top: 4.sp),
+                  child: descText,
+                ),
+                Listener(
+                  child: Container(
+                    height: picHeight,
+                    margin: EdgeInsets.only(top: 5.sp),
+                    child: picHeight == 200.sp
+                        ? ClipRRect(
+                            borderRadius: BorderRadius.circular(6.sp),
+                            child: VideoItemWidget(
+                                lists.album![0].url!,
+                                lists.id!.toString(),
+                                lists.user!.id.toString()))
+                        : picHeight == 250
+                            ? GestureDetector(
+                                onTap: () async {
+                                  // var imgList = <String>[];
+                                  // for (var element in lists.album!) {
+                                  //   imgList.add(element.url!);
+                                  // }
+                                  //
+                                  // Get.toNamed(Routes.SwiperPage, arguments: {
+                                  //   'imaglist': imgList,
+                                  //   'index': 0,
+                                  //   'userId': lists.user?.id!.toString()
+                                  // });
+                                },
+                                child: ClipRRect(
+                                  borderRadius: BorderRadius.circular(6.sp),
+                                  child: CachedImg(
+                                    imageUrl: lists.album!.first.url!,
+                                    fit: BoxFit.cover,
+                                  ),
+                                ),
+                              )
+                            : GridView.builder(
+                                controller: GridScrollController,
+                                itemCount: lists.album!.length,
+                                scrollDirection: Axis.vertical,
+                                physics: const NeverScrollableScrollPhysics(),
+                                gridDelegate:
+                                    SliverGridDelegateWithFixedCrossAxisCount(
+                                        crossAxisCount: 3, //横轴三个子widget
+                                        crossAxisSpacing: 8.sp,
+                                        mainAxisSpacing: 8.sp,
+                                        childAspectRatio: 0.6 //宽高比为1时，子widget
+                                        ),
+                                itemBuilder: (contentxt, currentIndex) {
+                                  Album album = lists.album![currentIndex];
+                                  return ClipRRect(
+                                    borderRadius: BorderRadius.circular(6.sp),
+                                    child: CachedImg(
+                                      imageUrl: album.url!,
+                                      fit: BoxFit.cover,
+                                    ),
+                                  );
+                                }),
+                  ),
+                ),
+                Row(
+                  children: [
+                    InkWell(
+                      onTap: () {},
+                      child: Container(
+                        margin: EdgeInsets.only(right: 5.sp),
+                        child: Image.asset(
+                          getCircleImage('forward'),
+                          width: 20.sp,
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Container(
+                        height: 30.sp,
+                        padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
+                        margin: EdgeInsets.only(
+                            top: picHeight > 0 ? 5.sp : 5.sp, bottom: 10.sp),
+                        decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(15.sp),
+                            color: Color(0x33000000)),
+                        child: Row(
+                          children: [
+                            widgets.isNotEmpty
+                                ? SizedBox(
+                                    width: 24 + 12.sp * widgets.length - 8.sp,
+                                    height: 24.sp,
+                                    child: Stack(children: widgets),
+                                  )
+                                : Container(),
+                            SizedBox(
+                              width: 4.sp,
+                            ),
+                            widgets.isNotEmpty
+                                ? Expanded(
+                                    child: Text(
+                                    '${lists.chat!.count!}位圈友已私聊',
+                                    style: TextStyle(
+                                        color: Colors.white.withOpacity(0.75),
+                                        fontSize: 13.sp),
+                                  ))
+                                : Expanded(
+                                    child: Text(
+                                    '赶紧成为第一位私聊ta的人吧',
+                                    style: TextStyle(
+                                        color: Colors.white.withOpacity(0.75),
+                                        fontSize: 13.sp),
+                                  )),
+                            GestureDetector(
+                              onTap: () {},
+                              child: Image.asset(
+                                getCircleImage('chat'),
+                                width: 50.sp,
+                              ),
+                            )
+                          ],
+                        ),
+                      ),
+                    ),
+                    Container(
+                      margin: EdgeInsets.only(
+                          left: 10.sp,
+                          bottom: (lists.topInteractType!['userCount'] ?? 0) > 0
+                              ? 5.sp
+                              : 5.sp),
+                      // height: 40.sp,
+                      alignment: Alignment.center,
+                      child: Stack(
+                        alignment: Alignment.center,
+                        children: [
+                          Container(
+                            height: 43.sp,
+                          ),
+                          Text(
+                            lists.interactedTypeEmote ?? '❤',
+                            style:
+                                TextStyle(color: Colors.white, fontSize: 20.sp),
+                          ),
+                          if ((lists.topInteractType!['userCount'] ?? 0) > 0)
+                            Positioned(
+                              bottom: 0,
+                              child: Text(
+                                '${lists.topInteractType!['userCount']}',
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 10.sp),
+                              ),
+                            ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+                if (lists.interest?.isNotEmpty ?? false)
+                  Container(
+                    width: Get.width - 26.sp,
+                    margin: EdgeInsets.only(bottom: 15.sp),
+                    child: circleInfoItem(lists.interest!),
+                  )
+              ],
+            ),
+          )
+        ]));
+  }
+
+  ///普通图文喊话
+  normalDynamicItem(Lists lists) {
+    int type = (lists.topInteractType?['type'] ?? 1) - 1;
+    Widget descText = HideText(
+      text: lists.content ?? '',
+      maxWidth: Get.width - 90.sp,
+      additionText: '查看更多',
+      maxLines: 10,
+      style: TextStyle(color: Colors.white, fontSize: 15.sp),
+      additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 15.sp),
+      onTap: () {
+        // widget.logic.openCallOutIdList.add(lists.id);
+        // setState(() {});
+      },
+    );
+
+    if (lists.user!.nickname! == '乐园园长') {
+      int i = 10;
+    }
+    double picHeight = 0.0;
+    double ratio = 0;
+    double picWidth = (Get.width - 100.sp) / 3 + 45;
+    if (lists.album != null) {
+      if (lists.album!.isNotEmpty) {
+        Album info = lists.album!.first;
+        ratio = ((Get.width - 100.sp) / 3) / picWidth;
+        if (info.type == 1) {
+          if (lists.album!.length > 3) {
+            picHeight = picWidth * 2;
+          } else {
+            if (lists.album!.length == 1) {
+              picHeight = 250;
+            } else {
+              picHeight = picWidth;
+            }
+          }
+        } else {
+          picHeight = 200.sp;
+        }
+      }
+    }
+
+    List<Widget> widgets = [];
+    int index = 0;
+    lists.chat!.users!.forEach((element) {
+      widgets.add(Positioned(
+        left: 12.sp * index,
+        child: circleWidget(element.avatar!, element.id.toString(), width: 24),
+      ));
+      index++;
+    });
+    if (widgets.isNotEmpty) {
+      widgets.add(Positioned(
+          left: 12.sp * lists.chat!.users!.length,
+          child: Image.asset(
+            getCircleImage('more'),
+            width: 24.sp,
+          )));
+    }
+
+    Widget atWidget = Container();
+
+    List<Widget> atList = [];
+    if (lists.at!.isNotEmpty) {
+      List infoList = jsonDecode(lists.at!);
+      infoList.forEach((element) {
+        atList.add(Container(
+          margin: EdgeInsets.only(right: 4.sp),
+          child: Text(
+            '@${element['nickName']}',
+            style: TextStyle(color: AppColor.mainColor, fontSize: 14.sp),
+          ),
+        ));
+      });
+      atWidget = Container(
+          padding: EdgeInsets.only(bottom: 5.sp),
+          child: Row(
+            children: [
+              Wrap(
+                children: atList,
+              ),
+            ],
+          ));
+    }
+
+    return Container(
+        margin: EdgeInsets.only(bottom: 10.sp),
+        width: Get.width,
+        // height: 120.sp + contentHeight(lists.content!) + picHeight,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage(
+                  getCircleImage('normal_bg'),
+                ))),
+        child: Stack(
+          children: [
+            Positioned(
+              right: 2.sp,
+              top: 2.sp,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  // Image.asset(
+                  //   getCircleImage('location'),
+                  //   height: 30.sp,
+                  // ),
+                  Container(
+                    // margin: EdgeInsets.only(top: 5.sp,right: 5.sp),
+                    padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
+                    alignment: Alignment.center,
+                    height: 24.sp,
+                    decoration: BoxDecoration(
+                        color: Color.fromRGBO(52, 41, 67, 1),
+                        borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(0),
+                            bottomRight: Radius.circular(0),
+                            topRight: Radius.circular(12.sp),
+                            bottomLeft: Radius.circular(12.sp))),
+                    child: Text(
+                      (lists.user!.city ?? '外星').length > 4
+                          ? (lists.user!.city ?? '外星').substring(0, 4) + '...'
+                          : (lists.user!.city ?? '外星'),
+                      style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                    ),
+                  )
+                ],
+              ),
+              // height: 18.sp,
+            ),
+            Container(
+              width: Get.width,
+              padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(
+                    height: 72.sp,
+                    child: Row(
+                      // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Stack(
+                          alignment: Alignment.center,
+                          children: [
+                            Container(
+                              width: 60.sp,
+                              height: 50.sp,
+                            ),
+                            Container(
+                              // margin: EdgeInsets.only(top: 6.sp, ),
+                              width: 41.sp,
+                              height: 41.sp,
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.circular(20.5.sp),
+                                gradient: const LinearGradient(
+                                  begin: Alignment.topCenter,
+                                  end: Alignment.bottomCenter,
+                                  colors: [
+                                    Color(0xFF71F3F2),
+                                    Color(0xFFF558FF),
+                                  ],
+                                  stops: [0.0365, 0.9427],
+                                ),
+                              ),
+                              padding: EdgeInsets.all(2.sp),
+                              child: ClipRRect(
+                                borderRadius: BorderRadius.circular(30.sp),
+                                child: Image.network(lists.user!.avatar_thumb!,
+                                    width: 40.sp,
+                                    height: 40.sp,
+                                    fit: BoxFit.cover),
+                              ),
+                            ),
+                            if ((lists.user!.onlineFlag ?? '').isNotEmpty)
+                              Positioned(
+                                  bottom: 0,
+                                  child: Container(
+                                      height: 20.sp,
+                                      padding: EdgeInsets.only(
+                                          left: 4.sp, right: 4.sp),
+                                      decoration: BoxDecoration(
+                                        borderRadius:
+                                            BorderRadius.circular(10.sp),
+                                        color: AppColor.bgColor,
+                                        border: GradientBoxBorder(
+                                          gradient:
+                                              AppColor.mainVerLinearGradient,
+                                          width: 1.sp,
+                                        ),
+                                      ),
+                                      alignment: Alignment.center,
+                                      child: Text(
+                                        lists.user!.onlineFlag ?? '',
+                                        style: TextStyle(
+                                          color: const Color.fromRGBO(
+                                              247, 250, 250, 1.0),
+                                          fontSize: 10.sp,
+                                        ),
+                                      )))
+                          ],
+                        ),
+                        Expanded(
+                            child: Container(
+                          padding: EdgeInsets.only(left: 0.sp, top: 12.sp),
+                          alignment: Alignment.centerLeft,
+                          height: 72.sp,
+                          child: Column(
+                            children: [
+                              Row(
+                                children: [
+                                  Text(
+                                    lists.user!.nickname!,
+                                    style: TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 18.sp,
+                                        fontWeight: FontWeight.w600),
+                                  ),
+                                  SizedBox(
+                                    width: 8.sp,
+                                  ),
+                                  UserTagWidget(lists.user!.mark!),
+                                ],
+                              ),
+                              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),
+                                        gradient: sexBgGradient(
+                                            lists.user!.gender ?? 0)),
+                                    child: Text(
+                                      getAgeCOntent(
+                                          lists.user!.gender ?? 0,
+                                          lists.user!.age ?? 0,
+                                          lists.user!.role ?? 0,
+                                          lists.user!.orientation ?? 0),
+                                      style: TextStyle(
+                                        color:
+                                            sexBgColor(lists.user!.gender ?? 0),
+                                        fontSize: 12.sp,
+                                      ),
+                                    ),
+                                  )
+                                ],
+                              ),
+                            ],
+                          ),
+                        )),
+                      ],
+                    ),
+                  ),
+                  atWidget,
+                  Container(
+                    alignment: Alignment.topLeft,
+                    // margin: EdgeInsets.only(top: 4.sp),
+                    child: descText,
+                  ),
+                  picHeight > 0
+                      ? Container(
+                          height: picHeight,
+                          // alignment: Alignment.centerLeft,
+                          margin: EdgeInsets.only(top: 5.sp),
+                          child: picHeight == 200.sp
+                              ? ClipRRect(
+                                  borderRadius: BorderRadius.circular(6.sp),
+                                  child: VideoItemWidget(
+                                      lists.album![0].url!,
+                                      lists.id!.toString(),
+                                      lists.user!.id.toString()))
+                              : picHeight == 250
+                                  ? ClipRRect(
+                                      borderRadius: BorderRadius.circular(6.sp),
+                                      child: CachedImg(
+                                        imageUrl: lists.album!.first.url!,
+                                        fit: BoxFit.cover,
+                                      ),
+                                    )
+                                  : GridView.builder(
+                                      controller: GridScrollController,
+                                      itemCount: lists.album!.length,
+                                      physics:
+                                          const NeverScrollableScrollPhysics(),
+                                      gridDelegate:
+                                          SliverGridDelegateWithFixedCrossAxisCount(
+                                              crossAxisCount: 3, //横轴三个子widget
+                                              crossAxisSpacing: 4.sp,
+                                              mainAxisSpacing: 4.sp,
+                                              childAspectRatio:
+                                                  ratio //宽高比为1时，子widget
+                                              ),
+                                      itemBuilder: (contentxt, currentIndex) {
+                                        Album album =
+                                            lists.album![currentIndex];
+                                        return ClipRRect(
+                                          borderRadius:
+                                              BorderRadius.circular(6.sp),
+                                          child: CachedImg(
+                                            imageUrl: album.url!,
+                                            fit: BoxFit.cover,
+                                          ),
+                                        );
+                                      }))
+                      : Container(),
+                  Row(
+                    children: [
+                      InkWell(
+                        onTap: () {},
+                        child: Container(
+                          margin: EdgeInsets.only(right: 5.sp),
+                          child: Image.asset(
+                            getCircleImage('forward'),
+                            width: 20.sp,
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
+                          height: 30.sp,
+                          padding: EdgeInsets.only(left: 5.sp, right: 10.sp),
+                          margin: EdgeInsets.only(
+                              top: picHeight > 0 ? 5.sp : 5.sp, bottom: 10.sp),
+                          decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(15.sp),
+                              color: Color(0x33000000)),
+                          child: Row(
+                            children: [
+                              widgets.isNotEmpty
+                                  ? SizedBox(
+                                      width: 24 + 12.sp * widgets.length - 8.sp,
+                                      height: 24.sp,
+                                      child: Stack(children: widgets),
+                                    )
+                                  : Container(),
+                              SizedBox(
+                                width: 4.sp,
+                              ),
+                              widgets.isNotEmpty
+                                  ? Expanded(
+                                      child: Text(
+                                      '${lists.chat!.count!}位圈友已私聊',
+                                      style: TextStyle(
+                                          color: Colors.white.withOpacity(0.75),
+                                          fontSize: 13.sp),
+                                    ))
+                                  : Expanded(
+                                      child: Text(
+                                      '赶紧成为第一位私聊ta的人吧',
+                                      style: TextStyle(
+                                          color: Colors.white.withOpacity(0.75),
+                                          fontSize: 13.sp),
+                                    )),
+                              Image.asset(
+                                getCircleImage('chat'),
+                                width: 50.sp,
+                              )
+                            ],
+                          ),
+                        ),
+                      ),
+                      Container(
+                        margin: EdgeInsets.only(
+                            left: 10.sp,
+                            bottom:
+                                (lists.topInteractType!['userCount'] ?? 0) > 0
+                                    ? 5.sp
+                                    : 5.sp),
+                        // height: 40.sp,
+                        alignment: Alignment.center,
+                        child: Stack(
+                          alignment: Alignment.center,
+                          children: [
+                            Container(
+                              height: 43.sp,
+                            ),
+                            Text(
+                              lists.interactedTypeEmote ?? '❤',
+                              style: TextStyle(
+                                  color: Colors.white, fontSize: 20.sp),
+                            ),
+                            if ((lists.topInteractType!['userCount'] ?? 0) > 0)
+                              Positioned(
+                                bottom: 0,
+                                child: Text(
+                                  '${lists.topInteractType!['userCount']}',
+                                  style: TextStyle(
+                                      color: Colors.white, fontSize: 10.sp),
+                                ),
+                              ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                  if (lists.interest?.isNotEmpty ?? false)
+                    Container(
+                      width: Get.width - 26.sp,
+                      margin: EdgeInsets.only(bottom: 15.sp),
+                      child: circleInfoItem(lists.interest!),
+                    )
+                ],
+              ),
+            ),
+            // Positioned(
+            //   bottom: 0,
+            //     child: Container(
+            //       width: Get.width - 26.sp,
+            //       child: circleInfoItem(lists.interest!),
+            //     ))
+          ],
+        ));
+  }
+
+  circleInfoItem(var bean) {
+    Circle list = Circle.fromJson(bean);
+    return ClipRRect(
+        borderRadius: BorderRadius.circular(12.sp),
+        child: Container(
+          padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
+          height: 30.sp,
+          decoration: BoxDecoration(
+              // color: Colors.red,
+              image: DecorationImage(
+                  fit: BoxFit.fill,
+                  image: AssetImage(getCircleImage('top_circle_bg')))),
+          child: Row(
+            // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Container(
+                width: 22.sp,
+                height: 22.sp,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(8.0),
+                  gradient: const LinearGradient(
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                    colors: [
+                      Color(0xFF71F3F2),
+                      Color(0xFFF558FF),
+                    ],
+                    stops: [0.0365, 0.9427],
+                  ),
+                ),
+                padding: EdgeInsets.all(1.sp),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(8.0),
+                  child: CachedImg(
+                      imageUrl: bean['image'],
+                      width: 20.sp,
+                      height: 20.sp,
+                      fit: BoxFit.cover),
+                ),
+              ),
+              Expanded(
+                  child: Container(
+                padding: EdgeInsets.only(
+                  left: 4.sp,
+                  // top: 12.sp,
+                ),
+                // alignment: Alignment.,
+                // height: 50.sp,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      bean['title'],
+                      style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 14.sp,
+                          fontWeight: FontWeight.w600),
+                    ),
+                  ],
+                ),
+              )),
+              Row(
+                children: [
+                  Text(
+                    '👁${convertToTenThousand(bean['view_total'])}',
+                    textAlign: TextAlign.left,
+                    style: TextStyle(
+                      color: const Color(0xff03FEFB),
+                      fontSize: 12.sp,
+                    ),
+                  ),
+                  Image.asset(
+                    getHomeImage("icon_in"),
+                    width: 16.sp,
+                  )
+                ],
+              ),
+              // Container(
+              //   margin: EdgeInsets.only(right: 8.sp),
+              //   child: GestureDetector(
+              //     //加入圈子
+              //       onTap: () async {
+              //         CircleLogic cLogic = Get.find<CircleLogic>();
+              //         if (bean['is_join']) {
+              //           var data = await DioManager.instance.get(
+              //             url: "/up-service/interest/${bean['id']}",
+              //           );
+              //           if (data["code"] == 200) {
+              //             Circle info = Circle.fromJson(data['data']);
+              //             Get.bottomSheet(CircleShare('', '', info),
+              //                 isScrollControlled: true, enableDrag: false);
+              //           }
+              //         } else {
+              //           await cLogic.outCircle(
+              //               bean['id'].toString(), bean['is_join']);
+              //           bean['is_join'] = !bean['is_join'];
+              //           // if (recomanddlists.isNotEmpty) {
+              //           //   recomanddlists.forEach((element) {
+              //           //     if (element.interest!['id'].toString() ==
+              //           //         bean['id'].toString()) {
+              //           //       element.interest!['is_join'] = true;
+              //           //       element.interest = element.interest!;
+              //           //     }
+              //           //   });
+              //           // }
+              //
+              //           if (lists.isNotEmpty) {
+              //             lists.forEach((element) {
+              //               if (element.interest!['id'].toString() ==
+              //                   bean['id'].toString()) {
+              //                 element.interest!['is_join'] = true;
+              //                 element.interest = element.interest!;
+              //               }
+              //             });
+              //           }
+              //           // if (Get.isRegistered<LikeLogic>()) {
+              //           //   LikeLogic likeLogic = Get.find<LikeLogic>();
+              //           //   likeLogic.loadMyCircleData();
+              //           // }
+              //           setState(() {});
+              //         }
+              //       },
+              //       child: Stack(
+              //         alignment: Alignment.center,
+              //         children: [
+              //           Opacity(
+              //             opacity: 0.5,
+              //             child: Image.asset(
+              //               getCircleImage('add'),
+              //               width: 60.sp,
+              //             ),
+              //           ),
+              //           Text(
+              //             !bean['is_join'] ? '申请加入' : '分享有奖',
+              //             style:
+              //             TextStyle(color: Colors.white, fontSize: 12.sp),
+              //           )
+              //         ],
+              //       )),
+              // )
+            ],
+          ),
+        ));
+  }
+
+  Widget _buildAvatar1(MinefragmentLogic logic) {
+    return ClipOval(
+      child: GestureDetector(
+        onTap: () {
+          if (logic.userInfoBean != null) {
+            var imgList = <String>[];
+            imgList.add(logic.userInfoBean!.avatar);
+            //   Get.toNamed(AppRoutes.Swiper,arguments:imgList);
+            // Get.toNamed(AppRoutes.Swiper, arguments: {
+            //   'imaglist': imgList,
+            //   'index': 0
+            // });
+          }
+        },
+        child: logic.userInfoBean == null
+            ? SizedBox(
+                width: 63.sp,
+                height: 63.sp,
+              )
+            : CachedImg(
+                fit: BoxFit.cover,
+                imageUrl: logic.avatar,
+                width: 63.sp,
+                height: 63.sp,
+              ),
+      ),
+    );
+  }
+
+  Widget _buildNameRow(MinefragmentLogic logic) {
+    return Container(
+      margin: EdgeInsets.only(top: 6.sp),
+      child: Row(
+        // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            logic.name,
+            style: TextStyle(
+              color: const Color.fromRGBO(247, 250, 250, 1.0),
+              fontSize: 16.sp,
+            ),
+          ),
+          SizedBox(
+            width: 4.sp,
+          ),
+          Container(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(17),
+              gradient: sexBgGradient(logic.userInfoBean?.gender ?? 0),
+            ),
+            padding: EdgeInsets.only(
+                top: 2.sp, bottom: 2.sp, left: 10.sp, right: 10.sp),
+            child: Text(
+              logic.ageMsg,
+              style: TextStyle(
+                color: sexBgColor(logic.userInfoBean?.gender ?? 0),
+                fontSize: 10.sp,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(MinefragmentLogic logic) {
+    return Row(
+      children: [
+        Text('邀请您加入',
+            style: TextStyle(
+              color: Colors.white,
+              fontSize: 12.sp,
+            )),
+        Text('【微乐园APP】',
+            style: TextStyle(
+              color: Color(0xFF0DF5F7),
+              fontSize: 12.sp,
+            )),
+      ],
+    );
+  }
+
+  circleWidget(String url, String userId, {double width = 24}) {
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        Image.asset(
+          getCircleImage('avatar_bg'),
+          width: width.sp,
+        ),
+        ClipOval(
+          child: CachedImg(
+            imageUrl: url ??
+                "https://qiniuyun.leyuan666.com/quanzi/avatar/default.png",
+            width: (width - 1).sp,
+            height: (width - 1).sp,
+            fit: BoxFit.cover,
+          ),
+        )
+      ],
+    );
+  }
+
+  shareAction(String img, String name, GestureTapCallback onTap) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        child: Column(
+          children: [
+            Image.asset(
+              img == 'msg_report' ? getMsgImage(img) : getMineImage(img),
+              width: 40.sp,
+            ),
+            SizedBox(
+              height: 10.sp,
+            ),
+            Text(
+              name,
+              style: TextStyle(color: Colors.white, fontSize: 12.sp),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+
+  _saveLocalImage() async {
+    RenderRepaintBoundary boundary =
+        _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
+    ui.Image image =
+        await boundary.toImage(pixelRatio: 1.0);
+    ByteData? byteData =
+        await (image.toByteData(format: ui.ImageByteFormat.png));
+    if (byteData != null) {
+      final result =
+          await ImageGallerySaver.saveImage(byteData.buffer.asUint8List());
+      print(result);
+      // isSuccess
+      if (result['isSuccess']) {
+        showOKToast('保存成功');
+      } else {
+        showOKToast('保存失败，请检查相册权限是否开启');
+      }
+    }
+  }
+
+  copyInviteText(
+    String username,
+  ) {
+    Clipboard.setData(ClipboardData(
+        text: '【${username}】邀请你加入“微乐园”，邀请码为${widget.code}，点击进入${widget.link!} '
+            '这是一款专为各种特色小众圈子爱好者打造的交友平台，资质齐全，安全正规。'
+            '在这里，能看到很多没听说过的圈子，也能发现很多为数不多的真实情怀，还能见证小众亚文化在生活方式上的新体验。真实、安全、私密、走心，我和很多圈友都在玩哦～'));
+    showOKToast('您已成功复制分享链接，前往对应平台粘贴发送即可～');
+  }
+
+  /**
+   * 分享图片到微信，
+   * file=本地路径
+   * url=网络地址
+   * asset=内置在app的资源图片
+   * scene=分享场景，1好友会话，2朋友圈，3收藏
+   */
+  void shareWxData(int scene) async {
+    SmartDialog.showLoading(msg: '正在生成分享图片...');
+    RenderRepaintBoundary boundary =
+        _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
+    ui.Image image =
+        await boundary.toImage(pixelRatio: 1.0);
+    ByteData? byteData =
+        await (image.toByteData(format: ui.ImageByteFormat.png));
+    String filePath = '';
+    if (byteData != null) {
+      Uint8List pngBytes = byteData!.buffer.asUint8List();
+      Directory directory = await getApplicationDocumentsDirectory();
+      filePath = '${directory.path}/widget_image.png';
+      File imageFile = File(filePath);
+      imageFile.writeAsBytesSync(pngBytes);
+    }
+    SmartDialog.dismiss();
+    fluwx.WeChatScene wxScene = fluwx.WeChatScene.SESSION;
+    if (scene == 2) {
+      wxScene = fluwx.WeChatScene.TIMELINE;
+    }
+    fluwx.WeChatShareImageModel? model;
+
+    if (filePath.isNotEmpty) {
+      model = fluwx.WeChatShareImageModel(
+          fluwx.WeChatImage.file(File(filePath)),
+          title: '',
+          description: '',
+          scene: wxScene);
+    }
+    if (model != null) {
+      fluwx.shareToWeChat(model!);
+    }
+  }
+
+  void loadFollowMeData() async {
+    List<V2TimUserFullInfo> stataionList = [];
+    if (conList.isEmpty) {
+      stataionList = await loadConverstationListData();
+    }
+    Map typeMap = {
+      '官方通知': 1,
+      '活动驿站': 2,
+      '会员中心': 3,
+      '资产中心': 4,
+      '乐园圈子': 5,
+      '互动通知': 6,
+    };
+
+    stataionList.forEach((element) {
+      if (!typeMap.containsKey(element.nickName ?? '')) {
+        conList.add(element);
+      }
+    });
+
+    if (conList.length < 5) {
+      var data = await DioManager.instance
+          .get(url: Api.fansList, params: {'page': 1, 'page_size': 6});
+      var bean = BaseResponse<UserList>.fromJson(
+          data, (data) => UserList.fromJson(data));
+      if (bean.isSuccess()) {
+        bean.data.lists.forEach((element) {
+          bool isContain = false;
+          conList.forEach((user) {
+            if (element.user.imId == user.userID!) {
+              isContain = true;
+            }
+          });
+          if (!isContain) {
+            lists.add(element);
+          }
+        });
+      }
+    }
+
+    setState(() {});
   }
 }
diff --git a/circle_app/lib/commons/widgets/follow_me_dialog.dart b/circle_app/lib/commons/widgets/follow_me_dialog.dart
index cad7043..83d2438 100644
--- a/circle_app/lib/commons/widgets/follow_me_dialog.dart
+++ b/circle_app/lib/commons/widgets/follow_me_dialog.dart
@@ -8,6 +8,7 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart';
 
 import '../../circle_app/circle/logic.dart';
+import '../../circle_app/circle/state.dart';
 import '../../circle_app/home/logic.dart';
 import '../../circle_app/likelist/logic.dart';
 import '../../circle_app/minefragment/logic.dart';
@@ -597,3 +598,578 @@ class _FollowMeDialogState extends State<FollowMeDialog> {
     }
   }
 }
+
+
+class FollowDialog extends StatefulWidget {
+  Lists lists;
+  FollowDialog({super.key,required this.lists});
+
+
+  @override
+  _FollowDialogState createState() => new _FollowDialogState();
+
+}
+
+class _FollowDialogState extends State<FollowDialog> {
+  // TODO: add state variables and methods
+  List<UserListItem> lists = [];
+  List<V2TimUserFullInfo> conList = [];
+  bool isMore = true;
+  int page = 1;
+  bool isVip = true;
+  final RefreshController refreshController = RefreshController();
+
+
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+    loadMineInfo();
+    loadData();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: add widget build method
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      body: Column(
+        children: [
+          Container(height: Get.height * 0.33,width: Get.width,),
+          Expanded(
+            child: Container(
+              color: Colors.black,
+              child: Column(
+                children: [
+                  Container(
+                    width: Get.width,
+                    height: 36.sp,
+                    child: Stack(
+
+                      alignment: Alignment.center,
+                      children: [
+                        Text(
+                            '最近聊过和喜欢我的',
+                            style: TextStyle(
+                                fontSize: 18.sp,
+                                color: Colors.white
+                            )),
+                        Positioned(
+                            right: 15.sp,
+                            child: GestureDetector(
+                              onTap: () {
+                                Get.back();
+                              },
+                              child: Image.asset(
+                                getCircleImage('close'),
+                                width: 24.sp,),
+                            ))
+                      ],
+                    ),
+                  ),
+                  Expanded(child: Stack(
+
+                    children: [
+                      SmartRefresher(
+                        controller: refreshController,
+                        // onRefresh: _onRefresh,
+                        onLoading: () {
+                          _onLoading();
+                        },
+                        enablePullDown: false,
+                        enablePullUp: true,
+                        child: ListView.builder(
+                          padding: EdgeInsets.zero,
+                          itemCount: lists.length + conList.length,
+                          itemBuilder: (context, index) {
+                            if (conList.length > index) {
+                              return ConListItem(conList[index], index);
+                            }
+                            return ListItem(lists[index - conList.length], index - conList.length);
+                          },
+                        ),
+
+                      ),
+                      showGd()
+                    ],))
+                ],
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget showGd() {
+    double interval = 50;
+    List<String> urlList = [];
+
+    if (lists.length > 3) {
+      for (int i = 3; i < lists.length; i++) {
+        if (urlList.length < 3) {
+          print(lists[i].user.avatar);
+          urlList.add(lists[i].user.avatar);
+        } else {
+          break;
+        }
+      }
+    }
+
+    List<Widget> widgets = [];
+
+    switch (urlList.length) {
+      case 0:
+        widgets.add(Positioned(
+          left: (Get.width / 2) - 40,
+          child: circleWidget(""),
+        ));
+        break;
+      case 1:
+        for (int i = 0; i < urlList.length; i++) {
+          var element = urlList[i];
+//      double xOffset = interval * i + xOffsetBase;
+          double let = (Get.width / 2) - 60;
+          if (element == '') {
+            element =
+            'https://i0.wp.com/picjumbo.com/wp-content/uploads/romantic-tropical-beach-with-villa-and-palms-during-beautiful-sunset-free-photo.jpg?w=600&quality=80';
+          }
+
+          widgets.add(Positioned(
+            left: let,
+            child: circleWidget(element),
+          ));
+        }
+
+        widgets.add(Positioned(
+          left: (Get.width / 2) - 20,
+          child: circleWidget(""),
+        ));
+        break;
+      case 2:
+        double xOffsetBase =
+            (Get.width + interval * urlList.length - 60.0 * urlList.length) *
+                0.25;
+
+        for (int i = 0; i < urlList.length; i++) {
+          var element = urlList[i];
+//      double xOffset = interval * i + xOffsetBase;
+          double let = ((Get.width / 2) - ((40 * urlList.length)) + (i * 40));
+          if (element == '') {
+            element =
+            'https://i0.wp.com/picjumbo.com/wp-content/uploads/romantic-tropical-beach-with-villa-and-palms-during-beautiful-sunset-free-photo.jpg?w=600&quality=80';
+          }
+          widgets.add(Positioned(
+            left: let,
+            child: circleWidget(element),
+          ));
+        }
+
+        double xOffset = interval * urlList.length + xOffsetBase;
+        widgets.add(Positioned(
+          left: xOffset,
+          child: circleWidget(""),
+        ));
+        break;
+      case 3:
+      //  double xOffsetBase = (Get.width + interval * urlList.length - 60.0 * urlList.length) * 0.25;
+
+        for (int i = 0; i < urlList.length; i++) {
+          switch (i) {
+            case 0:
+              if (urlList[i] == '') {
+                urlList[i] =
+                'https://i0.wp.com/picjumbo.com/wp-content/uploads/romantic-tropical-beach-with-villa-and-palms-during-beautiful-sunset-free-photo.jpg?w=600&quality=80';
+              }
+              widgets.add(Positioned(
+                left: (Get.width / 2) - 100,
+                child: circleWidget(urlList[i]),
+              ));
+              break;
+            case 1:
+              if (urlList[i] == '') {
+                urlList[i] =
+                'https://i0.wp.com/picjumbo.com/wp-content/uploads/romantic-tropical-beach-with-villa-and-palms-during-beautiful-sunset-free-photo.jpg?w=600&quality=80';
+              }
+              widgets.add(Positioned(
+                left: (Get.width / 2) - 60,
+                child: circleWidget(urlList[i]),
+              ));
+              break;
+            case 2:
+              if (urlList[i] == '') {
+                urlList[i] =
+                'https://i0.wp.com/picjumbo.com/wp-content/uploads/romantic-tropical-beach-with-villa-and-palms-during-beautiful-sunset-free-photo.jpg?w=600&quality=80';
+              }
+              widgets.add(Positioned(
+                left: (Get.width / 2) - 20,
+                child: circleWidget(urlList[i]),
+              ));
+              break;
+          }
+        }
+        widgets.add(Positioned(
+          left: (Get.width / 2) + 20,
+          child: circleWidget(""),
+        ));
+
+        break;
+    }
+
+    return isVip
+        ? Container()
+        : Positioned(
+      bottom: 150,
+      child: Container(
+        width: Get.width,
+        child: Column(
+          children: [
+            SizedBox(
+              height: 140.sp,
+              width: Get.width,
+              child: Stack(
+                alignment: Alignment.centerLeft,
+                children: widgets,
+              ),
+            ),
+            Container(
+              margin: EdgeInsets.only(bottom: 40.sp),
+              child: Text(
+                "TA们也喜欢你哦 \n"
+                    "成为会员查看所有圈友信息",
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 15.sp,
+                ),
+              ),
+            ),
+            GestureDetector(
+              onTap: () {
+                showRechargeDialog();
+              },
+              child: Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(17),
+                  gradient: AppColor.mainVerLinearGradient,
+                ),
+                padding: EdgeInsets.symmetric(
+                  vertical: 10.sp,
+                  horizontal: 55.sp,
+                ),
+                child: Text(
+                  "开通会员查看更多访客",
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 14.sp,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  circleWidget(String url, {double width = 80}) {
+    return GestureDetector(
+        onTap: () {
+          // openvi();
+        },
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            Image.asset(
+              getCircleImage('more'),
+              width: width.sp,
+              height: width.sp,
+            ),
+            url != null && url.contains("http")
+                ? ClipOval(
+              child: CachedImg(
+                imageUrl: url,
+                width: (width - 1).sp,
+                height: (width - 1).sp,
+                fit: BoxFit.cover,
+              ),
+            )
+                : Text(
+              url,
+              style: TextStyle(color: Color(0xffF756FF), fontSize: 12.sp),
+            )
+          ],
+        ));
+  }
+
+  Widget ConListItem(V2TimUserFullInfo item, int index) {
+    return InkWell(
+
+      onTap: () {
+        sendCallOutCustomMsg(
+            item.userID!,
+            jsonEncode(widget.lists.toJson()),
+            '分享[${widget.lists.user?.nickname ?? ''}]的喊话');
+        // if (isVip || index < 3) {
+        // if (widget.bean != null) {
+        //   sendCircleCustomMsg(item.userID!,  jsonEncode(widget.bean!.toJson()), '分享[${widget.bean!.title}]');
+        // } else {
+        //   sendUserHomeCustomMsg(item.userID!,
+        //       jsonEncode(widget.userInfoBean!.toJson()), '分享用户[${widget.userInfoBean!.nickname}]的主页');
+        // }
+
+        // Get.toNamed(AppRoutes.UserInfoActivity,
+        //     arguments: item.user.id.toString());
+        // }
+      },
+      child: Container(
+        margin: EdgeInsets.only(bottom: 21.sp),
+        child: Row(
+          children: [
+            Stack(
+              children: [
+                ClipOval(
+                  child: CachedImg(
+                    fit: BoxFit.cover,
+                    imageUrl: item.faceUrl!,
+                    width: 40.sp,
+                    height: 40.sp,
+                  ),
+                ),
+                Positioned(
+                    right: 0.sp,
+                    // left: 0.sp,
+                    bottom: 0.sp,
+                    child: Image.asset(
+                      getMsgImage(getGenderImg(item.role!)),
+                      height: 13.sp,
+                    )
+                )
+              ],
+            ),
+            SizedBox(width: 10.sp),
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Text(
+                      item.nickName!,
+                      style:  TextStyle(
+                          color: Colors.white70,
+                          fontSize: 16.sp,
+                          fontWeight: FontWeight.bold),
+                    ),
+                    // Placeholder image
+                  ],
+                ),
+              ],
+            ),
+            // Pla
+            const Spacer(),
+
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget ListItem(UserListItem item, int index) {
+    return InkWell(
+      onTap: () {
+        sendCallOutCustomMsg(
+            'qpqz_dev_0_'+ item.user.id.toString(),
+            jsonEncode(widget.lists.toJson()),
+            '分享[${widget.lists.user?.nickname ?? ''}]的喊话');
+      },
+      child: ImageFiltered(
+        imageFilter: ImageFilter.blur(
+          sigmaX: (isVip || index < 3) ? 0 : 5,
+          sigmaY: (isVip || index < 3) ? 0 : 5,
+        ),
+
+        child: Container(
+          margin: EdgeInsets.only(bottom: 21.sp),
+          child: Row(
+            children: [
+              Stack(
+                children: [
+                  ClipOval(
+                    child: CachedImg(
+                      fit: BoxFit.cover,
+                      imageUrl: item.user.avatarThumb,
+                      width: 40.sp,
+                      height: 40.sp,
+                    ),
+                  ),
+                  Positioned(
+                      right: 0.sp,
+                      // left: 0.sp,
+                      bottom: 0.sp,
+                      child: Image.asset(
+                        getMsgImage(getGenderImg(item.user.gender)),
+                        height: 13.sp,
+                      )
+                  )
+                ],
+              ),
+              SizedBox(width: 10.sp),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Text(
+                        item.user.nickname,
+                        style:  TextStyle(
+                            color: Colors.white70,
+                            fontSize: 16.sp,
+                            fontWeight: FontWeight.bold),
+                      ),
+                      SizedBox(width: 4.sp),
+                      // SizedBox(height: 8.sp),
+                      // _buildInfoRow(item),
+                      // Placeholder image
+                    ],
+                  ),
+                ],
+              ),
+              // Pla
+              const Spacer(),
+
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(UserListItem userInfoBean) {
+    String ageMsg = getAgeCOntent(
+        userInfoBean.user.gender,
+        userInfoBean.user.age,
+        userInfoBean.user.role,
+        userInfoBean.user.orientation);
+    return Row(
+      children: [
+        Container(
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(17.sp),
+            gradient: sexBgGradient(userInfoBean.user.gender),
+          ),
+          padding: EdgeInsets.only(
+              top: 2.sp, bottom: 2.sp, left: 10.sp, right: 10.sp),
+          child: Text(
+            ageMsg,
+            style: TextStyle(
+              color: sexBgColor(userInfoBean.user.gender),
+              fontSize: 10.sp,
+            ),
+          ),
+        ),
+        SizedBox(width: 6.sp),
+      ],
+    );
+  }
+
+  _onLoading() {
+    if (isMore) {
+      page = page + 1;
+      loadData();
+    }
+  }
+
+  showRechargeDialog() async {
+    Get.bottomSheet(
+        Scaffold(
+          backgroundColor: Colors.transparent,
+          body: Open_vip_tipPage(false,'visitor_list'),
+        ),
+        isScrollControlled: true,
+        enableDrag: false).then((value) {
+      loadMineInfo();
+    });
+  }
+
+  void loadData() async {
+    List<V2TimUserFullInfo> stataionList = [];
+    if (conList.isEmpty) {
+      stataionList  = await loadConverstationListData();
+      HomeLogic logic = Get.find<HomeLogic>();
+      var myelement;
+      try {
+        stataionList.forEach((element) {
+          String userId = element.userID!.split('_').last;
+          if (userId == logic.model!.id!.toString()) {
+            myelement = element;
+          }
+        });
+      } catch (e) {
+
+      }
+
+      if (myelement != null) {
+        stataionList.remove(myelement);
+      }
+    }
+    Map typeMap = {
+      '官方通知':1,
+      '活动驿站':2,
+      '会员中心':3,
+      '资产中心':4,
+      '乐园圈子':5,
+      '互动通知':6,
+
+    };
+
+    stataionList.forEach((element) {
+      if (!typeMap.containsKey(element.nickName ?? '')) {
+        conList.add(element);
+      }
+    });
+
+
+    var data = await DioManager.instance
+        .get(url: Api.fansList, params: {'page': page,'page_size':8});
+    var bean = BaseResponse<UserList>.fromJson(
+        data, (data) => UserList.fromJson(data));
+    if (bean.isSuccess()) {
+      List data = bean.data.lists;
+      if (data.isNotEmpty) {
+        data.forEach((element) {
+          bool isContain = false;
+          conList.forEach((user) {
+            if (element.user.imId == user.userID!) {
+              isContain = true;
+
+            }
+          });
+          if (!isContain) {
+            lists.add(element);
+          }
+        });
+        refreshController.loadComplete();
+      } else {
+        isMore = false;
+        refreshController.loadNoData();
+      }
+
+    } else if (bean.code == 21201){
+      isMore = false;
+      refreshController.loadNoData();
+    }
+    setState(() {
+
+    });
+  }
+
+  void loadMineInfo() async {
+    var data = await DioManager.instance.get(url: Api.getUserMine);
+    var bean = BaseResponse<MineResponseBean>.fromJson(
+        data, (data) => MineResponseBean.fromJson(data));
+    if (bean.isSuccess()) {
+      isVip = true;
+    }
+  }
+}
+
diff --git a/circle_app/lib/commons/widgets/sign_in_dialog.dart b/circle_app/lib/commons/widgets/sign_in_dialog.dart
index 1a9957e..47b88d3 100644
--- a/circle_app/lib/commons/widgets/sign_in_dialog.dart
+++ b/circle_app/lib/commons/widgets/sign_in_dialog.dart
@@ -343,7 +343,7 @@ class _SignInDialogState extends State<SignInDialog> {
                   left: 0,
                   top: 0,
                   child: Image.asset(
-                    getHomeImage('sign_check'),
+                    getMineImage("icon_pay_select"),
                     height: 20.sp,
                   ))
           ],
diff --git a/circle_app/lib/commons/widgets/user_share.dart b/circle_app/lib/commons/widgets/user_share.dart
index edcb655..eb21604 100644
--- a/circle_app/lib/commons/widgets/user_share.dart
+++ b/circle_app/lib/commons/widgets/user_share.dart
@@ -582,7 +582,7 @@ class _UserShareState extends State<UserShare> {
     RenderRepaintBoundary boundary =
         _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
     ui.Image image =
-        await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
         await (image.toByteData(format: ui.ImageByteFormat.png));
     if (byteData != null) {
@@ -623,7 +623,7 @@ class _UserShareState extends State<UserShare> {
     RenderRepaintBoundary boundary =
         _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
     ui.Image image =
-        await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        await boundary.toImage(pixelRatio: 1.0);
     ByteData? byteData =
         await (image.toByteData(format: ui.ImageByteFormat.png));
     String filePath = '';
diff --git a/circle_app/lib/commons/widgets/video_share_dialog.dart b/circle_app/lib/commons/widgets/video_share_dialog.dart
index c4d76dd..eb704d0 100644
--- a/circle_app/lib/commons/widgets/video_share_dialog.dart
+++ b/circle_app/lib/commons/widgets/video_share_dialog.dart
@@ -411,7 +411,7 @@ class _VideoShareDialogState extends State<VideoShareDialog> {
         RenderRepaintBoundary boundary =
         _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
         ui.Image image =
-        await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        await boundary.toImage(pixelRatio: 1.0);
         ByteData? byteData =
         await (image.toByteData(format: ui.ImageByteFormat.png));
         if (byteData != null) {
@@ -452,7 +452,7 @@ class _VideoShareDialogState extends State<VideoShareDialog> {
         RenderRepaintBoundary boundary =
         _globalKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
         ui.Image image =
-        await boundary.toImage(pixelRatio: ui.window.devicePixelRatio);
+        await boundary.toImage(pixelRatio: 1.0);
         ByteData? byteData =
         await (image.toByteData(format: ui.ImageByteFormat.png));
         String filePath = '';
diff --git a/circle_app/lib/main.dart b/circle_app/lib/main.dart
index 3aa9cab..bc2ec5b 100644
--- a/circle_app/lib/main.dart
+++ b/circle_app/lib/main.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
@@ -27,27 +28,41 @@ import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat
 import 'package:tencent_cloud_chat_uikit/data_services/core/core_services.dart';
 import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart';
 
-
 import 'package:tencent_chat_push_for_china/tencent_chat_push_for_china.dart';
 import 'circle_app/login/login/logic.dart';
 import 'circle_app/splash/view.dart';
 
 ///定义全局的 routeObserver 对象
 final RouteObserver<PageRoute> routeObserver = RouteObserver();
-List filterPageList = [Routes.Login,Routes.SetPasswordPage,Routes.Complete_materialPage];
+List filterPageList = [
+  Routes.Login,
+  Routes.SetPasswordPage,
+  Routes.Complete_materialPage
+];
 String currentPage = '';
 
 final CoreServicesImpl coreInstance = TIMUIKitCore.getInstance();
 final TUIChatSeparateViewModel chatSeparateViewModel =
     TUIChatSeparateViewModel();
+// 定义全局 navigatorKey
+final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
 OverlayEntry? mainOverlayEntry;
 
 void main() {
-  // setCustomErrorWidget();
+  if (!kDebugMode) {
+    FlutterError.onError = (FlutterErrorDetails details) {
+      // 发送错误信息到 Bugly
+      FlutterBugly.uploadException(
+          message: details.exceptionAsString(),
+          detail: details.stack.toString() +
+              (Platform.isAndroid
+                  ? 'UIextraMessage.txt'
+                  : 'UIcrash_attach.log'));
+    };
+  }
   SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
     systemNavigationBarColor: Colors.black, // 设置底部导航栏的颜色
-    // statusBarColor: Colors.transparent, // 设置状态栏颜色
   ));
   FlutterBugly.postCatchedException(() async {
     // 如果需要 ensureInitialized，请在这里运行。
@@ -71,7 +86,6 @@ void main() {
       );
     }
   });
-
 }
 
 setCustomErrorWidget() {
@@ -188,6 +202,7 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   AppLifecycleState? _lastLifecycleState;
 
+
   // This widget is the root of your application.
 
   final List<String> _guideList = ['bg', 'home_back'];
@@ -202,13 +217,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   void initState() {
     initIM();
     WidgetsBinding.instance.addObserver(this);
-    if (!kDebugMode) {
-      FlutterError.onError = (FlutterErrorDetails details) {
-        // 发送错误信息到 Bugly
-        FlutterBugly.uploadException(message: "${details.exception}:${details.stack}", detail:Platform.isAndroid ?
-        'UIextraMessage.txt' : 'UIcrash_attach.log');
-      };
-    }
 
     PaintingBinding.instance.imageCache.maximumSizeBytes = 1024 * 1024 * 300;
     loadBgImage();
@@ -350,8 +358,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
           }
         },
         // [建议配置，详见此部分](https://cloud.tencent.com/document/product/269/70746#callback)
-        listener: V2TimSDKListener(onConnectSuccess: () {
-        }));
+        listener: V2TimSDKListener(onConnectSuccess: () {}));
   }
 
   loadBgImage() async {
@@ -374,71 +381,76 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
         minTextAdapt: true,
         splitScreenMode: true,
         builder: (context, child) {
-          return  OKToast(
-                // 2-A: wrap your app with OKToast
-                textStyle: const TextStyle(fontSize: 19.0, color: Colors.white),
-                backgroundColor: Colors.grey,
-                animationCurve: Curves.easeIn,
+          return OKToast(
+            // 2-A: wrap your app with OKToast
+            textStyle: const TextStyle(fontSize: 19.0, color: Colors.white),
+            backgroundColor: Colors.grey,
+            animationCurve: Curves.easeIn,
 
-                // animationBuilder: const Miui10AnimBuilder(),
-                animationDuration: const Duration(milliseconds: 200),
-                duration: const Duration(seconds: 2),
-                child: GetMaterialApp(
-                  title: '微乐园',
-                  theme: ThemeData(
-                    splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
-                    highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
-                  ),
-                  initialBinding: SplashBinding(),
-                  getPages: PageList.routes,
+            // animationBuilder: const Miui10AnimBuilder(),
+            animationDuration: const Duration(milliseconds: 200),
+            duration: const Duration(seconds: 2),
+            child: GetMaterialApp(
+              title: '微乐园',
+              navigatorKey: navigatorKey,
+              theme: ThemeData(
+                splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
+                highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
+              ),
+              initialBinding: SplashBinding(),
+              getPages: PageList.routes,
 
-                  /// 国际化处理
-                  localizationsDelegates: const [
-                    GlobalMaterialLocalizations.delegate,
-                    GlobalWidgetsLocalizations.delegate,
-                    GlobalCupertinoLocalizations.delegate,
-                    RefreshLocalizations.delegate,
-                    /// iOS一定要设置，不然报错
-                  ],
-                  locale: const Locale('zh', 'CN'),
-                  supportedLocales: const [
-                    Locale('zh', 'CN'),
-                  ],
-                  home: SplashPage(),
-                  navigatorObservers: [routeObserver],
-                  builder: (BuildContext context, Widget? child) {
-                    return MediaQuery(
-                        ///设置文字大小不随系统设置改变
-                        data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
-                    child:FlutterSmartDialog(
-                      child: RefreshConfiguration(
-                        footerTriggerDistance: 15.0,
-                        dragSpeedRatio: 0.91,
-                        footerBuilder: () => CustomLoadFooter(), // 使用自定义 Footer
-                        headerTriggerDistance: 80.0,
-                        maxOverScrollExtent: 100,
-                        maxUnderScrollExtent: 0,
-                        enableScrollWhenRefreshCompleted: true,
-                        enableLoadingWhenFailed: true,
-                        hideFooterWhenNotFull: false,
-                        enableBallisticLoad: true, child: child!,
-                      )
-                    ));
-                  },
-                  // Listen to route changes
-                  routingCallback: (routing) {
-                    if (routing != null) {
-                      String currentRoute = routing.current;
-                      String previousRoute = routing.previous;
-                      if (currentRoute != Routes.Home && currentRoute != '/' && currentRoute != previousRoute && !filterPageList.contains(currentRoute)) {
-                        routeList.add(currentRoute);
-                        addUmengPage(currentRoute);
-                      }
-                    }
-                  },
-                  debugShowCheckedModeBanner: false,
-                ),
-              );
+              /// 国际化处理
+              localizationsDelegates: const [
+                GlobalMaterialLocalizations.delegate,
+                GlobalWidgetsLocalizations.delegate,
+                GlobalCupertinoLocalizations.delegate,
+                RefreshLocalizations.delegate,
+
+                /// iOS一定要设置，不然报错
+              ],
+              locale: const Locale('zh', 'CN'),
+              supportedLocales: const [
+                Locale('zh', 'CN'),
+              ],
+              home: SplashPage(),
+              navigatorObservers: [routeObserver],
+              builder: (BuildContext context, Widget? child) {
+                return MediaQuery(
+
+                    ///设置文字大小不随系统设置改变
+                    data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                    child: FlutterSmartDialog(
+                        child: RefreshConfiguration(
+                      footerTriggerDistance: 15.0,
+                      dragSpeedRatio: 0.91,
+                      footerBuilder: () => CustomLoadFooter(), // 使用自定义 Footer
+                      headerTriggerDistance: 80.0,
+                      maxOverScrollExtent: 100,
+                      maxUnderScrollExtent: 0,
+                      enableScrollWhenRefreshCompleted: true,
+                      enableLoadingWhenFailed: true,
+                      hideFooterWhenNotFull: false,
+                      enableBallisticLoad: true, child: child!,
+                    )));
+              },
+              // Listen to route changes
+              routingCallback: (routing) {
+                if (routing != null) {
+                  String currentRoute = routing.current;
+                  String previousRoute = routing.previous;
+                  if (currentRoute != Routes.Home &&
+                      currentRoute != '/' &&
+                      currentRoute != previousRoute &&
+                      !filterPageList.contains(currentRoute)) {
+                    routeList.add(currentRoute);
+                    addUmengPage(currentRoute);
+                  }
+                }
+              },
+              debugShowCheckedModeBanner: false,
+            ),
+          );
         });
   }
 
@@ -447,9 +459,15 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   }
 }
 
-void sendOpenSourceData(String source,{String userId = '',String params = ''}) async {
+void sendOpenSourceData(String source,
+    {String userId = '', String params = ''}) async {
   // 获取当前时间
   DateTime now = DateTime.now();
   String formattedTime = DateFormat('yyyy-MM-dd HH:mm:ss').format(now);
-  var result = await DioManager.instance.post(url: Api.triggerLog,params: {'event':source,'createTime':formattedTime,'userId':userId,'params':params});
+  var result = await DioManager.instance.post(url: Api.triggerLog, params: {
+    'event': source,
+    'createTime': formattedTime,
+    'userId': userId,
+    'params': params
+  });
 }
diff --git a/circle_app/lib/net/api.dart b/circle_app/lib/net/api.dart
index 00c99b0..b091997 100644
--- a/circle_app/lib/net/api.dart
+++ b/circle_app/lib/net/api.dart
@@ -74,6 +74,12 @@ class Api {
   //我关注的活跃用户列表
   static const activeUsers = '/user-service/follow/activeUsers';
 
+  //
+  static const getShowUserTrendsConf = '/user-service/user/config/getShowUserTrendsConf';
+
+  //
+  static const setShowUserTrendsConf = '/user-service/user/config/setShowUserTrendsConf';
+
   //所有问答
   static const quickAnswerAll = 'up-service/quickAnswer/getAll';
 
@@ -470,11 +476,14 @@ class Api {
   static const getWelfareList = '/mall-service/user/welfare/get/page';
 
   //喊话轮播
-  static const calloutBanner = '/up-service/callout/notice/v2';
+  static const calloutBanner = '/up-service/callout/notice/v3';
 
   //获取福袋详情
   static const getWelfareDetail = '/mall-service/user/welfare/get/id/';
 
+  //喊话通知已读
+  static const noticeRead = '/up-service/callout/notice/read';
+
   //领福袋
   static const getWelfare = '/mall-service/user/welfare/receive/';
 
@@ -783,4 +792,13 @@ class Api {
 
   static var searchCircle = '/up-service/interests/search';
 
+  //注册反馈
+  static var registerFeedback = '/user-service/register/feedback';
+
+  //上传凭证
+  static var tokenNoLogin = '/up-service/oss/tokenNoLogin';
+
+  //我的乐园时光
+  static var trends = '/user-service/my/trends';
+
 }
diff --git a/circle_app/lib/net/dio_manager.dart b/circle_app/lib/net/dio_manager.dart
index dd3a0e0..838d660 100644
--- a/circle_app/lib/net/dio_manager.dart
+++ b/circle_app/lib/net/dio_manager.dart
@@ -59,14 +59,6 @@ class DioManager {
       responseBody: true,
     ));
     _dio!.interceptors.add(TimingInterceptor()); // 添加拦截器
-    // _dio?.httpClientAdapter = IOHttpClientAdapter()
-    //   ..createHttpClient = () {
-    //     // 设置最大连接数
-    //     HttpClient client = HttpClient();
-    //     client.idleTimeout = Duration(seconds: 15); // 连接池的空闲超时
-    //     client.maxConnectionsPerHost = 15; // 设置同一主机的最大连接数为 15
-    //     return client;
-    //   };
   }
 
   setDioTimeOut(int time) {
diff --git a/circle_app/lib/router/pages.dart b/circle_app/lib/router/pages.dart
index d04cca9..7f934df 100644
--- a/circle_app/lib/router/pages.dart
+++ b/circle_app/lib/router/pages.dart
@@ -79,6 +79,8 @@ import '../circle_app/astral__arcadia/view.dart';
 import '../circle_app/aurora__nexus /binding.dart';
 import '../circle_app/aurora__nexus /view.dart';
 import '../circle_app/blacklist/view.dart';
+import '../circle_app/call_out_detail/binding.dart';
+import '../circle_app/call_out_detail/view.dart';
 import '../circle_app/cascade__corner/binding.dart';
 import '../circle_app/cascade__corner/view.dart';
 import '../circle_app/celestial/binding.dart';
@@ -122,6 +124,8 @@ import '../circle_app/good_reviews/binding.dart';
 import '../circle_app/good_reviews/view.dart';
 import '../circle_app/harmony__haven/binding.dart';
 import '../circle_app/harmony__haven/view.dart';
+import '../circle_app/help_back/binding.dart';
+import '../circle_app/help_back/view.dart';
 import '../circle_app/infinity__isle/binding.dart';
 import '../circle_app/infinity__isle/view.dart';
 import '../circle_app/invent_record/binding.dart';
@@ -692,6 +696,15 @@ class PageList {
       page: () => Search_peoplePage(),
       binding: Search_peopleBinding(),
     ),
+    GetPage(
+        name: Routes.HelpBack,
+        page: () => Help_BackPage(),
+        binding:  Help_BackBinding()),
+    GetPage(
+        name: Routes.CallOutDetail,
+        page: () => Call_out_detailPage(),
+        binding:  Call_out_detailBinding()),
+
 
   ];
 }
diff --git a/circle_app/lib/router/routers.dart b/circle_app/lib/router/routers.dart
index 2007e4b..5687483 100644
--- a/circle_app/lib/router/routers.dart
+++ b/circle_app/lib/router/routers.dart
@@ -134,4 +134,8 @@ abstract class Routes {
 
   static const Search = '/Search';
 
+  static const HelpBack = '/HelpBack';
+
+  static const CallOutDetail = '/CallOutDetail';
+
 }
\ No newline at end of file
diff --git a/circle_app/lib/utils/SharedPreferencesHelper.dart b/circle_app/lib/utils/SharedPreferencesHelper.dart
index af5d696..743d5a6 100644
--- a/circle_app/lib/utils/SharedPreferencesHelper.dart
+++ b/circle_app/lib/utils/SharedPreferencesHelper.dart
@@ -274,10 +274,6 @@ class SharedPreferencesHelper {
   bool containsKey(String key) {
     bool? status =  preferences?.containsKey(key);
     print(status);
-    if (status ?? false) {
-      bool? info = preferences?.getBool(key);
-      print(info);
-    }
     return preferences?.containsKey(key) ?? false;
   }
 
diff --git a/circle_app/lib/utils/util.dart b/circle_app/lib/utils/util.dart
index 6253ec2..75e048d 100644
--- a/circle_app/lib/utils/util.dart
+++ b/circle_app/lib/utils/util.dart
@@ -46,6 +46,7 @@ import '../commons/colors/app_color.dart';
 import '../commons/widgets/timeRecord_dialog.dart';
 import '../net/dio_manager.dart';
 import 'SharedPreferencesHelper.dart';
+import 'cache_img.dart';
 
 List chatIdList = [];
 List chatHotIdList = [];
@@ -1212,6 +1213,39 @@ sendCircleCustomMsg(String userId, String data, String desc) async {
   }
 }
 
+//发送喊话自定义消息
+sendCallOutCustomMsg(String userId, String data, String desc) async {
+  // 创建自定义消息
+  V2TimValueCallback<V2TimMsgCreateInfoResult> createCustomMessageRes =
+  await TencentImSDKPlugin.v2TIMManager
+      .getMessageManager()
+      .createCustomMessage(
+    data: data,
+    desc: desc,
+    extension: 'callOutData',
+  );
+
+  if (createCustomMessageRes.code == 0) {
+    String? id = createCustomMessageRes.data?.id;
+    String route = Get.currentRoute;
+    if (route.contains('/chat')) {
+      EventBusManager.fire(SendCoustomMessage(createCustomMessageRes));
+    } else {
+      V2TimValueCallback<V2TimMessage> sendMessageRes = await TencentImSDKPlugin
+          .v2TIMManager
+          .getMessageManager()
+          .sendMessage(id: id!, receiver: userId, groupID: '');
+      if (sendMessageRes.code == 0) {
+        // 发送成功
+        showOKToast('发送成功');
+        sendMessageRes.data?.customElem?.data; //自定义data
+        sendMessageRes.data?.customElem?.desc; //自定义desc
+        sendMessageRes.data?.customElem?.extension; //自定义extension
+      }
+    }
+  }
+}
+
 
 //发送求送礼物自定义消息
 sendGetGiftCustomMsg(String userId, String data, String desc) async {
@@ -1674,7 +1708,328 @@ Future<bool> checkCameraStatus() async {
   return PermissionStatus.granted == camerastatus;
 }
 
+bool isShowMasterDialog = false;
 
+void loadMasterData(String userId) async {
+  if (isShowMasterDialog) return;
+  isShowMasterDialog = true;
+  var result = await DioManager.instance.get(
+      url: Api.getMaster,
+      params: {'userId': userId});
+  if (result['code'] == 200) {
+    Map masterInfo = result['data'] ?? {};
+    HomeLogic homeLogic = Get.find<HomeLogic>();
+    var myResult = await DioManager.instance
+        .get(url: Api.getMaster, params: {'userId': homeLogic.model!.id!});
+    if (myResult['code'] == 200) {
+      if (myResult['data'] != null) {
+        if (myResult['data']['userId'].toString() == userId) {
+          showOKToast('TA是你的主哦，快和他互动呗～');
+          isShowMasterDialog = false;
+          return;
+        }
+      }
+    }
+
+    bool isHave = false;
+    if (masterInfo.isEmpty) {
+      var myResult = await DioManager.instance
+          .get(url: Api.havaedMaster, params: {'userId': userId});
+      if (myResult['code'] == 200) {
+        isHave = myResult['data']['beforeHasMaster'] == 1;
+      }
+    }
+
+    var resultData = await DioManager.instance.get(
+        url: masterInfo.isEmpty
+            ? isHave
+            ? Api.bindBabyMore
+            : Api.popBindBaby
+            : Api.popLootBaby,
+        params: {'userId': userId});
+    isShowMasterDialog = false;
+    if (resultData['code'] == 10000) {
+      TextEditingController textEditingController = TextEditingController();
+      if (masterInfo.isEmpty) {
+        var result1 = await DioManager.instance.get(
+          url: Api.minAmount,
+        );
+        textEditingController.text = result1['data'].toString() ?? '1000';
+      } else {
+        textEditingController.text = (masterInfo['amount'] + 100).toString();
+      }
+
+      showMasterDialog(resultData['title'], resultData['content'],
+          textEditingController.text, textEditingController,masterInfo,userId);
+    }
+  }
+}
+
+showMasterDialog(
+    String title, String content, String money, textEditingController, Map masterInfo,String userId) {
+  Get.bottomSheet(
+      isScrollControlled: true,
+      isDismissible: false,
+      InkWell(
+        onTap: () {
+          FocusManager.instance.primaryFocus?.unfocus();
+        },
+        child: Scaffold(
+          resizeToAvoidBottomInset: false,
+          backgroundColor: Colors.transparent,
+          body: Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Container(
+                height: 277.sp,
+                padding: const EdgeInsets.all(1.0),
+                child: Stack(
+                  children: [
+                    Container(
+                      decoration: BoxDecoration(
+                        shape: BoxShape.rectangle,
+                        borderRadius: BorderRadius.circular(10.0),
+                        gradient: const LinearGradient(
+                          colors: [Color(0xFFDD3DF4), Color(0xFF30FFD9)],
+                          begin: Alignment.topCenter,
+                          end: Alignment.bottomCenter,
+                        ),
+                      ),
+                    ),
+                    Container(
+                      margin: EdgeInsets.all(1.sp),
+                      decoration: BoxDecoration(
+                        shape: BoxShape.rectangle,
+                        borderRadius: BorderRadius.circular(10.0),
+                        gradient: const LinearGradient(
+                          colors: [Color(0xFF4C3E5F), Color(0xFF324140)],
+                          begin: Alignment.topCenter,
+                          end: Alignment.bottomCenter,
+                        ),
+                      ),
+                    ),
+                    Container(
+                      margin: EdgeInsets.only(top: 24.sp),
+                      child: Column(
+                        children: [
+                          if (title.isNotEmpty)
+                            Center(
+                              child: Text(
+                                title,
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 16.sp),
+                              ),
+                            ),
+                          if (title.isEmpty)
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Text(
+                                  masterInfo.isNotEmpty
+                                      ? '👑主人'
+                                      : '👑成为TA主人，期间收礼会给您上贡',
+                                  style: TextStyle(
+                                      color: Colors.white, fontSize: 16.sp),
+                                ),
+                                Row(
+                                  children: [
+                                    Row(
+                                      children: [
+                                        ClipOval(
+                                            child: CachedImg(
+                                              imageUrl: masterInfo['avatar'],
+                                              width: 25.sp,
+                                              height: 25.sp,
+                                              fit: BoxFit.cover,
+                                            )),
+                                        Text(
+                                          masterInfo['nickname'],
+                                          style: TextStyle(
+                                              color: AppColor.mainColor,
+                                              fontSize: 16.sp),
+                                        ),
+                                      ],
+                                    ),
+                                    Text(
+                                      '给了',
+                                      style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14.sp),
+                                    ),
+                                    Text(
+                                      '${masterInfo['amount']}',
+                                      style: TextStyle(
+                                          color: AppColor.mainColor,
+                                          fontSize: 16.sp),
+                                    ),
+                                    Image.asset(
+                                      getMineImage('bi_icon${0 + 1}'),
+                                      height: 20.sp,
+                                    )
+                                  ],
+                                ),
+                              ],
+                            ),
+                          Container(
+                            margin: EdgeInsets.only(
+                                top: 12.sp, left: 14.sp, right: 14.sp),
+                            alignment: Alignment.center,
+                            child: Text(
+                              content,
+                              textAlign: TextAlign.left,
+                              style: TextStyle(
+                                  color: const Color(0xCCF7FAFA),
+                                  fontSize: 16.sp),
+                            ),
+                          ),
+                          Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              Container(
+                                margin: EdgeInsets.only(top: 14.sp),
+                                width: 200.sp,
+                                height: 35.sp,
+                                decoration: BoxDecoration(
+                                    color: Color(0x1AFFFFFF),
+                                    borderRadius:
+                                    BorderRadius.circular(5.sp)),
+                                alignment: Alignment.center,
+                                child: TextField(
+                                  controller: textEditingController,
+                                  keyboardType: TextInputType.phone,
+                                  textAlign: TextAlign.center,
+
+                                  inputFormatters: [
+                                    FilteringTextInputFormatter.digitsOnly,
+                                    FilteringTextInputFormatter.deny(
+                                        RegExp('[^0-9]')),
+                                  ],
+                                  maxLength: 6,
+                                  //右边图标设置
+
+                                  style: TextStyle(
+                                      color: Colors.white, fontSize: 20.sp),
+                                  decoration: InputDecoration(
+                                    hintText: '请输入小票数量',
+                                    hintStyle: TextStyle(
+                                        color: Colors.white70,
+                                        fontSize: 20.sp),
+                                    border: InputBorder.none,
+                                    counterText: '',
+                                    contentPadding: EdgeInsets.only(
+                                        top: 0.sp, bottom: 7.5.sp),
+                                  ),
+                                ),
+                              ),
+                              Positioned(
+                                  child: Container(
+                                      margin: EdgeInsets.only(
+                                          top: 15.sp, left: 100.sp),
+                                      child: Image.asset(
+                                        getMineImage('bi_icon${1}'),
+                                        height: 25.sp,
+                                      )))
+                            ],
+                          ),
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            //  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              GestureDetector(
+                                onTap: () {
+                                  Get.back();
+                                },
+                                child: Container(
+                                  margin: EdgeInsets.only(top: 14.sp),
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(20),
+                                    gradient: const LinearGradient(
+                                      colors: [
+                                        Color(0x26FFFFFF),
+                                        Color(0x26FFFFFF),
+                                      ],
+                                      begin: Alignment.centerLeft,
+                                      end: Alignment.centerRight,
+                                    ),
+                                  ),
+                                  width: 120.sp,
+                                  height: 40.sp,
+                                  alignment: Alignment.center,
+                                  child: const Text(
+                                    "再考虑考虑",
+                                    style: TextStyle(
+                                      color: Colors.white,
+                                      fontSize: 15,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              SizedBox(width: 24.sp),
+                              GestureDetector(
+                                onTap: () {
+                                  masterBind(textEditingController,masterInfo,userId);
+                                },
+                                child: Container(
+                                  margin: EdgeInsets.only(top: 14.sp),
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(20),
+                                    gradient: const LinearGradient(
+                                      colors: [
+                                        Color(0xFF06F9FA),
+                                        Color(0xFFDC5BFD),
+                                      ],
+                                      begin: Alignment.centerLeft,
+                                      end: Alignment.centerRight,
+                                    ),
+                                  ),
+                                  width: 150.sp,
+                                  height: 40.sp,
+                                  alignment: Alignment.center,
+                                  child: Text(
+                                    title.isEmpty
+                                        ? '👑成为TA的新主人'
+                                        : title.contains('新主人')
+                                        ? '👑成为TA的新主人'
+                                        : "👑成为TA的第一任",
+                                    style: TextStyle(
+                                      color: Colors.white,
+                                      fontSize: 15,
+                                    ),
+                                  ),
+                                ),
+                              )
+                            ],
+                          )
+                        ],
+                      ),
+                    )
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ));
+}
+
+void masterBind(textEditingController,Map masterInfo,String userId) async {
+  if (masterInfo.isNotEmpty) {
+    if (int.parse(textEditingController.text) < masterInfo['amount'] + 100) {
+      showOKToast('小票数量不能低于${masterInfo['amount'] + 100}');
+      return;
+    }
+  }
+  var result = await DioManager.instance.postBody(
+      url: Api.masterBind,
+      params: {'userId': userId, 'amount': textEditingController.text});
+  if (result['code'] == 200) {
+    showOKToast('绑定成功，快去我的主或贝页面查看吧');
+    Get.back();
+  } else if (result['code'] == 31201) {
+    showRechargeScreenDialog('');
+  }
+}
 
 pushPage(String action,String param,{String name = '',bool isShowUpdate = true}) async {
   // public final static String MY_MAIN = "my_main";//我的主页
@@ -1714,12 +2069,15 @@ pushPage(String action,String param,{String name = '',bool isShowUpdate = true})
   // "follow";//喜欢
   // 'interest_discovery';//发现的圈子
   // "activity";//活动驿站
+  // to_bind_baby 抢贝
 
   if (action == 'my_main') {
     Get.until((route) => route.settings.name == '/home');
     final homeLogic = Get.put(HomeLogic());
     homeLogic.tabController.animateTo(4);
     homeLogic.updateIndex(4);
+  } else if (action == 'to_bind_baby') {
+    loadMasterData(param);
   } else if (action == 'my_interest') {
     Get.toNamed(Routes.MyCirclePage);
   } else if (action == 'activity') {
diff --git a/circle_app/lib/view/notice.dart b/circle_app/lib/view/notice.dart
index 30ba217..d3306f2 100644
--- a/circle_app/lib/view/notice.dart
+++ b/circle_app/lib/view/notice.dart
@@ -28,7 +28,10 @@ typedef void NoticeCallback();
 void showFloatingButtonOverlay(BuildContext context, String nickname,
     String ageMsg, String avatar, int event, NoticeCallback noticeCallback) {
   if (Get.currentRoute == Routes.Chat) return;
+  HomeLogic homeLogic = Get.find<HomeLogic>();
+  if (Get.currentRoute == Routes.Home && homeLogic.currentIndex == 3) return;
   OverlayState? overlayState = Overlay.of(context);
+
   late OverlayEntry overlayEntry;
   bool showMessage = false;
 
@@ -186,7 +189,7 @@ void showFloatingButtonOverlay(BuildContext context, String nickname,
               ),
             ),
           ),
-          if (event == 0)
+          // if (event == 0)
             Positioned(
                 top: MediaQuery.of(context).padding.top,
                 right: 8,
diff --git a/circle_app/pubspec.yaml b/circle_app/pubspec.yaml
index d0535ab..a7e2341 100644
--- a/circle_app/pubspec.yaml
+++ b/circle_app/pubspec.yaml
@@ -129,7 +129,7 @@ dependencies:
   #友盟
   umeng_common_sdk: ^1.2.7
   #易盾一键认证
-  quickpass_yidun_flutter: ^1.4.3
+  quickpass_yidun_flutter: ^1.5.6
   #视频播放器
   fijkplayer: ^0.11.0