diff --git a/circle_app/ios/Runner.xcodeproj/project.pbxproj b/circle_app/ios/Runner.xcodeproj/project.pbxproj
index 9c1899d..862a80d 100644
--- a/circle_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/circle_app/ios/Runner.xcodeproj/project.pbxproj
@@ -360,7 +360,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = C97QBVP4DP;
+ DEVELOPMENT_TEAM = C39VUKAY2Z;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "微乐园";
@@ -381,7 +381,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
- PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp123;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
@@ -508,7 +508,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = C97QBVP4DP;
+ DEVELOPMENT_TEAM = C39VUKAY2Z;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "微乐园";
@@ -529,7 +529,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
- PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp123;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
@@ -550,7 +550,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = C97QBVP4DP;
+ DEVELOPMENT_TEAM = C39VUKAY2Z;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "微乐园";
@@ -571,7 +571,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
- PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.example.circleApp123;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
diff --git a/circle_app/ios/Runner/Runner.entitlements b/circle_app/ios/Runner/Runner.entitlements
index 903def2..0c67376 100644
--- a/circle_app/ios/Runner/Runner.entitlements
+++ b/circle_app/ios/Runner/Runner.entitlements
@@ -1,8 +1,5 @@
-
- aps-environment
- development
-
+
diff --git a/circle_app/lib/app/blacklist/logic.dart b/circle_app/lib/app/blacklist/logic.dart
index 5598bf4..e174945 100644
--- a/circle_app/lib/app/blacklist/logic.dart
+++ b/circle_app/lib/app/blacklist/logic.dart
@@ -55,7 +55,7 @@ class BlacklistLogic extends GetxController {
initList();
update();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
diff --git a/circle_app/lib/app/call_out/logic.dart b/circle_app/lib/app/call_out/logic.dart
index 452cde3..0d91fcb 100644
--- a/circle_app/lib/app/call_out/logic.dart
+++ b/circle_app/lib/app/call_out/logic.dart
@@ -73,7 +73,7 @@ class Call_outLogic extends GetxController {
if (bean.isSuccess()) {
configBean = bean.data!;
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
var quniuData =
@@ -100,28 +100,28 @@ class Call_outLogic extends GetxController {
sendShout() async {
if (numbers.isEmpty) {
- showToast("请选择要喊话的圈子。");
+ showOKToast("请选择要喊话的圈子。");
return;
}
if (textEditingController.text.isEmpty) {
- showToast("请输入喊话内容");
+ showOKToast("请输入喊话内容");
return;
}
if (state.imaglist.isEmpty && state.videolist.isEmpty) {
if (textEditingController.text.length < 10) {
- showToast("您当前未添加图片或视频，请至少输入10字喊话内容。");
+ showOKToast("您当前未添加图片或视频，请至少输入10字喊话内容。");
return;
}
} else {
if (!state.imaglist.isEmpty) {
if (textEditingController.text.length < 5) {
- showToast("请至少输入5个字内容");
+ showOKToast("请至少输入5个字内容");
return;
}
}
if (!state.videolist.isEmpty) {
if (textEditingController.text.length < 5) {
- showToast("请至少输入5个字内容");
+ showOKToast("请至少输入5个字内容");
return;
}
}
@@ -151,7 +151,7 @@ class Call_outLogic extends GetxController {
);
SmartDialog.dismiss();
if (beandata.isSuccess()) {
- showToast(beandata.msg);
+ showOKToast(beandata.msg);
final logic = Get.put(CircleLogic());
logic.setCircle(numbers[0].id);
logic.refresh();
@@ -162,7 +162,7 @@ class Call_outLogic extends GetxController {
// if (beandata.data == null) {
// return;
// }
- showToast(beandata.msg);
+ showOKToast(beandata.msg);
var callOutBean = BaseResponse>.fromJson(
data,
(jsonData) => List.from(jsonData),
@@ -194,7 +194,7 @@ class Call_outLogic extends GetxController {
UnlockCallDialog().showUnlockBottomSheet(numbers[0].id);
// tipWdiget()
} else {
- showToast(beandata.msg);
+ showOKToast(beandata.msg);
}
}
@@ -218,11 +218,11 @@ class Call_outLogic extends GetxController {
showImg() async {
try {
if (state.videolist.length != 0) {
- showToast("已添加视频，无法添加图片。");
+ showOKToast("已添加视频，无法添加图片。");
return;
}
if (state.imaglist.length == 6) {
- showToast("最多上传6张图片哦~");
+ showOKToast("最多上传6张图片哦~");
return;
}
final XFile? pickedFile = await _picker.pickImage(
@@ -268,11 +268,11 @@ class Call_outLogic extends GetxController {
showVideo() async {
if (state.imaglist.length != 0) {
- showToast("已添加图片，无法添加视频。");
+ showOKToast("已添加图片，无法添加视频。");
return;
}
if (state.videolist.length != 0) {
- showToast("最多上传1个视频哦~");
+ showOKToast("最多上传1个视频哦~");
return;
}
@@ -309,7 +309,7 @@ class Call_outLogic extends GetxController {
});
} else {
SmartDialog.dismiss();
- showToast("请上传5-30秒的视频，当前视频长度为:$durationInSeconds" "秒");
+ showOKToast("请上传5-30秒的视频，当前视频长度为:$durationInSeconds" "秒");
}
} catch (e) {}
diff --git a/circle_app/lib/app/call_out/view.dart b/circle_app/lib/app/call_out/view.dart
index 80713a1..647eddb 100644
--- a/circle_app/lib/app/call_out/view.dart
+++ b/circle_app/lib/app/call_out/view.dart
@@ -181,7 +181,7 @@ class Call_outPage extends StatelessWidget {
controller.isCheck = !controller.isCheck;
controller.update();
}else{
- showToast("至尊喊话为年会员特权，开通年会员即可享受哦~");
+ showOKToast("至尊喊话为年会员特权，开通年会员即可享受哦~");
controller.showRechargeDialog();
}
diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
index c0d3c45..7c3a1a1 100644
--- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
+++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
@@ -266,7 +266,7 @@ bool isSendLoging = false;
return;
}
if (isBlack) {
- showToast("您已将对方拉黑，请移除黑名单后在发送消息~");
+ showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~");
return;
}
lastText = "";
@@ -275,7 +275,7 @@ bool isSendLoging = false;
if (text.isEmpty) {
if (hintText.contains('说些什么吧~')) {
- showToast('请输入消息内容后发送');
+ showOKToast('请输入消息内容后发送');
return;
} else {
if ((widget.currentConversation.lastMessage?.customElem ?? null) !=
@@ -303,7 +303,7 @@ bool isSendLoging = false;
}
}
} else {
- showToast('请输入消息内容后发送');
+ showOKToast('请输入消息内容后发送');
}
}
@@ -354,7 +354,7 @@ bool isSendLoging = false;
goDownBottom();
_handleSendEditStatus("", false);
} else {
- showToast('请输入消息内容');
+ showOKToast('请输入消息内容');
}
}
diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
index 9283e2c..19c073b 100644
--- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
+++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
@@ -2,6 +2,10 @@ import 'dart:async';
import 'dart:math';
import 'package:circle_app/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_send_sound_message.dart';
+import 'package:circle_app/app/minefragment/logic.dart';
+import 'package:circle_app/common/Widgets/open_vip_tip/view.dart';
+import 'package:circle_app/network/api.dart';
+import 'package:circle_app/network/dio_manager.dart';
import 'package:circle_app/util/util.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -150,6 +154,7 @@ class _TIMTextFieldLayoutNarrowState
final TUISettingModel settingModel = serviceLocator();
final ImagePicker _picker = ImagePicker();
+ bool isVip = false;
bool showMore = false;
bool showMoreButton = true;
bool showSendSoundText = false;
@@ -513,7 +518,8 @@ class _TIMTextFieldLayoutNarrowState
Stack(
children: [
Container(
- width: 296.sp,
+ width: Get.width - 80.sp,
+ // width: 296.sp,
padding: EdgeInsets.symmetric(
vertical: 8, horizontal: 12.sp),
constraints:
@@ -669,7 +675,7 @@ class _TIMTextFieldLayoutNarrowState
GestureDetector(
onTap: () async {
if (isBlack) {
- showToast("您已将对方拉黑，请移除黑名单后在发送消息~");
+ showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~");
return;
}
showKeyboard = showSendSoundText;
@@ -708,7 +714,7 @@ class _TIMTextFieldLayoutNarrowState
GestureDetector(
onTap: () {
if (isBlack) {
- showToast("您已将对方拉黑，请移除黑名单后在发送消息~");
+ showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~");
return;
}
getImageFile();
@@ -719,7 +725,7 @@ class _TIMTextFieldLayoutNarrowState
GestureDetector(
onTap: () {
if (isBlack) {
- showToast("您已将对方拉黑，请移除黑名单后在发送消息~");
+ showOKToast("您已将对方拉黑，请移除黑名单后在发送消息~");
return;
}
getTakeImageFile();
@@ -768,7 +774,38 @@ class _TIMTextFieldLayoutNarrowState
);
}
+ Future checkVipStatus() async {
+ if (!isVip) {
+ var data = await DioManager.instance.get(url: Api.getUserMine);
+ var bean = BaseResponse.fromJson(
+ data, (data) => MineResponseBean.fromJson(data));
+ if (bean.isSuccess()) {
+ User userInfoBean = bean.data.user!;
+ isVip = userInfoBean.vip > 0;
+ }
+
+ }
+ if (!isVip) {
+ showOKToast('开通会员之后才能发送图片');
+ Get.bottomSheet(
+ Scaffold(
+ backgroundColor: Colors.transparent,
+ body: Open_vip_tipPage(false),
+ ),
+ isScrollControlled: true,
+ enableDrag: false);
+
+ return false;
+ }
+
+ return isVip;
+ }
+
Future getImageFile() async {
+ bool isOK = await checkVipStatus();
+ if (!isOK) {
+ return;
+ }
try {
final XFile? pickedFile = await _picker.pickImage(
source: ImageSource.gallery,
@@ -787,6 +824,12 @@ class _TIMTextFieldLayoutNarrowState
}
Future getTakeImageFile() async {
+ bool isOK = await checkVipStatus();
+ if (!isOK) {
+ return;
+ }
+
+
try {
final XFile? pickedFile = await _picker.pickImage(
source: ImageSource.camera,
diff --git a/circle_app/lib/app/chat/view.dart b/circle_app/lib/app/chat/view.dart
index db7e7c7..527fcca 100644
--- a/circle_app/lib/app/chat/view.dart
+++ b/circle_app/lib/app/chat/view.dart
@@ -124,7 +124,7 @@ class _ChatPageState extends State {
],
),
customAppBar:MyAppBar(
- centerTitle: con.showName!,
+ centerTitle: con.showName! ?? '',
actionWdiget: GestureDetector(
onTap: () async{
var data = await Get.toNamed(AppRoutes.UserInfoActivity,arguments: con.userID.toString().split('_').last);
diff --git a/circle_app/lib/app/circle/logic.dart b/circle_app/lib/app/circle/logic.dart
index 75518f8..98c67c6 100644
--- a/circle_app/lib/app/circle/logic.dart
+++ b/circle_app/lib/app/circle/logic.dart
@@ -69,7 +69,7 @@ class CircleLogic extends GetxController {
}
});
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
updateCircleInfo(Circle circleInfo) {
@@ -122,7 +122,7 @@ class CircleLogic extends GetxController {
await sendTextMsg(data['data']['account_id']);
}
} else {
- showToast(data['msg']);
+ showOKToast(data['msg']);
}
}
diff --git a/circle_app/lib/app/circle/view.dart b/circle_app/lib/app/circle/view.dart
index a1f4918..e460e0d 100644
--- a/circle_app/lib/app/circle/view.dart
+++ b/circle_app/lib/app/circle/view.dart
@@ -77,7 +77,7 @@ class _CirclePageState extends State
itemCount: logic.circle.lists.length,
viewportFraction: 0.93,
// scale: 0.9,
- loop: false,
+ loop: false,
key: UniqueKey(),
// pagination: new SwiperPagination(),//如果不填则不显示指示点
// control: new SwiperControl(),//如果不填则不显示左右按钮
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 89a1b1b..6e3b9d5 100644
--- a/circle_app/lib/app/circle/widgets/info_list_view.dart
+++ b/circle_app/lib/app/circle/widgets/info_list_view.dart
@@ -51,7 +51,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
void dispose() {
// TODO: implement dispose
super.dispose();
- widget.scrollController.dispose();
+ // widget.scrollController.dispose();
}
@@ -97,7 +97,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
setState(() {});
}
} else {
- showToast(data["msg"]);
+ showOKToast(data["msg"]);
}
}
@@ -169,7 +169,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
var sp = await SharedPreferencesHelper.getInstance();
String myUserId = sp.getMyUserId();
if (bean.user!.id.toString() == myUserId) {
- showToast('无法与自己私聊');
+ showOKToast('无法与自己私聊');
return;
}
// if ()
@@ -253,12 +253,11 @@ 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: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () {
+ child: HideText(text: widget.bean.intro,additionText: '查看更多',maxLines: 1,style: TextStyle(color: Colors.white, fontSize: 10.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 10.sp),onTap: () {
_showTextContentDialog(
context, widget.bean.intro);
- },),
-
- ),
+ },
+ )),
GestureDetector(
behavior:HitTestBehavior.opaque,
@@ -450,6 +449,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
padding: const EdgeInsets.all(1.0),
child: Stack(
children: [
+
Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
@@ -486,7 +486,19 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
color: const Color(0xCCF7FAFA), fontSize: 16.sp),
),),
),
- )
+ ),
+ Positioned(
+ top:8.sp,
+ right: 10.sp,
+ child: GestureDetector(
+ onTap: () {
+ Get.back();
+ },
+ child: Icon(
+ Icons.close,color: Colors.white,
+ size: 20.sp,
+ ),
+ )),
],
),
),
diff --git a/circle_app/lib/app/circle/widgets/list_logic.dart b/circle_app/lib/app/circle/widgets/list_logic.dart
index 105cd9a..b56c88a 100644
--- a/circle_app/lib/app/circle/widgets/list_logic.dart
+++ b/circle_app/lib/app/circle/widgets/list_logic.dart
@@ -39,7 +39,7 @@ class ListLogic extends GetxController {
callOutMore = dataList.length == 20;
update();
} else {
- showToast(data["msg"]);
+ showOKToast(data["msg"]);
}
}
diff --git a/circle_app/lib/app/dialog/BaseDialog.dart b/circle_app/lib/app/dialog/BaseDialog.dart
index a77b461..539c0bd 100644
--- a/circle_app/lib/app/dialog/BaseDialog.dart
+++ b/circle_app/lib/app/dialog/BaseDialog.dart
@@ -2,6 +2,7 @@
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';
diff --git a/circle_app/lib/app/dialog/UnlockCallDialog.dart b/circle_app/lib/app/dialog/UnlockCallDialog.dart
index f3c6906..a55bf67 100644
--- a/circle_app/lib/app/dialog/UnlockCallDialog.dart
+++ b/circle_app/lib/app/dialog/UnlockCallDialog.dart
@@ -245,7 +245,7 @@ class UnlockCallDialog extends GetxController {
Get.back();
});
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
} else {
var data = await DioManager.instance.post(
@@ -258,7 +258,7 @@ class UnlockCallDialog extends GetxController {
Get.back();
});
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
SmartDialog.dismiss();
diff --git a/circle_app/lib/app/feedback/logic.dart b/circle_app/lib/app/feedback/logic.dart
index 9b28b6a..1df67ae 100644
--- a/circle_app/lib/app/feedback/logic.dart
+++ b/circle_app/lib/app/feedback/logic.dart
@@ -68,7 +68,7 @@ class FeedbackLogic extends GetxController {
'type':1
});
var bean = BaseResponse.fromJson(data, (jsonData) => jsonData,);
- showToast(bean.msg);
+ showOKToast(bean.msg);
if(bean.isSuccess()){
Get.back();
}
diff --git a/circle_app/lib/app/friendslist/logic.dart b/circle_app/lib/app/friendslist/logic.dart
index 6831f93..b3e3012 100644
--- a/circle_app/lib/app/friendslist/logic.dart
+++ b/circle_app/lib/app/friendslist/logic.dart
@@ -56,7 +56,7 @@ class FriendslistLogic extends GetxController {
lists[index].isLike = !lists[index].isLike;
update();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
diff --git a/circle_app/lib/app/likelist/logic.dart b/circle_app/lib/app/likelist/logic.dart
index 7780cec..d5d4f7f 100644
--- a/circle_app/lib/app/likelist/logic.dart
+++ b/circle_app/lib/app/likelist/logic.dart
@@ -65,7 +65,7 @@ class LikelistLogic extends GetxController {
lists[index].isLike = !lists[index].isLike;
update();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
diff --git a/circle_app/lib/app/login/complete_material/logic.dart b/circle_app/lib/app/login/complete_material/logic.dart
index 350aadb..6d1b321 100644
--- a/circle_app/lib/app/login/complete_material/logic.dart
+++ b/circle_app/lib/app/login/complete_material/logic.dart
@@ -68,7 +68,7 @@ class Complete_materialLogic extends GetxController {
update();
// state.nickName = userInfoBean!.nickname;
}else{
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
@@ -124,41 +124,41 @@ class Complete_materialLogic extends GetxController {
checkInfo() async {
if (state.textEditingController.text.isEmpty) {
- showToast('请输入您的昵称');
+ showOKToast('请输入您的昵称');
return;
} else if(state.textEditingController.text.length<2){
- showToast('昵称不能低于两个字');
+ showOKToast('昵称不能低于两个字');
return;
} else if(state.textEditingController.text.length>6){
- showToast('昵称最多输入6个字');
+ showOKToast('昵称最多输入6个字');
return;
}else if (state.sex.isEmpty) {
- showToast('请选择您的属性');
+ showOKToast('请选择您的属性');
return;
} else if (state.age.isEmpty) {
- showToast('请选择您的年龄');
+ showOKToast('请选择您的年龄');
return;
} else if (state.role.isEmpty) {
- showToast('请选择您的角色');
+ showOKToast('请选择您的角色');
return;
} else if (state.role.isEmpty) {
- showToast('请选择您的角色');
+ showOKToast('请选择您的角色');
return;
} else if (state.orientation.isEmpty) {
- showToast('请选择您的取向');
+ showOKToast('请选择您的取向');
return;
} else if (numbers.isEmpty) {
- showToast('请选择您的兴趣');
+ showOKToast('请选择您的兴趣');
// return;
} else if (state.descEditingController.text.isEmpty) {
- showToast('请输入您的交友宣言');
+ showOKToast('请输入您的交友宣言');
return;
} else if (state.descEditingController.text.length < 5) {
- showToast('您的交友宣言太短');
+ showOKToast('您的交友宣言太短');
return;
}
if (headUrl == '') {
- showToast('请上传头像');
+ showOKToast('请上传头像');
return;
}
// LatLng location = await getLocation();
@@ -182,44 +182,44 @@ class Complete_materialLogic extends GetxController {
if (bean.code == 200) {
Get.offAllNamed(AppRoutes.Home);
}else{
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
editInfo() async {
if (state.textEditingController.text.isEmpty) {
- showToast('请输入您的昵称');
+ showOKToast('请输入您的昵称');
return;
} else if(state.textEditingController.text.length>6){
- showToast('昵称最多输入6个字');
+ showOKToast('昵称最多输入6个字');
return;
}else if (state.sex.isEmpty) {
- showToast('请选择您的属性');
+ showOKToast('请选择您的属性');
return;
} else if (state.age.isEmpty) {
- showToast('请选择您的年龄');
+ showOKToast('请选择您的年龄');
return;
} else if (state.role.isEmpty) {
- showToast('请选择您的角色');
+ showOKToast('请选择您的角色');
return;
} else if (state.role.isEmpty) {
- showToast('请选择您的角色');
+ showOKToast('请选择您的角色');
return;
} else if (state.orientation.isEmpty) {
- showToast('请选择您的取向');
+ showOKToast('请选择您的取向');
return;
} else if (numbers.isEmpty) {
- showToast('请选择您的兴趣');
+ showOKToast('请选择您的兴趣');
// return;
} else if (state.descEditingController.text.isEmpty) {
- showToast('请输入您的交友宣言');
+ showOKToast('请输入您的交友宣言');
return;
} else if (state.descEditingController.text.length < 5) {
- showToast('您的交友宣言太短');
+ showOKToast('您的交友宣言太短');
return;
}
if (headUrl == '') {
- showToast('请上传头像');
+ showOKToast('请上传头像');
return;
}
//TODO 强制获取经纬度
@@ -255,7 +255,7 @@ class Complete_materialLogic extends GetxController {
}else{
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
diff --git a/circle_app/lib/app/login/login/logic.dart b/circle_app/lib/app/login/login/logic.dart
index 0e43af0..6638178 100644
--- a/circle_app/lib/app/login/login/logic.dart
+++ b/circle_app/lib/app/login/login/logic.dart
@@ -60,7 +60,7 @@ class LoginLogic extends GetxController {
var data = await DioManager.instance.post(
url: Api.sendCode, params: {"phone": phoneEditingController.text});
var bean = BaseResponse.fromJson(data, (data) => Data.fromJson(data));
- showToast(bean.msg);
+ showOKToast(bean.msg);
if (bean.code == 200) {
if (kDebugMode) {
print("验证码：${bean.data!.code}");
@@ -88,16 +88,16 @@ class LoginLogic extends GetxController {
void login() async {
if (!GetUtils.isPhoneNumber(phoneEditingController.text)) {
- showToast('请输入正确的手机号');
+ showOKToast('请输入正确的手机号');
return;
}
if (codeEditingController.text == '') {
- showToast('请输入验证码');
+ showOKToast('请输入验证码');
return;
}
if (!check) {
- showToast('请勾选同意用户协议和隐私协议');
+ showOKToast('请勾选同意用户协议和隐私协议');
return;
}
var data = await DioManager.instance.post(url: Api.login, params: {
@@ -127,7 +127,7 @@ class LoginLogic extends GetxController {
Get.offNamed(AppRoutes.Complete_materialPage);
return;
} else {
- showToast(bean.msg.toString());
+ showOKToast(bean.msg.toString());
}
// try {
diff --git a/circle_app/lib/app/login/login/view.dart b/circle_app/lib/app/login/login/view.dart
index 39b72be..4b5d5b9 100644
--- a/circle_app/lib/app/login/login/view.dart
+++ b/circle_app/lib/app/login/login/view.dart
@@ -18,272 +18,278 @@ class LoginPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return Scaffold(
- resizeToAvoidBottomInset: false,
- body: GestureDetector(
- onTap: () {
- FocusManager.instance.primaryFocus?.unfocus();
- },
- child: GetBuilder(builder: (logic) {
- return Stack(
- alignment: Alignment.center,
- children: [
- Image.asset(
- getBaseImage('bg'),
- fit: BoxFit.fill,
- width: Get.width,
- height: Get.height,
- ),
- Positioned(
- left: 0,
- right: 0,
- top: 180.sp,
- child: Image.asset(getBaseImage("ic_launcher"),width: 120.sp,height: 120.sp,)),
+ return Stack(
+ children: [
+ Image.asset(
+ getBaseImage('bg'),
+ fit: BoxFit.fill,
+ width: Get.width,
+ height: Get.height,
+ ),
+ Scaffold(
+ resizeToAvoidBottomInset: false,
+ backgroundColor: Colors.transparent,
+ body: GestureDetector(
+ onTap: () {
+ FocusManager.instance.primaryFocus?.unfocus();
+ },
+ child: GetBuilder(builder: (logic) {
+ return Stack(
+ alignment: Alignment.center,
+ children: [
- Container(
- width: Get.width,
- height: Get.height,
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Container(
- // margin: EdgeInsets.only(
- // top: MediaQuery.of(context).padding.top + 100.sp),
- child: Stack(
- alignment: Alignment.center,
- children: [
- Positioned(
- bottom: 0,
+ Positioned(
+ left: 0,
+ right: 0,
+ top: 180.sp,
+ child: Image.asset(getBaseImage("ic_launcher"),width: 120.sp,height: 120.sp,)),
- child: Container(
- width: 280.sp,
- height: 50.sp,
- decoration: BoxDecoration(
- // color: Colors.white60,
- borderRadius: BorderRadius.circular(25.sp),
- border: Border.all(color: Colors.white60,width: 0.5.sp)
- ),)),
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
+ Container(
+ width: Get.width,
+ height: Get.height,
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Container(
+ // margin: EdgeInsets.only(
+ // top: MediaQuery.of(context).padding.top + 100.sp),
+ child: Stack(
+ alignment: Alignment.center,
children: [
- Text(
- ' +86',
- style: TextStyle(
- color: Colors.white, fontSize: 16.sp),
- ),
- Stack(
+ Positioned(
+ bottom: 0,
+
+ child: Container(
+ width: 280.sp,
+ height: 50.sp,
+ decoration: BoxDecoration(
+ // color: Colors.white60,
+ borderRadius: BorderRadius.circular(25.sp),
+ border: Border.all(color: Colors.white60,width: 0.5.sp)
+ ),)),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
children: [
- Container(
- width: 200.sp,
- child: TextField(
- onChanged: (msg){
- if (GetUtils.isPhoneNumber(msg)&& msg.length==11) {
- logic.isPhoto = true;
- }else{
- logic.isPhoto = false;
- }
- logic.update();
- },
- controller: logic.phoneEditingController,
- keyboardType: TextInputType.phone,
- inputFormatters: [
- FilteringTextInputFormatter.digitsOnly,
- FilteringTextInputFormatter.deny(RegExp('[^0-9]')),
- ],
- maxLength: 11,
- style: TextStyle(
- color: Colors.white, fontSize: 16.sp),
- decoration: InputDecoration(
- hintText: '请输入手机号',
- hintStyle: TextStyle(
- color: Colors.white70,
- fontSize: 16.sp),
- border: InputBorder.none,
- counterText: '',
- contentPadding: EdgeInsets.only(
- left: 16.sp)),
- ),
+ Text(
+ ' +86',
+ style: TextStyle(
+ color: Colors.white, fontSize: 16.sp),
),
-
- ],
- )
- ],
- ),
-
- ],
- ),
- ),
- Container(
- margin: EdgeInsets.only(top: 20.sp),
- child: Stack(
- alignment: Alignment.center,
- children: [
- Positioned(
- bottom: 0,
-
- child: Container(
- width: 280.sp,
- height: 50.sp,
- decoration: BoxDecoration(
- // color: Colors.white60,
- borderRadius: BorderRadius.circular(25.sp),
- border: Border.all(color: Colors.white60,width: 0.5.sp)
- ),)),
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Text(
- '验证码',
- style: TextStyle(
- color: Colors.white, fontSize: 16.sp),
- ),
- Stack(
- alignment: Alignment.center,
- children: [
- SizedBox(
- width: 200.sp,
- child: TextField(
- controller: logic.codeEditingController,
- keyboardType: TextInputType.phone,
- maxLength: 8,
- style: TextStyle(
- color: Colors.white, fontSize: 16.sp),
- decoration: InputDecoration(
- hintText: '请输入验证码',
-
- hintStyle: TextStyle(
- color: Colors.white70,
- fontSize: 16.sp),
- border: InputBorder.none,
- counterText: '',
- contentPadding: EdgeInsets.only(
- left: 16.sp)),
- ),
- ),
- Positioned(
- right: 0,
- child: GestureDetector(
- onTap: () {
- if(logic.isPhoto){
- logic.starDownTimer();
- }
- },
- child: Container(
- alignment: Alignment.center,
- width: 76.sp,
- height: 29.sp,
- decoration: BoxDecoration(
- color:logic.isPhoto ? logic.sendCodeBtn? Colors.white30:const Color(0xff0AFCFF) : Colors.white30,
- borderRadius: BorderRadius.circular(
- 29.sp / 2)
- ),
- child: Text(logic.sendCodeBtn ? '${logic.seconds}s' : '获取验证码', style: TextStyle(
- color: logic.isPhoto ? logic.sendCodeBtn? Colors.white:Colors.black : Colors.white, fontSize: 12.sp),),
+ Stack(
+ children: [
+ Container(
+ width: 200.sp,
+ child: TextField(
+ onChanged: (msg){
+ if (GetUtils.isPhoneNumber(msg)&& msg.length==11) {
+ logic.isPhoto = true;
+ }else{
+ logic.isPhoto = false;
+ }
+ logic.update();
+ },
+ controller: logic.phoneEditingController,
+ keyboardType: TextInputType.phone,
+ inputFormatters: [
+ FilteringTextInputFormatter.digitsOnly,
+ FilteringTextInputFormatter.deny(RegExp('[^0-9]')),
+ ],
+ maxLength: 11,
+ style: TextStyle(
+ color: Colors.white, fontSize: 16.sp),
+ decoration: InputDecoration(
+ hintText: '请输入手机号',
+ hintStyle: TextStyle(
+ color: Colors.white70,
+ fontSize: 16.sp),
+ border: InputBorder.none,
+ counterText: '',
+ contentPadding: EdgeInsets.only(
+ left: 16.sp)),
),
- )),
+ ),
+ ],
+ )
],
- )
+ ),
+
],
),
+ ),
+ Container(
+ margin: EdgeInsets.only(top: 20.sp),
+ child: Stack(
+ alignment: Alignment.center,
+ children: [
+ Positioned(
+ bottom: 0,
- ],
- ),
- ),
+ child: Container(
+ width: 280.sp,
+ height: 50.sp,
+ decoration: BoxDecoration(
+ // color: Colors.white60,
+ borderRadius: BorderRadius.circular(25.sp),
+ border: Border.all(color: Colors.white60,width: 0.5.sp)
+ ),)),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ '验证码',
+ style: TextStyle(
+ color: Colors.white, fontSize: 16.sp),
+ ),
+ Stack(
+ alignment: Alignment.center,
+ children: [
+ SizedBox(
+ width: 200.sp,
+ child: TextField(
+ controller: logic.codeEditingController,
+ keyboardType: TextInputType.phone,
+ maxLength: 8,
+ style: TextStyle(
+ color: Colors.white, fontSize: 16.sp),
+ decoration: InputDecoration(
+ hintText: '请输入验证码',
- ],
- ),
- ),
- Positioned(
- bottom: 182.sp,
- child: GestureDetector(
- onTap: () {
- logic.login();
- },
- 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),
+ hintStyle: TextStyle(
+ color: Colors.white70,
+ fontSize: 16.sp),
+ border: InputBorder.none,
+ counterText: '',
+ contentPadding: EdgeInsets.only(
+ left: 16.sp)),
+ ),
+ ),
+ Positioned(
+ right: 0,
+ child: GestureDetector(
+ onTap: () {
+ if(logic.isPhoto){
+ logic.starDownTimer();
+ }
+ },
+ child: Container(
+ alignment: Alignment.center,
+ width: 76.sp,
+ height: 29.sp,
+ decoration: BoxDecoration(
+ color:logic.isPhoto ? logic.sendCodeBtn? Colors.white30:const Color(0xff0AFCFF) : Colors.white30,
+ borderRadius: BorderRadius.circular(
+ 29.sp / 2)
+ ),
+ child: Text(logic.sendCodeBtn ? '${logic.seconds}s' : '获取验证码', style: TextStyle(
+ color: logic.isPhoto ? logic.sendCodeBtn? Colors.white:Colors.black : Colors.white, fontSize: 12.sp),),
+ ),
+ )),
+
+ ],
+ )
+ ],
+ ),
+
+ ],
+ ),
+ ),
+
+ ],
),
),
- ),
- ),
- Positioned(
- bottom: 17.sp + MediaQuery.of(context).padding.bottom,
- child: GestureDetector(
- behavior: HitTestBehavior.opaque,
- onTap: () {
- logic.check = !logic.check;
- logic.update();
- },
- child: Container(
- child: Row(
- children: [
- !logic.check ? Container(width: 14.sp,height: 14.sp,decoration: BoxDecoration(border: Border.all(color: Colors.white70,width: 1.sp),borderRadius: BorderRadius.circular(10)),): Icon(Icons.check_circle_rounded,size: 15.sp,color: Color(0xff00FFF4),),
- SizedBox(width: 4.sp,),
- Text(
- '同意',
- style: TextStyle(
- color: Colors.white,
- fontSize: 11.sp,
- fontWeight: FontWeight.w600),
- ),
- SizedBox(
- width: 2.sp,
- ),
- GestureDetector(
- onTap: (){
- navigateToUserAgreement();
- },
- child: Text(
- '《用户协议》',
- style: TextStyle(
- color: Color(0xff00FFF4),
- fontSize: 11.sp,
- fontWeight: FontWeight.w400,
- ),
- ),
- ),
- Text(
- '和',
- style: TextStyle(
- color: Colors.white,
- fontSize: 11.sp,
- fontWeight: FontWeight.w600),
- ),
- SizedBox(
- width: 2.sp,
- ),
- GestureDetector(
- onTap: (){
- navigateToPrivacyPolicy();
- },
- child: Text(
- '《隐私协议》',
- style: TextStyle(
- color: Color(0xff00FFF4),
- fontSize: 11.sp,
- fontWeight: FontWeight.w400,
- ),
- ),
- ),
- ],
+ Positioned(
+ bottom: 182.sp,
+ child: GestureDetector(
+ onTap: () {
+ logic.login();
+ },
+ 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: 17.sp + MediaQuery.of(context).padding.bottom,
+ child: GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: () {
+ logic.check = !logic.check;
+ logic.update();
+ },
+ child: Container(
+ child: Row(
+ children: [
+ !logic.check ? Container(width: 14.sp,height: 14.sp,decoration: BoxDecoration(border: Border.all(color: Colors.white70,width: 1.sp),borderRadius: BorderRadius.circular(10)),): Icon(Icons.check_circle_rounded,size: 15.sp,color: Color(0xff00FFF4),),
+ SizedBox(width: 4.sp,),
+ Text(
+ '同意',
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 11.sp,
+ fontWeight: FontWeight.w600),
+ ),
+ SizedBox(
+ width: 2.sp,
+ ),
+ GestureDetector(
+ onTap: (){
+ navigateToUserAgreement();
+ },
+ child: Text(
+ '《用户协议》',
+ style: TextStyle(
+ color: Color(0xff00FFF4),
+ fontSize: 11.sp,
+ fontWeight: FontWeight.w400,
+ ),
+ ),
+ ),
+ Text(
+ '和',
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 11.sp,
+ fontWeight: FontWeight.w600),
+ ),
+ SizedBox(
+ width: 2.sp,
+ ),
+ GestureDetector(
+ onTap: (){
+ navigateToPrivacyPolicy();
+ },
+ child: Text(
+ '《隐私协议》',
+ style: TextStyle(
+ color: Color(0xff00FFF4),
+ fontSize: 11.sp,
+ fontWeight: FontWeight.w400,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ))
- ],
- );
- }),
- ));
+ ],
+ );
+ }),
+ )),
+ ],
+ );
}
}
diff --git a/circle_app/lib/app/minefragment/logic.dart b/circle_app/lib/app/minefragment/logic.dart
index 869ee2d..5373d2f 100644
--- a/circle_app/lib/app/minefragment/logic.dart
+++ b/circle_app/lib/app/minefragment/logic.dart
@@ -94,7 +94,7 @@ class MinefragmentLogic extends GetxController {
update();
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
diff --git a/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart b/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
index 31e99e6..2159c3e 100644
--- a/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
+++ b/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
@@ -150,7 +150,7 @@ class TIMConversationItem extends TIMUIKitStatelessWidget {
// Alignment(0.52, 0.52)
gradient: LinearGradient(
colors: isPined
- ? [const Color(0xFF4B3E5E), const Color(0xFF334141)]
+ ? [const Color(0x0F4B3E5E), const Color(0xaF334141)]
: [Colors.transparent, Colors.transparent])),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
diff --git a/circle_app/lib/app/my_circle/logic.dart b/circle_app/lib/app/my_circle/logic.dart
index 7660374..1cd6d7a 100644
--- a/circle_app/lib/app/my_circle/logic.dart
+++ b/circle_app/lib/app/my_circle/logic.dart
@@ -59,7 +59,7 @@ class MyCircleLogic extends GetxController {
}
});
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
Circle getCircleIndex() {
diff --git a/circle_app/lib/app/offaccount/logic.dart b/circle_app/lib/app/offaccount/logic.dart
index ee469c5..8f25225 100644
--- a/circle_app/lib/app/offaccount/logic.dart
+++ b/circle_app/lib/app/offaccount/logic.dart
@@ -11,15 +11,15 @@ class OffaccountLogic extends GetxController {
offaccount() async {
if(state.photoController.text==''){
- showToast("请输入手机号");
+ showOKToast("请输入手机号");
return;
}
if(state.photoController.text.length<11){
- showToast("请输入正确手机号");
+ showOKToast("请输入正确手机号");
return;
}
if(state.offReasonMsg=="请选择"){
- showToast("请选择注销原因");
+ showOKToast("请选择注销原因");
return;
}
var data = await DioManager.instance.post(url: Api.offAccount, params: {
@@ -30,7 +30,7 @@ class OffaccountLogic extends GetxController {
if(bean.isSuccess()){
pushLoginPage();
}else{
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
}
diff --git a/circle_app/lib/app/photoinfo/logic.dart b/circle_app/lib/app/photoinfo/logic.dart
index 0ba093d..33b9970 100644
--- a/circle_app/lib/app/photoinfo/logic.dart
+++ b/circle_app/lib/app/photoinfo/logic.dart
@@ -50,7 +50,7 @@ class PhotoinfoLogic extends GetxController {
// var activity = Get.find();
// activity.isVip
var bean = BaseResponse.fromJson(data, (jsonData) => jsonData,);
- showToast(bean.msg);
+ showOKToast(bean.msg);
if(bean.isSuccess()){
final accountLogic = Get.find();
accountLogic.photo = newPhotoController.text.toString();
@@ -79,12 +79,12 @@ class PhotoinfoLogic extends GetxController {
Future getCode() async {
if(!GetUtils.isPhoneNumber(newPhotoController.text)){
- showToast("新手机号输入有误");
+ showOKToast("新手机号输入有误");
return;
}
var data = await DioManager.instance.post(url: Api.sendCode, params: {"phone": newPhotoController.text});
var bean = BaseResponse.fromJson(data, (data) => Data.fromJson(data));
- showToast(bean.msg);
+ showOKToast(bean.msg);
if(kDebugMode){
if(bean.code==200){
codeController.text = bean.data!.code.toString();
diff --git a/circle_app/lib/app/photoinfo/view.dart b/circle_app/lib/app/photoinfo/view.dart
index 8f42288..933caf4 100644
--- a/circle_app/lib/app/photoinfo/view.dart
+++ b/circle_app/lib/app/photoinfo/view.dart
@@ -312,7 +312,7 @@ class PhotoinfoPage extends StatelessWidget {
String newphoto = logic.newPhotoController.text;
String code = logic.codeController.text;
if (photo == "" || photo.length < 11) {
- showToast("已绑定的手机号输入有误");
+ showOKToast("已绑定的手机号输入有误");
return;
}
// if(password==""){
@@ -320,11 +320,11 @@ class PhotoinfoPage extends StatelessWidget {
// return ;
// }
if (newphoto == "" || newphoto.length < 11) {
- showToast("新手机号输入有误");
+ showOKToast("新手机号输入有误");
return;
}
if (code == "") {
- showToast("请输入验证码");
+ showOKToast("请输入验证码");
return;
}
logic.bindingPhoto();
diff --git a/circle_app/lib/app/privacy/view.dart b/circle_app/lib/app/privacy/view.dart
index 7da4877..26e2361 100644
--- a/circle_app/lib/app/privacy/view.dart
+++ b/circle_app/lib/app/privacy/view.dart
@@ -83,7 +83,7 @@ class PrivacyPage extends StatelessWidget {
logic.update();
}else{
showRechargeDialog();
- showToast("请先升级vip");
+ showOKToast("请先升级vip");
}
},
diff --git a/circle_app/lib/app/report/logic.dart b/circle_app/lib/app/report/logic.dart
index e6f7dbf..6970232 100644
--- a/circle_app/lib/app/report/logic.dart
+++ b/circle_app/lib/app/report/logic.dart
@@ -33,7 +33,7 @@ class ReportLogic extends GetxController {
onSubmit()async{
if(myPosition== -1){
- showToast("请选择举报类目");
+ showOKToast("请选择举报类目");
return;
}
List myBean = [];
@@ -54,7 +54,7 @@ class ReportLogic extends GetxController {
if(bean.isSuccess()){
Get.back();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
final ImagePicker _picker = ImagePicker();
diff --git a/circle_app/lib/app/select_circle/view.dart b/circle_app/lib/app/select_circle/view.dart
index c093912..7f87c66 100644
--- a/circle_app/lib/app/select_circle/view.dart
+++ b/circle_app/lib/app/select_circle/view.dart
@@ -41,7 +41,7 @@ class Select_circlePage extends StatelessWidget {
if (numbers.length > 0) {
Navigator.pop(context, numbers);
} else {
- showToast("请选择兴趣圈子");
+ showOKToast("请选择兴趣圈子");
}
},
),
diff --git a/circle_app/lib/app/signal_circle_list/logic.dart b/circle_app/lib/app/signal_circle_list/logic.dart
index 9e79331..e4cf8e1 100644
--- a/circle_app/lib/app/signal_circle_list/logic.dart
+++ b/circle_app/lib/app/signal_circle_list/logic.dart
@@ -38,7 +38,7 @@ class Signal_circle_listLogic extends GetxController {
update();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
diff --git a/circle_app/lib/app/splash/logic.dart b/circle_app/lib/app/splash/logic.dart
index 211a234..66b02fd 100644
--- a/circle_app/lib/app/splash/logic.dart
+++ b/circle_app/lib/app/splash/logic.dart
@@ -51,7 +51,7 @@ class SplashLogic extends GetxController {
pushLoginPage();
return;
}
- showToast(bean.msg.toString());
+ showOKToast(bean.msg.toString());
if (bean.code == 500) {
await Future.delayed(Duration(seconds: 5));
onInit();
diff --git a/circle_app/lib/app/text/view.dart b/circle_app/lib/app/text/view.dart
index 0b87d9a..7ee6bda 100644
--- a/circle_app/lib/app/text/view.dart
+++ b/circle_app/lib/app/text/view.dart
@@ -328,7 +328,7 @@ class _MyTabbedScreenState extends State
),
GestureDetector(
onTap: () {
- showToast("喜欢");
+ showOKToast("喜欢");
},
child: Container(
decoration: BoxDecoration(
@@ -355,7 +355,7 @@ class _MyTabbedScreenState extends State
),
GestureDetector(
onTap: () {
- showToast("私聊");
+ showOKToast("私聊");
},
child: Container(
decoration: BoxDecoration(
@@ -723,7 +723,7 @@ class _MyTabbedScreenState extends State
borderRadius: BorderRadius.circular(0.0),
child: GestureDetector(
onTap: () {
- showToast("点击了图片");
+ showOKToast("点击了图片");
},
child: Image.network(
url,
@@ -736,7 +736,7 @@ class _MyTabbedScreenState extends State
right: 0,
child: GestureDetector(
onTap: () {
- showToast("删除");
+ showOKToast("删除");
},
child: Image(
image: AssetImage(getMineImage("icon_img_del")),
diff --git a/circle_app/lib/app/userinfo/logic.dart b/circle_app/lib/app/userinfo/logic.dart
index a72e623..4ada9c5 100644
--- a/circle_app/lib/app/userinfo/logic.dart
+++ b/circle_app/lib/app/userinfo/logic.dart
@@ -108,7 +108,7 @@ class UserinfoLogic extends GetxController {
isBlackBeen = bean.data.isBlock;
isDestroy = bean.data.isDestroy;
if(isBlackBeen){
- showToast("您已被对方拉黑");
+ showOKToast("您已被对方拉黑");
}
}
onLineCity = isOnline ? "在线" : "离线";
@@ -122,7 +122,7 @@ class UserinfoLogic extends GetxController {
} else if (bean.code == 9999) {
showBlackDialog(Get.context!);
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
update();
}
@@ -160,11 +160,11 @@ class UserinfoLogic extends GetxController {
.post(url: "${Api.urgeAlbum + userId}/urge/album");
var bean = BaseResponse.fromJson(data, (data) => data);
if (bean.isSuccess()) {
- showToast("催更成功");
+ showOKToast("催更成功");
isUrgeStatus = true;
update();
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
@@ -181,7 +181,7 @@ class UserinfoLogic extends GetxController {
setLike() async {
if(isBlack||isDestroy){
- showToast("喜欢失败,存在拉黑关系或者该账户已注销");
+ showOKToast("喜欢失败,存在拉黑关系或者该账户已注销");
return;
}
@@ -196,13 +196,13 @@ class UserinfoLogic extends GetxController {
isLike = !isLike;
update();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
setBlock(String status) async {
List parts = imId.split('_');
if (parts[2] == "10") {
- showToast("不可拉黑客服号哦~");
+ showOKToast("不可拉黑客服号哦~");
return;
}
var data = await DioManager.instance.post(
@@ -235,7 +235,7 @@ class UserinfoLogic extends GetxController {
update();
}
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
Future getImageFile() async {
diff --git a/circle_app/lib/app/userinfo/view.dart b/circle_app/lib/app/userinfo/view.dart
index b42a18b..45aee89 100644
--- a/circle_app/lib/app/userinfo/view.dart
+++ b/circle_app/lib/app/userinfo/view.dart
@@ -172,7 +172,7 @@ class MyTabbedScreenState extends State
final chatButton = GestureDetector(
onTap: () {
if(logic.isBlack||logic.isDestroy||logic.isBlackBeen){
- showToast("私聊失败，存在拉黑关系或者该账户已注销");
+ showOKToast("私聊失败，存在拉黑关系或者该账户已注销");
return;
}
diff --git a/circle_app/lib/app/userinfo/widgets/home_call_out_logic.dart b/circle_app/lib/app/userinfo/widgets/home_call_out_logic.dart
index 88e356e..2ed935c 100644
--- a/circle_app/lib/app/userinfo/widgets/home_call_out_logic.dart
+++ b/circle_app/lib/app/userinfo/widgets/home_call_out_logic.dart
@@ -37,7 +37,7 @@ class HomeCallOutLogic extends GetxController {
callOutMore = dataList.length == 20;
update();
} else {
- showToast(data["msg"]);
+ showOKToast(data["msg"]);
}
}
@@ -71,11 +71,11 @@ class HomeCallOutLogic extends GetxController {
var data = await DioManager.instance.delete(
url: "/up-service/callout/${callOutId}",);
if (data['code'] == 200) {
- showToast('删除成功');
+ showOKToast('删除成功');
lists.removeAt(index);
update();
} else {
- showToast('操作失败');
+ showOKToast('操作失败');
}
}
}
\ No newline at end of file
diff --git a/circle_app/lib/common/Widgets/base_tip_widget.dart b/circle_app/lib/common/Widgets/base_tip_widget.dart
index 9035fcf..a1a6671 100644
--- a/circle_app/lib/common/Widgets/base_tip_widget.dart
+++ b/circle_app/lib/common/Widgets/base_tip_widget.dart
@@ -229,7 +229,7 @@ unlockingPayment(String cicleId, MyCallback myCallback) async {
});
// showToast(data.toString());
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
} else {
var data = await DioManager.instance
@@ -245,7 +245,7 @@ unlockingPayment(String cicleId, MyCallback myCallback) async {
}
});
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
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 fdfd89f..09ff83c 100644
--- a/circle_app/lib/common/Widgets/open_vip_tip/logic.dart
+++ b/circle_app/lib/common/Widgets/open_vip_tip/logic.dart
@@ -66,7 +66,7 @@ class Open_vip_tipLogic extends GetxController {
}
});
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
} else {
var data = await DioManager.instance.post(
@@ -84,7 +84,7 @@ class Open_vip_tipLogic extends GetxController {
}
});
} else {
- showToast(bean.msg);
+ showOKToast(bean.msg);
}
}
SmartDialog.dismiss();
diff --git a/circle_app/lib/common/Widgets/open_vip_tip/view.dart b/circle_app/lib/common/Widgets/open_vip_tip/view.dart
index faad932..910f4bf 100644
--- a/circle_app/lib/common/Widgets/open_vip_tip/view.dart
+++ b/circle_app/lib/common/Widgets/open_vip_tip/view.dart
@@ -280,7 +280,7 @@ class Open_vip_tipPage extends StatelessWidget {
controller.index = index;
controller.update();
}else{
- showToast("只有年会员才可使用至尊喊话哦~");
+ showOKToast("只有年会员才可使用至尊喊话哦~");
}
},
diff --git a/circle_app/lib/main.dart b/circle_app/lib/main.dart
index ca6c0dd..0c3b631 100644
--- a/circle_app/lib/main.dart
+++ b/circle_app/lib/main.dart
@@ -16,6 +16,7 @@ import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
+import 'package:oktoast/oktoast.dart';
import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart';
import 'package:tencent_cloud_chat_uikit/data_services/core/core_services.dart';
import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart';
@@ -259,7 +260,7 @@ class _MyAppState extends State {
FlutterNativeSplash.remove();
return;
}
- showToast(bean.msg.toString());
+ showOKToast(bean.msg.toString());
if (bean.code == 500) {
await Future.delayed(const Duration(seconds: 5));
getLoginStyle();
@@ -279,12 +280,12 @@ class _MyAppState extends State {
switch (callbackValue.type) {
case TIMCallbackType.INFO:
// Shows the recommend text for info callback directly
- showToast(callbackValue.infoRecommendText!);
+ showOKToast(callbackValue.infoRecommendText!);
break;
case TIMCallbackType.API_ERROR:
//Prints the API error to console, and shows the error message.
if(callbackValue.errorCode==20007){
- showToast("您已被对方拉黑，换个人聊聊天吧~");
+ showOKToast("您已被对方拉黑，换个人聊聊天吧~");
return;
}
if(callbackValue.errorCode==6015){
@@ -294,7 +295,7 @@ class _MyAppState extends State {
"Error from TUIKit: ${callbackValue.errorMsg}, Code: ${callbackValue.errorCode}");
if (callbackValue.errorCode == 10004 &&
callbackValue.errorMsg!.contains("not support @all")) {
- showToast("当前群组不支持@全体成员");
+ showOKToast("当前群组不支持@全体成员");
} else {
// showToast(callbackValue.errorMsg ??
// callbackValue.errorCode.toString());
@@ -338,14 +339,22 @@ class _MyAppState extends State {
minTextAdapt: true,
splitScreenMode: true,
builder: (context, child) {
- return GetMaterialApp(
+ return OKToast(
+ // 2-A: wrap your app with OKToast
+ textStyle: const TextStyle(fontSize: 19.0, color: Colors.white),
+ backgroundColor: Colors.grey,
+ animationCurve: Curves.easeIn,
+ // animationBuilder: const Miui10AnimBuilder(),
+ animationDuration: const Duration(milliseconds: 200),
+ duration: const Duration(seconds: 2),
+ child: GetMaterialApp(
title: '微乐园',
initialBinding: SplashBinding(),
getPages: AppPages.routes,
home: SplashPage(),
builder: FlutterSmartDialog.init(),
debugShowCheckedModeBanner: false,
- );
+ ));
});
}
diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart
index 0612d96..c9d186e 100644
--- a/circle_app/lib/network/dio_manager.dart
+++ b/circle_app/lib/network/dio_manager.dart
@@ -323,7 +323,7 @@ class ConnectivityInterceptor extends Interceptor {
Future onRequest(
RequestOptions options, RequestInterceptorHandler handler) async {
if (!await isInternetAvailable()) {
- showToast("请检查网络连接是否正常");
+ showOKToast("请检查网络连接是否正常");
}
return handler.next(options);
}
diff --git a/circle_app/lib/util/CacheUtil.dart b/circle_app/lib/util/CacheUtil.dart
index 273bb97..39d8ddf 100644
--- a/circle_app/lib/util/CacheUtil.dart
+++ b/circle_app/lib/util/CacheUtil.dart
@@ -121,7 +121,7 @@ class CacheUtil {
if (value.toInt() <= 0&&totalSize<=0) {
- showToast("暂无缓存");
+ showOKToast("暂无缓存");
// Get.back();
} else if (value >= 0) {
@@ -147,7 +147,7 @@ class CacheUtil {
await loadCache();
SmartDialog.dismiss();
- showToast("清理缓存成功");
+ showOKToast("清理缓存成功");
callback("0KB");
});
return "正在清理中···";
@@ -155,7 +155,7 @@ class CacheUtil {
} catch (e) {
print(e);
SmartDialog.dismiss();
- showToast("清除缓存失败");
+ showOKToast("清除缓存失败");
}
}
diff --git a/circle_app/lib/util/PaymentUtils.dart b/circle_app/lib/util/PaymentUtils.dart
index 58e7aad..bdd912d 100644
--- a/circle_app/lib/util/PaymentUtils.dart
+++ b/circle_app/lib/util/PaymentUtils.dart
@@ -24,7 +24,7 @@ Future openWxPay(PaymentData data, WxPayCallback callback) async {
// 是否安装微信
bool isInstalled = await fluwx.isWeChatInstalled;
if (!isInstalled) {
- showToast("请先安装微信");
+ showOKToast("请先安装微信");
callback(false, "请先安装微信");
return;
}
@@ -43,11 +43,11 @@ Future openWxPay(PaymentData data, WxPayCallback callback) async {
// 监听微信回调
fluwx.weChatResponseEventHandler.listen((event) {
if (event.isSuccessful) {
- showToast("微信支付成功");
+ showOKToast("微信支付成功");
callback(true, null);
} else {
print(event.errStr);
- showToast(event.errStr ?? "微信支付失败");
+ showOKToast(event.errStr ?? "微信支付失败");
callback(false, event.errStr);
}
});
@@ -69,19 +69,19 @@ void _listenPay(AlipayResp resp) {
} else {
switch(resp.resultStatus){
case 8000:
- showToast("正在处理中");
+ showOKToast("正在处理中");
break;
case 4000:
- showToast("订单支付失败");
+ showOKToast("订单支付失败");
break;
case 5000:
- showToast("重复请求");
+ showOKToast("重复请求");
break;
case 6001:
- showToast("支付已取消");
+ showOKToast("支付已取消");
break;
case 6002:
- showToast("网络连接出错");
+ showOKToast("网络连接出错");
break;
}
callback(false, resp.result);
@@ -96,7 +96,7 @@ openAliPay(String payUrl, WxPayCallback myCallback) async {
callback = myCallback;
bool isInstalled = await AlipayKitPlatform.instance.isInstalled();
if (!isInstalled) {
- showToast("请先安装支付宝");
+ showOKToast("请先安装支付宝");
return;
}
if (null == _paySubs) {
diff --git a/circle_app/lib/util/qiniu.dart b/circle_app/lib/util/qiniu.dart
index c54dad1..e5c84a2 100644
--- a/circle_app/lib/util/qiniu.dart
+++ b/circle_app/lib/util/qiniu.dart
@@ -62,7 +62,7 @@ void uploadImage(String quToken ,XFile pickedFile,String updataRoute,MyCallback
if(bean.isSuccess()){
quToken = bean.data!.token.toString();
}else{
- showToast("图片上传失败");
+ showOKToast("图片上传失败");
SmartDialog.dismiss(force: true);
return;
}
@@ -83,7 +83,7 @@ void uploadImage(String quToken ,XFile pickedFile,String updataRoute,MyCallback
});
}).catchError((error) {
print(error);
- showToast("图片上传失败");
+ showOKToast("图片上传失败");
SmartDialog.dismiss(force: true);
});
}else{
diff --git a/circle_app/lib/util/util.dart b/circle_app/lib/util/util.dart
index fb58cec..4ff15ef 100644
--- a/circle_app/lib/util/util.dart
+++ b/circle_app/lib/util/util.dart
@@ -6,8 +6,8 @@ import 'package:circle_app/main.dart';
import 'package:circle_app/router/app_routers.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:fluttertoast/fluttertoast.dart';
import 'package:get/get.dart';
+import 'package:oktoast/oktoast.dart';
import 'package:path_provider/path_provider.dart';
import 'package:video_compress/video_compress.dart';
@@ -50,15 +50,23 @@ String getCircleImage(String image) {
}
///弹窗文本提示 msg: 提示内容
-showToast(String msg) {
- Fluttertoast.showToast(
- msg: msg,
- toastLength: Toast.LENGTH_SHORT,
- gravity: ToastGravity.CENTER,
- timeInSecForIosWeb: 1,
- backgroundColor: Colors.black54,
- textColor: Colors.white,
- fontSize: 16.0);
+showOKToast(String msg) {
+ showToast(
+ msg,
+ position: ToastPosition.center,
+ backgroundColor: Colors.black.withOpacity(0.8),
+ radius: 13.0,
+ textStyle: const TextStyle(fontSize: 16.0),
+ // animationBuilder: const Miui10AnimBuilder(),
+ );
+ // Fluttertoast.showToast(
+ // msg: msg,
+ // toastLength: Toast.LENGTH_SHORT,
+ // gravity: ToastGravity.CENTER,
+ // timeInSecForIosWeb: 1,
+ // backgroundColor: Colors.black54,
+ // textColor: Colors.white,
+ // fontSize: 16.0);
}
loaddingWidget(bool isMore) {
diff --git a/circle_app/lib/view/ExitAppConfirmation.dart b/circle_app/lib/view/ExitAppConfirmation.dart
index f01c3ab..e8c2800 100644
--- a/circle_app/lib/view/ExitAppConfirmation.dart
+++ b/circle_app/lib/view/ExitAppConfirmation.dart
@@ -32,7 +32,7 @@ class _ExitAppConfirmationState extends State {
// ScaffoldMessenger.of(context).showSnackBar(
// const SnackBar(content: Text('再按一次返回键退出应用')),
// );
- showToast("再按一次返回键退出应用");
+ showOKToast("再按一次返回键退出应用");
return Future.value(false);
}
return Future.value(true);
diff --git a/circle_app/pubspec.yaml b/circle_app/pubspec.yaml
index 15285d5..6d08e91 100644
--- a/circle_app/pubspec.yaml
+++ b/circle_app/pubspec.yaml
@@ -41,7 +41,7 @@ dependencies:
# 相册库
image_picker: ^0.8.6
# Toast弹窗
- fluttertoast: ^8.1.0
+ oktoast: ^3.3.1
# 清除缓存
flutter_cache_manager: ^3.2.0
# 跳转web
@@ -93,7 +93,7 @@ dependencies:
#event_bus:
event_bus: ^2.0.0
#安装apk
- flutter_install_app: 1.3.0
+# flutter_install_app: 1.3.0
#闪屏页
flutter_native_splash: 2.2.16
#腾讯离线推送