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 @@ @@ -479,7 +479,7 @@
479 CODE_SIGN_IDENTITY = "iPhone Developer"; 479 CODE_SIGN_IDENTITY = "iPhone Developer";
480 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 480 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
481 CODE_SIGN_STYLE = Automatic; 481 CODE_SIGN_STYLE = Automatic;
482 - CURRENT_PROJECT_VERSION = 290; 482 + CURRENT_PROJECT_VERSION = 296;
483 DEVELOPMENT_TEAM = 8J59HM8B82; 483 DEVELOPMENT_TEAM = 8J59HM8B82;
484 ENABLE_BITCODE = NO; 484 ENABLE_BITCODE = NO;
485 FLUTTER_BUILD_MODE = release; 485 FLUTTER_BUILD_MODE = release;
@@ -624,7 +624,7 @@ @@ -624,7 +624,7 @@
624 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 624 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
625 CODE_SIGN_IDENTITY = "iPhone Developer"; 625 CODE_SIGN_IDENTITY = "iPhone Developer";
626 CODE_SIGN_STYLE = Automatic; 626 CODE_SIGN_STYLE = Automatic;
627 - CURRENT_PROJECT_VERSION = 290; 627 + CURRENT_PROJECT_VERSION = 296;
628 DEVELOPMENT_TEAM = 8J59HM8B82; 628 DEVELOPMENT_TEAM = 8J59HM8B82;
629 ENABLE_BITCODE = NO; 629 ENABLE_BITCODE = NO;
630 FLUTTER_BUILD_MODE = release; 630 FLUTTER_BUILD_MODE = release;
@@ -659,7 +659,7 @@ @@ -659,7 +659,7 @@
659 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 659 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
660 CODE_SIGN_IDENTITY = "iPhone Developer"; 660 CODE_SIGN_IDENTITY = "iPhone Developer";
661 CODE_SIGN_STYLE = Automatic; 661 CODE_SIGN_STYLE = Automatic;
662 - CURRENT_PROJECT_VERSION = 290; 662 + CURRENT_PROJECT_VERSION = 296;
663 DEVELOPMENT_TEAM = 8J59HM8B82; 663 DEVELOPMENT_TEAM = 8J59HM8B82;
664 ENABLE_BITCODE = NO; 664 ENABLE_BITCODE = NO;
665 FLUTTER_BUILD_MODE = release; 665 FLUTTER_BUILD_MODE = release;
@@ -62,6 +62,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -62,6 +62,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
62 EventBus().on('changeStatusColor', (arg) { 62 EventBus().on('changeStatusColor', (arg) {
63 Utils.changeStatusColor(color: MyColours.color_199095); 63 Utils.changeStatusColor(color: MyColours.color_199095);
64 }); 64 });
  65 + EventBus().on('refreshMySms', (arg) {
  66 + _getSmsInfo(context);
  67 + });
65 } 68 }
66 69
67 @override 70 @override
@@ -69,6 +72,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -69,6 +72,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
69 // TODO: implement dispose 72 // TODO: implement dispose
70 super.dispose(); 73 super.dispose();
71 EventBus().off('changeStatusColor'); 74 EventBus().off('changeStatusColor');
  75 + EventBus().off('refreshMySms');
72 } 76 }
73 77
74 @override 78 @override
@@ -64,229 +64,241 @@ class _SmsManagerPageState extends State<SmsManagerPage> { @@ -64,229 +64,241 @@ class _SmsManagerPageState extends State<SmsManagerPage> {
64 needWhite: true, 64 needWhite: true,
65 onTap: () { 65 onTap: () {
66 EventBus().emit('changeStatusColor'); 66 EventBus().emit('changeStatusColor');
  67 + EventBus().emit('refreshMySms');
67 Navigator.pop(context); 68 Navigator.pop(context);
68 }, 69 },
69 ), 70 ),
70 - body: NestedScrollView(  
71 - // controller: _scrollViewController,  
72 - headerSliverBuilder:  
73 - (BuildContext context, bool innerBoxIsScrolled) {  
74 - return <Widget>[  
75 - SliverAppBar(  
76 - pinned: false,  
77 - floating: false,  
78 - leading: Container(),  
79 - expandedHeight: ScreenUtil().setWidth(320 + 40),  
80 - flexibleSpace: FlexibleSpaceBar(  
81 - collapseMode: CollapseMode.pin,  
82 - background: Consumer<MyModel>(builder:  
83 - (BuildContext context, MyModel model, Widget child) {  
84 - return Container(  
85 - width: double.infinity,  
86 - height: ScreenUtil().setHeight(320 + 30),  
87 - color: MyColours.color_199095,  
88 - child: Padding(  
89 - padding:  
90 - EdgeInsets.only(left: ScreenUtil().setWidth(30)),  
91 - child: Column(  
92 - crossAxisAlignment: CrossAxisAlignment.center,  
93 - children: [  
94 - VEmptyView(80),  
95 - Container(  
96 - height: ScreenUtil().setWidth(40),  
97 - child: Text(  
98 - '短信余量',  
99 - style: TextStyle(  
100 - color: MyColours.color_ffffff,  
101 - fontSize: ScreenUtil().setSp(30)),  
102 - ),  
103 - ),  
104 - VEmptyView(10),  
105 - Row(  
106 - mainAxisAlignment: MainAxisAlignment.center, 71 + body: WillPopScope(
  72 + onWillPop: () async {
  73 + EventBus().emit('changeStatusColor');
  74 + EventBus().emit('refreshMySms');
  75 + return true;
  76 + },
  77 + child: NestedScrollView(
  78 + // controller: _scrollViewController,
  79 + headerSliverBuilder:
  80 + (BuildContext context, bool innerBoxIsScrolled) {
  81 + return <Widget>[
  82 + SliverAppBar(
  83 + pinned: false,
  84 + floating: false,
  85 + leading: Container(),
  86 + expandedHeight: ScreenUtil().setWidth(320 + 40),
  87 + flexibleSpace: FlexibleSpaceBar(
  88 + collapseMode: CollapseMode.pin,
  89 + background: Consumer<MyModel>(builder:
  90 + (BuildContext context, MyModel model, Widget child) {
  91 + return Container(
  92 + width: double.infinity,
  93 + height: ScreenUtil().setHeight(320 + 30),
  94 + color: MyColours.color_199095,
  95 + child: Padding(
  96 + padding: EdgeInsets.only(
  97 + left: ScreenUtil().setWidth(30)),
  98 + child: Column(
107 crossAxisAlignment: CrossAxisAlignment.center, 99 crossAxisAlignment: CrossAxisAlignment.center,
108 children: [ 100 children: [
  101 + VEmptyView(80),
109 Container( 102 Container(
110 - height: ScreenUtil().setWidth(40),  
111 - child: Text(  
112 - widget.infoData.lastNum, 103 + height: ScreenUtil().setWidth(40),
  104 + child: Text(
  105 + '短信余量',
  106 + style: TextStyle(
  107 + color: MyColours.color_ffffff,
  108 + fontSize: ScreenUtil().setSp(30)),
  109 + ),
  110 + ),
  111 + VEmptyView(10),
  112 + Row(
  113 + mainAxisAlignment: MainAxisAlignment.center,
  114 + crossAxisAlignment: CrossAxisAlignment.center,
  115 + children: [
  116 + Container(
  117 + height: ScreenUtil().setWidth(40),
  118 + child: Text(
  119 + widget.infoData.lastNum,
  120 + style: TextStyle(
  121 + color: MyColours.color_ffffff,
  122 + fontWeight: FontWeight.bold,
  123 + fontSize: ScreenUtil().setSp(36)),
  124 + )),
  125 + Container(
  126 + height: ScreenUtil().setWidth(30),
  127 + child: Text(
  128 + ' 条',
  129 + style: TextStyle(
  130 + color: MyColours.color_ffffff,
  131 + fontSize: ScreenUtil().setSp(30)),
  132 + ))
  133 + ],
  134 + ),
  135 + VEmptyView(80),
  136 + Stack(children: [
  137 + RoundButton(
  138 + text: '立即充值',
  139 + gradientStart: MyColours.color_ffffff,
  140 + gradientEnd: MyColours.color_ffffff,
  141 + borderColor:
  142 + Color.fromRGBO(255, 255, 255, 0.2),
  143 + width: ScreenUtil().setWidth(225),
  144 + height: ScreenUtil().setWidth(80),
  145 + textColor: MyColours.color_199095,
  146 + radius: ScreenUtil().setWidth(10),
  147 + fontSize: 28,
  148 + isBold: true,
  149 + imgWidth: 26,
  150 + onPressed: () {
  151 + NavigatorUtil.goSmsRechargePage(context,
  152 + smsInfoData: widget.infoData);
  153 + },
  154 + ),
  155 + isShow
  156 + ? Positioned(
  157 + top: 0,
  158 + right: 0,
  159 + child: Container(
  160 + // padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
  161 + padding: EdgeInsets.only(
  162 + left:
  163 + ScreenUtil().setWidth(6)),
  164 + alignment: Alignment.center,
  165 + width:
  166 + ScreenUtil().setWidth(34 * 2),
  167 + height: ScreenUtil().setWidth(30),
  168 + decoration: BoxDecoration(
  169 + // color: Colors.red,
  170 + image: DecorationImage(
  171 + image: ExactAssetImage(
  172 + Utils.getImgPath(
  173 + 'sms_manager'),
  174 + ),
  175 + fit: BoxFit.cover,
  176 + ),
  177 + ),
  178 + child: Text(
  179 + '特惠',
  180 + style: TextStyle(
  181 + color:
  182 + MyColours.color_fefefe,
  183 + fontSize:
  184 + ScreenUtil().setSp(24)),
  185 + )),
  186 + )
  187 + : SizedBox()
  188 + ])
  189 + ],
  190 + )),
  191 + );
  192 + }),
  193 + ),
  194 + )
  195 + ];
  196 + }, body: Consumer<MyModel>(builder:
  197 + (BuildContext context, MyModel model, Widget child) {
  198 + return MediaQuery.removePadding(
  199 + context: context,
  200 + child: SingleChildScrollView(
  201 + child: Padding(
  202 + padding: EdgeInsets.symmetric(
  203 + horizontal: ScreenUtil().setWidth(40)),
  204 + child: Column(
  205 + crossAxisAlignment: CrossAxisAlignment.start,
  206 + children: <Widget>[
  207 + VEmptyView(60),
  208 + Row(
  209 + mainAxisAlignment: MainAxisAlignment.center,
  210 + children: [
  211 + MyDivider(ScreenUtil().setWidth(130),
  212 + ScreenUtil().setWidth(2)),
  213 + HEmptyView(40),
  214 + Text(
  215 + '常见问题说明',
113 style: TextStyle( 216 style: TextStyle(
114 - color: MyColours.color_ffffff,  
115 - fontWeight: FontWeight.bold,  
116 - fontSize: ScreenUtil().setSp(36)),  
117 - )), 217 + fontSize: ScreenUtil().setSp(28),
  218 + color: MyColours.color_333333),
  219 + ),
  220 + HEmptyView(40),
  221 + MyDivider(ScreenUtil().setWidth(130),
  222 + ScreenUtil().setWidth(2))
  223 + ],
  224 + ),
  225 + VEmptyView(40),
  226 + Text(
  227 + "1.短信计费",
  228 + style: TextStyle(
  229 + color: MyColours.color_333333,
  230 + fontSize: ScreenUtil().setSp(28),
  231 + fontWeight: FontWeight.bold),
  232 + ),
118 Container( 233 Container(
119 - height: ScreenUtil().setWidth(30),  
120 - child: Text(  
121 - ' 条',  
122 - style: TextStyle(  
123 - color: MyColours.color_ffffff,  
124 - fontSize: ScreenUtil().setSp(30)),  
125 - ))  
126 - ],  
127 - ),  
128 - VEmptyView(80),  
129 - Stack(children: [  
130 - RoundButton(  
131 - text: '立即充值',  
132 - gradientStart: MyColours.color_ffffff,  
133 - gradientEnd: MyColours.color_ffffff,  
134 - borderColor: Color.fromRGBO(255, 255, 255, 0.2),  
135 - width: ScreenUtil().setWidth(225),  
136 - height: ScreenUtil().setWidth(80),  
137 - textColor: MyColours.color_199095,  
138 - radius: ScreenUtil().setWidth(10),  
139 - fontSize: 28,  
140 - isBold: true,  
141 - imgWidth: 26,  
142 - onPressed: () {  
143 - NavigatorUtil.goSmsRechargePage(context,  
144 - smsInfoData: widget.infoData);  
145 - },  
146 - ),  
147 - isShow  
148 - ? Positioned(  
149 - top: 0,  
150 - right: 0,  
151 - child: Container(  
152 - // padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),  
153 - padding: EdgeInsets.only(  
154 - left: ScreenUtil().setWidth(6)),  
155 - alignment: Alignment.center,  
156 - width: ScreenUtil().setWidth(34 * 2),  
157 - height: ScreenUtil().setWidth(30),  
158 - decoration: BoxDecoration(  
159 - // color: Colors.red,  
160 - image: DecorationImage(  
161 - image: ExactAssetImage(  
162 - Utils.getImgPath('sms_manager'),  
163 - ),  
164 - fit: BoxFit.cover,  
165 - ),  
166 - ),  
167 - child: Text(  
168 - '特惠',  
169 - style: TextStyle(  
170 - color: MyColours.color_fefefe,  
171 - fontSize:  
172 - ScreenUtil().setSp(24)),  
173 - )),  
174 - )  
175 - : SizedBox()  
176 - ])  
177 - ],  
178 - )),  
179 - );  
180 - }),  
181 - ),  
182 - )  
183 - ];  
184 - }, body: Consumer<MyModel>(  
185 - builder: (BuildContext context, MyModel model, Widget child) {  
186 - return MediaQuery.removePadding(  
187 - context: context,  
188 - child: SingleChildScrollView(  
189 - child: Padding(  
190 - padding: EdgeInsets.symmetric(  
191 - horizontal: ScreenUtil().setWidth(40)),  
192 - child: Column(  
193 - crossAxisAlignment: CrossAxisAlignment.start,  
194 - children: <Widget>[  
195 - VEmptyView(60),  
196 - Row(  
197 - mainAxisAlignment: MainAxisAlignment.center,  
198 - children: [  
199 - MyDivider(ScreenUtil().setWidth(130),  
200 - ScreenUtil().setWidth(2)),  
201 - HEmptyView(40), 234 + margin: EdgeInsets.only(
  235 + top: ScreenUtil().setWidth(20),
  236 + bottom: ScreenUtil().setWidth(20)),
  237 + child: Text(
  238 + "· 短信计费统一根据三大运营商标注计算；\n· 当短信内容字符数≤70，短信按照一条计费；\n· 当短信内容字符数>70个字符时，按照每70个字符为一条短信；",
  239 + style: TextStyle(
  240 + color: MyColours.color_333333,
  241 + fontSize: ScreenUtil().setSp(28),
  242 + ),
  243 + strutStyle: StrutStyle(
  244 + forceStrutHeight: true,
  245 + height: 1,
  246 + leading: 0.3),
  247 + ),
  248 + ),
  249 + MyDivider(
  250 + double.infinity, ScreenUtil().setWidth(1)),
  251 + VEmptyView(40),
202 Text( 252 Text(
203 - '常见问题说明', 253 + "2.短信统计",
204 style: TextStyle( 254 style: TextStyle(
  255 + color: MyColours.color_333333,
205 fontSize: ScreenUtil().setSp(28), 256 fontSize: ScreenUtil().setSp(28),
206 - color: MyColours.color_333333), 257 + fontWeight: FontWeight.bold),
207 ), 258 ),
208 - HEmptyView(40),  
209 - MyDivider(ScreenUtil().setWidth(130),  
210 - ScreenUtil().setWidth(2))  
211 - ],  
212 - ),  
213 - VEmptyView(40),  
214 - Text(  
215 - "1.短信计费",  
216 - style: TextStyle(  
217 - color: MyColours.color_333333,  
218 - fontSize: ScreenUtil().setSp(28),  
219 - fontWeight: FontWeight.bold),  
220 - ),  
221 - Container(  
222 - margin: EdgeInsets.only(  
223 - top: ScreenUtil().setWidth(20),  
224 - bottom: ScreenUtil().setWidth(20)),  
225 - child: Text(  
226 - "· 短信计费统一根据三大运营商标注计算；\n· 当短信内容字符数≤70，短信按照一条计费；\n· 当短信内容字符数>70个字符时，按照每70个字符为一条短信；",  
227 - style: TextStyle(  
228 - color: MyColours.color_333333,  
229 - fontSize: ScreenUtil().setSp(28), 259 + Container(
  260 + margin: EdgeInsets.only(
  261 + top: ScreenUtil().setWidth(20),
  262 + bottom: ScreenUtil().setWidth(20)),
  263 + child: Text(
  264 + "· 短信统计只统计计费短信，与订单数量无关，一个订单可能会发送多条短信，则计费时按照多条短信计费；",
  265 + style: TextStyle(
  266 + color: MyColours.color_333333,
  267 + fontSize: ScreenUtil().setSp(28),
  268 + ),
  269 + strutStyle: StrutStyle(
  270 + forceStrutHeight: true,
  271 + height: 1,
  272 + leading: 0.3),
  273 + ),
230 ), 274 ),
231 - strutStyle: StrutStyle(  
232 - forceStrutHeight: true,  
233 - height: 1,  
234 - leading: 0.3),  
235 - ),  
236 - ),  
237 - MyDivider(  
238 - double.infinity, ScreenUtil().setWidth(1)),  
239 - VEmptyView(40),  
240 - Text(  
241 - "2.短信统计",  
242 - style: TextStyle(  
243 - color: MyColours.color_333333,  
244 - fontSize: ScreenUtil().setSp(28),  
245 - fontWeight: FontWeight.bold),  
246 - ),  
247 - Container(  
248 - margin: EdgeInsets.only(  
249 - top: ScreenUtil().setWidth(20),  
250 - bottom: ScreenUtil().setWidth(20)),  
251 - child: Text(  
252 - "· 短信统计只统计计费短信，与订单数量无关，一个订单可能会发送多条短信，则计费时按照多条短信计费；",  
253 - style: TextStyle(  
254 - color: MyColours.color_333333,  
255 - fontSize: ScreenUtil().setSp(28), 275 + MyDivider(
  276 + double.infinity, ScreenUtil().setWidth(1)),
  277 + VEmptyView(40),
  278 + Text(
  279 + "3.充值说明",
  280 + style: TextStyle(
  281 + color: MyColours.color_333333,
  282 + fontSize: ScreenUtil().setSp(28),
  283 + fontWeight: FontWeight.bold),
256 ), 284 ),
257 - strutStyle: StrutStyle(  
258 - forceStrutHeight: true,  
259 - height: 1,  
260 - leading: 0.3),  
261 - ),  
262 - ),  
263 - MyDivider(  
264 - double.infinity, ScreenUtil().setWidth(1)),  
265 - VEmptyView(40),  
266 - Text(  
267 - "3.充值说明",  
268 - style: TextStyle(  
269 - color: MyColours.color_333333,  
270 - fontSize: ScreenUtil().setSp(28),  
271 - fontWeight: FontWeight.bold),  
272 - ),  
273 - Container(  
274 - margin: EdgeInsets.only(  
275 - top: ScreenUtil().setWidth(20),  
276 - bottom: ScreenUtil().setWidth(20)),  
277 - child: Text(  
278 - "· 短信统一在订座商户小程序上进行充值，充值记录和详细使用情况统一在小程序上查看。",  
279 - style: TextStyle(  
280 - color: MyColours.color_333333,  
281 - fontSize: ScreenUtil().setSp(28), 285 + Container(
  286 + margin: EdgeInsets.only(
  287 + top: ScreenUtil().setWidth(20),
  288 + bottom: ScreenUtil().setWidth(20)),
  289 + child: Text(
  290 + "· 短信统一在订座商户小程序上进行充值，充值记录和详细使用情况统一在小程序上查看。",
  291 + style: TextStyle(
  292 + color: MyColours.color_333333,
  293 + fontSize: ScreenUtil().setSp(28),
  294 + ),
  295 + strutStyle: StrutStyle(
  296 + forceStrutHeight: true,
  297 + height: 1,
  298 + leading: 0.3),
  299 + ),
282 ), 300 ),
283 - strutStyle: StrutStyle(  
284 - forceStrutHeight: true,  
285 - height: 1,  
286 - leading: 0.3),  
287 - ),  
288 - ),  
289 - ]))));  
290 - }))); 301 + ]))));
  302 + }))));
291 } 303 }
292 } 304 }
@@ -387,6 +387,7 @@ class _StatisticsPageState extends State<StatisticsPage> { @@ -387,6 +387,7 @@ class _StatisticsPageState extends State<StatisticsPage> {
387 model.needAllSel(); 387 model.needAllSel();
388 }); 388 });
389 })), 389 })),
  390 + /** 发版注释
390 Container( 391 Container(
391 alignment: Alignment.centerRight, 392 alignment: Alignment.centerRight,
392 height: ScreenUtil().setWidth(42 * 2), 393 height: ScreenUtil().setWidth(42 * 2),
@@ -464,6 +465,7 @@ class _StatisticsPageState extends State<StatisticsPage> { @@ -464,6 +465,7 @@ class _StatisticsPageState extends State<StatisticsPage> {
464 ], 465 ],
465 ), 466 ),
466 ) 467 )
  468 + */
467 ], 469 ],
468 ); 470 );
469 } 471 }
@@ -583,11 +585,13 @@ class _StatisticsPageState extends State<StatisticsPage> { @@ -583,11 +585,13 @@ class _StatisticsPageState extends State<StatisticsPage> {
583 color: MyColours.color_f5f5f5))), 585 color: MyColours.color_f5f5f5))),
584 child: Row( 586 child: Row(
585 children: [ 587 children: [
  588 + /*** 发版注释
586 Image.asset( 589 Image.asset(
587 Utils.getImgPath(model.select ? 'select' : 'unselect'), 590 Utils.getImgPath(model.select ? 'select' : 'unselect'),
588 width: ScreenUtil().setWidth(34), 591 width: ScreenUtil().setWidth(34),
589 height: ScreenUtil().setWidth(34), 592 height: ScreenUtil().setWidth(34),
590 ), 593 ),
  594 + */
591 // HEmptyView(20), 595 // HEmptyView(20),
592 Expanded( 596 Expanded(
593 child: Text( 597 child: Text(