xt / Flutter-ReserveApp · Commits

Go to a project

Commit cc8b43d8ddd3067f6765ce41eff495d5f60d21be

Authored by wdn127929
1 parent 4acb1e4e
build: skipped

隐藏统计页面部分元素 发版2.9.6

Inline Side-by-side
Showing 4 changed files with 232 additions and 212 deletions
... ... @@ -479,7 +479,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 290;
CURRENT_PROJECT_VERSION = 296;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -624,7 +624,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 290;
CURRENT_PROJECT_VERSION = 296;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -659,7 +659,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 290;
CURRENT_PROJECT_VERSION = 296;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -62,6 +62,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
EventBus().on('changeStatusColor', (arg) {
Utils.changeStatusColor(color: MyColours.color_199095);
});
EventBus().on('refreshMySms', (arg) {
_getSmsInfo(context);
});
}
@override
... ... @@ -69,6 +72,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
// TODO: implement dispose
super.dispose();
EventBus().off('changeStatusColor');
EventBus().off('refreshMySms');
}
@override
... ...
... ... @@ -64,229 +64,241 @@ class _SmsManagerPageState extends State<SmsManagerPage> {
needWhite: true,
onTap: () {
EventBus().emit('changeStatusColor');
EventBus().emit('refreshMySms');
Navigator.pop(context);
},
),
body: NestedScrollView(
// controller: _scrollViewController,
headerSliverBuilder:
(BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverAppBar(
pinned: false,
floating: false,
leading: Container(),
expandedHeight: ScreenUtil().setWidth(320 + 40),
flexibleSpace: FlexibleSpaceBar(
collapseMode: CollapseMode.pin,
background: Consumer<MyModel>(builder:
(BuildContext context, MyModel model, Widget child) {
return Container(
width: double.infinity,
height: ScreenUtil().setHeight(320 + 30),
color: MyColours.color_199095,
child: Padding(
padding:
EdgeInsets.only(left: ScreenUtil().setWidth(30)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
VEmptyView(80),
Container(
height: ScreenUtil().setWidth(40),
child: Text(
'短信余量',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(30)),
),
),
VEmptyView(10),
Row(
mainAxisAlignment: MainAxisAlignment.center,
body: WillPopScope(
onWillPop: () async {
EventBus().emit('changeStatusColor');
EventBus().emit('refreshMySms');
return true;
},
child: NestedScrollView(
// controller: _scrollViewController,
headerSliverBuilder:
(BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverAppBar(
pinned: false,
floating: false,
leading: Container(),
expandedHeight: ScreenUtil().setWidth(320 + 40),
flexibleSpace: FlexibleSpaceBar(
collapseMode: CollapseMode.pin,
background: Consumer<MyModel>(builder:
(BuildContext context, MyModel model, Widget child) {
return Container(
width: double.infinity,
height: ScreenUtil().setHeight(320 + 30),
color: MyColours.color_199095,
child: Padding(
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(30)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
VEmptyView(80),
Container(
height: ScreenUtil().setWidth(40),
child: Text(
widget.infoData.lastNum,
height: ScreenUtil().setWidth(40),
child: Text(
'短信余量',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(30)),
),
),
VEmptyView(10),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
height: ScreenUtil().setWidth(40),
child: Text(
widget.infoData.lastNum,
style: TextStyle(
color: MyColours.color_ffffff,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
Container(
height: ScreenUtil().setWidth(30),
child: Text(
' 条',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(30)),
))
],
),
VEmptyView(80),
Stack(children: [
RoundButton(
text: '立即充值',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
borderColor:
Color.fromRGBO(255, 255, 255, 0.2),
width: ScreenUtil().setWidth(225),
height: ScreenUtil().setWidth(80),
textColor: MyColours.color_199095,
radius: ScreenUtil().setWidth(10),
fontSize: 28,
isBold: true,
imgWidth: 26,
onPressed: () {
NavigatorUtil.goSmsRechargePage(context,
smsInfoData: widget.infoData);
},
),
isShow
? Positioned(
top: 0,
right: 0,
child: Container(
// padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
padding: EdgeInsets.only(
left:
ScreenUtil().setWidth(6)),
alignment: Alignment.center,
width:
ScreenUtil().setWidth(34 * 2),
height: ScreenUtil().setWidth(30),
decoration: BoxDecoration(
// color: Colors.red,
image: DecorationImage(
image: ExactAssetImage(
Utils.getImgPath(
'sms_manager'),
),
fit: BoxFit.cover,
),
),
child: Text(
'特惠',
style: TextStyle(
color:
MyColours.color_fefefe,
fontSize:
ScreenUtil().setSp(24)),
)),
)
: SizedBox()
])
],
)),
);
}),
),
)
];
}, body: Consumer<MyModel>(builder:
(BuildContext context, MyModel model, Widget child) {
return MediaQuery.removePadding(
context: context,
child: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
VEmptyView(60),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
MyDivider(ScreenUtil().setWidth(130),
ScreenUtil().setWidth(2)),
HEmptyView(40),
Text(
'常见问题说明',
style: TextStyle(
color: MyColours.color_ffffff,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
fontSize: ScreenUtil().setSp(28),
color: MyColours.color_333333),
),
HEmptyView(40),
MyDivider(ScreenUtil().setWidth(130),
ScreenUtil().setWidth(2))
],
),
VEmptyView(40),
Text(
"1.短信计费",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
fontWeight: FontWeight.bold),
),
Container(
height: ScreenUtil().setWidth(30),
child: Text(
' 条',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(30)),
))
],
),
VEmptyView(80),
Stack(children: [
RoundButton(
text: '立即充值',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
borderColor: Color.fromRGBO(255, 255, 255, 0.2),
width: ScreenUtil().setWidth(225),
height: ScreenUtil().setWidth(80),
textColor: MyColours.color_199095,
radius: ScreenUtil().setWidth(10),
fontSize: 28,
isBold: true,
imgWidth: 26,
onPressed: () {
NavigatorUtil.goSmsRechargePage(context,
smsInfoData: widget.infoData);
},
),
isShow
? Positioned(
top: 0,
right: 0,
child: Container(
// padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(6)),
alignment: Alignment.center,
width: ScreenUtil().setWidth(34 * 2),
height: ScreenUtil().setWidth(30),
decoration: BoxDecoration(
// color: Colors.red,
image: DecorationImage(
image: ExactAssetImage(
Utils.getImgPath('sms_manager'),
),
fit: BoxFit.cover,
),
),
child: Text(
'特惠',
style: TextStyle(
color: MyColours.color_fefefe,
fontSize:
ScreenUtil().setSp(24)),
)),
)
: SizedBox()
])
],
)),
);
}),
),
)
];
}, body: Consumer<MyModel>(
builder: (BuildContext context, MyModel model, Widget child) {
return MediaQuery.removePadding(
context: context,
child: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
VEmptyView(60),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
MyDivider(ScreenUtil().setWidth(130),
ScreenUtil().setWidth(2)),
HEmptyView(40),
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(20)),
child: Text(
"· 短信计费统一根据三大运营商标注计算；\n· 当短信内容字符数≤70，短信按照一条计费；\n· 当短信内容字符数>70个字符时，按照每70个字符为一条短信；",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
),
MyDivider(
double.infinity, ScreenUtil().setWidth(1)),
VEmptyView(40),
Text(
'常见问题说明',
"2.短信统计",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
color: MyColours.color_333333),
fontWeight: FontWeight.bold),
),
HEmptyView(40),
MyDivider(ScreenUtil().setWidth(130),
ScreenUtil().setWidth(2))
],
),
VEmptyView(40),
Text(
"1.短信计费",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
fontWeight: FontWeight.bold),
),
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(20)),
child: Text(
"· 短信计费统一根据三大运营商标注计算；\n· 当短信内容字符数≤70，短信按照一条计费；\n· 当短信内容字符数>70个字符时，按照每70个字符为一条短信；",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(20)),
child: Text(
"· 短信统计只统计计费短信，与订单数量无关，一个订单可能会发送多条短信，则计费时按照多条短信计费；",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
),
MyDivider(
double.infinity, ScreenUtil().setWidth(1)),
VEmptyView(40),
Text(
"2.短信统计",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
fontWeight: FontWeight.bold),
),
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(20)),
child: Text(
"· 短信统计只统计计费短信，与订单数量无关，一个订单可能会发送多条短信，则计费时按照多条短信计费；",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
MyDivider(
double.infinity, ScreenUtil().setWidth(1)),
VEmptyView(40),
Text(
"3.充值说明",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
fontWeight: FontWeight.bold),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
),
MyDivider(
double.infinity, ScreenUtil().setWidth(1)),
VEmptyView(40),
Text(
"3.充值说明",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
fontWeight: FontWeight.bold),
),
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(20)),
child: Text(
"· 短信统一在订座商户小程序上进行充值，充值记录和详细使用情况统一在小程序上查看。",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(20)),
child: Text(
"· 短信统一在订座商户小程序上进行充值，充值记录和详细使用情况统一在小程序上查看。",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
),
strutStyle: StrutStyle(
forceStrutHeight: true,
height: 1,
leading: 0.3),
),
),
]))));
})));
]))));
}))));
}
}
... ...
... ... @@ -387,6 +387,7 @@ class _StatisticsPageState extends State<StatisticsPage> {
model.needAllSel();
});
})),
/** 发版注释
Container(
alignment: Alignment.centerRight,
height: ScreenUtil().setWidth(42 * 2),
... ... @@ -464,6 +465,7 @@ class _StatisticsPageState extends State<StatisticsPage> {
],
),
)
*/
],
);
}
... ... @@ -583,11 +585,13 @@ class _StatisticsPageState extends State<StatisticsPage> {
color: MyColours.color_f5f5f5))),
child: Row(
children: [
/*** 发版注释
Image.asset(
Utils.getImgPath(model.select ? 'select' : 'unselect'),
width: ScreenUtil().setWidth(34),
height: ScreenUtil().setWidth(34),
),
*/
// HEmptyView(20),
Expanded(
child: Text(
... ...