From f9d934e9eeef3981d8b65101d3e53d629dd5c961 Mon Sep 17 00:00:00 2001 From: YangYuhao Date: Wed, 9 Aug 2023 18:06:38 +0800 Subject: [PATCH] bug --- circle_app/lib/app/call_out/logic.dart | 184 +++--------- ..._uikit_chat_history_message_list_item.dart | 22 +- .../tim_uikit_more_panel.dart | 1 + .../app/circle/widgets/info_list_view.dart | 25 +- circle_app/lib/app/dialog/BaseDialog.dart | 8 +- .../lib/app/dialog/UnlockCallDialog.dart | 269 ++++++++++++++++++ .../lib/app/login/complete_material/view.dart | 6 +- circle_app/lib/app/splash/logic.dart | 1 - circle_app/lib/app/userinfo/view.dart | 1 + .../lib/common/Widgets/base_tip_widget.dart | 4 + .../common/Widgets/open_vip_tip/logic.dart | 3 + circle_app/lib/main.dart | 6 +- circle_app/lib/util/util.dart | 11 + 13 files changed, 366 insertions(+), 175 deletions(-) create mode 100644 circle_app/lib/app/dialog/UnlockCallDialog.dart diff --git a/circle_app/lib/app/call_out/logic.dart b/circle_app/lib/app/call_out/logic.dart index c0e2d26..452cde3 100644 --- a/circle_app/lib/app/call_out/logic.dart +++ b/circle_app/lib/app/call_out/logic.dart @@ -12,6 +12,7 @@ import 'package:image_picker/image_picker.dart'; import 'package:video_player/video_player.dart'; import 'package:video_thumbnail/video_thumbnail.dart'; +import '../../common/Widgets/base_tip_widget.dart'; import '../../common/Widgets/open_vip_tip/view.dart'; import '../../network/api.dart'; import '../../network/dio_manager.dart'; @@ -20,6 +21,7 @@ import '../../util/SharedPreferencesHelper.dart'; import '../../util/eventBus.dart'; import '../../util/qiniu.dart'; import '../circle/logic.dart'; +import '../dialog/UnlockCallDialog.dart'; import '../select_circle/logic.dart'; import 'state.dart'; import '../../common/config.dart'; @@ -37,6 +39,8 @@ class Call_outLogic extends GetxController { List myConfigData = Get.arguments['numbers']; int vip = 0; + bool isZfbPrice = true; + @override void onClose() { super.onClose(); @@ -78,18 +82,13 @@ class Call_outLogic extends GetxController { quniuData, (quniuData) => QnTokenData.fromJson(quniuData)); quToken = qiniuBean.data!.token.toString(); - - - - StreamSubscription subscription = EventBusManager.on().listen((event) { + StreamSubscription subscription = + EventBusManager.on().listen((event) { vip = event.vip; }); - } - - - showRechargeDialog(){ + showRechargeDialog() { Get.bottomSheet( Scaffold( backgroundColor: Colors.transparent, @@ -97,7 +96,6 @@ class Call_outLogic extends GetxController { ), isScrollControlled: true, enableDrag: false); - } sendShout() async { @@ -110,8 +108,8 @@ class Call_outLogic extends GetxController { return; } if (state.imaglist.isEmpty && state.videolist.isEmpty) { - if (textEditingController.text.length < 30) { - showToast("您当前未添加图片或视频，请至少输入30字故事内容。"); + if (textEditingController.text.length < 10) { + showToast("您当前未添加图片或视频，请至少输入10字喊话内容。"); return; } } else { @@ -165,138 +163,42 @@ class Call_outLogic extends GetxController { // return; // } showToast(beandata.msg); - var callOutBean = BaseResponse>.fromJson(data, (jsonData) => List.from(jsonData),); + var callOutBean = BaseResponse>.fromJson( + data, + (jsonData) => List.from(jsonData), + ); textEditingController.text = filterSensitiveWords(textEditingController.text, callOutBean.data!); - print(filterSensitiveWords(textEditingController.text, callOutBean.data!)); + print( + filterSensitiveWords(textEditingController.text, callOutBean.data!)); update(); } else if (beandata.code == 30505) { var callOutBean = BaseResponse.fromJson( data, (jsonData) => CirclePaymentBean.fromJson(jsonData), ); - showDialog(); + // showDialog(); + print(numbers[0].id); + + showJoinCiclePiker(numbers[0].id.toString(),callOutBean.data.amount,callOutBean.data.oldAmount,0,(payResult){ + final logic = Get.put(CircleLogic()); + logic.circle.lists.forEach((element) { + if(element.id == numbers[0].id){ + element.is_limit = false; + } + }); + // widget.bean.is_limit = false; + }); + + UnlockCallDialog().showUnlockBottomSheet(numbers[0].id); // tipWdiget() } else { showToast(beandata.msg); } } - void showDialog() { - Get.bottomSheet( - Scaffold( - backgroundColor: Colors.transparent, - body: Container( - width: Get.width, - height: Get.height, - child: Center( - child: Container( - width: 339.sp, - height: 330.sp, - decoration: BoxDecoration( - image: DecorationImage( - fit: BoxFit.fill, - image: AssetImage(getCircleImage('add_tip_bg')))), - child: Stack( - alignment: Alignment.center, - children: [ - Positioned( - top: 5.sp, - right: 12.sp, - child: GestureDetector( - onTap: () { - Get.back(); - }, - child: Image.asset( - getCircleImage('close'), - width: 24.sp, - ), - )), - Positioned( - top: 24.sp, - child: Text( - '解锁圈子才能发布喊话', - style: - TextStyle(color: Colors.white, fontSize: 16.sp), - )), - Positioned( - left: 17.sp, - top: 64.sp, - child: Text( - '为什么要解锁圈子?', - style: - TextStyle(color: Colors.white, fontSize: 16.sp), - )), - Positioned( - top: 98.sp, - child: Container( - width: 339.sp, - padding: EdgeInsets.only(left: 17.sp, right: 17.sp), - child: Text( - '为打造纯净的社交环境，更好地服务大家，基于以下几方面考虑:1、平台升级为全天24小时人工审核，保证用户真实，避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈;3、谢绝只会白嫖的猎奇人士。', - style: TextStyle( - color: Color.fromRGBO(247, 250, 250, 0.8), - fontSize: 12.sp)), - )), - Positioned( - bottom: 18.sp, - child: Container( - width: 168.sp, - height: 42.sp, - alignment: Alignment.center, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(21.sp), - gradient: const LinearGradient( - begin: Alignment.centerLeft, - end: Alignment.centerRight, - colors: [ - Color(0xff0AFCFF), - Color(0xffD739EA) - ])), - child: Text( - '立即解锁', - style: - TextStyle(color: Colors.white, fontSize: 16.sp), - ), - )), - Positioned( - bottom: 72.sp, - child: Container( - child: Row( - children: [ - Text( - '￥18', - style: TextStyle( - color: Color(0xffE845FF), - fontSize: 16.sp, - fontWeight: FontWeight.w600), - ), - SizedBox( - width: 2.sp, - ), - Text( - '(原价60)', - style: TextStyle( - color: Colors.white70, - fontSize: 16.sp, - fontWeight: FontWeight.w400, - decoration: TextDecoration.lineThrough, - decorationColor: Colors.white70, - ), - ), - ], - ), - )) - ], - ), - ), - ), - ), - ), - isScrollControlled: true, - enableDrag: false); - } + startSelectCircleActivity() async { var data = await Get.toNamed(AppRoutes.SelectCircleActivity, arguments: { @@ -326,12 +228,12 @@ class Call_outLogic extends GetxController { final XFile? pickedFile = await _picker.pickImage( source: ImageSource.gallery, ); - if(null==pickedFile){ + if (null == pickedFile) { return; } SmartDialog.showLoading(); - uploadImage(quToken,pickedFile!,CONFIG.CALL_OUT_IMAGE,(result){ + uploadImage(quToken, pickedFile!, CONFIG.CALL_OUT_IMAGE, (result) { SmartDialog.dismiss(); state.imaglist.add(result); update(); @@ -378,7 +280,7 @@ class Call_outLogic extends GetxController { final XFile? pickedFile = await _picker.pickVideo( source: ImageSource.gallery, ); - if(null==pickedFile){ + if (null == pickedFile) { return; } SmartDialog.showLoading(); @@ -398,21 +300,20 @@ class Call_outLogic extends GetxController { } }); - uploadQiniu(pickedFile.path, pickedFile.name, CONFIG.CALL_OUT_VIDEO, quToken, - (result) { - SmartDialog.dismiss(); - state.videolist.add(result); - update(); - }); + uploadQiniu( + pickedFile.path, pickedFile.name, CONFIG.CALL_OUT_VIDEO, quToken, + (result) { + SmartDialog.dismiss(); + state.videolist.add(result); + update(); + }); } else { SmartDialog.dismiss(); - showToast("请上传5-30秒的视频，当前视频长度为:$durationInSeconds""秒"); + showToast("请上传5-30秒的视频，当前视频长度为:$durationInSeconds" "秒"); } } catch (e) {} - - - //压缩 感觉越压越大 + //压缩 感觉越压越大 // try { // final XFile? pickedFile = await _picker.pickVideo( // source: ImageSource.gallery, @@ -457,7 +358,6 @@ class Call_outLogic extends GetxController { // } catch (e) {} } - Future _loadCaptions(BuildContext context) async { final String fileContents = await DefaultAssetBundle.of(context) .loadString('assets/bumble_bee_captions.vtt'); diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart index 0b97706..4b68e73 100644 --- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart +++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart @@ -525,7 +525,7 @@ class _TIMUIKItHistoryMessageListItemState ), GestureDetector( onTap: (){ - navigateToUserAgreement(); + navigateToCodeOfConduct(); }, child: Text( '《文明公约》', @@ -1287,16 +1287,16 @@ class _TIMUIKItHistoryMessageListItemState isSelf && (message.status == MessageStatus.V2TIM_MSG_STATUS_SEND_SUCC || message.status == MessageStatus.V2TIM_MSG_STATUS_SENDING)) - Container( - padding: const EdgeInsets.only(bottom: 3), - margin: const EdgeInsets.only(right: 6), - child: Text( - isPeerRead ? TIM_t("已读") : TIM_t("未读"), - style: TextStyle( - color: theme.chatMessageItemUnreadStatusTextColor, - fontSize: 12), - ), - ), + // Container( + // padding: const EdgeInsets.only(bottom: 3), + // margin: const EdgeInsets.only(right: 6), + // child: Text( + // isPeerRead ? TIM_t("已读") : TIM_t("未读"), + // style: TextStyle( + // color: theme.chatMessageItemUnreadStatusTextColor, + // fontSize: 12), + // ), + // ), if (model.chatConfig.isShowGroupReadingStatus && model.chatConfig.isShowGroupMessageReadReceipt && model.conversationType == ConvType.group && diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart index 78c2d89..8bdfca0 100644 --- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart +++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart @@ -367,6 +367,7 @@ class _MorePanelState extends TIMUIKitState { ); final photos = await Permissions.checkPermission( context,Permission.photos.value, + theme, ); if(!videos && !photos){ diff --git a/circle_app/lib/app/circle/widgets/info_list_view.dart b/circle_app/lib/app/circle/widgets/info_list_view.dart index 187304c..cf8a34a 100644 --- a/circle_app/lib/app/circle/widgets/info_list_view.dart +++ b/circle_app/lib/app/circle/widgets/info_list_view.dart @@ -222,11 +222,13 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie refreshData(); refreshCircleData(); }, - child: lists.isEmpty - ? !callOutMore - ? noResultWidget() - : loaddingWidget(true) - : ListView.builder( + child: + // lists.isEmpty + // ? !callOutMore + // ? noResultWidget() + // : loaddingWidget(true) + // : + ListView.builder( physics: const AlwaysScrollableScrollPhysics(), scrollDirection: Axis.vertical, controller: scrollController, @@ -236,7 +238,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie return Container( padding: EdgeInsets.only( left: 12.sp, right: 12.sp), - height: 88.sp, + height:urlList.length==0?47.sp: 88.sp, decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, @@ -250,7 +252,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie margin: EdgeInsets.only(bottom: 7.sp), width: Get.width, height: 30.sp, - child: HideText(text: widget.bean.intro,additionText: '查看更多',maxLines: 2,style: TextStyle(color: Colors.white, fontSize: 10.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 10.sp),onTap: () { + child: HideText(text: widget.bean.intro,additionText: '查看更多',maxLines: 2,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () { _showTextContentDialog( context, widget.bean.intro); },), @@ -263,7 +265,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie // showToast("点个鸡毛，星哥还没做"); // Get.toNamed(AppRoutes.FriendsActivity,arguments: '3'); }, - child: Row( + child:urlList.length==0?Container(): Row( children: [ Row( children: [ @@ -1276,6 +1278,13 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie setState(() { }); + // final logic = Get.put(CircleLogic()); + // logic.update(); + + }else if(data['code'] == 404){ + var logic = Get.put(CircleLogic()); + logic.circle.lists.removeAt(logic.state.index); + logic.update(); } } } diff --git a/circle_app/lib/app/dialog/BaseDialog.dart b/circle_app/lib/app/dialog/BaseDialog.dart index 4fc60e8..a77b461 100644 --- a/circle_app/lib/app/dialog/BaseDialog.dart +++ b/circle_app/lib/app/dialog/BaseDialog.dart @@ -1,16 +1,10 @@ -import 'dart:io'; + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_install_app/flutter_install_app.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:get/get_core/src/get_main.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../../main.dart'; -import '../../network/dio_manager.dart'; -import '../../util/util.dart'; class BaseDialog extends StatefulWidget { final bool isDismiss; diff --git a/circle_app/lib/app/dialog/UnlockCallDialog.dart b/circle_app/lib/app/dialog/UnlockCallDialog.dart new file mode 100644 index 0000000..f3c6906 --- /dev/null +++ b/circle_app/lib/app/dialog/UnlockCallDialog.dart @@ -0,0 +1,269 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; +import 'package:get/get_state_manager/src/simple/get_controllers.dart'; + +import '../../common/Widgets/open_vip_tip/logic.dart'; +import '../../network/api.dart'; +import '../../network/dio_manager.dart'; +import '../../util/PaymentUtils.dart'; +import '../../util/util.dart'; + +class UnlockCallDialog extends GetxController { + RxBool isZfbPrice = true.obs; + String circleId = ""; + + void showUnlockBottomSheet(String id) { + circleId = id; + Get.bottomSheet( + Scaffold( + backgroundColor: Colors.transparent, + body: Container( + width: Get.width, + height: Get.height, + child: Center( + child: Container( + width: 339.sp, + height: 330.sp, + decoration: BoxDecoration( + image: DecorationImage( + fit: BoxFit.fill, + image: AssetImage(getCircleImage('add_tip_bg')))), + child: Stack( + alignment: Alignment.center, + children: [ + Positioned( + top: 5.sp, + right: 12.sp, + child: GestureDetector( + onTap: () { + Get.back(); + }, + child: Image.asset( + getCircleImage('close'), + width: 24.sp, + ), + )), + Positioned( + top: 24.sp, + child: Text( + '解锁圈子才能发布喊话', + style: + TextStyle(color: Colors.white, fontSize: 16.sp), + )), + Positioned( + left: 17.sp, + top: 64.sp, + child: Text( + '为什么要解锁圈子?', + style: + TextStyle(color: Colors.white, fontSize: 16.sp), + )), + Positioned( + top: 98.sp, + child: Container( + width: 339.sp, + padding: EdgeInsets.only(left: 17.sp, right: 17.sp), + child: Text( + '为打造纯净的社交环境，更好地服务大家，基于以下几方面考虑:1、平台升级为全天24小时人工审核，保证用户真实，避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈;3、谢绝只会白嫖的猎奇人士。', + style: TextStyle( + color: Color.fromRGBO(247, 250, 250, 0.8), + fontSize: 12.sp)), + )), + Platform.isIOS + ? Container( + height: 1, + width: 1, + ) + : Positioned( + bottom: 108.sp, + child: Container( + margin: EdgeInsets.only(top: 24.0.sp), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + GestureDetector( + onTap: () { + isZfbPrice.value = true; + update(); + }, + child: Row( + children: [ + Obx(() => Image.asset( + isZfbPrice.value + ? getMineImage("icon_pay_select") + : getMineImage( + "icon_pay_is_no_select"), + width: 20.0.sp, + height: 20.0.sp, + )) + , + SizedBox(width: 8.0.sp), + Image.asset( + getMineImage('icon_cooperate_ali'), + width: 20.0.sp, + height: 20.0.sp, + ), + SizedBox(width: 4.0.sp), + Text( + '支付宝支付', + style: TextStyle( + color: const Color(0xFFF7FAFA), + fontSize: 14.0.sp, + ), + ), + SizedBox(width: 4.0.sp), + Image.asset( + getMineImage( + 'icon_recommend_pay_way'), + width: 32.0.sp, + height: 16.0.sp, + ), + ], + ), + ), + SizedBox(width: 24.0.sp), + GestureDetector( + onTap: () { + isZfbPrice.value = false; + update(); + }, + child: Row( + children: [ + Obx(() => Image.asset( + !isZfbPrice.value + ? getMineImage("icon_pay_select") + : getMineImage( + "icon_pay_is_no_select"), + width: 20.0.sp, + height: 20.0.sp, + )) + , + SizedBox(width: 8.0.sp), + Image.asset( + getMineImage('icon_cooperate_wx'), + width: 20.0.sp, + height: 20.0.sp, + ), + SizedBox(width: 4.0.sp), + Text( + '微信支付', + style: TextStyle( + color: const Color(0xFFF7FAFA), + fontSize: 14.0.sp, + ), + ), + ], + ), + ), + ], + ), + ), + ), + Positioned( + bottom: 18.sp, + child: GestureDetector( + onTap: () { + if (Platform.isIOS) { + } else { + startPayment(); + // unlockingPayment(numbers[0].id, (payResult) {}); + } + }, + child: Container( + width: 168.sp, + height: 42.sp, + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(21.sp), + gradient: const LinearGradient( + begin: Alignment.centerLeft, + end: Alignment.centerRight, + colors: [ + Color(0xff0AFCFF), + Color(0xffD739EA) + ])), + child: Text( + '立即解锁', + style: TextStyle( + color: Colors.white, fontSize: 16.sp), + ), + ), + )), + Positioned( + bottom: 72.sp, + child: Container( + child: Row( + children: [ + Text( + '￥18', + style: TextStyle( + color: Color(0xffE845FF), + fontSize: 16.sp, + fontWeight: FontWeight.w600), + ), + SizedBox( + width: 2.sp, + ), + Text( + '(原价60)', + style: TextStyle( + color: Colors.white70, + fontSize: 16.sp, + fontWeight: FontWeight.w400, + decoration: TextDecoration.lineThrough, + decorationColor: Colors.white70, + ), + ), + ], + ), + )) + ], + ), + ), + ), + ), + ), + isScrollControlled: true, + enableDrag: false); + } + + startPayment() async { + SmartDialog.showLoading(); + if (isZfbPrice.value) { + var data = await DioManager.instance.post( + url: Api.postAliPayOrder, + params: {"product_id": circleId, "type": 1}); + var bean = BaseResponse.fromJson( + data, (data) => PayUrlBean.fromJson(data)); + if (bean.isSuccess()) { + openAliPay(bean.data.payUrl, (isSuccess, errorMsg) { + Get.back(); + }); + } else { + showToast(bean.msg); + } + } else { + var data = await DioManager.instance.post( + url: Api.postWxOrder, + params: {"product_id": circleId, "type": 1}); + var bean = BaseResponse.fromJson( + data, (data) => PaymentData.fromJson(data)); + if (bean.isSuccess()) { + openWxPay(bean.data, (bool isSuccess, String? errorMessage) { + Get.back(); + }); + } else { + showToast(bean.msg); + } + } + SmartDialog.dismiss(); + } + + + +} \ No newline at end of file diff --git a/circle_app/lib/app/login/complete_material/view.dart b/circle_app/lib/app/login/complete_material/view.dart index 8d98766..9cca0a0 100644 --- a/circle_app/lib/app/login/complete_material/view.dart +++ b/circle_app/lib/app/login/complete_material/view.dart @@ -354,7 +354,7 @@ class Complete_materialPage extends StatelessWidget { data: controller.genderList, selectData: controller.state.sex.isNotEmpty ? controller.state.sex - : '男', onConfirm: (p, position) { + : 'MTF', onConfirm: (p, position) { controller.state.sex = p; controller.state.genderId = controller.configBean.genderMap.keys.toList()[position]; @@ -401,7 +401,7 @@ class Complete_materialPage extends StatelessWidget { data: controller.roleList, selectData: controller.state.role.isNotEmpty ? controller.state.role - : 'Sado', onConfirm: (p, position) { + : 'Dom', onConfirm: (p, position) { controller.state.role = p; controller.state.roleId = controller.configBean.roleMap.keys.toList()[position]; @@ -416,7 +416,7 @@ class Complete_materialPage extends StatelessWidget { data: controller.orientationList, selectData: controller.state.orientation.isNotEmpty ? controller.state.orientation - : '异性恋', onConfirm: (p, position) { + : '双性恋', onConfirm: (p, position) { controller.state.orientation = p; controller.state.orientationId = controller.configBean.orientationMap.keys.toList()[position]; diff --git a/circle_app/lib/app/splash/logic.dart b/circle_app/lib/app/splash/logic.dart index 065165f..211a234 100644 --- a/circle_app/lib/app/splash/logic.dart +++ b/circle_app/lib/app/splash/logic.dart @@ -38,7 +38,6 @@ class SplashLogic extends GetxController { sharedPreferences.setString(SharedPreferencesHelper.AUTHORIZATION, bean.data!.Authorization.toString()); }); - Get.offNamed(AppRoutes.Home); return; } else if (bean.code == 30002) { diff --git a/circle_app/lib/app/userinfo/view.dart b/circle_app/lib/app/userinfo/view.dart index 5db4d2c..b42a18b 100644 --- a/circle_app/lib/app/userinfo/view.dart +++ b/circle_app/lib/app/userinfo/view.dart @@ -78,6 +78,7 @@ class MyTabbedScreenState extends State ), body: Stack( children: [ + Container( child: buildContent(logic), ), diff --git a/circle_app/lib/common/Widgets/base_tip_widget.dart b/circle_app/lib/common/Widgets/base_tip_widget.dart index 1edae26..9035fcf 100644 --- a/circle_app/lib/common/Widgets/base_tip_widget.dart +++ b/circle_app/lib/common/Widgets/base_tip_widget.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:circle_app/util/util.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import '../../network/api.dart'; @@ -214,6 +215,7 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice, } unlockingPayment(String cicleId, MyCallback myCallback) async { + SmartDialog.showLoading(); if (isZfbPrice) { var data = await DioManager.instance.post( url: Api.postAliPayOrder, params: {"product_id": cicleId, "type": 1}); @@ -245,7 +247,9 @@ unlockingPayment(String cicleId, MyCallback myCallback) async { } else { showToast(bean.msg); } + } + SmartDialog.dismiss(); } typedef void MyCallback(bool payResult); diff --git a/circle_app/lib/common/Widgets/open_vip_tip/logic.dart b/circle_app/lib/common/Widgets/open_vip_tip/logic.dart index 189ffde..fdfd89f 100644 --- a/circle_app/lib/common/Widgets/open_vip_tip/logic.dart +++ b/circle_app/lib/common/Widgets/open_vip_tip/logic.dart @@ -1,5 +1,6 @@ import 'package:circle_app/util/util.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import '../../../network/api.dart'; @@ -46,6 +47,7 @@ class Open_vip_tipLogic extends GetxController { final Open_vip_tipState state = Open_vip_tipState(); startPayment() async { + SmartDialog.showLoading(); if (isZfbPrice) { var data = await DioManager.instance.post( url: Api.postAliPayOrder, @@ -85,6 +87,7 @@ class Open_vip_tipLogic extends GetxController { showToast(bean.msg); } } + SmartDialog.dismiss(); } diff --git a/circle_app/lib/main.dart b/circle_app/lib/main.dart index 0137a60..ca6c0dd 100644 --- a/circle_app/lib/main.dart +++ b/circle_app/lib/main.dart @@ -296,15 +296,15 @@ class _MyAppState extends State { callbackValue.errorMsg!.contains("not support @all")) { showToast("当前群组不支持@全体成员"); } else { - showToast(callbackValue.errorMsg ?? - callbackValue.errorCode.toString()); + // showToast(callbackValue.errorMsg ?? + // callbackValue.errorCode.toString()); } break; case TIMCallbackType.FLUTTER_ERROR: default: // prints the stack trace to console or shows the catch error if (callbackValue.catchError != null) { - showToast(callbackValue.catchError.toString()); + // showToast(callbackValue.catchError.toString()); } else { print(callbackValue.stackTrace); // loginIM(); diff --git a/circle_app/lib/util/util.dart b/circle_app/lib/util/util.dart index ab8df0a..fb58cec 100644 --- a/circle_app/lib/util/util.dart +++ b/circle_app/lib/util/util.dart @@ -281,6 +281,17 @@ void navigateToPrivacyPolicy() { "url": "https://docs.qq.com/doc/DZXhvcXV6b1RNTUx1" }); } + +//跳转到文明公约 +void navigateToCodeOfConduct() { + Get.toNamed(AppRoutes.WebViewActivity, arguments: { + 'title': "文明公约", + "url": "https://docs.qq.com/doc/DZUtoZ3V0S3ltY2Zw" + }); +} + + + //发布内容规范 void navigateToContentGuidelines() { Get.toNamed(AppRoutes.WebViewActivity, arguments: {