Merge branch 'v1.0.0' into feature/gc/ios_mapkit_adapt

lib/data/consts/web_url.dart

@@ -15,7 +15,7 @@ class WebUrl {
   static const String _userAgreementIos =
       "https://doc.v8dashen.com/doc/9ac4289f64ac276a";
 
-  static const String _shareUrl = "https://www.v8dashen.com";
+  static const String _shareUrl = "https://ssdw.myaskai.cn/#/";
 
   static const String _customUrl = "https://qiyu-kefu.atmob.com";
 

lib/module/track/track_page.dart

@@ -61,7 +61,7 @@ class TrackPage extends BasePage<TrackController> {
             // Enable snapping. This is true by default.
             snap: true,
             // Set custom snapping points.
-            snappings: [168 / Get.height, 1.0],
+            snappings: [SnapSpec.headerFooterSnap, 1.0],
             // Define to what the snappings relate to. In this case,
             // the total available space that the sheet can expand to.
             positioning: SnapPositioning.relativeToAvailableSpace,
@@ -69,8 +69,9 @@ class TrackPage extends BasePage<TrackController> {
           footerBuilder: (context, state) {
             return buildOperationBtn();
           },
-          builder: (context, state) {
-            return Column(
+          headerBuilder: (context, state) {
+            return IntrinsicHeight(
+                child: Column(
               children: [
                 SizedBox(height: 5.w),
                 Align(
@@ -86,6 +87,12 @@ class TrackPage extends BasePage<TrackController> {
                 ),
                 SizedBox(height: 25.w),
                 buildTrackHeaderView(),
+              ],
+            ));
+          },
+          builder: (context, state) {
+            return Column(
+              children: [
                 SizedBox(
                   width: double.infinity,
                   height: 220.w,

lib/sdk/wechat/wechat_helper.dart

@@ -31,6 +31,7 @@ class WechatHelper {
         scene: scene,
         webpageUrl: webpageUrl,
         title: title,
+        thumbData: thumbData,
         description: description);
   }
 

lib/utils/location_convert_marker_util.dart

@@ -1,5 +1,6 @@
 import 'package:flutter_map/flutter_map.dart';
 import 'package:location/data/bean/user_info.dart';
+import 'package:location/data/consts/constants.dart';
 
 class Location2MarkerUtil {
   Location2MarkerUtil._();
@@ -10,7 +11,9 @@ class Location2MarkerUtil {
       markerName: e.getUserNickName(),
       longitude: e.lastLocation.value?.longitude,
       latitude: e.lastLocation.value?.latitude,
-      markerType: MarkerType.friend,
+      markerType: e.id == Constants.mineLocationId
+          ? MarkerType.mine
+          : MarkerType.friend,
       isSelected: isSelected,
     );
   }

lib/utils/permission_util.dart

@@ -16,12 +16,7 @@ class PermissionUtil {
 
   static Future<bool> checkLocationPermission() async {
     final status = await Permission.locationWhenInUse.status;
-    if (status.isGranted) {
-      return true;
-    }
-    {
-      return false;
-    }
+    return status.isGranted;
   }
 
   static Future<bool> requestShowLocationAlways() async {

plugins/map/lib/src/consts/map_constants.dart

@@ -5,10 +5,10 @@ class MapConstants {
   static const String mapLocationEventChannel =
       'atmob_map_location_event_channel';
 
-  //地图方法通道名称
+  //地图SDK通道名称
   static const String mapMethodChannel = 'atmob_map_method_channel';
 
-  //地图渠道名称
+  //地图widget通道
   static const String mapViewChannelName = "com.atmob.flutter_map/map_view_";
 
   //地图widget_viewType名称