2.3.1代码提交

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 74
-        versionName "2.3.0"
+        versionCode 75
+        versionName "2.3.1"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

circle_app/lib/circle_app/call_out/logic.dart

@@ -36,15 +36,21 @@ class Call_outLogic extends GetxController {
   bool isCheck = false;
   late ConfigBean configBean;
   String circleName = "";
+
+
+
   final ImagePicker _picker = ImagePicker();
   var quToken = '';
   VideoPlayerController? videoPlayerController;
   List<MyConfigData> numbers = [];
+
+  List<MyConfigData> localNumberList = [];
+
   List<MyConfigData>? myConfigData;
   int vip = 0;
 
   bool isZfbPrice = true;
-
+  bool isLocal = false;
   final TUISettingModel settingModel = serviceLocator<TUISettingModel>();
 
   @override
@@ -67,40 +73,49 @@ class Call_outLogic extends GetxController {
     } else {
       showOKToast(bean.msg);
     }
-
     var arg = Get.arguments;
 
     if (arg != null) {
-      // print(myConfigData.name);
       if (arg is Map) {
         List<MyConfigData> myConfigData = Get.arguments['numbers'];
         numbers.addAll(myConfigData);
-        if(numbers.length>0) {
+
+        var result = await DioManager.instance.get(
+          url: "/up-service/interest/${numbers.first.id}",
+        );
+
+
+        if (result['code'] == 200) {
+            isLocal = result['data']['isLocal'];
+            localNumberList.addAll(myConfigData);
+        }
+
+
+        if(numbers.length>0 && !isLocal) {
           circleName = numbers[0].name;
         }
         update();
       }
-
     } else {
-      var data = await DioManager.instance
-          .get(url: Api.getMyCircleInterests, params: {"page": 1,'page_size':20});
-
-      var bean = BaseResponse<InterestsBean>.fromJson(
-          data, (data) => InterestsBean.fromJson(data));
-
-      InterestsBean info = bean.data;
-
-      if (info.lists.isNotEmpty) {
-        Circle circle = info.lists.first;
-        MyConfigData configData = MyConfigData(circle.id.toString(),circle.title,true);
-        numbers.add(configData);
-        if(numbers.length>0){
-          circleName = numbers[0].name;
-        }
-
-
-        update();
-      }
+      // var data = await DioManager.instance
+      //     .get(url: Api.getMyCircleInterests, params: {"page": 1,'page_size':20});
+      //
+      // var bean = BaseResponse<InterestsBean>.fromJson(
+      //     data, (data) => InterestsBean.fromJson(data));
+      //
+      // InterestsBean info = bean.data;
+      //
+      // if (info.lists.isNotEmpty) {
+      //   Circle circle = info.lists.first;
+      //   MyConfigData configData = MyConfigData(circle.id.toString(),circle.title,true);
+      //   numbers.add(configData);
+      //   if(numbers.length>0){
+      //     circleName = numbers[0].name;
+      //   }
+      //
+      //
+      //   update();
+      // }
 
 
     }
@@ -185,6 +200,7 @@ class Call_outLogic extends GetxController {
       'content': textEditingController.text.trim(),
       'interest_id': numbers[0].id,
       'use_queen': isCheck ? 1 : 0,
+      'localInterestId': isLocal ? localNumberList.first.id : ''
     });
 
     var beandata = BaseResponse<dynamic>.fromJson(
@@ -253,7 +269,7 @@ class Call_outLogic extends GetxController {
 
   startSelectCircleActivity() async {
     var data = await Get.toNamed(Routes.SelectCirclePage, arguments: {
-      "interestMap": configBean.interestMap,
+      "interestMap": configBean.calloutInterests,
       'selectCircle': numbers,
       "isRodio": true
     });

circle_app/lib/circle_app/minefragment/view.dart

@@ -1721,7 +1721,7 @@ class _MinefragmentPageState extends State<MinefragmentPage>
         logic.isShowPositiveFeedBack ? _editGoodReviewItemView() : Container(),
         _wxItemView(),
         _helpItemView(),
-        _setUpItemView()
+        _setUpItemView(),
       ],
     );
   }

circle_app/lib/circle_app/quick/logic.dart

@@ -46,7 +46,7 @@ class QuickLogic extends GetxController {
     super.onInit();
 
     initGerder();
-    getLocationData();
+
     initList(1);
     // initList(2);
   }
@@ -76,6 +76,9 @@ class QuickLogic extends GetxController {
       // 权限申请通过
       position = await getCurrentPosition();
       initList(2);
+    } else {
+      position = Position(longitude: 0.0, latitude: 0.0, timestamp: null, accuracy: 0, altitude: 0, altitudeAccuracy: 0, heading: 0, headingAccuracy: 0, speed: 0, speedAccuracy: 0);;
+      initList(2);
     }
   }
 

circle_app/lib/circle_app/quick/view.dart

@@ -717,6 +717,14 @@ class LocationItem extends StatefulWidget {
 class _LocationItemState extends State<LocationItem> {
   final ctr = Get.find<QuickLogic>();
   final logic = Get.find<MsgLogic>();
+
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+    ctr.getLocationData();;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Padding(

circle_app/lib/circle_app/select_circle/logic.dart

@@ -58,16 +58,23 @@ class ConfigBean {
   late Map<String, dynamic> roleMap;
   late Map<String, dynamic> orientationMap;
   late Map<String, dynamic> interestMap;
+  late Map<String, dynamic> calloutInterests;
 
   ConfigBean.fromJson(Map<String, dynamic> json) {
     genderMap = json['gender_map'];
     roleMap = json['role_map'];
     orientationMap = json['orientation_map'];
     List list = json['interests'];
+    List calloutInterestslist = json['calloutInterests'];
     interestMap = {};
     list.forEach((element) {
       interestMap[element['id'].toString()] = element['title'];
     });
+    calloutInterests = {};
+    calloutInterestslist.forEach((element) {
+      calloutInterests[element['id'].toString()] = element['title'];
+    });
+
   }
 }
 

circle_app/lib/circle_app/visitorlist/view.dart

@@ -1,8 +1,6 @@
 import 'dart:ui';
 
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:circle_app/circle_app/visitorlist/widget/visitors_follow_item.dart';
-import 'package:circle_app/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';

circle_app/lib/utils/paymentUtil.dart

@@ -76,10 +76,11 @@ class IOSPayment {
       List<PurchaseDetails> purchaseDetailsList) async {
     for (final PurchaseDetails purchaseDetails in purchaseDetailsList) {
       if (purchaseDetails.status == PurchaseStatus.pending) {
-        SmartDialog.showLoading(msg: '请稍等片刻');
+
       } else {
         if (purchaseDetails.status == PurchaseStatus.error) {
           showOKToast('支付发生错误');
+          SmartDialog.dismiss();
         } else if (purchaseDetails.status == PurchaseStatus.purchased) {
           Map<String,dynamic> params =  {
             'payload': purchaseDetails.verificationData.serverVerificationData,
@@ -184,6 +185,7 @@ class IOSPayment {
 
   /// 启动支付
   void iosPay(String skuInfo, String typeID, int productType,{String userId = '',String source = ''}) async {
+    SmartDialog.showLoading(msg: '请稍等片刻');
     if (!await isAvailable()) {
       SmartDialog.dismiss();
       showOKToast('无法连接AppStore，请稍后再试');

circle_app/pubspec.yaml

@@ -115,8 +115,6 @@ dependencies:
   gradient_borders: ^1.0.0
   #系统设置 安卓4.3.1 苹果4.0.4
   app_settings: 4.3.1
-  #百度定位插件
-#  flutter_bmflocation: ^3.6.0
   #通知权限
   notification_permissions: ^0.6.1
   #分帧