Browse Source

7.22 1.1.10

huxiaoqiang 4 năm trước cách đây
mục cha
commit
09e6cfbe80

+ 1 - 0
android/app/build.gradle

@@ -65,4 +65,5 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.amap.api:location:latest.integration'
+    implementation('com.amap.api:3dmap:7.7.0')
 }

+ 4 - 4
lib/paegs/gang_page/gang_in_page/gang_in_page.dart

@@ -1201,12 +1201,12 @@ class _GangInPageState extends State<GangInPage> {
           });
           MyShopBeanDataData chatWith;
 
-          if (helper.length == 0) {
+          // if (helper.length == 0) {
             chatWith = member[
                 member.indexWhere((element) => element.role == shopUserOwner)];
-          } else {
-            chatWith = helper[Random().nextInt(helper.length)];
-          }
+          // } else {
+          //   chatWith = helper[Random().nextInt(helper.length)];
+          // }
           MyTools().toPage(context, ChatPage(chatWith, null), (then) {});
         } else {
           controller.refreshCompleted();

+ 10 - 4
lib/paegs/home_page/home_page.dart

@@ -20,6 +20,7 @@ import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_tools.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:bbyyy/paegs/home_page/recommended_today_page.dart';
+import 'package:bbyyy/paegs/map_demo/map_demo_page.dart';
 import 'package:bbyyy/paegs/root_page/root_page_view.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -364,10 +365,15 @@ class _HomePageState extends State<HomePage>
               Swiper(
                 itemBuilder: (BuildContext context, int index) {
                   return netImgs.length == 0
-                      ? Image.asset(
-                          "${imgs[index]}",
-                          fit: BoxFit.cover,
-                        )
+                      ? GestureDetector(
+                    onTap: (){
+                      // MyTools().toPage(context, MapDemoPage(), (then){});
+                    },
+                        child: Image.asset(
+                            "${imgs[index]}",
+                            fit: BoxFit.cover,
+                          ),
+                      )
                       : MyViews().netImg(
                           imgURL(netImgs[index]), H, double.infinity,
                           placeholder: 'images/svg/goodsDefImg.svg');

+ 57 - 0
lib/paegs/map_demo/map_demo_page.dart

@@ -0,0 +1,57 @@
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+import 'package:flutter/material.dart';
+
+class MapDemoPage extends StatefulWidget {
+  @override
+  _MapDemoPageState createState() => _MapDemoPageState();
+}
+
+class _MapDemoPageState extends State<MapDemoPage> {
+  static final CameraPosition _kInitialPosition = const CameraPosition(
+    target: LatLng(39.909187, 116.397451),
+    zoom: 10.0,
+  );
+  List<Widget> _approvalNumberWidget = List<Widget>();
+
+  @override
+  Widget build(BuildContext context) {
+    final AMapWidget map = AMapWidget(
+      initialCameraPosition: _kInitialPosition,
+      onMapCreated: onMapCreated,
+    );
+
+    return Scaffold(
+      body: map,
+    );
+  }
+
+  AMapController _mapController;
+
+  void onMapCreated(AMapController controller) {
+    setState(() {
+      _mapController = controller;
+      getApprovalNumber();
+    });
+  }
+
+  /// 获取审图号
+  void getApprovalNumber() async {
+    //普通地图审图号
+    String mapContentApprovalNumber =
+        await _mapController?.getMapContentApprovalNumber();
+    //卫星地图审图号
+    String satelliteImageApprovalNumber =
+        await _mapController?.getSatelliteImageApprovalNumber();
+    setState(() {
+      if (null != mapContentApprovalNumber) {
+        _approvalNumberWidget.add(Text(mapContentApprovalNumber));
+      }
+      if (null != satelliteImageApprovalNumber) {
+        _approvalNumberWidget.add(Text(satelliteImageApprovalNumber));
+      }
+    });
+    print('地图审图号(普通地图): $mapContentApprovalNumber');
+    print('地图审图号(卫星地图): $satelliteImageApprovalNumber');
+  }
+}

+ 21 - 0
pubspec.lock

@@ -8,6 +8,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.0.1"
+  amap_flutter_base:
+    dependency: "direct main"
+    description:
+      name: amap_flutter_base
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
+  amap_flutter_map:
+    dependency: "direct main"
+    description:
+      name: amap_flutter_map
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   amap_location:
     dependency: "direct main"
     description:
@@ -775,6 +789,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:

+ 3 - 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.1.09+1
+version: 1.1.10+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -69,6 +69,8 @@ dependencies:
   address_picker: ^0.0.1
   fluwx: ^3.4.2
   image_gallery_saver: ^1.6.9
+  amap_flutter_map: ^2.0.1
+  amap_flutter_base: ^2.0.0
 
 dev_dependencies:
   flutter_test: