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

完善一些需求

Browse Source
This commit is contained in:
YangYuhao 2023-07-18 14:12:27 +08:00
parent 66740977ab
commit 46831e4b2a
15 changed files with 168 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
circle_app/android/app/build.gradle
View File

@ -43,10 +43,7 @@ android {
}
signingConfigs {
// ndk {
// abiFilters 'armeabi-v7a','arm64-v8a'
// ldLibs "log"
// }
debug {
storeFile file('../leyuan.jks')
storePassword 'leyuan'
@ -69,16 +66,21 @@ android {
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
ldLibs "log"
}
}
buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
//flutter build apk --no-sound-null-safety
signingConfig signingConfigs.debug
project.ext.enableFlutterNullSafety = false
}
debug{
debug {
project.ext.enableFlutterNullSafety = false
}
}

BIN
circle_app/assets/images/home/icon_vip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 KiB

After

Width:  |  Height:  |  Size: 407 KiB

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

@ -18,6 +18,7 @@ import '../../network/dio_manager.dart';
import '../../router/app_routers.dart';
import '../../util/SharedPreferencesHelper.dart';
import '../../util/qiniu.dart';
import '../circle/logic.dart';
import '../select_circle/logic.dart';
import 'state.dart';
import '../../common/config.dart';
@ -50,9 +51,11 @@ class Call_outLogic extends GetxController {
circleName = numbers[0].name;
SharedPreferencesHelper.getInstance().then((sharedPreferences) {
vip = sharedPreferences.getInt(SharedPreferencesHelper.VIP);
print(vip);
if (vip == 2) {
isCheck = true;
}
update();
});
update();
@ -127,6 +130,7 @@ class Call_outLogic extends GetxController {
myBean.add(MyBean(type: 2, url: state.videolist[0]).toJson());
}
print(myBean.toString());
SmartDialog.showLoading();
var data = await DioManager.instance.post(url: Api.SendShout, params: {
'album': myBean,
'content': textEditingController.text.trim(),
@ -138,9 +142,11 @@ class Call_outLogic extends GetxController {
data,
(jsonData) => jsonData,
);
SmartDialog.dismiss();
if (beandata.isSuccess()) {
showToast(beandata.msg);
final logic = Get.put(CircleLogic());
logic.refresh();
// Navigator.pop(Get.context!, numbers);
Get.back();
} else if (beandata.code == 30503) {

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

@ -181,10 +181,12 @@ class Call_outPage extends StatelessWidget {
controller.isCheck = !controller.isCheck;
controller.update();
}else{
showToast("至尊喊话为年会员特权，开通年会员即可享受哦~");
controller.showRechargeDialog();
}
},
child: Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
@ -207,6 +209,7 @@ class Call_outPage extends StatelessWidget {
),
),
),
),
GestureDetector(
child: Text(
'内容规范',

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

@ -182,9 +182,6 @@ class _InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClie
@override
Widget build(BuildContext context) {
List<JoinUser> urlList = widget.bean.lastJoinUsers;
List<Widget> widgets = [];
int i = 0;
@ -589,7 +586,7 @@ class _InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClie
String myUserId = sp.getMyUserId();
if(lists.user?.id!.toString() == myUserId){
Get.toNamed(AppRoutes.UserInfoActivity, arguments: {});
Get.toNamed(AppRoutes.UserInfoActivity);
return;
}
if (widget.bean.is_limit) {
@ -612,7 +609,7 @@ class _InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClie
lists.user!.avatar!,
width: 40.sp,
height: 40.sp,
fit: BoxFit.fill,
fit: BoxFit.cover,
),
)
],
@ -884,7 +881,7 @@ class _InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClie
var sp = await SharedPreferencesHelper.getInstance();
String myUserId = sp.getMyUserId();
if(lists.user?.id!.toString() == myUserId){
Get.toNamed(AppRoutes.UserInfoActivity, arguments: "");
Get.toNamed(AppRoutes.UserInfoActivity);
return;
}
if (widget.bean.is_limit&&widget.bean.amount > 0) {

3
circle_app/lib/app/login/complete_material/view.dart
View File

@ -10,7 +10,6 @@ import 'package:flutter_pickers/time_picker/model/date_mode.dart';
import 'package:flutter_pickers/time_picker/model/pduration.dart';
import 'package:flutter_pickers/time_picker/model/suffix.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'logic.dart';
@ -35,7 +34,7 @@ class Complete_materialPage extends StatelessWidget {
),
),
Scaffold(
appBar: MyAppBar(
appBar: const MyAppBar(
centerTitle: '完善您的个人形象',
isBack: true,
),

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

@ -28,6 +28,7 @@ class MinefragmentLogic extends GetxController {
String enterHomeInfoMsg = "进入主页";
String joinedCircle = "";
String vipMsg = "九大专属特权等你领取";
@override
void onInit() async {

11
circle_app/lib/app/minefragment/view.dart
View File

@ -51,12 +51,17 @@ class MinefragmentPage extends StatelessWidget {
GestureDetector(
onTap: () {
showRechargeDialog();
},
child: Image(
child: Stack(children: [
Image(
image: AssetImage(getHomeImage("icon_vip")),
fit: BoxFit.fill,
),
Positioned(
top: 54.sp,
left: 71.3.sp,
child: Text(logic.vipMsg,style: TextStyle(color: const Color(0x99FFFFFF),fontSize: 12.sp),))
],),
),
_circleLiveView(logic),
],
@ -365,7 +370,7 @@ class MinefragmentPage extends StatelessWidget {
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () async{
await Get.toNamed(AppRoutes.UserInfoActivity, arguments: "");
await Get.toNamed(AppRoutes.UserInfoActivity);
logic.onInit();
},
child: SizedBox(

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

@ -31,7 +31,7 @@ class _SwiperPageState extends State<SwiperPage> {
controller: logic.swiperController,
index:logic.index,
itemBuilder: (BuildContext context, int index) {
return Container(
return SizedBox(
width: double.infinity,
child: Image.network(
logic.imgList[index], fit: BoxFit.contain,)

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

@ -7,7 +7,7 @@ import 'package:get/get_core/src/get_main.dart';
import 'package:get/get_state_manager/src/simple/get_state.dart';
import '../../components/my_app_bar.dart';
//TODO 上线前再删
class TextPage extends StatefulWidget {
@override
State<TextPage> createState() => _MyTabbedScreenState();

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

@ -141,6 +141,8 @@ class UserinfoLogic extends GetxController {
showToast("催更成功");
isUrgeStatus = true;
update();
}else {
showToast(bean.msg);
}
}

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

@ -410,11 +410,13 @@ class _MyTabbedScreenState extends State<UserinfoPage>
),
itemCount: controller.isMe
? controller.isEdit
? controller.state.imaglist.length<15
? controller.state.imaglist.length + 1
:controller.state.imaglist.length
: controller.state.imaglist.length
: controller.state.imaglist.length,
itemBuilder: (BuildContext context, int index) {
if (controller.isMe && controller.isEdit) {
if (controller.isMe && controller.isEdit&&controller.state.imaglist.length<15) {
if (index == 0) {
return GestureDetector(
onTap: () {

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

@ -1,5 +1,4 @@
import 'dart:io';
import 'dart:math';
import 'package:circle_app/util/util.dart';
import 'package:flutter/material.dart';
@ -65,7 +64,7 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
child: Text(
'为打造纯净的社交环境，更好地服务大家，基于以下几方面考虑:1、平台升级为全天24小时人工审核，保证用户真实，避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈的;3、谢绝只会白嫖的猎奇人士。',
style: TextStyle(
color: Color.fromRGBO(247, 250, 250, 0.8),
color: const Color.fromRGBO(247, 250, 250, 0.8),
fontSize: 12.sp)),
)),
Platform.isIOS
@ -102,7 +101,7 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
Text(
'支付宝支付',
style: TextStyle(
color: Color(0xFFF7FAFA),
color: const Color(0xFFF7FAFA),
fontSize: 14.0.sp,
),
),
@ -141,7 +140,7 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
Text(
'微信支付',
style: TextStyle(
color: Color(0xFFF7FAFA),
color: const Color(0xFFF7FAFA),
fontSize: 14.0.sp,
),
),
@ -180,7 +179,6 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
)),
Positioned(
bottom: 72.sp,
child: Container(
child: Row(
children: [
Text(
@ -204,7 +202,6 @@ joiinCircileTipWdiget(String cicleId, String pirce, String oldPrice,
),
),
],
),
))
],
),

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

@ -85,7 +85,7 @@ class Open_vip_tipPage extends StatelessWidget {
)),
Positioned(
top: 44.sp,
child: Container(
child: SizedBox(
width: Get.width,
height: 180.sp,
child: Swiper(
@ -98,9 +98,9 @@ class Open_vip_tipPage extends StatelessWidget {
autoplay: true,
pagination: SwiperPagination(
builder: DotSwiperPaginationBuilder(
color: Color(0x99FFFFFF),
color: const Color(0x99FFFFFF),
size: 4.sp,
activeColor: Color(0xFF00FFD2),
activeColor: const Color(0xFF00FFD2),
activeSize: 4.sp)), //如果不填则不显示指示点
),
)),
@ -155,7 +155,7 @@ class Open_vip_tipPage extends StatelessWidget {
Text(
'支付宝支付',
style: TextStyle(
color: Color(0xFFF7FAFA),
color: const Color(0xFFF7FAFA),
fontSize: 14.0.sp,
),
),
@ -192,7 +192,7 @@ class Open_vip_tipPage extends StatelessWidget {
Text(
'微信支付',
style: TextStyle(
color: Color(0xFFF7FAFA),
color: const Color(0xFFF7FAFA),
fontSize: 14.0.sp,
),
),
@ -235,7 +235,6 @@ class Open_vip_tipPage extends StatelessWidget {
),)),
Positioned(
bottom: 17.sp,
child: Container(
child: Row(
children: [
Text(
@ -251,13 +250,12 @@ class Open_vip_tipPage extends StatelessWidget {
Text(
'《合伙人协议》',
style: TextStyle(
color: Color(0xff00FFF4),
color: const Color(0xff00FFF4),
fontSize: 11.sp,
fontWeight: FontWeight.w400,
),
),
],
),
))
],
),
@ -296,7 +294,7 @@ class Open_vip_tipPage extends StatelessWidget {
width: isSelected ? 96.sp : 98.sp,
height: isSelected ? 108.sp : 110.sp,
decoration: BoxDecoration(
color: Color.fromRGBO(255, 255, 255, 0.1),
color: const Color.fromRGBO(255, 255, 255, 0.1),
borderRadius: BorderRadius.circular(10.sp),
),
child: Column(
@ -338,17 +336,16 @@ class Open_vip_tipPage extends StatelessWidget {
controller.priceBean[index].isYearVip ? Positioned(
top: 0.sp,
left: 0.sp,
child: Image.asset(getMineImage("icon_yean_vip")),
width: 44.sp,
height: 18.sp,
child: Image.asset(getMineImage("icon_yean_vip")),
) :Container()
],
));
}
funcItem(String func, String funcDesc, int index) {
return Container(
child: Column(
return Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
@ -374,7 +371,6 @@ class Open_vip_tipPage extends StatelessWidget {
fontSize: 12.sp,
))
],
),
);
}
}

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

@ -51,7 +51,9 @@ Future<void> openWxPay(PaymentData data, WxPayCallback callback) async {
}
});
}
late final StreamSubscription<AlipayResp> _paySubs;
StreamSubscription<AlipayResp>? _paySubs = null;
/// 返回码，标识支付状态，含义如下：
/// 9000——订单支付成功 下面的result有值
/// 8000——正在处理中
@ -61,29 +63,45 @@ late final StreamSubscription<AlipayResp> _paySubs;
/// 6002——网络连接出错
void _listenPay(AlipayResp resp) {
final String content = 'pay: ${resp.resultStatus} - ${resp.result}';
if(resp.resultStatus == 9000){
callback(true,resp.result);
}else{
callback(false,resp.result);
if (resp.resultStatus == 9000) {
callback(true, resp.result);
} else {
switch(resp.resultStatus){
case 8000:
showToast("正在处理中");
break;
case 4000:
showToast("订单支付失败");
break;
case 5000:
showToast("重复请求");
break;
case 6001:
showToast("取消支付");
break;
case 6002:
showToast("网络连接出错");
break;
}
callback(false, resp.result);
}
print(content );
print("payment"+content);
}
late WxPayCallback callback ;
openAliPay(String payUrl,WxPayCallback myCallback)async{
late WxPayCallback callback;
openAliPay(String payUrl, WxPayCallback myCallback) async {
callback = myCallback;
bool isInstalled =await AlipayKitPlatform.instance.isInstalled();
bool isInstalled = await AlipayKitPlatform.instance.isInstalled();
if (!isInstalled) {
showToast("请先安装支付宝");
return;
}
if(null==_paySubs){
if (null == _paySubs) {
_paySubs = AlipayKitPlatform.instance.payResp().listen(_listenPay);
}
var data = await AlipayKitPlatform.instance.pay(
orderInfo: payUrl,
isShowLoading :true
);
var data = await AlipayKitPlatform.instance
.pay(orderInfo: payUrl, isShowLoading: true);
}