huxiaoqiang il y a 4 ans
Parent
commit
a9fd292926

+ 7 - 4
lib/https/MyDio.dart

@@ -5,6 +5,7 @@ import 'package:bbyyy/beans/simple_bean.dart';
 import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
 import 'package:bbyyy/my_tools/global.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
+import 'package:bbyyy/paegs/root_page/root_page_view.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -163,8 +164,7 @@ class MyDio {
     post('/data/update', data, sCallBack, fCallBack);
   }
 
-  updateM(
-      data, SCallBack sCallBack, FCallBack fCallBack) {
+  updateM(data, SCallBack sCallBack, FCallBack fCallBack) {
     post('/data/updateM', data, sCallBack, fCallBack);
   }
 
@@ -219,9 +219,12 @@ class MyDio {
         return true;
       } else {
         EasyLoading.showToast(simpleBean.error);
-        if (simpleBean.error.contains('token')||simpleBean.error.contains('会话过期,请重新登录')) {
+        if (simpleBean.error.contains('token') ||
+            simpleBean.error.contains('会话过期,请重新登录')) {
           MyCookie().clean();
-          navigatorKey.currentState.pushNamedAndRemoveUntil('/loginPage', ModalRoute.withName("/loginPage"));
+          RootPageView().bNIndex = 0;
+          navigatorKey.currentState.pushNamedAndRemoveUntil(
+              '/loginPage', ModalRoute.withName("/loginPage"));
         }
         return false;
       }

+ 43 - 9
lib/main.dart

@@ -12,7 +12,6 @@ import 'package:bbyyy/paegs/gang_page/gang_in_page/gang_in_page.dart';
 import 'package:bbyyy/paegs/login_page/login_page.dart';
 import 'package:bbyyy/paegs/root_page/root_page_view.dart';
 import 'package:bbyyy/paegs/welcome_page/welcome_page.dart';
-import 'package:catcher/catcher.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -37,6 +36,7 @@ import 'my_tools/global.dart';
 import 'my_tools/my_colors.dart';
 import 'my_tools/my_views.dart';
 import 'my_tools/order.dart';
+import 'my_tools/pop_up_queue.dart';
 
 final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
     FlutterLocalNotificationsPlugin();
@@ -212,11 +212,15 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
 
   //获取剪切板文字
   Future<void> getClipboardData() async {
+    PopUpQueue().onShow = true;
     ClipboardData text = await Clipboard.getData(Clipboard.kTextPlain);
-    print('Clipboard-----\n${text.text}');
+    try{print('Clipboard-----\n${text.text}');
     clipboardT = text.text;
     Clipboard.setData(ClipboardData(text: ''));
-    getOnlineTemplate();
+    getOnlineTemplate();}catch(e){
+      PopUpQueue().onShow = false;
+      PopUpQueue().showNext();
+    }
   }
 
   //获取线上模板
@@ -230,12 +234,19 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
         TemplateBeanEntity entity = TemplateBeanEntity()
             .fromJson(json.decode(response.data.toString()));
         checkOrder(entity.data);
+      }else{
+        PopUpQueue().onShow = false;
+        PopUpQueue().showNext();
       }
-    }, (error) {});
+    }, (error) {
+      PopUpQueue().onShow = false;
+      PopUpQueue().showNext();
+    });
   }
 
   //匹配模板去除不是自己的订单
   void checkOrder(List<TemplateBeanData> data) {
+    bool hasMatch = false;
     w:
     for (int i = 0; i < data.length; i++) {
       try {
@@ -255,11 +266,18 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
                   .name
                   .contains(element.seller.name));
           if (order.length > 0) {
+            hasMatch = true;
             getShop(order);
           }
           break w;
         }
-      } catch (e) {}
+      } catch (e) {
+
+      }
+    }
+    if(!hasMatch){
+      PopUpQueue().onShow = false;
+      PopUpQueue().showNext();
     }
   }
 
@@ -364,6 +382,8 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
         shops.removeWhere((element) => !element.privateShop);
         if (shops.length == 0) {
           showToast('你还没有添加任何货帮,暂时不能发送智能订单');
+          PopUpQueue().onShow = false;
+          PopUpQueue().showNext();
         } else {
           EasyLoading.instance
             ..contentPadding = EdgeInsets.symmetric(horizontal: 0, vertical: 12)
@@ -391,7 +411,8 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
                               right: 0,
                               child: GestureDetector(
                                 onTap: () {
-                                  EasyLoading.dismiss();
+                                  PopUpQueue().onShow = false;
+                                  PopUpQueue().showNext();
                                 },
                                 behavior: HitTestBehavior.translucent,
                                 child: Container(
@@ -478,6 +499,8 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
                                 showToast('发送成功');
                                 clipboardT = '';
                                 EventBus().off('saveOrder');
+                                PopUpQueue().onShow = false;
+                                PopUpQueue().showNext();
                               }
                             });
                             order.forEach((element) {
@@ -508,7 +531,14 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
           );
         }
       }
-    }, (error) {});
+      else{
+        PopUpQueue().onShow = false;
+        PopUpQueue().showNext();
+      }
+    }, (error) {
+      PopUpQueue().onShow = false;
+      PopUpQueue().showNext();
+    });
   }
 
   //店铺视图
@@ -762,7 +792,8 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
                   Expanded(
                     child: GestureDetector(
                       onTap: () {
-                        EasyLoading.dismiss();
+                        PopUpQueue().onShow = false;
+                        PopUpQueue().showNext();
                       },
                       behavior: HitTestBehavior.translucent,
                       child: Container(
@@ -790,6 +821,8 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
                           payTheOrder();
                         } else {
                           showToast('该订单与你无关');
+                          PopUpQueue().onShow = false;
+                          PopUpQueue().showNext();
                         }
                       },
                       behavior: HitTestBehavior.translucent,
@@ -944,7 +977,8 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
                     ),
                     GestureDetector(
                       onTap: () {
-                        EasyLoading.dismiss();
+                        PopUpQueue().onShow = false;
+                        PopUpQueue().showNext();
                       },
                       behavior: HitTestBehavior.translucent,
                       child: Container(

+ 46 - 0
lib/my_tools/pop_up_queue.dart

@@ -0,0 +1,46 @@
+import 'package:bbyyy/beans/coupon_bean_entity.dart';
+import 'package:bbyyy/beans/new_order_bean_entity.dart';
+import 'package:bbyyy/beans/system_information_bean_entity.dart';
+import 'package:bbyyy/my_tools/event_bus.dart';
+
+import 'easy_loading/easy_loading.dart';
+
+class PopUpQueue {
+  PopUpQueue._internal();
+
+  static PopUpQueue _singleton = PopUpQueue._internal();
+
+  factory PopUpQueue() => _singleton;
+  List<CouponBeanDataData> coupon = [];
+  var nsqData = [];
+  bool onShow = true;
+  showNext(){
+    print('=========================');
+    print(onShow);
+    print(nsqData.length);
+    print(coupon.length);
+    print('=========================');
+    if(onShow){
+      return;
+    }
+    if(nsqData.isNotEmpty){
+      if(nsqData[0] is NewOrderBeanEntity){
+        onShow = true;
+        EventBus().emit('hasNewOrder', nsqData[0]);
+        nsqData.removeAt(0);
+      }else if(nsqData[0] is SystemInformationBeanEntity){
+        onShow = true;
+        EventBus().emit('systemInformation',nsqData[0]);
+        nsqData.removeAt(0);
+      }
+    }
+    else if(coupon.isNotEmpty){
+      onShow = true;
+      EventBus().emit('hasCoupon',coupon[0]);
+      coupon.clear();
+    }
+    else{
+      EasyLoading.dismiss();
+    }
+  }
+}

+ 5 - 3
lib/nsq/nsq.dart

@@ -17,6 +17,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:bbyyy/beans/system_information_bean_entity.dart';
 
 import '../main.dart';
+import 'package:bbyyy/my_tools/pop_up_queue.dart';
 
 //const ServerIP = '127.0.0.1';
 //const ServerPort = 4150; // 服务器端口号
@@ -56,7 +57,8 @@ Future<void> handlerMessage(Message message) async {
     if (entity.type == notifyTypeNewOrder) {
       NewOrderBeanEntity order =
           NewOrderBeanEntity().fromJson(json.decode(utf8.decode(message.Body)));
-      EventBus().emit('hasNewOrder', order);
+      PopUpQueue().nsqData.insert(0, order);
+      PopUpQueue().showNext();
     }
     else if (entity.type == notifyTypeNewMsg) {
       MessageBeanEntity entity =
@@ -74,7 +76,6 @@ Future<void> handlerMessage(Message message) async {
       EventBus().emit('alipayPaymentCallback');
     }
     else if(entity.type == notifyTypeSysMsg){
-      print('$notifyTypeSysMsg---------------------------\n${utf8.decode(message.Body)}\n---------------------');
       SystemInformationBeanEntity entity = SystemInformationBeanEntity().fromJson(json.decode(utf8.decode(message.Body)));
       String systemInformation = MyCookie().prefs.getString('${MyCookie().getUID()}系统消息');
       if(systemInformation==null){
@@ -90,7 +91,8 @@ Future<void> handlerMessage(Message message) async {
         sI.insert(0, entity);
         MyCookie().prefs.setString('${MyCookie().getUID()}系统消息', json.encode(sI));
       }
-      EventBus().emit('systemInformation',entity);
+      PopUpQueue().nsqData.insert(0, entity);
+      PopUpQueue().showNext();
     }
   } catch (e) {}
   return;

+ 3 - 0
lib/paegs/gang_page/gang_in_page/gang_in_page.dart

@@ -26,6 +26,7 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'gang_information_page/gang_information_page.dart';
+import 'package:bbyyy/my_tools/pop_up_queue.dart';
 
 class GangInPage extends StatefulWidget {
   MyShopBeanDataData data;
@@ -852,6 +853,8 @@ class _GangInPageState extends State<GangInPage> {
         ),
         (then) {
           controller.requestRefresh();
+          PopUpQueue().onShow = false;
+          PopUpQueue().showNext();
         });
     // showPayDialog(data, context, () {
     //   Navigator.pop(context);

+ 5 - 1
lib/paegs/gang_page/gang_in_page/pay_to_the_helper_page/pay_to_the_helper_page.dart

@@ -222,7 +222,11 @@ class _PayToTheHelperPageState extends State<PayToTheHelperPage> {
           sellPic: widget.data.ownerPic,
           sellUid: widget.data.ownerUid,
         ),
-        (then) {});
+        (then) {
+          if(then is int && then ==1){
+            Navigator.pop(context);
+          }
+        });
     // MyTools().toPage(context, PayPage(orderUID, true, amount), (then) {
     //   if (then is String) {
     //     if (then == '支付成功') {

+ 2 - 1
lib/paegs/root_page/root_page.dart

@@ -19,6 +19,7 @@ import 'package:bbyyy/paegs/root_page/root_page_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:bbyyy/my_tools/pop_up_queue.dart';
 import 'package:bbyyy/beans/coupon_bean_entity.dart';
 class RootPage extends StatefulWidget {
   @override
@@ -165,7 +166,7 @@ class _RootPageState extends State<RootPage> {
     }, (response, hasError) {
       if(!hasError){
         CouponBeanEntity entity = CouponBeanEntity().fromJson(json.decode(response.data.toString()));
-        EventBus().emit('hasCoupon',entity.data.data[0]);
+        PopUpQueue().coupon.addAll(entity.data.data);
       }
     }, (error) {});
   }

+ 4 - 4
lib/paegs/welcome_page/welcome_page.dart

@@ -38,14 +38,14 @@ class _WelcomePageState extends State<WelcomePage> {
       } else {
         checkLogin((r, hE) {
           if (!hE) {
-            MyTools().toPage(context, RootPage(), (then) {}, noBack: true);
-          } else {
             String token = MyCookie().getToken();
             LoginInformationBeanEntity loginInformation =
-                LoginInformationBeanEntity()
-                    .fromJson(json.decode(r.data.toString()));
+            LoginInformationBeanEntity()
+                .fromJson(json.decode(r.data.toString()));
             loginInformation.data.token = token;
             MyCookie().saveLoginInformationBeanEntity(loginInformation);
+            MyTools().toPage(context, RootPage(), (then) {}, noBack: true);
+          } else {
             MyTools().toPage(context, LoginPage(), (then) {}, noBack: true);
           }
         }, (e) {});

+ 107 - 107
pubspec.lock

@@ -5,56 +5,56 @@ packages:
     dependency: "direct main"
     description:
       name: amap_location
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0"
   archive:
     dependency: transitive
     description:
       name: archive
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.2"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.5.0"
   audioplayers:
     dependency: "direct main"
     description:
       name: audioplayers
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.18.3"
   azlistview:
     dependency: "direct main"
     description:
       name: azlistview
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.1"
   badges:
     dependency: "direct main"
     description:
       name: badges
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   catcher:
@@ -68,63 +68,63 @@ packages:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
   common_utils:
     dependency: transitive
     description:
       name: common_utils
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.4"
   convert:
     dependency: "direct main"
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   crypto:
     dependency: "direct main"
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   decimal:
     dependency: transitive
     description:
       name: decimal
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0+1"
   device_info_plus:
@@ -173,42 +173,42 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   disable_screenshots:
     dependency: "direct main"
     description:
       name: disable_screenshots
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.0"
   flustars:
     dependency: "direct main"
     description:
       name: flustars
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.3.3"
   flutter:
@@ -220,35 +220,35 @@ packages:
     dependency: transitive
     description:
       name: flutter_blurhash
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.0"
   flutter_cache_manager:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   flutter_image_compress:
     dependency: "direct main"
     description:
       name: flutter_image_compress
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.7.0"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.0.0+1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   flutter_localizations:
@@ -267,35 +267,35 @@ packages:
     dependency: transitive
     description:
       name: flutter_page_indicator
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.0.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   flutter_slidable:
     dependency: "direct main"
     description:
       name: flutter_slidable
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.5.7"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.21.0+1"
   flutter_swiper:
     dependency: "direct main"
     description:
       name: flutter_swiper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   flutter_test:
@@ -319,91 +319,91 @@ packages:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.13.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   image:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.2"
   image_cropper:
     dependency: "direct main"
     description:
       name: image_cropper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.4.0"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.7.4"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   install_plugin:
     dependency: "direct main"
     description:
       name: install_plugin
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   intl:
     dependency: transitive
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.17.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
   launch_review:
     dependency: "direct main"
     description:
       name: launch_review
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   lpinyin:
     dependency: "direct main"
     description:
       name: lpinyin
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   mailer:
@@ -417,14 +417,14 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   mime:
@@ -438,14 +438,14 @@ packages:
     dependency: transitive
     description:
       name: octo_image
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0+1"
   package_info:
     dependency: "direct main"
     description:
       name: package_info
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.3+4"
   package_info_plus:
@@ -494,140 +494,140 @@ packages:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.5.0"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.11.0"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.3"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.3"
+    version: "3.3.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.2.1"
   pull_to_refresh:
     dependency: "direct main"
     description:
       name: pull_to_refresh
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.5"
   rational:
     dependency: transitive
     description:
       name: rational
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   rxdart:
     dependency: "direct main"
     description:
       name: rxdart
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.26.0"
   scroll_to_index:
     dependency: "direct main"
     description:
       name: scroll_to_index
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.6"
   scrollable_positioned_list:
     dependency: transitive
     description:
       name: scrollable_positioned_list
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.10"
   sentry:
@@ -641,49 +641,49 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   simple_logger:
     dependency: "direct main"
     description:
       name: simple_logger
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0+1"
   sky_engine:
@@ -695,98 +695,98 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
   sp_util:
     dependency: transitive
     description:
       name: sp_util
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0+3"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0+2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.19"
   timezone:
     dependency: transitive
     description:
       name: timezone
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.7.0"
   tobias:
     dependency: "direct main"
     description:
       name: tobias
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   transformer_page_view:
     dependency: transitive
     description:
       name: transformer_page_view
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.6"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   universal_io:
@@ -800,77 +800,77 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.0.3"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   uuid:
     dependency: "direct main"
     description:
       name: uuid
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.4"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.1.0"
 sdks:

+ 1 - 1
pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.6+1
+version: 1.0.7+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"