xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更换Toast第三方，修改表单bug

Browse Source
This commit is contained in:
CYH 2023-08-10 12:23:28 +03:00
parent 59c0969691
commit 613660f1ce
46 changed files with 483 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
circle_app/ios/Runner.xcodeproj/project.pbxproj
View File

@ -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;

5
circle_app/ios/Runner/Runner.entitlements
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
</dict>
<dict/>
</plist>

2
circle_app/lib/app/blacklist/logic.dart
View File

@ -55,7 +55,7 @@ class BlacklistLogic extends GetxController {
initList();
update();
}
showToast(bean.msg);
showOKToast(bean.msg);
}
}

28
circle_app/lib/app/call_out/logic.dart
View File

@ -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<List<String>>.fromJson(
data,
(jsonData) => List<String>.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) {}

2
circle_app/lib/app/call_out/view.dart
View File

@ -181,7 +181,7 @@ class Call_outPage extends StatelessWidget {
controller.isCheck = !controller.isCheck;
controller.update();
}else{
showToast("至尊喊话为年会员特权，开通年会员即可享受哦~");
showOKToast("至尊喊话为年会员特权，开通年会员即可享受哦~");
controller.showRechargeDialog();
}

8
circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
View File

@ -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('请输入消息内容');
}
}

51
circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
View File

@ -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<TUISettingModel>();
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<MineResponseBean>.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,

2
circle_app/lib/app/chat/view.dart
View File

@ -124,7 +124,7 @@ class _ChatPageState extends State<ChatPage> {
],
),
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);

4
circle_app/lib/app/circle/logic.dart
View File

@ -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']);
}
}

28
circle_app/lib/app/circle/widgets/info_list_view.dart
View File

@ -51,7 +51,7 @@ class _InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClie
void dispose() {
// TODO: implement dispose
super.dispose();
widget.scrollController.dispose();
// widget.scrollController.dispose();
}
@ -97,7 +97,7 @@ class _InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClie
setState(() {});
}
} else {
showToast(data["msg"]);
showOKToast(data["msg"]);
}
}
@ -169,7 +169,7 @@ class _InfoListViewState extends State<InfoListView> 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<InfoListView> 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<InfoListView> 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<InfoListView> 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,
),
)),
],
),
),

2
circle_app/lib/app/circle/widgets/list_logic.dart
View File

@ -39,7 +39,7 @@ class ListLogic extends GetxController {
callOutMore = dataList.length == 20;
update();
} else {
showToast(data["msg"]);
showOKToast(data["msg"]);
}
}

1
circle_app/lib/app/dialog/BaseDialog.dart
View File

@ -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';

4
circle_app/lib/app/dialog/UnlockCallDialog.dart
View File

@ -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();

2
circle_app/lib/app/feedback/logic.dart
View File

@ -68,7 +68,7 @@ class FeedbackLogic extends GetxController {
'type':1
});
var bean = BaseResponse<dynamic>.fromJson(data, (jsonData) => jsonData,);
showToast(bean.msg);
showOKToast(bean.msg);
if(bean.isSuccess()){
Get.back();
}

2
circle_app/lib/app/friendslist/logic.dart
View File

@ -56,7 +56,7 @@ class FriendslistLogic extends GetxController {
lists[index].isLike = !lists[index].isLike;
update();
}
showToast(bean.msg);
showOKToast(bean.msg);
}
}

2
circle_app/lib/app/likelist/logic.dart
View File

@ -65,7 +65,7 @@ class LikelistLogic extends GetxController {
lists[index].isLike = !lists[index].isLike;
update();
}
showToast(bean.msg);
showOKToast(bean.msg);
}
}

52
circle_app/lib/app/login/complete_material/logic.dart
View File

@ -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);
}
}

10
circle_app/lib/app/login/login/logic.dart
View File

@ -60,7 +60,7 @@ class LoginLogic extends GetxController {
var data = await DioManager.instance.post(
url: Api.sendCode, params: {"phone": phoneEditingController.text});
var bean = BaseResponse<Data>.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 {

22
circle_app/lib/app/login/login/view.dart
View File

@ -18,8 +18,17 @@ class LoginPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
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();
@ -28,12 +37,7 @@ class LoginPage extends StatelessWidget {
return Stack(
alignment: Alignment.center,
children: [
Image.asset(
getBaseImage('bg'),
fit: BoxFit.fill,
width: Get.width,
height: Get.height,
),
Positioned(
left: 0,
right: 0,
@ -284,6 +288,8 @@ class LoginPage extends StatelessWidget {
],
);
}),
));
)),
],
);
}
}

2
circle_app/lib/app/minefragment/logic.dart
View File

@ -94,7 +94,7 @@ class MinefragmentLogic extends GetxController {
update();
} else {
showToast(bean.msg);
showOKToast(bean.msg);
}
}

2
circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
View File

@ -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,

2
circle_app/lib/app/my_circle/logic.dart
View File

@ -59,7 +59,7 @@ class MyCircleLogic extends GetxController {
}
});
}
showToast(bean.msg);
showOKToast(bean.msg);
}
Circle getCircleIndex() {

8
circle_app/lib/app/offaccount/logic.dart
View File

@ -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);
}
}
}

6
circle_app/lib/app/photoinfo/logic.dart
View File

@ -50,7 +50,7 @@ class PhotoinfoLogic extends GetxController {
// var activity = Get.find<MinefragmentLogic>();
// activity.isVip
var bean = BaseResponse<dynamic>.fromJson(data, (jsonData) => jsonData,);
showToast(bean.msg);
showOKToast(bean.msg);
if(bean.isSuccess()){
final accountLogic = Get.find<AccountLogic>();
accountLogic.photo = newPhotoController.text.toString();
@ -79,12 +79,12 @@ class PhotoinfoLogic extends GetxController {
Future<void> 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<Data>.fromJson(data, (data) => Data.fromJson(data));
showToast(bean.msg);
showOKToast(bean.msg);
if(kDebugMode){
if(bean.code==200){
codeController.text = bean.data!.code.toString();

6
circle_app/lib/app/photoinfo/view.dart
View File

@ -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();

2
circle_app/lib/app/privacy/view.dart
View File

@ -83,7 +83,7 @@ class PrivacyPage extends StatelessWidget {
logic.update();
}else{
showRechargeDialog();
showToast("请先升级vip");
showOKToast("请先升级vip");
}
},

4
circle_app/lib/app/report/logic.dart
View File

@ -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();

2
circle_app/lib/app/select_circle/view.dart
View File

@ -41,7 +41,7 @@ class Select_circlePage extends StatelessWidget {
if (numbers.length > 0) {
Navigator.pop(context, numbers);
} else {
showToast("请选择兴趣圈子");
showOKToast("请选择兴趣圈子");
}
},
),

2
circle_app/lib/app/signal_circle_list/logic.dart
View File

@ -38,7 +38,7 @@ class Signal_circle_listLogic extends GetxController {
update();
}
showToast(bean.msg);
showOKToast(bean.msg);
}
}

2
circle_app/lib/app/splash/logic.dart
View File

@ -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();

8
circle_app/lib/app/text/view.dart
View File

@ -328,7 +328,7 @@ class _MyTabbedScreenState extends State<TextPage>
),
GestureDetector(
onTap: () {
showToast("喜欢");
showOKToast("喜欢");
},
child: Container(
decoration: BoxDecoration(
@ -355,7 +355,7 @@ class _MyTabbedScreenState extends State<TextPage>
),
GestureDetector(
onTap: () {
showToast("私聊");
showOKToast("私聊");
},
child: Container(
decoration: BoxDecoration(
@ -723,7 +723,7 @@ class _MyTabbedScreenState extends State<TextPage>
borderRadius: BorderRadius.circular(0.0),
child: GestureDetector(
onTap: () {
showToast("点击了图片");
showOKToast("点击了图片");
},
child: Image.network(
url,
@ -736,7 +736,7 @@ class _MyTabbedScreenState extends State<TextPage>
right: 0,
child: GestureDetector(
onTap: () {
showToast("删除");
showOKToast("删除");
},
child: Image(
image: AssetImage(getMineImage("icon_img_del")),

16
circle_app/lib/app/userinfo/logic.dart
View File

@ -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<String>.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<String> 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 {

2
circle_app/lib/app/userinfo/view.dart
View File

@ -172,7 +172,7 @@ class MyTabbedScreenState extends State<UserinfoPage>
final chatButton = GestureDetector(
onTap: () {
if(logic.isBlack||logic.isDestroy||logic.isBlackBeen){
showToast("私聊失败，存在拉黑关系或者该账户已注销");
showOKToast("私聊失败，存在拉黑关系或者该账户已注销");
return;
}

6
circle_app/lib/app/userinfo/widgets/home_call_out_logic.dart
View File

@ -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('操作失败');
}
}
}

4
circle_app/lib/common/Widgets/base_tip_widget.dart
View File

@ -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);
}
}

4
circle_app/lib/common/Widgets/open_vip_tip/logic.dart
View File

@ -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();

2
circle_app/lib/common/Widgets/open_vip_tip/view.dart
View File

@ -280,7 +280,7 @@ class Open_vip_tipPage extends StatelessWidget {
controller.index = index;
controller.update();
}else{
showToast("只有年会员才可使用至尊喊话哦~");
showOKToast("只有年会员才可使用至尊喊话哦~");
}
},

21
circle_app/lib/main.dart
View File

@ -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<MyApp> {
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<MyApp> {
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<MyApp> {
"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<MyApp> {
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,
);
));
});
}

2
circle_app/lib/network/dio_manager.dart
View File

@ -323,7 +323,7 @@ class ConnectivityInterceptor extends Interceptor {
Future<void> onRequest(
RequestOptions options, RequestInterceptorHandler handler) async {
if (!await isInternetAvailable()) {
showToast("请检查网络连接是否正常");
showOKToast("请检查网络连接是否正常");
}
return handler.next(options);
}

6
circle_app/lib/util/CacheUtil.dart
View File

@ -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("清除缓存失败");
}
}

18
circle_app/lib/util/PaymentUtils.dart
View File

@ -24,7 +24,7 @@ Future<void> openWxPay(PaymentData data, WxPayCallback callback) async {
// 是否安装微信
bool isInstalled = await fluwx.isWeChatInstalled;
if (!isInstalled) {
showToast("请先安装微信");
showOKToast("请先安装微信");
callback(false, "请先安装微信");
return;
}
@ -43,11 +43,11 @@ Future<void> 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) {

4
circle_app/lib/util/qiniu.dart
View File

@ -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{

28
circle_app/lib/util/util.dart
View File

@ -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) {

2
circle_app/lib/view/ExitAppConfirmation.dart
View File

@ -32,7 +32,7 @@ class _ExitAppConfirmationState extends State<ExitAppConfirmation> {
// ScaffoldMessenger.of(context).showSnackBar(
// const SnackBar(content: Text('再按一次返回键退出应用')),
// );
showToast("再按一次返回键退出应用");
showOKToast("再按一次返回键退出应用");
return Future.value(false);
}
return Future.value(true);

4
circle_app/pubspec.yaml
View File

@ -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
#腾讯离线推送