From e7d880bf6b697d029a684820205eb203fdc36037 Mon Sep 17 00:00:00 2001
From: CYH <13923927013@163.com>
Date: Wed, 27 Nov 2024 10:16:00 +0800
Subject: [PATCH] =?UTF-8?q?2.2.3=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 ++--
 circle_app/lib/circle_app/chat/view.dart      | 20 +++++++++++--------
 circle_app/lib/circle_app/home/view.dart      |  2 ++
 .../lib/circle_app/new_people/view.dart       | 14 -------------
 circle_app/lib/circle_app/quick/logic.dart    |  2 ++
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle
index 28849ca..7aee71a 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 72
-        versionName "2.2.2"
+        versionCode 73
+        versionName "2.2.3"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",
diff --git a/circle_app/lib/circle_app/chat/view.dart b/circle_app/lib/circle_app/chat/view.dart
index 69bfd91..de1ab8b 100644
--- a/circle_app/lib/circle_app/chat/view.dart
+++ b/circle_app/lib/circle_app/chat/view.dart
@@ -438,15 +438,19 @@ class _ChatPageState extends State<ChatPage>
                   ) : GestureDetector(
                     onTap: () {
                       HomeLogic homelogic = Get.find<HomeLogic>();
-                      Get.bottomSheet(InitmacyDialog(avatar: otherUserBean!.avatar,myAvatar: homelogic.model!.avatar,info: logic.intimacyInfo,accId:logic.selectedConversation!.userID!),isScrollControlled:true);
 
-                      // if (logic.hotInfo['canReceiveReward'] == 1 && logic.hotInfo['receivedReward'] == 0) {
-                      //   showHotRewardTipDialog();
-                      // } else if (logic.hotInfo['receivedReward'] == 0){
-                      //   showHotTipDialog();
-                      // } else {
-                      //   showOKToast('和TA互动的奖励已领取，可以再和其他人聊，继续领取奖励哦~');
-                      // }
+
+                      if (logic.hotInfo['canReceiveReward'] == 1 && logic.hotInfo['receivedReward'] == 0) {
+                        showHotRewardTipDialog();
+                      } else if (logic.hotInfo['receivedReward'] == 0){
+                        showHotTipDialog();
+                      } else {
+                        if (homelogic.model != null && otherUserBean != null) {
+                          Get.bottomSheet(InitmacyDialog(avatar: otherUserBean!.avatar,myAvatar: homelogic.model!.avatar,info: logic.intimacyInfo,accId:logic.selectedConversation!.userID!),isScrollControlled:true);
+                        }
+
+                        // showOKToast('和TA互动的奖励已领取，可以再和其他人聊，继续领取奖励哦~');
+                      }
                     },
                     child: Row(
                       children: [
diff --git a/circle_app/lib/circle_app/home/view.dart b/circle_app/lib/circle_app/home/view.dart
index a75d7b3..566d56f 100644
--- a/circle_app/lib/circle_app/home/view.dart
+++ b/circle_app/lib/circle_app/home/view.dart
@@ -124,6 +124,8 @@ class _HomePageState extends State<HomePage>
     sub1.cancel();
     giftAnimationNotifySub.cancel();
     callOutActionNotifySub.cancel();
+    permissionNotifySub.canel();
+    permissionCloseNotifySub.canel();
     routeObserver.unsubscribe(this);
   }
 
diff --git a/circle_app/lib/circle_app/new_people/view.dart b/circle_app/lib/circle_app/new_people/view.dart
index 1175e37..0824172 100644
--- a/circle_app/lib/circle_app/new_people/view.dart
+++ b/circle_app/lib/circle_app/new_people/view.dart
@@ -6,7 +6,6 @@ import 'package:get/get.dart';
 import 'package:gradient_borders/box_borders/gradient_box_border.dart';
 import 'package:keframe/keframe.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:visibility_detector/visibility_detector.dart';
 
 import '../../commons/Widgets/my_app_bar.dart';
 import '../../commons/Widgets/tag_widget.dart';
@@ -415,18 +414,11 @@ class New_peoplePage extends StatelessWidget {
         data: logic.cityMap,
         columeNum: 2, onConfirm: (List res, List<int> position) {
           print(res);
-          // print(logic.cityMap[res[0]][res[1]][0]);
-          // controller.state.city = controller.cityMap[res[0]][res[1]][0];
-          //   logic.state.city = res[1];
-
           if (res[0].contains("台湾")) {
             logic.city = "台湾省";
           } else {
             logic.city = res[1];
           }
-
-
-          // EventBusManager.fire(NearScrollTap());
           _onRefresh();
         }
     );
@@ -444,11 +436,5 @@ class New_peoplePage extends StatelessWidget {
 
   void _onLoading() async {
     logic.loadData();
-    // if (widget.logic.vicinityPage == 2 &&
-    //     maxOff == 0 &&
-    //     widget.logic.lists.isNotEmpty) {
-    //   maxOff = _scrollController.offset - 170.sp;
-    // }
-    // widget.logic.getNearByList();
   }
 }
diff --git a/circle_app/lib/circle_app/quick/logic.dart b/circle_app/lib/circle_app/quick/logic.dart
index a690bcd..aecde2b 100644
--- a/circle_app/lib/circle_app/quick/logic.dart
+++ b/circle_app/lib/circle_app/quick/logic.dart
@@ -55,6 +55,7 @@ class QuickLogic extends GetxController {
     initGerder();
     getLocationData();
     initList(1);
+    // initList(2);
   }
 
 
@@ -122,6 +123,7 @@ class QuickLogic extends GetxController {
     if (hasLocationPermission) {
       // 权限申请通过
     } else {
+      initList(2);
       return;
     }