宴会null 循环报错

wdn127929
1 parent 66fa3530
Showing 6 changed files with 43 additions and 24 deletions
android/app/build.gradle
lib/net/http_url.dart
lib/pages/coupon/coupon_poster_page.dart
lib/pages/feast/feast_create_page.dart
lib/pages/my/photo_type/table_photo_manager_page.dart
lib/utils/upload_image_util.dart
--- a/android/app/build.gradle
View file @61a8937
+++ b/android/app/build.gradle
View file @61a8937
@@ -18,19 +18,19 @@ if (flutterRoot == null) {
-def flutterVersionCode = "519"
+def flutterVersionCode = "520"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '519'
+    flutterVersionCode = '520'
 }
-def flutterVersionName = "5.1.9"
+def flutterVersionName = "5.2.0"
 if (flutterVersionName == null) {
-    flutterVersionName = '5.1.9' 
+    flutterVersionName = '5.2.0' 
 }
--- a/lib/net/http_url.dart
View file @61a8937
+++ b/lib/net/http_url.dart
View file @61a8937
 class HttpUrl {
+  static const String qiniu_address = "http://rs.qiniuapi.com/"; //七牛云服务端请求地址
   static const String server_address = "http://xt04.colorcun.com/"; //服务端请求地址
   static const String app_user_login =
       "?service=Android.User.AppUserLogin"; //登录地址
@@ -509,9 +510,7 @@ class HttpUrl {
   static const String sort_by_table =
       "?service=App.Tables.SortByTable"; //          区域内桌位排序
-
- static const String get_reserve_action_log =
-      "?service=Android.Reserve.GetReserveActionLog"; //           获取预订操作记录 
-      
+  static const String get_reserve_action_log =
+      "?service=Android.Reserve.GetReserveActionLog"; //           获取预订操作记录
 }
--- a/lib/pages/coupon/coupon_poster_page.dart
View file @61a8937
+++ b/lib/pages/coupon/coupon_poster_page.dart
View file @61a8937
@@ -258,8 +258,8 @@ class _CouponPosterPageState extends State<CouponPosterPage> {
                                                                   .color_E4461D)),
                                                     ])),
                                             VEmptyView(10),
-                                            Row(
-                                              children: [
+                                            // Row(
+                                            //   children: [
                                                 Text(
                                                   address,
                                                   maxLines: 10,
@@ -271,13 +271,13 @@ class _CouponPosterPageState extends State<CouponPosterPage> {
                                                     fontSize: font(14),
                                                   ),
                                                 ),
-                                                Image.asset(
-                                                  Utils.getImgPath(
-                                                      'location_orange'),
-                                                  width: w(25),
-                                                )
-                                              ],
-                                            ),
+                                            //     Image.asset(
+                                            //       Utils.getImgPath(
+                                            //           'location_orange'),
+                                            //       width: w(25),
+                                            //     )
+                                            //   ],
+                                            // ),
                                           ],
                                         ),
                                       ))
--- a/lib/pages/feast/feast_create_page.dart
View file @61a8937
+++ b/lib/pages/feast/feast_create_page.dart
View file @61a8937
@@ -212,12 +212,16 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
           customC.text = basicInfo.remark;
           //备注图片
           _uploadImageProvider.feastRemarkImageList = [];
-          basicInfo.images.forEach((element) {
-            UploadImgModel imgModel = UploadImgModel();
-            imgModel.qiniuUrl = element.url;
-            imgModel.process = 1;
-            _uploadImageProvider.feastRemarkImageList.add(imgModel);
-          });
+          print(basicInfo.images);
+          if (basicInfo.images != null) {
+            basicInfo.images.forEach((element) {
+              UploadImgModel imgModel = UploadImgModel();
+              imgModel.qiniuUrl = element.url;
+              imgModel.process = 1;
+              _uploadImageProvider.feastRemarkImageList.add(imgModel);
+            });
+          }
+
           /**
            * 选台
            */
@@ -430,7 +434,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
     bool success = await feastModel.getBanquetById(context, pramas);
     if (success) {
       _uploadImageProvider.feastRemarkContractImageList = [];
-      feastModel.banquetDetail.contractInfo.contractImages.forEach((element) {
+      feastModel.banquetDetail.contractInfo?.contractImages?.forEach((element) {
         UploadImgModel uploadImgModel = UploadImgModel();
         uploadImgModel.process = 1;
         uploadImgModel.qiniuUrl = element.url;
--- a/lib/pages/my/photo_type/table_photo_manager_page.dart
View file @61a8937
+++ b/lib/pages/my/photo_type/table_photo_manager_page.dart
View file @61a8937
 import 'dart:convert';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:one_key/constant/state.dart';
 import 'package:one_key/models/table_photo_model.dart';
 import 'package:one_key/models/upload_img_model.dart';
+import 'package:one_key/net/dio_util.dart';
 import 'package:one_key/pages/online_check/img_picker_widget.dart';
 import 'package:one_key/provider/table_photo_manager_provider.dart';
 import 'package:one_key/provider/upload_img_provider.dart';
@@ -130,6 +132,18 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> {
     bool success = await _tablePhotoManagerModel.delTablePhoto(context, params,
         isShowLoading: true);
     if (success) {
+      // String entry = 'qn.colorcun.com:FhPRiYHsv64MELeqTDp9A5TBuBp1/jpeg';
+      // Codec<String, String> stringToBase64 = utf8.fuse(base64);
+      // String encoded = stringToBase64.encode(entry);
+      // DioUtil.getInstance().getDio().options.headers = {
+      //   "Authorization":
+      //       'Qiniu uva-aaonM8dukeR6phc9yuPBrOXk9brrNW_PxLD7:7RbiwJYcLWQlVBaYarlWsKKLtDc=:eyJzY29wZSI6ImNvbG9yY3VuLWF0dHIiLCJkZWFkbGluZSI6MTcxMDEzMjAzNH0='
+      // };
+      // Response response = await DioUtil.getInstance()
+      //     .getDio()
+      //     .post('http://rs.qiniuapi.com/delete/${encoded}');
+
+      // print(response);
       print('删除成功');
       //调用删除桌子图片接口
       _uploadImageProvider.tableImageList.removeWhere(
--- a/lib/utils/upload_image_util.dart
View file @61a8937
+++ b/lib/utils/upload_image_util.dart
View file @61a8937
@@ -115,6 +115,7 @@ class UploadImageUtil {
       uploadImageProvider.notifyListeners();
     });
     // 添加实际发送进度订阅
+   
     putController.addSendProgressListener((percent) {
       // _onlineCheckEditProvider.imageList[index].process = percent;
       // setState(() {});
@@ -129,6 +130,7 @@ class UploadImageUtil {
       return;
     }
     print('开始上传文件');
+    
     storage.putFile(
       selectedFile,
       usedToken,