diff --git a/circle_app/lib/app/circle_list/widgets/circle_type_item.dart b/circle_app/lib/app/circle_list/widgets/circle_type_item.dart index 8fb3169..5251ea1 100644 --- a/circle_app/lib/app/circle_list/widgets/circle_type_item.dart +++ b/circle_app/lib/app/circle_list/widgets/circle_type_item.dart @@ -71,7 +71,7 @@ class _CircleTypeItemState extends State { 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 { // Get.toName(''); }, child: Container( - height: 100.sp, - width: 90.sp, - margin: EdgeInsets.only(right: 4.sp), + height: 145.sp, + width: 110.sp, + margin: EdgeInsets.only(right: 8.sp), child: Stack( alignment: Alignment.center, fit: StackFit.expand, @@ -93,8 +93,8 @@ class _CircleTypeItemState extends State { child: Image.network( dataList[index]['image'], fit: BoxFit.cover, - height: 120.sp, - width: 90.sp, + height: 145.sp, + width: 110.sp, )), Column( // mainAxisAlignment: MainAxisAlignment.center, @@ -110,12 +110,12 @@ class _CircleTypeItemState extends State { padding: EdgeInsets.only(left: 10.sp, right: 10.sp), decoration: BoxDecoration( - color: AppColor.bgColor, - borderRadius: BorderRadius.circular(2.sp)), + color: AppColor.bgColor.withOpacity(0.65), + borderRadius: BorderRadius.circular(3.sp)), child: Text( dataList[index]['title'], style: TextStyle( - color: Colors.white, fontSize: 12.sp), + color: Colors.white, fontSize: 13.sp), ), ), ], diff --git a/circle_app/lib/app/home/logic.dart b/circle_app/lib/app/home/logic.dart index b08834f..f73e9f2 100644 --- a/circle_app/lib/app/home/logic.dart +++ b/circle_app/lib/app/home/logic.dart @@ -110,9 +110,9 @@ class HomeLogic extends GetxController with WidgetsBindingObserver { checkVersion(); loadMyCircleData(); - if (Platform.isAndroid) { - initWxApi(); - } + + initWxApi(); + } void addMsgListener() { diff --git a/circle_app/lib/app/minefragment/view.dart b/circle_app/lib/app/minefragment/view.dart index bcf5469..48eb81e 100644 --- a/circle_app/lib/app/minefragment/view.dart +++ b/circle_app/lib/app/minefragment/view.dart @@ -413,7 +413,7 @@ class _MinefragmentPageState extends State with RouteAware { SizedBox(width: 10.sp), const Text( - "评价微乐园", + "给个5星好评", style: TextStyle(color: Colors.white), ), @@ -430,7 +430,7 @@ class _MinefragmentPageState extends State with RouteAware { shape: BoxShape.circle), ), const Text( - "+3天会员时长", + "免费领3天会员", style: TextStyle(color: Colors.white60), ), Image( diff --git a/circle_app/lib/app/report/view.dart b/circle_app/lib/app/report/view.dart index c0b8c5c..44dc29a 100644 --- a/circle_app/lib/app/report/view.dart +++ b/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( '补充说明', diff --git a/circle_app/lib/app/world_call_out/view.dart b/circle_app/lib/app/world_call_out/view.dart index ba0581d..1a02688 100644 --- a/circle_app/lib/app/world_call_out/view.dart +++ b/circle_app/lib/app/world_call_out/view.dart @@ -487,123 +487,128 @@ class _World_call_outPageState extends State 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), - height: 40.sp, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.sp), - border: Border.all(color: Colors.white.withOpacity(0.1),width: 1.sp) - // image: DecorationImage( - // fit: BoxFit.fill, - // image: AssetImage(getCircleImage('top_circle_bg'))) - ), - child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Container( - width: 32.sp, - height: 32.sp, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.0), - gradient: const LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0xFF71F3F2), - Color(0xFFF558FF), - ], - stops: [0.0365, 0.9427], + child: Container( + padding: EdgeInsets.only(left: 12.sp, right: 12.sp), + height: 40.sp, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.sp), + border: Border.all(color: Colors.white.withOpacity(0.1),width: 1.sp) + // image: DecorationImage( + // fit: BoxFit.fill, + // image: AssetImage(getCircleImage('top_circle_bg'))) + ), + child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Container( + width: 32.sp, + height: 32.sp, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.0), + gradient: const LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Color(0xFF71F3F2), + Color(0xFFF558FF), + ], + stops: [0.0365, 0.9427], + ), + ), + padding: EdgeInsets.all(1.sp), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.0), + child: CachedNetworkImage( + imageUrl: list.interest!.image!, + width: 30.sp, + height: 30.sp, + fit: BoxFit.cover), ), ), - padding: EdgeInsets.all(1.sp), - child: ClipRRect( - borderRadius: BorderRadius.circular(8.0), - child: CachedNetworkImage( - imageUrl: list.interest!.image!, - width: 30.sp, - height: 30.sp, - fit: BoxFit.cover), - ), - ), - Expanded( - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - // scrollController.animateTo( - // 0.0, // Scroll to the top - // duration: Duration(milliseconds: 300), - // curve: Curves.easeInOut, - // ); - }, - child: Container( - padding: EdgeInsets.only(left: 8.sp, top: 2.sp), - // alignment: Alignment., - // height: 40.sp, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - list.interest!.title!, - style: TextStyle( - color: Colors.white, - fontSize: 14.sp,), - ), - SizedBox( - height: 2.sp, - ), - Text( - '${convertToTenThousand(list.interest!.viewTotal!)}人看过', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.white.withOpacity(0.5), - fontSize: 10.sp, - ), - ), - ], - ), - ), - )), - GestureDetector( - //加入圈子 - onTap: () async { - if (list.interest!.isJoin!) { - Map info = list.interest!.toJson(); - Get.bottomSheet( - CircleShare('', '', Circle.fromJson(info)), - isScrollControlled: true, - enableDrag: false); - } else { - await logic.outCircle(list.interest!.id!.toString(), - list.interest!.isJoin!); - if (Get.isRegistered()) { - LikeLogic likeLogic = Get.find(); - likeLogic.loadMyCircleData(); - } - logic.update(); - } + Expanded( + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + // scrollController.animateTo( + // 0.0, // Scroll to the top + // duration: Duration(milliseconds: 300), + // curve: Curves.easeInOut, + // ); }, - child: Stack( - alignment: Alignment.center, - children: [ - Opacity( - opacity: 0.5, - child: Image.asset( - getCircleImage('add'), - width: 60.sp, + child: Container( + padding: EdgeInsets.only(left: 8.sp, top: 2.sp), + // alignment: Alignment., + // height: 40.sp, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + list.interest!.title!, + style: TextStyle( + color: Colors.white, + fontSize: 14.sp,), ), - ), - Text( - !list.interest!.isJoin! ? '申请加入' : '分享有奖', - style: - TextStyle(color: Colors.white, fontSize: 12.sp), - ) - ], - )) - ], - ), - )) + SizedBox( + height: 2.sp, + ), + Text( + '${convertToTenThousand(list.interest!.viewTotal!)}人看过', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.white.withOpacity(0.5), + fontSize: 10.sp, + ), + ), + ], + ), + ), + )), + GestureDetector( + //加入圈子 + onTap: () async { + if (list.interest!.isJoin!) { + Map info = list.interest!.toJson(); + Get.bottomSheet( + CircleShare('', '', Circle.fromJson(info)), + isScrollControlled: true, + enableDrag: false); + } else { + await logic.outCircle(list.interest!.id!.toString(), + list.interest!.isJoin!); + if (Get.isRegistered()) { + LikeLogic likeLogic = Get.find(); + likeLogic.loadMyCircleData(); + } + logic.update(); + } + }, + child: Stack( + alignment: Alignment.center, + children: [ + Opacity( + opacity: 0.5, + child: Image.asset( + getCircleImage('add'), + width: 60.sp, + ), + ), + Text( + !list.interest!.isJoin! ? '申请加入' : '分享有奖', + style: + TextStyle(color: Colors.white, fontSize: 12.sp), + ) + ], + )) + ], + ), + )), + ) : Container(); } diff --git a/circle_app/lib/main.dart b/circle_app/lib/main.dart index 6937f50..495a3c1 100644 --- a/circle_app/lib/main.dart +++ b/circle_app/lib/main.dart @@ -360,9 +360,7 @@ class _MyAppState extends State with WidgetsBindingObserver { minTextAdapt: true, splitScreenMode: true, builder: (context, child) { - return RefreshConfiguration( - footerBuilder: () => CustomLoadFooter(), - child: OKToast( + return 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 with WidgetsBindingObserver { }, debugShowCheckedModeBanner: false, ), - )); + ); }); } diff --git a/circle_app/lib/util/util.dart b/circle_app/lib/util/util.dart index 74c6ead..fd27251 100644 --- a/circle_app/lib/util/util.dart +++ b/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), - // animationBuilder: const Miui10AnimBuilder(), + textStyle: const TextStyle(fontSize: 16.0,color: Colors.white), ); } @@ -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') { diff --git a/circle_app/pubspec.lock b/circle_app/pubspec.lock index d549189..ac73e4b 100644 --- a/circle_app/pubspec.lock +++ b/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: