Merge branch 'master' of http://git.ycjcjy.com/nanyang/worker_client

lib/models/app.dart

@@ -2,6 +2,7 @@
 import 'dart:io';
 
 import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/services/user.dart';
 import '/models/entities/person.dart';
 import '/widgets/Modal.dart';
@@ -11,7 +12,7 @@ import '../utils/location.dart';
 class AppController extends GetxController {
   // 有了这句, 可以直接 AppController.t 调用
   static AppController t = Get.find();
-
+  GetStorage box = GetStorage();
   final user = Rx<Person>(Person());
   final location = Rxn<Map<String, Object>>();
   final testInt = 1.obs;
@@ -35,7 +36,6 @@ class AppController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-
     //尝试获取 location
     requireLocation(onLocationChange).then((loc) {
       _location = loc;
@@ -49,12 +49,14 @@ class AppController extends GetxController {
       );
     });
 
-    // // 尝试获取一次人员信息
-    getCurrent().then((person) {
-      user(Person.fromJson(person));
-    }).catchError((e) {
-      print(e);
-    });
+    if(box.read('token')!=null) {
+      // 尝试获取一次人员信息
+      getCurrent().then((person) {
+        user(Person.fromJson(person));
+      }).catchError((e) {
+        print(e);
+      });
+    }
   }
 
   @override

lib/models/entities/person.dart

@@ -1,59 +1,15 @@
-// class Person {
-//   String? personId;
-//   String? appId;
-//   String? openid;
-//   String? nickName;
-//   String? userName;
-//   String? avatar;
-//   int? sex;
-//   String? phone;
-//   String? userId;
-//   int? status;
-//   String? createDate;
-//
-//   Person();
-//
-//   Person.fromJson(Map<String, dynamic> json)
-//       : personId = json["personId"],
-//         appId = json["appId"],
-//         openid = json["openid"],
-//         nickName = json["nickName"],
-//         userName = json["userName"],
-//         avatar = json["avatar"],
-//         sex = json["sex"],
-//         phone = json["phone"],
-//         userId = json["userId"],
-//         status = json["status"],
-//         createDate = json["createDate"];
-//
-//   Map<String, dynamic> toJson() => {
-//         'personId': personId,
-//         'appId': appId,
-//         'openid': openid,
-//         'nickName': nickName,
-//         'userName': userName,
-//         'avatar': avatar,
-//         'sex': sex,
-//         'phone': phone,
-//         'userId': userId,
-//         'status': status,
-//         'createDate': createDate,
-//       };
-// }
-
-
 class Person {
   String? personId;
   String? appId;
   String? openid;
   String? nickName;
+  String? userName;
   String? avatar;
   num? sex;
   String? phone;
   String? userId;
   num? status;
   String? createDate;
-  String? identity;
   bool? isOrgManager;
 
   Person();
@@ -63,28 +19,27 @@ class Person {
         appId = json["appId"],
         openid = json["openid"],
         nickName = json["nickName"],
+        userName = json["userName"],
         avatar = json["avatar"],
         sex = json["sex"],
         phone = json["phone"],
         userId = json["userId"],
         status = json["status"],
         createDate = json["createDate"],
-        isOrgManager = json["isOrgManager"],
-        identity = json["identity"];
+        isOrgManager = json["isOrgManager"];
 
   Map<String, dynamic> toJson() => {
-    'personId': personId,
-    'appId': appId,
-    'openid': openid,
-    'nickName': nickName,
-    'avatar': avatar,
-    'sex': sex,
-    'phone': phone,
-    'userId': userId,
-    'status': status,
-    'createDate': createDate,
-    'isOrgManager': isOrgManager,
-    'identity': identity,
-
-  };
+        'personId': personId,
+        'appId': appId,
+        'openid': openid,
+        'nickName': nickName,
+        'userName': userName,
+        'avatar': avatar,
+        'sex': sex,
+        'phone': phone,
+        'userId': userId,
+        'status': status,
+        'createDate': createDate,
+        'isOrgManager': isOrgManager,
+      };
 }

lib/pages/Login/index.dart

@@ -85,9 +85,7 @@ class _Login extends State<Login> {
             userInfo(Person.fromJson(res['person']));
             Fluttertoast.showToast(msg: '登录成功！');
             Get.offNamed('/home');
-            // print(userInfo);
           }).catchError((err) {
-            print(err);
             Fluttertoast.showToast(msg: err);
           });
         } else {

lib/pages/home/index.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -127,10 +129,15 @@ class Home extends BasicPage {
                               itemCount: 1,
                               itemBuilder:
                                   (BuildContext context, int position) {
-                                jobList([
-                                  ...jobList.value,
-                                  ...GetList(data.records)
-                                ]);
+                                if (jobList.value.isNotEmpty &&
+                                    jobList.value[0].jobId !=
+                                        GetList(data.records)[0].jobId) {
+                                  jobList([
+                                    ...jobList.value,
+                                    ...GetList(data.records)
+                                  ]);
+                                }
+
                                 return Obx(() {
                                   if (jobList.value != []) {
                                     return Column(

lib/pages/index.dart

@@ -6,6 +6,8 @@ export 'main/index.dart';
 export 'jobDetail/index.dart';
 export 'orderDetail/index.dart';
 export 'machineryList/index.dart';
+export 'machineryDetail/index.dart';
+export 'machineryMap/index.dart';
 export 'bankList/index.dart';
 export 'addBankCard/index.dart';
 

lib/pages/machineryDetail/index.dart

@@ -0,0 +1,156 @@
+import 'package:carousel_slider/carousel_slider.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/entities/Machinery.dart';
+import 'package:worker_client/services/machinery.dart';
+import 'package:worker_client/widgets/Jianbian/index.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+class MachineryDetail extends BasicPage {
+  MachineryDetail({Key? key}) : super(key: key) {
+    naviTitle = '查看详情';
+  }
+  final machinery = Rx<Machinery>(Machinery());
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    if (Get.arguments != null) {
+      getMachineryDetail(Get.arguments['id'], {
+        'attached': true,
+        'location': '118.84002,31.95266'
+      }).then((res) => {machinery(Machinery.fromJson(res))});
+    }
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    return SizedBox(
+      width: 375.w,
+      child: ListView(
+        children: [
+          Obx(() => Stack(
+                children: [
+                  Positioned(
+                      top: 0,
+                      left: 0,
+                      child: SizedBox(
+                        width: 375.w,
+                        child: CarouselSlider(
+                          items: machinery.value.imagesList!
+                              .map((item) => Image.network(item.url.toString(),
+                                  fit: BoxFit.cover, width: 375.w))
+                              .toList(),
+                          options: CarouselOptions(
+                            autoPlay: true,
+                            enlargeCenterPage: false,
+                            //图片中心放大
+                            viewportFraction: 1,
+                            height: 187.5.w,
+                            initialPage: 1, //初始页
+                          ),
+                        ),
+                      )),
+                  Container(
+                      margin: EdgeInsets.only(top: 157.5.w),
+                      decoration: BoxDecoration(
+                          color: const Color(0xffffffff),
+                          borderRadius: BorderRadius.only(
+                              topLeft: Radius.circular(20.w),
+                              topRight: Radius.circular(20.w))),
+                      child: Column(
+                        children: [
+                          Container(
+                            height: 46.w,
+                            clipBehavior: Clip.hardEdge,
+                            decoration: BoxDecoration(
+                                borderRadius: BorderRadius.only(
+                                    topLeft: Radius.circular(20.w))),
+                            child: Stack(
+                              children: [
+                                Jianbian(
+                                  status: machinery.value.status,
+                                  type: 'machinery',
+                                  value: machinery.value.jobStatus,
+                                )
+                              ],
+                            ),
+                          ),
+                          Container(
+                            margin: EdgeInsets.only(
+                                top: 6.h, left: 15.w, right: 15.w),
+                            alignment: Alignment.centerLeft,
+                            child: Text(
+                              machinery.value.name.toString(),
+                              style: TextStyle(
+                                  fontSize: 18.sp,
+                                  fontWeight: FontWeight.bold,
+                                  color: const Color(0xff222222)),
+                            ),
+                          ),
+                          Container(
+                            margin: EdgeInsets.fromLTRB(15.w, 43.h, 15.w, 25.h),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Image.asset(
+                                  'images/machinery/micon2.png',
+                                  width: 17.w,
+                                ),
+                                Container(
+                                  padding:
+                                      EdgeInsets.only(left: 15.w, right: 15.w),
+                                  child: Text(
+                                    '农机详情',
+                                    style: TextStyle(
+                                        color: const Color(0xff222222),
+                                        fontWeight: FontWeight.bold,
+                                        fontSize: 15.sp,
+                                        height: 1.2),
+                                  ),
+                                ),
+                                Image.asset(
+                                  'images/machinery/micon2.png',
+                                  width: 17.w,
+                                ),
+                              ],
+                            ),
+                          ),
+                          Container(
+                            margin: EdgeInsets.only(left: 15.w, right: 15.w),
+                            child: Column(
+                              children: machinery.value.contentList != null
+                                  ? machinery.value.contentList!.map((e) {
+                                      if (e.contentType == 'image') {
+                                        return Image.network(
+                                            e.content.toString(),
+                                            fit: BoxFit.cover,
+                                            width: 345.w);
+                                      } else {
+                                        return Container(
+                                          alignment: Alignment.centerLeft,
+                                          margin: EdgeInsets.only(
+                                              top: 15.h, bottom: 15.h),
+                                          child: Text(
+                                            e.content.toString(),
+                                            style: TextStyle(
+                                              fontSize: 15.sp,
+                                              color: const Color(0xff222222),
+                                            ),
+                                          ),
+                                        );
+                                      }
+                                    }).toList()
+                                  : [],
+                            ),
+                          )
+                        ],
+                      )),
+                ],
+              ))
+        ],
+      ),
+    );
+  }
+}

lib/pages/machineryList/index.dart

@@ -21,20 +21,32 @@ class MachineryList extends BasicPage {
     });
   }
 
+  void goDetail(id) {
+    Get.toNamed('/machineryDetail', arguments: {'id': id});
+  }
+  void goMap(id) {
+    Get.toNamed('/machineryMap', arguments: {'id': id});
+  }
+
   @override
   Widget builder(BuildContext context) {
-    naviTitle = '我的';
+    naviTitle = '农机列表';
     return Container(
       padding: EdgeInsets.only(top: 15.w),
-      child: Obx(() => machineryList.value.length > 0
+      child: Obx(() => machineryList.value.isNotEmpty
           ? ListView(
-        children: machineryList.value
-            .map((e) =>
-            MachineryCard(machinery: e, goDetail: () {}, goMap: () {}))
-            .toList(),
-      )
+              children: machineryList.value
+                  .map((e) => MachineryCard(
+                      machinery: e,
+                      goDetail: () {
+                        goDetail(e.machineryId);
+                      },
+                      goMap: () {
+                        goMap(e.machineryId);
+                      }))
+                  .toList(),
+            )
           : const NullCard(text: '暂无更多农机')),
-    )
-      ;
+    );
   }
 }

lib/pages/machineryMap/index.dart

@@ -0,0 +1,124 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/entities/Machinery.dart';
+import 'package:worker_client/services/machinery.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+class MachineryMap extends BasicPage {
+  MachineryMap({Key? key}) : super(key: key);
+  final machineryList = Rx<List<Machinery>>([]);
+  final machinery = Rx<Machinery>(Machinery());
+
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    if (Get.arguments != null) {
+      getMachineryDetail(Get.arguments['id'], {
+        'attached': true,
+        'location': '118.84002,31.95266'
+      }).then((res) => {machinery(Machinery.fromJson(res))});
+    }
+  }
+
+  void goBack() {
+    Get.back();
+  }
+  void goDetail() {
+    Get.toNamed('/machineryDetail',
+        arguments: {'id': machinery.value.machineryId});
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    naviTitle = '我的农机';
+    return Stack(
+      children: [
+        Container(
+          width: 375.w,
+          decoration: const BoxDecoration(color: Colors.greenAccent),
+        ),
+        Positioned(
+          bottom: 0,
+          child: Container(
+            width: 375.w,
+            padding: EdgeInsets.symmetric(horizontal: 15.w, vertical: 30.h),
+            decoration: BoxDecoration(
+                borderRadius: BorderRadius.only(
+                    topLeft: Radius.circular(20.w),
+                    topRight: Radius.circular(20.w)),
+                color: Colors.white),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                GestureDetector(
+                  onTap: () {
+                    goBack();
+                  },
+                  child: Text(
+                    '<<农机列表',
+                    style: TextStyle(
+                        color: const Color(0xff666666),
+                        fontSize: 15.sp,
+                        fontWeight: FontWeight.bold),
+                  ),
+                ),
+                Container(
+                  margin: EdgeInsets.only(top: 30.h, bottom: 20.h),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        '第一台收割机',
+                        style: TextStyle(
+                            color: const Color(0xff222222),
+                            fontSize: 18.sp,
+                            fontWeight: FontWeight.bold),
+                      ),
+                      GestureDetector(
+                        onTap: () {
+                          goDetail();
+                        },
+                        child: Text(
+                          '详情>>',
+                          style: TextStyle(
+                              color: const Color(0xff666666),
+                              fontSize: 15.sp,
+                              fontWeight: FontWeight.bold),
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+                Row(
+                  children: [
+                    Container(
+                      margin: EdgeInsets.only(right: 8.w),
+                      child: Image.asset(
+                        'images/index/position.png',
+                        width: 17.w,
+                      ),
+                    ),
+                    Expanded(
+                      flex: 1,
+                      child: Text(
+                        '当前位置：  江苏省南京市南京南站城际空间站D2栋212南京云致科技服务有限公司',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 15.sp,
+                          color: const Color(0xff222222),
+                        ),
+                      ),
+                    )
+                  ],
+                )
+              ],
+            ),
+          ),
+        )
+      ],
+    );
+  }
+}

lib/pages/main/index.dart

@@ -32,21 +32,24 @@ class Main extends BasicPage {
     Get.toNamed('/machineryList');
   }
 
+  void goWallet() {
+    //钱包页面
+    // Get.toNamed('/bankList');
+  }
   void goBankPage() {
-    Get.toNamed('/bankList');
+    // if (store.user().isOrgManager==true) {
+      Get.toNamed('/bankList');
+    // }
   }
 
   @override
   Widget builder(BuildContext context) {
-    print(store.user);
-
     return Container(
       decoration: const BoxDecoration(color: Colors.white),
       child: ListView(
         children: [
           Stack(
             children: [
-              Obx(()=>
               Positioned(
                 top: 0,
                 child: Container(
@@ -64,10 +67,16 @@ class Main extends BasicPage {
                       Container(
                         margin: EdgeInsets.fromLTRB(40.w, 0, 10.w, 0),
                         child: store.user().avatar != null
-                            ? Image.network(
-                                store.user().avatar.toString(),
-                                width: 63.w,
-                                height: 63.w,
+                            ? Container(
+                                clipBehavior: Clip.hardEdge,
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(
+                                        Radius.circular(31.5.w))),
+                                child: Image.network(
+                                  store.user().avatar.toString(),
+                                  width: 63.w,
+                                  height: 63.w,
+                                ),
                               )
                             : Image.asset(
                                 'images/main/defaultAvatar.png',
@@ -80,7 +89,9 @@ class Main extends BasicPage {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           Text(
-                            store.user().nickName != null?store.user().nickName.toString():'',
+                            store.user().nickName != null
+                                ? store.user().nickName.toString()
+                                : '',
                             style: TextStyle(
                                 color: Colors.white,
                                 fontWeight: FontWeight.w500,
@@ -96,8 +107,9 @@ class Main extends BasicPage {
                           Container(
                             margin: EdgeInsets.fromLTRB(0, 19.h, 0, 0),
                             child: Text(
-                                store.user().nickName != null?
-                              store.user().phone.toString():'',
+                              store.user().nickName != null
+                                  ? store.user().phone.toString()
+                                  : '',
                               style: TextStyle(
                                   color: Colors.white,
                                   fontWeight: FontWeight.w500,
@@ -117,14 +129,13 @@ class Main extends BasicPage {
                   ),
                 ),
               ),
-              ),
               Positioned(
                 right: 0,
                 top: 0,
                 child: Container(
                   decoration: const BoxDecoration(color: Color(0xb2000000)),
                   child: Text(
-                    '该账号归${store.user().nickName!=null?store.user().nickName.toString():''}所属',
+                    '该账号归${store.user().userName != null ? store.user().nickName.toString() : ''}所属',
                     style: TextStyle(color: Colors.white, fontSize: 12.sp),
                   ),
                 ),

lib/routes/pages.dart

@@ -17,6 +17,8 @@ List<GetPage> pages=[
   GetPage(name: '/jobDetail', page: () => JobDetail()),
   GetPage(name: '/orderDetail', page: () => OrderDetail()),
   GetPage(name: '/machineryList', page: () => MachineryList()),
+  GetPage(name: '/machineryDetail', page: () => MachineryDetail()),
+  GetPage(name: '/machineryMap', page: () => MachineryMap()),
   GetPage(name: '/bankList', page: () => BankListPages()),
   GetPage(name: '/addBankCard', page: () => AddBankPage()),
 ];

lib/services/machinery.dart

@@ -7,17 +7,18 @@ import 'package:fluttertoast/fluttertoast.dart';
 /// @returns
 Future getMachineryList(params) async {
   return request('/machinery',
-      options: Options(method: 'GET'), queryParameters: params)
+          options: Options(method: 'GET'), queryParameters: params)
       .catchError((error) =>
-  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+          {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
 }
 
 /// 农机详情
 /// @param {*} data
 /// @returns
-Future getMachineryDetail(String id) async {
-  return request('/machinery-summary/$id', options: Options(method: 'GET'))
+Future getMachineryDetail(String id, params) async {
+  return request('/machinery-summary/$id',
+          options: Options(method: 'GET'), queryParameters: params)
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
-}
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
+}

lib/widgets/Jianbian/index.dart

@@ -4,12 +4,13 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:worker_client/widgets/MyCard/entities/ItemColor.dart';
 
 class Jianbian extends StatelessWidget {
-  Jianbian({Key? key,  this.type, required this.status, this.value})
+  Jianbian({Key? key, this.type, required this.status, this.value, this.ptop})
       : super(key: key);
 
   final String? type;
   final dynamic status;
   final dynamic? value;
+  final double? ptop;
 
   List<ItemColor> colors = [
     ItemColor(const Color(0xFFC7C7C7), const Color(0xFF8F8F8F),
@@ -56,7 +57,7 @@ class Jianbian extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Positioned(
-      top: -61.w,
+      top: ptop == null ? -61.w : ptop! - 61.w,
       left: -67.w,
       child: Transform.rotate(
         angle: pi / 6,

lib/widgets/LoadMore.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/widgets.dart';
 import '/models/entities/PagedResult.dart';
 
@@ -8,20 +7,20 @@ class LoadMore extends StatefulWidget {
     required this.builder,
     required this.fetch,
     this.onError,
-  }): super(key: key);
+  }) : super(key: key);
 
   Future Function(Map param) fetch;
   Function? onError;
 
   Widget Function({
-  required BuildContext context,
-  required ScrollController scrollController,
-  required PagedResult data,
-  required bool haveMore,
+    required BuildContext context,
+    required ScrollController scrollController,
+    required PagedResult data,
+    required bool haveMore,
   }) builder;
 
   @override
-  State<StatefulWidget> createState () => _LoadMoreState();
+  State<StatefulWidget> createState() => _LoadMoreState();
 }
 
 class _LoadMoreState extends State<LoadMore> {
@@ -53,7 +52,7 @@ class _LoadMoreState extends State<LoadMore> {
   Future fetchData() {
     final pageNum = result.current + 1;
     final pageSize = result.size == 0 ? 10 : result.size;
-    Map<String, dynamic> params = { "pageNum": pageNum, "pageSize": pageSize };
+    Map<String, dynamic> params = {"pageNum": pageNum, "pageSize": pageSize};
     return Future.value(widget.fetch(params).then((res) {
       setState(() {
         result = PagedResult.fromJson(res);

pubspec.lock

@@ -5,175 +5,175 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "39.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
       name: amap_flutter_base
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   amap_flutter_location:
     dependency: "direct main"
     description:
       name: amap_flutter_location
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   amap_flutter_map:
     dependency: "direct main"
     description:
       name: amap_flutter_map
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.8.2"
   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"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   carousel_slider:
     dependency: "direct main"
     description:
       name: carousel_slider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   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"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.2"
   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.4"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.3"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.6"
   dotted_border:
     dependency: "direct main"
     description:
       name: dotted_border
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0+2"
   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.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.2"
   flutter:
@@ -185,7 +185,7 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   flutter_picker:
@@ -199,14 +199,14 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.5.2"
   flutter_test:
@@ -223,238 +223,238 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "8.0.9"
   get:
     dependency: "direct main"
     description:
       name: get
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.6.1"
   get_storage:
     dependency: "direct main"
     description:
       name: get_storage
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   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"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.5.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.2.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   path:
     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: "1.0.0"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.13"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
   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.1.5"
   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.5"
   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.3"
   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.5"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "9.2.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "9.0.2+1"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "9.0.4"
   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.7.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.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.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   sky_engine:
@@ -466,105 +466,105 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.2"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.2"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.1"
   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"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.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"
   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.4.8"
   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"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.5.2"
   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+1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
 sdks:

pubspec.yaml

@@ -76,6 +76,7 @@ flutter:
     - images/login/
     - images/index/
     - images/main/
+    - images/machinery/
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg