2.4.4代码提交

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 87
+        versionCode 89
-        versionName "2.4.2"
+        versionName "2.4.4"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

circle_app/lib/circle_app/circle/widgets/like_view.dart

@@ -624,7 +624,7 @@ class _LikeViewState extends State<LikeView>
                             margin:
                                 EdgeInsets.only(top: recomandMore ? 0 : 10.sp),
                             child: recomandMore
-                                ? loaddingWidget(recomandMore)
+                                ? Container()
                                 : GestureDetector(
                                     onTap: () {
                                       widget.changeCallback();

circle_app/lib/circle_app/dialog/YesAgreementDialog.dart

@@ -1,6 +1,7 @@
 import 'dart:ffi';
 import 'dart:io';
 
+import 'package:circle_app/commons/colors/app_color.dart';
 import 'package:connectivity/connectivity.dart';
 import 'package:device_info/device_info.dart';
 import 'package:flutter/cupertino.dart';
@@ -126,22 +127,10 @@ class _CustomDialogState extends State<YesAgreementDialog> {
                   GestureDetector(
                     onTap: () async {
                       // 点击操作
-                      SmartDialog.showLoading();
-                      var connectivityResult =
-                          await Connectivity().checkConnectivity();
-
-                      if (connectivityResult == ConnectivityResult.none) {
-                        showOKToast("网络不流畅哦，请检查网络情况");
-                        print('没网');
-                        return;
-                      }
-
                       try {
                         var sp = await SharedPreferencesHelper.getInstance();
                         sp.setBool(SharedPreferencesHelper.AGREEMENT, true);
                       } catch (e) {}
-                       uploadBuzIDAndToken();
-                      SmartDialog.dismiss();
                       pushLoginPage();
                       FlutterBugly.init(
                         androidAppId: "8509314e11",
@@ -156,11 +145,7 @@ class _CustomDialogState extends State<YesAgreementDialog> {
                         horizontal: 44,
                       ),
                       decoration: BoxDecoration(
-                        gradient: const LinearGradient(
+                        gradient: AppColor.mainVerLinearGradient,
-                          colors: [Color(0xFFDD3DF4), Color(0xFF30FFD9)],
-                          begin: Alignment.centerLeft,
-                          end: Alignment.centerRight,
-                        ),
                         borderRadius: BorderRadius.circular(30),
                       ),
                       child: Center(

circle_app/lib/circle_app/home/logic.dart

@@ -409,6 +409,7 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
           if (logic.isShowLocationDialog) {
             logic.checkLcoationStatus();
           }
+          checkIsShowFraudPreventionDialog();
           // readClipboardData();
         }
         break;
@@ -576,7 +577,6 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
     final logic = Get.find<CircleLogic>();
     logic.loadCirclePeopleData();
 
-    SharedPreferencesHelper sp = await SharedPreferencesHelper.getInstance();
     if (Get.parameters.isNotEmpty) {
       if (model == null) {
         await loadMyInfoData();

circle_app/lib/circle_app/home/view.dart

@@ -172,7 +172,6 @@ class _HomePageState extends State<HomePage>
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                // 、
                 funcItem(0, 'circle', 0 == controller.currentIndex, controller,
                     '乐园'),
                 funcItem(
@@ -301,24 +300,27 @@ class _HomePageState extends State<HomePage>
                 )),
           if (index != 2)
             Container(
-                margin: EdgeInsets.only(top: 4.sp),
+                margin: EdgeInsets.only(top: 2.sp),
                 child: Column(
                   children: [
                     Image.asset(
                       isSelected
                           ? getTabbarImage('${image}_selected')
                           : getTabbarImage('${image}_normal'),
-                      width: 34.sp,
+                      width: 30.sp,
-                      height: 34.sp,
+                      height: 30.sp,
                       fit: BoxFit.fill,
                       excludeFromSemantics: true,
                       gaplessPlayback: true,
                     ),
-                    Text(
+                    Container(
-                      btnStr,
+                      margin: EdgeInsets.only(bottom: 2.sp),
-                      style: TextStyle(
+                      child: Text(
-                          color: isSelected ? AppColor.mainColor : Colors.white,
+                        btnStr,
-                          fontSize: 13.sp),
+                        style: TextStyle(
+                            color: isSelected ? AppColor.mainColor : Colors.white,
+                            fontSize: 12.sp),
+                      ),
                     )
                   ],
                 )),
@@ -326,13 +328,13 @@ class _HomePageState extends State<HomePage>
               visible: index == 1 && controller.showcirlceUnred.value,
               child: Positioned(
                 // right: 4.sp,
-                top: 10.sp,
+                top: 5.sp,
                 child: Container(
-                    width: 14.sp,
+                    width: 12.sp,
-                    height: 14.sp,
+                    height: 12.sp,
-                    margin: EdgeInsets.only(left: 24.sp),
+                    margin: EdgeInsets.only(left: 16.sp),
                     decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(7.sp),
+                        borderRadius: BorderRadius.circular(6.sp),
                         gradient: LinearGradient(
                             colors: controller.showcirlceUnred.value
                                 ? [Color(0xFFC343F9), Color(0xFFFB34B2)]

circle_app/lib/circle_app/report/logic.dart

@@ -31,8 +31,10 @@ class ReportLogic extends GetxController {
     return arrList;
   }
 
-  onSubmit()async{
+  bool isSubmiting = false;
-    if(myPosition== -1){
+
+  onSubmit() async {
+    if (myPosition == -1) {
       showOKToast("请选择举报类目");
       return;
     }
@@ -41,17 +43,19 @@ class ReportLogic extends GetxController {
       myBean.add(MyBean(type: 1, url: element).toJson());
     });
 
-
+    if (isSubmiting) return;
-  var data =  await DioManager.instance.post(url: Api.postReport, params: {
+    isSubmiting = true;
-    "user_id" : userId,
+    var data = await DioManager.instance.post(url: Api.postReport, params: {
-    "words" :   textEditingController.text,
+      "user_id": userId,
-    "obj_type" :1,
+      "words": textEditingController.text,
-    "obj_id":userId,
+      "obj_type": 1,
-    "reason":arrList[myPosition].name,
+      "obj_id": userId,
-    "album" :myBean
+      "reason": arrList[myPosition].name,
-  });
+      "album": myBean
+    });
+    isSubmiting = false;
     var bean = BaseResponse<String>.fromJson(data, (data) => data);
-    if(bean.isSuccess()){
+    if (bean.isSuccess()) {
       Get.back();
     }
     showOKToast(bean.msg);
@@ -62,34 +66,33 @@ class ReportLogic extends GetxController {
   var quToken = '';
 
   @override
-  void onInit()  async{
+  void onInit() async {
     super.onInit();
     var data =
-    await DioManager.instance.get(url: Api.getqiniuToken, params: {});
+        await DioManager.instance.get(url: Api.getqiniuToken, params: {});
     var bean = BaseResponse<QnTokenData>.fromJson(
         data, (data) => QnTokenData.fromJson(data));
-    if(bean.isSuccess()){
+    if (bean.isSuccess()) {
       quToken = bean.data!.token.toString();
     }
   }
 
   Future getImageFile() async {
- checkPhotosStatus();
+    checkPhotosStatus();
     try {
       final XFile? pickedFile = await _picker.pickImage(
         source: ImageSource.gallery,
       );
-      if(null==pickedFile){
+      if (null == pickedFile) {
         return;
       }
       SmartDialog.showLoading();
-      uploadImage(quToken,pickedFile!,ImgPath.USER_INFO_AVATAR,(result){
+      uploadImage(quToken, pickedFile!, ImgPath.USER_INFO_AVATAR, (result) {
         SmartDialog.dismiss(force: true);
         state.imaglist.add(result);
         update();
       });
-    } catch (e) {
+    } catch (e) {}
-    }
   }
 }