短信剩余条数和已选人数

wdn127929
1 parent 1276a2aa
Showing 7 changed files with 43 additions and 35 deletions
android/app/build.gradle
lib/pages/notebook/statistics_page.dart
lib/pages/notebook/statistics_sms_page.dart
lib/provider/statistics_provider.dart
lib/route/navigator_util.dart
lib/route/route_handles.dart
lib/utils/fluro_convert_utils.dart
--- a/android/app/build.gradle
View file @d7abef3
+++ b/android/app/build.gradle
View file @d7abef3
@@ -11,14 +11,14 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
-def flutterVersionCode = "285"
+def flutterVersionCode = "290"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '285'
+    flutterVersionCode = '290'
 }
-def flutterVersionName = "2.8.5"
+def flutterVersionName = "2.9.0"
 if (flutterVersionName == null) {
-    flutterVersionName = '2.8.5'
+    flutterVersionName = '2.9.0'
 }
 apply plugin: 'com.android.application'
--- a/lib/pages/notebook/statistics_page.dart
View file @d7abef3
+++ b/lib/pages/notebook/statistics_page.dart
View file @d7abef3
@@ -48,18 +48,6 @@ class _StatisticsPageState extends State<StatisticsPage> {
         removeOverlay();
       }
     });
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      // for (int i = 0; i < 50; i++) {
-      //   StaticsModel tableHeaderModel1 = StaticsModel();
-      //   tableHeaderModel1.select = false;
-      //   tableHeaderModel1.numstr = '$i';
-      //   tableHeaderModel1.name = '某某';
-      //   tableHeaderModel1.phone = '1879097890';
-      //   tableHeaderModel1.count = '${i}次';
-      //   _provider.dataStatics.add(tableHeaderModel1);
-      // }
-      // _provider.notifyListeners();
-    });
   }
   showOverlay(BuildContext context) {
@@ -433,7 +421,7 @@ class _StatisticsPageState extends State<StatisticsPage> {
                           onTap: () {
                             if (model.selectAny()) {
                               NavigatorUtil.goStatisticsSmsPage(context,
-                                );
+                                  selectData: model.seletNum());
                             } else {
                               Utils.showToast('请选择顾客');
                             }
--- a/lib/pages/notebook/statistics_sms_page.dart
View file @d7abef3
+++ b/lib/pages/notebook/statistics_sms_page.dart
View file @d7abef3
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:one_key/models/statics_model.dart';
+import 'package:one_key/provider/my_model.dart';
 import 'package:one_key/provider/statistics_provider.dart';
 import 'package:one_key/res/colors.dart';
 import 'package:one_key/utils/utils.dart';
@@ -12,8 +13,8 @@ import 'package:one_key/widgets/v_empty_view.dart';
 import 'package:provider/provider.dart';
 class StatisticsSmsPage extends StatefulWidget {
-  // final List<String> selectData;
-  StatisticsSmsPage({Key key}) : super(key: key);
+  final List selectData;
+  StatisticsSmsPage({Key key, this.selectData}) : super(key: key);
   @override
   _StatisticsSmsPageState createState() => _StatisticsSmsPageState();
@@ -21,6 +22,15 @@ class StatisticsSmsPage extends StatefulWidget {
 class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
   StatisticsProvider _provider;
+  MyModel _myModel;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _getSmsInfo(context);
+    });
+  }
   ///文本
   Widget _textWidget(String title, {Color textColor = MyColours.color_333333}) {
@@ -37,9 +47,15 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
     );
   }
+  ///获取短信余量
+  _getSmsInfo(context) async {
+    await _myModel.getSmsInfo(context);
+  }
+
   @override
   Widget build(BuildContext context) {
     _provider = Provider.of<StatisticsProvider>(context, listen: true);
+    _myModel = Provider.of<MyModel>(context, listen: true);
     return Scaffold(
       backgroundColor: MyColours.color_f5f5f5,
       appBar: SystemAppBar(
@@ -88,11 +104,10 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
                                         CrossAxisAlignment.center,
                                     children: [
                                       _textWidget('当前已选择'),
-                                      _textWidget(
-                                          '33',
+                                      _textWidget('${widget.selectData.length}',
                                           textColor: MyColours.color_199095),
                                       _textWidget('人/短信剩余条数'),
-                                      _textWidget('33',
+                                      _textWidget('${_myModel.smsInfo}',
                                           textColor: MyColours.color_199095),
                                       _textWidget('条')
                                     ]),
--- a/lib/provider/statistics_provider.dart
View file @d7abef3
+++ b/lib/provider/statistics_provider.dart
View file @d7abef3
@@ -86,14 +86,16 @@ class StatisticsProvider with ChangeNotifier {
     return false;
   }
-  List<String> seletNum() {
-    List<String> selectStatics = [];
+  Map<String, List> seletNum() {
+    List selectStatics = [];
     for (StaticsSunModel item in dataStatics) {
       if (item.select) {
-        selectStatics.add(item.rname);
+        selectStatics.add('dffdfdf');
       }
     }
-    return selectStatics;
+    Map<String, List> map = {};
+    map['selectStatics'] = selectStatics;
+    return map;
   }
   //获取统计列表
--- a/lib/route/navigator_util.dart
View file @d7abef3
+++ b/lib/route/navigator_util.dart
View file @d7abef3
@@ -329,8 +329,9 @@ class NavigatorUtil {
   ///  统计发短信
   static Future<dynamic> goStatisticsSmsPage(BuildContext context,
-      {replace = false, List<String> selectData}) {
-    return _navigateTo(context, "${Routes.statistics_sms_page}",
+      {replace = false, Map<String, List> selectData}) {
+    return _navigateTo(context,
+        "${Routes.statistics_sms_page}?selectData=${FluroConvertUtils.object2string(selectData)}",
         replace: replace);
   }
 }
--- a/lib/route/route_handles.dart
View file @d7abef3
+++ b/lib/route/route_handles.dart
View file @d7abef3
@@ -495,12 +495,16 @@ var statisticsSmsPageHandler = new Handler(
   //     FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
   // String tid = params["tid"].first;
-  // List<String> selectData = params["selectData"].first;
+  Map temp = FluroConvertUtils.string2map(params["selectData"].first);
+
+  List selectData = temp['selectStatics'];
   return ChangeNotifierProvider<StatisticsProvider>(
       create: (_) => StatisticsProvider(),
-      child: StatisticsSmsPage(
-        // selectData: selectData,
-      ));
+      child: ChangeNotifierProvider<MyModel>(
+          create: (_) => MyModel(),
+          child: StatisticsSmsPage(
+            selectData: selectData,
+          )));
   // return ChangeNotifierProvider<UploadImageProvider>(
   //     create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
 });
--- a/lib/utils/fluro_convert_utils.dart
View file @d7abef3
+++ b/lib/utils/fluro_convert_utils.dart
View file @d7abef3
@@ -49,9 +49,7 @@ class FluroConvertUtils {
     return json.decode(fluroCnParamsDecode(str));
   }
-  static List<String> string2dynamic(String str) {
-    return json.decode(fluroCnParamsDecode(str));
-  }
+
   /// string json 转为 map
   static Map<String, List<TableList>> string2mapTableList(String str) {