2.1.1代码提交

circle_app/lib/app/circle_list/widgets/circle_type_item.dart

@@ -71,7 +71,7 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
           SizedBox(height: 4.sp,),
           Container(
             // color: Colors.red,
-            height: 100.sp,
+            height: 145.sp,
             width: Get.width,
             child: ListView.builder(
               itemBuilder: (BuildContext context, int index) {
@@ -81,9 +81,9 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
                     // Get.toName('');
                   },
                   child: Container(
-                    height: 100.sp,
+                    height: 145.sp,
-                    width: 90.sp,
+                    width: 110.sp,
-                    margin: EdgeInsets.only(right: 4.sp),
+                    margin: EdgeInsets.only(right: 8.sp),
                     child: Stack(
                       alignment: Alignment.center,
                       fit: StackFit.expand,
@@ -93,8 +93,8 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
                             child: Image.network(
                               dataList[index]['image'],
                               fit: BoxFit.cover,
-                              height: 120.sp,
+                              height: 145.sp,
-                              width: 90.sp,
+                              width: 110.sp,
                             )),
                         Column(
                           // mainAxisAlignment: MainAxisAlignment.center,
@@ -110,12 +110,12 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
                                   padding:
                                       EdgeInsets.only(left: 10.sp, right: 10.sp),
                                   decoration: BoxDecoration(
-                                      color: AppColor.bgColor,
+                                      color: AppColor.bgColor.withOpacity(0.65),
-                                      borderRadius: BorderRadius.circular(2.sp)),
+                                      borderRadius: BorderRadius.circular(3.sp)),
                                   child: Text(
                                     dataList[index]['title'],
                                     style: TextStyle(
-                                        color: Colors.white, fontSize: 12.sp),
+                                        color: Colors.white, fontSize: 13.sp),
                                   ),
                                 ),
                               ],

circle_app/lib/app/home/logic.dart

@@ -110,9 +110,9 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
 
     checkVersion();
     loadMyCircleData();
-    if (Platform.isAndroid) {
+
     initWxApi();
-    }
+
   }
 
   void addMsgListener() {

circle_app/lib/app/minefragment/view.dart

@@ -413,7 +413,7 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
                 SizedBox(width: 10.sp),
 
                 const Text(
-                  "评价微乐园",
+                  "给个5星好评",
                   style: TextStyle(color: Colors.white),
                 ),
 
@@ -430,7 +430,7 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
                       shape: BoxShape.circle),
                 ),
                 const Text(
-                  "+3天会员时长",
+                  "免费领3天会员",
                   style: TextStyle(color: Colors.white60),
                 ),
                 Image(

circle_app/lib/app/report/view.dart

@@ -53,7 +53,7 @@ class ReportPage extends StatelessWidget {
                   ),
                 ),
                 SizedBox(
-                  height: 120.sp,
+                  height: 140.sp,
                   child: _reportAdapter(controller),
                 ),
                 Expanded(
@@ -72,7 +72,7 @@ class ReportPage extends StatelessWidget {
                         // 添加 RecyclerView（ListView） 的内容
                         // 例如: MyRecyclerViewWidget(),
                         SizedBox(
-                            height: 130.sp,
+                            height: 150.sp,
                             child:  _imageAdapter(controller)),
                         Text(
                           '补充说明',

circle_app/lib/app/world_call_out/view.dart

@@ -487,7 +487,11 @@ class _World_call_outPageState extends State<World_call_outPage>
 
   circleInfoItem(WorldLists list) {
     return list.interest!.image != null
-        ? ClipRRect(
+        ? GestureDetector(
+      onTap: () {
+        Get.toNamed(AppRoutes.Signal_circle_list, arguments: list.interest!.id!);
+      },
+          child: ClipRRect(
 
               child: Container(
                 padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
@@ -603,7 +607,8 @@ class _World_call_outPageState extends State<World_call_outPage>
                         ))
                   ],
                 ),
-            ))
+              )),
+        )
         : Container();
   }
 

circle_app/lib/main.dart

@@ -360,9 +360,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
         minTextAdapt: true,
         splitScreenMode: true,
         builder: (context, child) {
-          return RefreshConfiguration(
+          return  OKToast(
-              footerBuilder: () => CustomLoadFooter(),
-              child: OKToast(
                 // 2-A: wrap your app with OKToast
                 textStyle: const TextStyle(fontSize: 19.0, color: Colors.white),
                 backgroundColor: Colors.grey,
@@ -400,7 +398,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
                   },
                   debugShowCheckedModeBanner: false,
                 ),
-              ));
+              );
         });
   }
 

circle_app/lib/util/util.dart

@@ -87,8 +87,7 @@ showOKToast(String msg) {
     position: ToastPosition.center,
     backgroundColor: Colors.black.withOpacity(0.8),
     radius: 13.0,
-    textStyle: const TextStyle(fontSize: 16.0),
+    textStyle: const TextStyle(fontSize: 16.0,color: Colors.white),
-    // animationBuilder: const Miui10AnimBuilder(),
   );
 }
 
@@ -1106,7 +1105,7 @@ pushPage(String action,String param,{String name = ''}) {
   } else if (action == 'offsite_share') {
     Get.toNamed(AppRoutes.ExternalsharePage);
   }  else if (action == 'good_rate') {
-    await launch('https://apps.apple.com/cn/app/%E5%BE%AE%E4%B9%90%E5%9B%AD-%E4%BA%9A%E6%96%87%E5%8C%96%E5%A4%9A%E5%85%83%E4%BA%A4%E5%8F%8B%E5%9F%BA%E5%9C%B0/id6459449499', forceSafariVC: false);
+     launch('https://apps.apple.com/cn/app/%E5%BE%AE%E4%B9%90%E5%9B%AD-%E4%BA%9A%E6%96%87%E5%8C%96%E5%A4%9A%E5%85%83%E4%BA%A4%E5%8F%8B%E5%9F%BA%E5%9C%B0/id6459449499', forceSafariVC: false);
   }  else if (action == 'buy_vip') {
     showOepnVipDialog();
   } else if (action == 'recharge') {

circle_app/pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: "direct main"
     description:
       name: app_settings
-      sha256: e6a34735d4ddb24ca9c5fd7e965ec65c8b611cbd3a329152c294f9e9f4bacb33
+      sha256: "2ec421f375d747916c4c0193933567074ea60c4f01c4a68642f07fef1002524e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.1"
+    version: "4.0.4"
   archive:
     dependency: transitive
     description:
@@ -630,14 +630,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.3"
-  flutter_install_app:
-    dependency: "direct main"
-    description:
-      name: flutter_install_app
-      sha256: "9b117006d17c900e671c26bcbc9b15c7b8efd15d6f9b4442ad5d576de20fab53"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
   flutter_intl:
     dependency: "direct main"
     description: