feats

lib/models/Store.dart

@@ -1 +0,0 @@
-// TODO Implement this library.

lib/models/User.dart

@@ -1,15 +0,0 @@
-
-import 'package:farmer_client/models/entities/person.dart';
-import 'package:get/get.dart';
-
-class User extends GetxController {
-  Person? _person;
-  Person? get person => _person;
-  set person (Person? p) {
-    _person = p;
-    update();
-  }
-
-  bool get isLogin => _person != null;
-
-}

lib/pages/index.dart

@@ -2,5 +2,5 @@
 export 'home/index.dart';
 export 'splash/splash.dart';
 export 'login/login.dart';
-export 'machinery/map.dart';
+export 'machinery/map/index.dart';
 export 'main/index.dart';

lib/pages/machinery/map.dart

@@ -1,22 +0,0 @@
-
-import 'package:farmer_client/widgets/amap/amap.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-
-class MachineryMapPage extends StatelessWidget {
-
-  Widget page(BuildContext context) {
-    return Column(children: [
-      Expanded( flex: 1, child: AMap(),),
-      Expanded( flex: 1, child: Container(),),
-      Expanded( flex: 1, child: Container(),),
-    ],);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(appBar: AppBar(title: const Text("查看地图"), centerTitle: true,), body: page(context),);
-  }
-  
-}
-

lib/pages/machinery/map/index.dart

@@ -0,0 +1,23 @@
+
+import 'package:farmer_client/pages/machinery/map/widgets/detail.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+class MachineryMapPage extends StatelessWidget {
+
+  final title = Rx<String>('查看地图');
+  // final detail = Rxn<T>(); // 农机信息
+
+  // 响应预约事件
+  void handleClick() {
+
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final appBar = AppBar(title: Obx(() => Text(title.value)), centerTitle: true,);
+    return Scaffold(appBar: appBar, body: page(context: context, appbarSize: appBar.preferredSize, handleClick: handleClick),);
+  }
+  
+}
+

lib/pages/machinery/map/widgets/detail.dart

@@ -0,0 +1,143 @@
+
+
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:farmer_client/widgets/amap/amap.dart';
+
+Widget page({ required BuildContext context, required Size appbarSize, required void Function() handleClick}) {
+  final _offset = 20.h;
+  final width = MediaQuery.of(context).size.width;
+  final height = MediaQuery.of(context).size.height
+      - appbarSize.height
+      - MediaQuery.of(context).padding.top;
+  final mapHeight = height * 0.3;
+  final cardHeight = (height - mapHeight) / 2 + _offset;
+
+
+  final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
+  final LatLng position = LatLng(32.690712, 112.091892);
+
+  return Stack(
+    alignment: Alignment.topCenter,
+    children: [
+      // 第一个组件用来撑满全屏
+      SizedBox(
+        width: width,
+        height: height,
+      ),
+      SizedBox(
+        width: width,
+        height: mapHeight,
+        child: AMap(position: position),
+      ),
+      Positioned(
+        left: 0,
+        top: mapHeight - _offset,
+        height: cardHeight,
+        child: _thumb(context, img),
+      ),
+      Positioned(
+        left: 0,
+        top: mapHeight + cardHeight - 2 * _offset,
+        height: cardHeight,
+        child: _content(context, handleClick),
+      ),
+    ],);
+}
+
+Widget _card(BuildContext context, Widget child) {
+  final _border = 20.w;
+  return Container(
+    width: MediaQuery.of(context).size.width,
+    clipBehavior: Clip.hardEdge,
+    decoration: BoxDecoration(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
+    ),
+    child: child,
+  );
+}
+
+Widget _thumb(BuildContext context, String imgUrl) {
+  return _card(context, Image.network(imgUrl, fit: BoxFit.cover));
+}
+
+Widget _title() {
+  return Row(
+    children: [
+      Expanded(
+          child: Text("收割机001--S001",
+              style: TextStyle(
+                color: Color(0xFF222222),
+                fontSize: 18.sp,
+              )),
+          flex: 1),
+      Container(
+        width: 100.w,
+        alignment: Alignment.centerRight,
+        child: Text("450元",
+            style: TextStyle(
+              color: Color(0xFFB61515),
+              fontSize: 22.sp,
+            )),
+      )
+    ],
+  );
+}
+
+Widget _desc() {
+  return Row(
+    children: [
+      Icon(Icons.location_on_outlined, size: 16.sp,),
+      Expanded(
+        flex: 1,
+        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: Color(0xFF222222), fontSize: 15.sp),),
+      ),
+    ],
+  );
+}
+
+Widget _detail() {
+  return Container(
+    alignment: Alignment.centerLeft,
+    child: Text("农机手1的收割机", style: TextStyle(color: Color(0xFF222222), fontSize: 15.sp),),
+  );
+}
+
+Widget _button(void Function() handleClick) {
+  return ElevatedButton(
+    child: const Text("预约"),
+    style: ElevatedButton.styleFrom(
+        primary: const Color(0xFFFF703B),
+        textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
+        elevation: 0,
+        minimumSize: Size(double.infinity, 49.w),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+        )
+    ),
+    onPressed: handleClick,
+  );
+}
+
+Widget _content(BuildContext context, void Function() handleClick) {
+  return _card(context, Container(
+    padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
+    decoration: const BoxDecoration(
+      color: Colors.white,
+    ),
+    child: Column(
+
+      children: [
+        _title(),
+        SizedBox(height: 20.h,),
+        _desc(),
+        SizedBox(height: 20.h,),
+        _detail(),
+        SizedBox(height: 20.h,),
+        _button(handleClick),
+      ],
+    ),
+  ));
+}

lib/widgets/amap/amap.dart

@@ -20,8 +20,7 @@ class AMap extends StatelessWidget {
     if (null != position) {
       Marker marker = Marker(
         position: position!,
-        //使用默认hue的方式设置Marker的图标
-        icon: BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueOrange),
+        icon: BitmapDescriptor.fromIconPath("images/locationImage.png")
       );
       _markers[marker.id] = marker;
     }
@@ -35,7 +34,8 @@ class AMap extends StatelessWidget {
       privacyStatement: ConstConfig.amapPrivacyStatement,
       apiKey: ConstConfig.amapApiKeys,
       markers: Set<Marker>.of(_markers.values),
-      initialCameraPosition: const CameraPosition(target: LatLng(31.230378, 121.473658)),
+      // 默认是邓州市中心
+      initialCameraPosition: const CameraPosition(target: LatLng(32.687732, 112.08745)),
     );
   }
 

pubspec.yaml

@@ -87,6 +87,7 @@ flutter:
     - images/feedbacks.png
     - images/userRight.png
     - images/versionUpdate.png
+    - images/locationImage.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.