'.'

lib/models/entities/Machinery.dart

@@ -18,6 +18,8 @@ class Machinery {
   int? laborCost;
 //  当前位置
   String? location;
+  //当前农机地址
+  String? address;
 //  农机Id
   String? machineryId;
 //  名称
@@ -61,6 +63,7 @@ class Machinery {
         price = json["price"],
         thumb = json["thumb"],
         location = json["location"],
+        address = json["address"],
         // distance=json["distance"],调度？？
         orgId = json["orgId"],
         orgName = json["orgName"],
@@ -77,6 +80,7 @@ class Machinery {
         'price': price,
         'thumb': thumb,
         'location': location,
+        'address': address,
         // 'distance':distance,
         'orgId': orgId,
         'orgName': orgName,
@@ -89,7 +93,7 @@ class Machinery {
 
 List<ExtendContent> jsonToContentList(list) {
   List<ExtendContent> contList = [];
-  if (list!=null) {
+  if (list != null) {
     list.forEach((item) {
       contList.add(ExtendContent.fromJson(item));
     });
@@ -99,7 +103,7 @@ List<ExtendContent> jsonToContentList(list) {
 
 List<MachineryImage> jsonToImagesList(list) {
   List<MachineryImage> contList = [];
-  if (list!=null) {
+  if (list != null) {
     list.forEach((item) {
       contList.add(MachineryImage.fromJson(item));
     });

lib/pages/home/index.dart

@@ -132,6 +132,7 @@ class Home extends BasicPage {
                               itemBuilder:
                                   (BuildContext context, int position) {
                                 if (jobList.value.isNotEmpty &&
+                                    GetList(data.records).isNotEmpty &&
                                     jobList.value[0].jobId !=
                                         GetList(data.records)[0].jobId) {
                                   jobList([

lib/pages/machineryMap/index.dart

@@ -1,25 +1,73 @@
+import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:worker_client/models/app.dart';
 import 'package:worker_client/models/entities/Machinery.dart';
+import 'package:worker_client/services/amap.dart';
 import 'package:worker_client/services/machinery.dart';
 import 'package:worker_client/widgets/amap/amap.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
-import 'package:amap_flutter_base/amap_flutter_base.dart';
 
 class MachineryMap extends BasicPage {
   MachineryMap({Key? key}) : super(key: key);
+  String? location = AppController.t.locationStr;
   final machineryList = Rx<List<Machinery>>([]);
+  //用来放地图中心的
   final machinery = Rx<Machinery>(Machinery());
+  //切换农机时用的当前农机变量
+  final current = Rx<Machinery>(Machinery());
+  final visible = Rx<bool>(true);
 
+  dynamic locList = [
+    '32.685927, 112.106514',
+    '32.673406, 112.100406',
+    '32.670488, 112.06397',
+    '32.685684, 112.05434',
+    '32.701302, 112.058724',
+    '32.665504, 112.015102',
+    '32.685502, 112.010503',
+    '32.651764, 112.097747',
+    '32.664957, 112.149705',
+    '32.701241, 112.16185',
+  ];
   @override
   void beforeShow() {
     super.beforeShow();
     if (Get.arguments != null) {
       getMachineryDetail(Get.arguments['id'], {
         'attached': true,
+        //查询农机详情时需要把当前定位传到服务端
         'location': '118.84002,31.95266'
-      }).then((res) => {machinery(Machinery.fromJson(res))});
+      }).then((res) => {
+            getMachineryList({'pageSize': 500, 'location': location})
+                .then((value) {
+              dynamic list = <Machinery>[];
+              int index;
+              Machinery data = Machinery.fromJson(res);
+              List area = [];
+              value['records'].forEach((item) {
+                index = value['records'].indexOf(item);
+                item['location'] = locList[index % 10];
+                list.add(Machinery.fromJson(item));
+                if (data.machineryId == item['machineryId']) {
+                  data.location = item['location'];
+                  area = item['location'].toString().split(',');
+                  setAmap({
+                    'params': 'location=${area[1]},${area[0]}',
+                    'path': '/v3/geocode/regeo'
+                  }).then((value) {
+                    //json字符串转Map对象
+                    data.address =
+                        jsonDecode(value)['regeocode']['formatted_address'];
+                    machinery(data);
+                    current(data);
+                  });
+                }
+              });
+              machineryList(list);
+            }),
+          });
     }
   }
 
@@ -29,97 +77,134 @@ class MachineryMap extends BasicPage {
 
   void goDetail() {
     Get.toNamed('/machineryDetail',
-        arguments: {'id': machinery.value.machineryId});
+        arguments: {'id': current.value.machineryId});
+  }
+
+  void onClick(e) {
+    List area = e.location.toString().split(',');
+    if (e.address == null) {
+      setAmap({
+        //定位有问题
+        'params': 'location=${area[1]},${area[0]}',
+        'path': '/v3/geocode/regeo'
+      }).then((value) {
+        //json字符串转Map对象
+        e.address = jsonDecode(value)['regeocode']['formatted_address'];
+        current(e);
+        visible(true);
+      });
+    } else {
+      current(e);
+      visible(true);
+    }
+  }
+
+  void onCancel() {
+    if (!visible.value) {
+      visible(false);
+    }
   }
 
-  final LatLng position = const LatLng(32.690712, 112.091892);
   @override
   Widget builder(BuildContext context) {
     naviTitle = '我的农机';
+
     return Stack(
       children: [
         SizedBox(
           width: 375.w,
-          child: AMap(position: position),
+          child: Obx(
+            () => AMap(
+              machineryList: machineryList.value,
+              machinery: machinery.value,
+              onCancel: onCancel,
+              onClick: onClick,
+            ),
+          ),
         ),
-        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(
-                        '第一台收割机',
+        Obx(
+          () => Visibility(
+            visible: visible.value,
+            child: 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(0xff222222),
-                            fontSize: 18.sp,
+                            color: const Color(0xff666666),
+                            fontSize: 15.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,
+                      margin: EdgeInsets.only(top: 30.h, bottom: 20.h),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Text(
+                            current.value.name.toString(),
+                            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),
+                            ),
+                          )
+                        ],
                       ),
                     ),
-                    Expanded(
-                      flex: 1,
-                      child: Text(
-                        '当前位置：  江苏省南京市南京南站城际空间站D2栋212南京云致科技服务有限公司',
-                        style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 15.sp,
-                          color: const Color(0xff222222),
+                    Row(
+                      children: [
+                        Container(
+                          margin: EdgeInsets.only(right: 8.w),
+                          child: Image.asset(
+                            'images/index/position.png',
+                            width: 17.w,
+                          ),
                         ),
-                      ),
-                    )
+                        Expanded(
+                          flex: 1,
+                          child: Text(
+                            '当前位置：${current.value.address ?? ''.toString()}',
+                            style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 15.sp,
+                              color: const Color(0xff222222),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
                   ],
-                )
-              ],
+                ),
+              ),
             ),
           ),
-        )
+        ),
       ],
     );
   }

lib/widgets/amap/amap.dart

@@ -1,27 +1,60 @@
 import 'package:amap_flutter_map/amap_flutter_map.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
 import 'package:flutter/widgets.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/entities/Machinery.dart';
 
 import '/utils/amap/const_config.dart';
 
 // https://developer.amap.com/api/flutter/guide/map-flutter-plug-in/map-flutter-info
 class AMap extends StatelessWidget {
   late AMapController _mapController;
-  final LatLng? position;
+  final List<Machinery> machineryList;
+  final Machinery machinery;
+  dynamic centerLocationArea = [];
   final Map<String, Marker> _markers = Map<String, Marker>();
+  final Function onClick;
+  final Function onCancel;
 
-  AMap({Key? key, this.position}) : super(key: key);
+  AMap({
+    Key? key,
+    required this.machineryList,
+    required this.machinery,
+    required this.onClick,
+    required this.onCancel,
+  }) : super(key: key);
 
   void onMapCreated(AMapController controller) {
     _mapController = controller;
   }
 
+  BitmapDescriptor m1 =
+      BitmapDescriptor.fromIconPath("images/machinery/greenMachinery.png");
+  BitmapDescriptor m2 =
+      BitmapDescriptor.fromIconPath("images/machinery/orangeMachinery.png");
+  BitmapDescriptor m3 =
+      BitmapDescriptor.fromIconPath("images/machinery/repairMachinery.png");
   void _initMarkers() {
-    if (null != position) {
-      Marker marker = Marker(
-          position: position!,
-          icon: BitmapDescriptor.fromIconPath("images/locationImage.png"));
-      _markers[marker.id] = marker;
+    if (machineryList.isNotEmpty && machinery.location != null) {
+      centerLocationArea = machinery.location!.split(',');
+
+      dynamic locationArea = [];
+      for (var item in machineryList) {
+        locationArea = item.location!.split(',');
+        Marker marker = Marker(
+            onTap: (e) {
+              onClick(item);
+            },
+            clickable: true,
+            position: LatLng(
+                double.parse(locationArea[0]), double.parse(locationArea[1])),
+            icon: item.status == 0
+                ? m3
+                : (item.jobStatus == null || item.jobStatus == 3)
+                    ? m2
+                    : m1);
+        _markers[item.machineryId.toString()] = marker;
+      }
     }
   }
 
@@ -29,13 +62,25 @@ class AMap extends StatelessWidget {
   Widget build(BuildContext context) {
     _initMarkers();
 
-    return AMapWidget(
-      privacyStatement: ConstConfig.amapPrivacyStatement,
-      apiKey: ConstConfig.amapApiKeys,
-      markers: Set<Marker>.of(_markers.values),
-      // 默认是邓州市中心
-      initialCameraPosition:
-          const CameraPosition(target: LatLng(32.687732, 112.08745)),
-    );
+    return centerLocationArea.length != 0
+        ? AMapWidget(
+            privacyStatement: ConstConfig.amapPrivacyStatement,
+            apiKey: ConstConfig.amapApiKeys,
+            markers: Set<Marker>.of(_markers.values),
+            onPoiTouched: (e) {},
+            onCameraMove: (e) {
+              // 移动地图
+              onCancel();
+            },
+            // 默认是邓州市中心
+            initialCameraPosition: CameraPosition(
+                target: LatLng(double.parse(centerLocationArea[0].toString()),
+                    double.parse(centerLocationArea[1].toString())),
+                zoom: 13),
+          )
+        : const SizedBox(
+            width: 1,
+            height: 1,
+          );
   }
 }