From 2eac87fd60496641e724d757683ab0e1af19e097 Mon Sep 17 00:00:00 2001
From: CYH <13923927013@163.com>
Date: Wed, 22 Nov 2023 14:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A5=BD=E8=AF=84=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
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/app/minefragment/logic.dart |  8 ++++++++
 circle_app/lib/app/minefragment/view.dart  | 10 +++++++---
 circle_app/lib/network/api.dart            |  2 ++
 circle_app/lib/network/dio_manager.dart    |  3 ++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle
index e3cf78c..3b22b37 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 25
-        versionName "1.3.2"
+        versionCode 26
+        versionName "1.3.3"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",
diff --git a/circle_app/lib/app/minefragment/logic.dart b/circle_app/lib/app/minefragment/logic.dart
index eec93cd..67a5fab 100644
--- a/circle_app/lib/app/minefragment/logic.dart
+++ b/circle_app/lib/app/minefragment/logic.dart
@@ -31,6 +31,7 @@ class MinefragmentLogic extends GetxController {
 
   bool has_pwd = false;
   bool isUpdateVersion = false;
+  bool isShwGoodReview = false;
   String enterHomeInfoMsg = "进入主页";
   String joinedCircle = "";
   String vipMsg = "十几种专属特权等你领取";
@@ -47,6 +48,7 @@ class MinefragmentLogic extends GetxController {
 
     getMode();
     checkVersion();
+    checkShowPositiveFeedBack();
     EventBusManager.on<CommentVipEvent>().listen((event) {
       isVip.value = event.vip;
     //  update();
@@ -120,6 +122,12 @@ class MinefragmentLogic extends GetxController {
     }
   }
 
+  void checkShowPositiveFeedBack() async {
+    var data = await DioManager.instance.get(url: Api.showPositiveFeedBack);
+    isShwGoodReview = data['data'];
+    update();
+  }
+
 
 }
 
diff --git a/circle_app/lib/app/minefragment/view.dart b/circle_app/lib/app/minefragment/view.dart
index 6b34f80..57b2963 100644
--- a/circle_app/lib/app/minefragment/view.dart
+++ b/circle_app/lib/app/minefragment/view.dart
@@ -42,7 +42,7 @@ class MinefragmentPage extends StatefulWidget {
 }
 
 class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
-  final logic = Get.lazyPut(() => MinefragmentLogic());
+
 
   final mineLogic = Get.find<MinefragmentLogic>();
 
@@ -70,6 +70,7 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
   void didPopNext() {
     print('didPopNext');
     mineLogic.checkVersion();
+    mineLogic.checkShowPositiveFeedBack();
   }
 
   ///当前页面进入时触发
@@ -161,6 +162,8 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
   }
 
   Widget _circleLiveView(MinefragmentLogic logic) {
+
+
     return Column(
       children: [_circleItemView(logic),_invienItemView(),_editGoodReviewItemView(), _helpItemView(),_setUpItemView()],
     );
@@ -324,7 +327,8 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
   }
 
   Widget _editGoodReviewItemView() {
-    return GestureDetector(
+
+    return mineLogic.isShwGoodReview ?  GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: () {
         showTipPop();
@@ -375,7 +379,7 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
           ],
         ),
       ),
-    );
+    ) : Container();
   }
 
   Widget _shareItemView() {
diff --git a/circle_app/lib/network/api.dart b/circle_app/lib/network/api.dart
index 57fba28..2a36981 100644
--- a/circle_app/lib/network/api.dart
+++ b/circle_app/lib/network/api.dart
@@ -308,5 +308,7 @@ class Api {
   //是否隐藏微信号
   static const hideWxNum = '/user-service/hideWxNum/';
 
+  //是否显示好评反馈
+  static const showPositiveFeedBack = '/up-service/showPositiveFeedBack';
 
 }
\ No newline at end of file
diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart
index 6fc599a..f4d0e1a 100644
--- a/circle_app/lib/network/dio_manager.dart
+++ b/circle_app/lib/network/dio_manager.dart
@@ -229,6 +229,7 @@ class DioManager {
       String jsonStr = json.encode(response.data);
       Map<String, dynamic> responseMap = json.decode(jsonStr);
       if (responseMap["code"] == 5003 || responseMap["code"] == 30003) {
+        showOKToast(responseMap['msg']);
         pushLoginPage();
       } else {
         switch (responseMap["code"]) {
@@ -244,9 +245,9 @@ class DioManager {
           case 5001:
           case 5000:
             pushLoginPage();
-            showOKToast(responseMap['msg']);
             break;
         }
+        showOKToast(responseMap['msg']);
       }
       return responseMap;
       // switch(responseMap["code"]){