From dd3ef4012c3b714bad128b7b3ac389ee48ba4aed Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Fri, 4 Jun 2021 18:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=BB=E5=AE=9D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=9C=B0=E5=9B=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jarRepositories.xml                     |  10 +
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |  19 +-
 app/src/main/AndroidManifest.xml              |  33 +-
 .../com/navinfo/outdoor/api/Constant.java     |  28 ++
 .../navinfo/outdoor/api/UserApplication.java  |   1 +
 .../outdoor/fragment/TreasureFragment.java    | 325 +++++++++++++++++-
 .../navinfo/outdoor/util/NetWorkUtils.java    |  35 ++
 .../com/navinfo/outdoor/util/ToastUtil.java   | 286 +++++++++++++++
 app/src/main/res/drawable/atlas_selector.xml  |   5 +
 app/src/main/res/drawable/foot_selector.xml   |   5 +
 app/src/main/res/drawable/location.png        | Bin 0 -> 484 bytes
 app/src/main/res/layout/treasure_fragment.xml |  89 ++++-
 app/src/main/res/mipmap-xxhdpi/filter.png     | Bin 0 -> 2144 bytes
 app/src/main/res/mipmap-xxhdpi/footprint.png  | Bin 0 -> 2236 bytes
 .../res/mipmap-xxhdpi/footprint_select.png    | Bin 0 -> 2257 bytes
 app/src/main/res/mipmap-xxhdpi/map_type.png   | Bin 0 -> 2083 bytes
 .../res/mipmap-xxhdpi/map_type_select.png     | Bin 0 -> 1951 bytes
 .../main/res/mipmap-xxhdpi/mine_location.png  | Bin 0 -> 1808 bytes
 app/src/main/res/mipmap-xxhdpi/refresh.png    | Bin 0 -> 2099 bytes
 app/src/main/res/mipmap-xxhdpi/submit.png     | Bin 0 -> 2642 bytes
 app/src/main/res/mipmap-xxhdpi/zoom_add.png   | Bin 0 -> 1551 bytes
 app/src/main/res/mipmap-xxhdpi/zoom_del.png   | Bin 0 -> 1544 bytes
 app/src/main/res/values/colors.xml            |   1 +
 build.gradle                                  |   8 +
 25 files changed, 828 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/navinfo/outdoor/api/Constant.java
 create mode 100644 app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java
 create mode 100644 app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java
 create mode 100644 app/src/main/res/drawable/atlas_selector.xml
 create mode 100644 app/src/main/res/drawable/foot_selector.xml
 create mode 100644 app/src/main/res/drawable/location.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/filter.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/footprint.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/footprint_select.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/map_type.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/map_type_select.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/mine_location.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/refresh.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/submit.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/zoom_add.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/zoom_del.png

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f9f33c3..2199f5a 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,15 @@
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.aliyun.com/repository/apache-snapshots" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..b6ea2b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 1b29773..d139b6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,9 +22,9 @@ android {
         }
     }
 
-   compileOptions {
-       sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 //efs {
@@ -54,8 +54,8 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation  'com.umeng.umsdk:common:9.3.8'
-    implementation  'com.umeng.umsdk:asms:1.2.2'
+    implementation 'com.umeng.umsdk:common:9.3.8'
+    implementation 'com.umeng.umsdk:asms:1.2.2'
     implementation 'com.umeng.umsdk:apm:1.2.0'
 
     //状态栏侵染
@@ -65,7 +65,6 @@ dependencies {
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
 
 
-
     //网络框架
     implementation 'com.lzy.net:okgo:3.0.4'
     implementation 'com.google.code.gson:gson:2.8.5'
@@ -96,4 +95,12 @@ dependencies {
     implementation project(':xrecyclerview')
 
 
+//腾讯地图
+    // 地图库
+    implementation 'com.tencent.map:tencent-map-vector-sdk:4.4.2'
+    // 地图组件库，包括小车平移、点聚合等组件功能，详见开发指南。
+    implementation 'com.tencent.map:sdk-utilities:1.0.6'
+
+    //腾讯地图 定位
+    implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.6'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1495c3..52a502f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,12 +8,38 @@
     <uses-permission android:name="android.permission.CAMERA" />
 
 <!--    <uses-sdk android:minSdkVersion="8"></uses-sdk>-->
-
+<!--友盟检测bug-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+<!--    腾讯地图 定位权限-->
+    <!-- 通过GPS得到精确位置 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <!-- 通过网络得到粗略位置 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <!-- 访问网络. 某些位置信息需要从网络服务器获取 -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- 访问WiFi状态. 需要WiFi信息用于网络定位 -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!-- 修改WiFi状态. 发起WiFi扫描, 需要WiFi信息用于网络定位 -->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <!-- 访问网络状态, 检测网络的可用性. 需要网络运营商相关信息用于网络定位 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!-- 访问网络的变化, 需要某些信息用于网络定位 -->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <!-- 访问手机当前状态, 需要device id用于网络定位 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!-- 访问蓝牙状态，需要蓝牙信息用于网络定位 -->
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <!-- 支持A-GPS辅助定位 -->
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <!-- 用于 log 日志 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+
     <application
         android:name="com.navinfo.outdoor.api.UserApplication"
         android:allowBackup="true"
@@ -23,6 +49,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">
+
+<!--       腾讯地图申请Key  定位-->
+        <meta-data android:name="TencentMapSDK" android:value="EWWBZ-2PB62-6JXUL-CEX7G-N7UE6-XRB4V" />
+
+
         <meta-data
             android:name="design_width_in_dp"
             android:value="480" />
diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java
new file mode 100644
index 0000000..0386e8c
--- /dev/null
+++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java
@@ -0,0 +1,28 @@
+package com.navinfo.outdoor.api;
+
+import com.tencent.map.geolocation.TencentLocation;
+
+/**
+ * 常量
+ */
+public class Constant {
+    /**
+     * 当前网络不可用
+     */
+    public static final CharSequence NETWORK_UNAVAILABLE = "当前网络不可用，请检查网络设置";
+
+    /**
+     * 位置权限
+     */
+    public static final String SET_LOCATION_PERMISSION = "请在“设置”中给予“TengXunMap”位置权限,否则当前功能将不可使用";
+
+
+    public static final String GET_ERR_MESSAGE1 = "设备缺少使用腾讯定位服务需要的基本条件";
+    public static final String GET_ERR_MESSAGE2 = "manifest 中配置的 key 不正确";
+    public static final String GET_ERR_MESSAGE3 = "自动加载libtencentloc.so失败";
+
+    /**
+     * 用户当前位置
+     */
+    public static TencentLocation currentLocation;
+}
diff --git a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
index 13e8e6c..047b3e9 100644
--- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
+++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
@@ -25,6 +25,7 @@ public class UserApplication extends Application {
     public void onCreate() {
         super.onCreate();
         userApplication=this;
+        //友盟 检测bug
         UMConfigure.init(this, "60b885bd6c421a3d97db55e6", "navinfo", UMConfigure.DEVICE_TYPE_PHONE, "");
         /**
          *设置组件化的Log开关
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index 64533ac..ef18535 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -1,13 +1,65 @@
 package com.navinfo.outdoor.fragment;
 
+import android.Manifest;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import android.location.Location;
+import android.os.Build;
+import android.os.Looper;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+
 import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.api.Constant;
 import com.navinfo.outdoor.base.BaseFragment;
+import com.navinfo.outdoor.util.NetWorkUtils;
+import com.navinfo.outdoor.util.ToastUtil;
+import com.tencent.map.geolocation.TencentLocation;
+import com.tencent.map.geolocation.TencentLocationListener;
+import com.tencent.map.geolocation.TencentLocationManager;
+import com.tencent.map.geolocation.TencentLocationRequest;
+import com.tencent.tencentmap.mapsdk.maps.CameraUpdate;
+import com.tencent.tencentmap.mapsdk.maps.CameraUpdateFactory;
+import com.tencent.tencentmap.mapsdk.maps.LocationSource;
+import com.tencent.tencentmap.mapsdk.maps.MapView;
+import com.tencent.tencentmap.mapsdk.maps.TencentMap;
+import com.tencent.tencentmap.mapsdk.maps.UiSettings;
+import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
+import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
+import com.tencent.tencentmap.mapsdk.maps.model.CameraPosition;
+import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
+import com.tencent.tencentmap.mapsdk.maps.model.MyLocationStyle;
+
+import static com.lzy.okgo.utils.HttpUtils.runOnUiThread;
 
 /**
  * 寻宝的Fragment
  * 2021-5-25
  */
-public class TreasureFragment extends BaseFragment {
+public class TreasureFragment extends BaseFragment implements View.OnClickListener, LocationSource, TencentLocationListener {
+    private MapView treasureMap;
+    private TencentMap tencentMap;
+    private CheckBox cbMapType;
+    private ImageView ivZoomAdd;
+    private ImageView ivZoomDel;
+    private TencentLocationManager locationManager;
+    private TencentLocationRequest locationRequest;
+    private MyLocationStyle locationStyle;
+    private OnLocationChangedListener locationChangedListener;
+    private ImageView ivLocation;
+
     @Override
     protected int getLayout() {
         return R.layout.treasure_fragment;
@@ -16,10 +68,277 @@ public class TreasureFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        treasureMap = (MapView) findViewById(R.id.treasure_map);
+        tencentMap = treasureMap.getMap();
+        cbMapType = (CheckBox) findViewById(R.id.cb_map_type);
+        //地图转换
+        cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    tencentMap.setMapType(TencentMap.MAP_TYPE_SATELLITE);
+                } else {
+                    tencentMap.setMapType(TencentMap.MAP_TYPE_NORMAL);
+                }
+            }
+        });
+        //地图放大
+        ivZoomAdd = (ImageView) findViewById(R.id.iv_zoom_add);
+        ivZoomAdd.setOnClickListener(this::onClick);
+        //地图缩小
+        ivZoomDel = (ImageView) findViewById(R.id.iv_zoom_del);
+        ivZoomDel.setOnClickListener(this::onClick);
+        //回到定位位置
+        ivLocation = findViewById(R.id.iv_location);
+        ivLocation.setOnClickListener(this::onClick);
+        //样式
+        tencentMap.setMapStyle(2);
+        //启用3d视图
+        tencentMap.setBuilding3dEffectEnable(true);
+        //获取地图UI 设置对象
+        UiSettings uiSettings = tencentMap.getUiSettings();
+        //设置logo的大小
+        uiSettings.setLogoScale(0.7f);
+        //开启定位权限
+        checkNetWork();
+    }
+    /**
+     * 设置定位图标样式
+     */
+    private void setLocMarkerStyle() {
+        locationStyle = new MyLocationStyle();
+        //创建图标
+        BitmapDescriptor bitmapDescriptor = BitmapDescriptorFactory.fromBitmap(getBitMap(R.drawable.location));
+        locationStyle.icon(bitmapDescriptor);
+        //设置定位圆形区域的边框宽度;
+        locationStyle.strokeWidth(1);
+        //设置圆区域的颜色
+        // locationStyle.fillColor(R.color.colormap);
+        // locationStyle.anchor(1000,2000);
+        tencentMap.setMyLocationStyle(locationStyle);
+    }
+    /**
+     * 定位的一些初始化设置
+     */
+    private void initLocation() {
+//用于访问腾讯定位服务的类, 周期性向客户端提供位置更新
+        locationManager = TencentLocationManager.getInstance(getContext());
+        //设置坐标系
+        locationManager.setCoordinateType(TencentLocationManager.COORDINATE_TYPE_GCJ02);
+        //创建定位请求
+        locationRequest = TencentLocationRequest.create();
+        //设置定位周期（位置监听器回调周期）为3s
+        locationRequest.setInterval(3000);
+        //地图上设置定位数据源
+        tencentMap.setLocationSource(this);
+        //设置当前位置可见
+        tencentMap.setMyLocationEnabled(true);
+        //设置定位图标样式
+        setLocMarkerStyle();
+//        locationStyle = locationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);
+        tencentMap.setMyLocationStyle(locationStyle);
+    }
+    private Bitmap getBitMap(int resourceId) {
+        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), resourceId);
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        int newWidth = 55;
+        int newHeight = 55;
+        float widthScale = ((float) newWidth) / width;
+        float heightScale = ((float) newHeight) / height;
+        Matrix matrix = new Matrix();
+        matrix.postScale(widthScale, heightScale);
+        bitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true);
+        return bitmap;
     }
-
     @Override
     protected void initData() {
         super.initData();
     }
-}
+    @Override
+    public void onStart() {
+        super.onStart();
+        treasureMap.onStart();
+    }
+    @Override
+    public void onResume() {
+        super.onResume();
+        treasureMap.onResume();
+    }
+    @Override
+    public void onPause() {
+        super.onPause();
+        treasureMap.onPause();
+    }
+    @Override
+    public void onStop() {
+        super.onStop();
+        treasureMap.onStop();
+    }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        treasureMap.onDestroy();
+    }
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.iv_zoom_add://放大
+                CameraUpdate cameraUpdateIn = CameraUpdateFactory.zoomIn();
+                tencentMap.animateCamera(cameraUpdateIn);
+                break;
+            case R.id.iv_zoom_del://缩小
+                CameraUpdate cameraUpdateOut = CameraUpdateFactory.zoomOut();
+                tencentMap.animateCamera(cameraUpdateOut);
+                break;
+            case R.id.iv_location://定位:
+                Constant.currentLocation.getLongitude();
+                CameraUpdate cameraSigma =
+                        CameraUpdateFactory.newCameraPosition(new CameraPosition(
+                                new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()), //中心点坐标，地图目标经纬度
+                                19,  //目标缩放级别
+                                0, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0)
+                                0)); //目标旋转角 0~360° (正北方为0)
+                tencentMap.animateCamera(cameraSigma);
+                break;
+        }
+    }
+    /**
+     * 检查网络状态
+     */
+    private void checkNetWork() {
+        if (NetWorkUtils.isNetworkAvailable(getContext())) { // 当前网络可用
+            checkMyLocation();
+        } else { // 当前网络不可用
+            ToastUtil.showShort(getContext(), Constant.NETWORK_UNAVAILABLE);
+        }
+    }
+    /**
+     * 检查所需权限
+     */
+    private void checkMyLocation() {
+        // 1.判断是否拥有定位的权限
+        // 1.1 拥有权限进行相应操作
+        // 1.2 没有权限申请权限
+        // 1.2.1 Android 6.0 动态申请权限
+        // 1.2.1.1 用户给予权限进行相应操作
+        // 1.2.1.2 用户没有给予权限 作出相应提示
+        // 1.2.2 某些5.0权限的手机执行相应操作
+        String[] permission = {
+                Manifest.permission.ACCESS_COARSE_LOCATION
+        };
+        if (ContextCompat.checkSelfPermission(getContext(), permission[0]) == PackageManager.PERMISSION_GRANTED) { // 拥有权限
+            //建立定位
+            initLocation();
+        } else { // 没有权限
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { //6.0
+                requestPermissions(permission, 0);
+            } else {
+                // 此处为某些5.0动态权限的手机
+                //goSystemLocationActivity(); // TODO =======待删除======
+                tipPermissionAlertDialog();
+            }
+        }
+    }
+    /**
+     * 用户授权回调
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        UserAuthorization(requestCode, grantResults);
+    }
+    /**
+     * 用户授权情况
+     *
+     * @param requestCode
+     * @param grantResults
+     */
+    private void UserAuthorization(int requestCode, int[] grantResults) {
+        if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { // 拥有了授权
+            checkMyLocation();
+        } else {
+            tipPermissionAlertDialog();
+        }
+    }
+    private void tipPermissionAlertDialog() {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("提示");
+        builder.setMessage(Constant.SET_LOCATION_PERMISSION);
+        builder.setPositiveButton("我知道了", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                AlertDialog alertDialog = builder.show();
+                alertDialog.dismiss();
+            }
+        });
+        builder.show();
+    }
+    /**
+     * 跳转系统定位页面
+     */
+    private void goSystemLocationActivity() {
+        startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+    }
+    @Override
+    public void activate(OnLocationChangedListener onLocationChangedListener) {
+        locationChangedListener = onLocationChangedListener;
+        int err = locationManager.requestLocationUpdates(locationRequest, this, Looper.myLooper());
+        switch (err) {
+            case 1:
+                ToastUtil.showShort(getContext(), Constant.GET_ERR_MESSAGE1);
+                break;
+            case 2:
+                ToastUtil.showShort(getContext(), Constant.GET_ERR_MESSAGE2);
+                break;
+            case 3:
+                ToastUtil.showShort(getContext(), Constant.GET_ERR_MESSAGE3);
+                break;
+            default:
+                break;
+        }
+    }
+    @Override
+    public void deactivate() {
+        locationManager.removeUpdates(this);
+        locationManager = null;
+        locationRequest = null;
+        locationChangedListener = null;
+    }
+    /**
+     * 实现位置监听
+     *
+     * @param tencentLocation
+     * @param i
+     * @param s
+     */
+    @Override
+    public void onLocationChanged(TencentLocation tencentLocation, int i, String s) {
+        if (i == TencentLocation.ERROR_OK && locationChangedListener != null) {
+            Location location = new Location(tencentLocation.getProvider());
+            //设置经纬度以及精度
+            location.setLatitude(tencentLocation.getLatitude());
+            location.setLongitude(tencentLocation.getLongitude());
+            location.setAccuracy(tencentLocation.getAccuracy());
+            locationChangedListener.onLocationChanged(location);
+            Constant.currentLocation = tencentLocation;
+            //显示回调的实时位置信息
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    //打印tencentLocation的json字符串
+//                    Toast.makeText(getApplicationContext(), new Gson().toJson(location), Toast.LENGTH_LONG).show();
+                }
+            });
+        }
+    }
+    @Override
+    public void onStatusUpdate(String s, int i, String s1) {
+        //GPS, WiFi, Radio 等状态发生变化
+        Log.v("State changed", s + "===" + s1);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java b/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java
new file mode 100644
index 0000000..01fb01e
--- /dev/null
+++ b/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java
@@ -0,0 +1,35 @@
+package com.navinfo.outdoor.util;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+/**
+ * 项目名称：网络工具类
+ * 创建人： mwb
+ * 创建时间：2018/9/3 8:57
+ */
+public class NetWorkUtils {
+    /**
+     * 当前网络是否可用
+     *
+     * @param context
+     * @return
+     */
+    public static boolean isNetworkAvailable(Context context) {
+        ConnectivityManager connectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        if (connectivityManager != null) {
+            NetworkInfo info = connectivityManager.getActiveNetworkInfo();
+            if (info != null && info.isConnected()) {
+                // 当前网络是连接的
+                if (info.getState() == NetworkInfo.State.CONNECTED) {
+                    // 当前所链接的网络可用
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java b/app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java
new file mode 100644
index 0000000..411eff9
--- /dev/null
+++ b/app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java
@@ -0,0 +1,286 @@
+package com.navinfo.outdoor.util;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+/**
+ * 项目名称：ToastUtil
+ * 创建人：mwb
+ * 创建时间：2018/9/3 9:25
+ */
+public class ToastUtil {
+    private static boolean isShow = true;//默认显示
+    private static Toast mToast = null;//全局唯一的Toast
+
+    /*private控制不应该被实例化*/
+    private ToastUtil() {
+        throw new UnsupportedOperationException("不能被实例化");
+    }
+
+    /**
+     * 全局控制是否显示Toast
+     *
+     * @param isShowToast
+     */
+    public static void controlShow(boolean isShowToast) {
+        isShow = isShowToast;
+    }
+
+    /**
+     * 取消Toast显示
+     */
+    public void cancelToast() {
+        if (isShow && mToast != null) {
+            mToast.cancel();
+        }
+    }
+
+    /**
+     * 短时间显示Toast
+     *
+     * @param context
+     * @param message
+     */
+    public static void showShort(Context context, CharSequence message) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, Toast.LENGTH_SHORT);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 短时间显示Toast
+     *
+     * @param context
+     * @param resId   资源ID:getResources().getString(R.string.xxxxxx);
+     */
+    public static void showShort(Context context, int resId) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, resId, Toast.LENGTH_SHORT);
+            } else {
+                mToast.setText(resId);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 长时间显示Toast
+     *
+     * @param context
+     * @param message
+     */
+    public static void showLong(Context context, CharSequence message) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, Toast.LENGTH_LONG);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 长时间显示Toast
+     *
+     * @param context
+     * @param resId   资源ID:getResources().getString(R.string.xxxxxx);
+     */
+    public static void showLong(Context context, int resId) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, resId, Toast.LENGTH_LONG);
+            } else {
+                mToast.setText(resId);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义显示Toast时间
+     *
+     * @param context
+     * @param message
+     * @param duration 单位:毫秒
+     */
+    public static void show(Context context, CharSequence message, int duration) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, duration);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义显示Toast时间
+     *
+     * @param context
+     * @param resId    资源ID:getResources().getString(R.string.xxxxxx);
+     * @param duration 单位:毫秒
+     */
+    public static void show(Context context, int resId, int duration) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, resId, duration);
+            } else {
+                mToast.setText(resId);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义Toast的View
+     *
+     * @param context
+     * @param message
+     * @param duration 单位:毫秒
+     * @param view     显示自己的View
+     */
+    public static void customToastView(Context context, CharSequence message, int duration, View view) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, duration);
+            } else {
+                mToast.setText(message);
+            }
+            if (view != null) {
+                mToast.setView(view);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义Toast的位置
+     *
+     * @param context
+     * @param message
+     * @param duration 单位:毫秒
+     * @param gravity
+     * @param xOffset
+     * @param yOffset
+     */
+    public static void customToastGravity(Context context, CharSequence message, int duration, int gravity, int xOffset, int yOffset) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, duration);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.setGravity(gravity, xOffset, yOffset);
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义带图片和文字的Toast，最终的效果就是上面是图片，下面是文字
+     *
+     * @param context
+     * @param message
+     * @param iconResId 图片的资源id,如:R.drawable.icon
+     * @param duration
+     * @param gravity
+     * @param xOffset
+     * @param yOffset
+     */
+    public static void showToastWithImageAndText(Context context, CharSequence message, int iconResId, int duration, int gravity, int xOffset, int yOffset) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, duration);
+            } else {
+                mToast.setText(message);
+            }
+            mToast.setGravity(gravity, xOffset, yOffset);
+            LinearLayout toastView = (LinearLayout) mToast.getView();
+            ImageView imageView = new ImageView(context);
+            imageView.setImageResource(iconResId);
+            toastView.addView(imageView, 0);
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义Toast,针对类型CharSequence
+     *
+     * @param context
+     * @param message
+     * @param duration
+     * @param view
+     * @param isGravity        true,表示后面的三个布局参数生效,false,表示不生效
+     * @param gravity
+     * @param xOffset
+     * @param yOffset
+     * @param isMargin         true,表示后面的两个参数生效，false,表示不生效
+     * @param horizontalMargin
+     * @param verticalMargin
+     */
+    public static void customToastAll(Context context, CharSequence message, int duration, View view, boolean isGravity, int gravity, int xOffset, int yOffset, boolean isMargin, float horizontalMargin, float verticalMargin) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, message, duration);
+            } else {
+                mToast.setText(message);
+            }
+            if (view != null) {
+                mToast.setView(view);
+            }
+            if (isMargin) {
+                mToast.setMargin(horizontalMargin, verticalMargin);
+            }
+            if (isGravity) {
+                mToast.setGravity(gravity, xOffset, yOffset);
+            }
+            mToast.show();
+        }
+    }
+
+    /**
+     * 自定义Toast,针对类型resId
+     *
+     * @param context
+     * @param resId
+     * @param duration
+     * @param view             :应该是一个布局，布局中包含了自己设置好的内容
+     * @param isGravity        true,表示后面的三个布局参数生效,false,表示不生效
+     * @param gravity
+     * @param xOffset
+     * @param yOffset
+     * @param isMargin         true,表示后面的两个参数生效，false,表示不生效
+     * @param horizontalMargin
+     * @param verticalMargin
+     */
+    public static void customToastAll(Context context, int resId, int duration, View view, boolean isGravity, int gravity, int xOffset, int yOffset, boolean isMargin, float horizontalMargin, float verticalMargin) {
+        if (isShow) {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, resId, duration);
+            } else {
+                mToast.setText(resId);
+            }
+            if (view != null) {
+                mToast.setView(view);
+            }
+            if (isMargin) {
+                mToast.setMargin(horizontalMargin, verticalMargin);
+            }
+            if (isGravity) {
+                mToast.setGravity(gravity, xOffset, yOffset);
+            }
+            mToast.show();
+        }
+    }
+
+}
diff --git a/app/src/main/res/drawable/atlas_selector.xml b/app/src/main/res/drawable/atlas_selector.xml
new file mode 100644
index 0000000..c8e06bd
--- /dev/null
+++ b/app/src/main/res/drawable/atlas_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:drawable="@mipmap/map_type" android:state_checked="false"/>
+<item android:drawable="@mipmap/map_type_select" android:state_checked="true"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/foot_selector.xml b/app/src/main/res/drawable/foot_selector.xml
new file mode 100644
index 0000000..7f2929d
--- /dev/null
+++ b/app/src/main/res/drawable/foot_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/footprint" android:state_checked="false"/>
+    <item android:drawable="@mipmap/footprint_select" android:state_checked="true"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/location.png b/app/src/main/res/drawable/location.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e7fd807f9683b06ddaeeaa2498a8fdc5eb139cd
GIT binary patch
literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq000dD000jN1^@s6KO;qV00052Nkl<Zc$|&W
zze^i&7{~E<a$XWIXF?KVYP1qTYqTg4O(P~MQmCSX*qWkgp%fQK0~T~>UBt;va1aD1
z=PsSZrQ$!Js5rQ3Y)Y|>Cnk3$xef`1#-E?%f$#IYmgo7x?J)r6V!aXLZI8j|yeBxj
zJ&mhdel&U>iu6fd{~Z2k$77MjRogfrx+?AX!ZAR25WV=Y5)dSJuc`tL-vI5C&mKYs
zZ=mn3UM@M(X+U<>;g5~oiz+)tpNRJAVI>1v77&c!Xc)oX>bMhC_e{OYnkpK8UxJzg
z@_<~`MmXMo2l7}=?xyjyUS>?C;W`KCfY~DA?Hs3YxBrpn%|Z~_9Zp?=qJfqxHu8X6
z^ODG7pcDyZzR){OkSdf6C|OW-3d`03tJ6t+?*zpkVgxXE#p|&>9lFYcqCzr}JXDT$
zR!Jp}&;gOcLYiZB|B%oceXWT$@1Gw(cYp1Fk0-x=8qBOmrr7#C!13k`=VyCJP9N<b
zM*s}8y|-FI@rAs0k<hl5HaPiqT6!0125ae=i6NNW94~({&=NI)P3B<j{Kjx;S|*)v
aarqZB)^ta}Zf)5B0000<MNUMnLSTYVG1<ES

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/treasure_fragment.xml b/app/src/main/res/layout/treasure_fragment.xml
index dbfe1ee..c54c301 100644
--- a/app/src/main/res/layout/treasure_fragment.xml
+++ b/app/src/main/res/layout/treasure_fragment.xml
@@ -1,18 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <com.tencent.tencentmap.mapsdk.maps.MapView
+        android:id="@+id/treasure_map"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_launcher_foreground" />
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/cb_map_type"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/atlas_selector"
+        android:button="@null"
+        android:checked="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/cb_foot_type"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/foot_selector"
+        android:button="@null"
+        android:checked="false"
+        app:layout_constraintRight_toRightOf="@id/cb_map_type"
+        app:layout_constraintTop_toBottomOf="@id/cb_map_type" />
+    <ImageView
+        android:id="@+id/iv_submit"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@mipmap/submit"
+        app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
+        app:layout_constraintTop_toTopOf="@id/iv_zoom_del"
+        app:layout_constraintBottom_toBottomOf="@id/iv_refrish"
+        />
+    <ImageView
+        android:id="@+id/iv_filter"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@mipmap/filter"
+        android:layout_marginTop="15dp"
+        app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
+        app:layout_constraintTop_toBottomOf="@id/iv_submit"
+        />
+    <ImageView
+        android:id="@+id/iv_zoom_add"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="15dp"
+        android:src="@mipmap/zoom_add"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cb_foot_type" />
+
+    <ImageView
+        android:id="@+id/iv_zoom_del"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="15dp"
+        android:src="@mipmap/zoom_del"
+        app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
+        app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
+    <ImageView
+        android:id="@+id/iv_refrish"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="15dp"
+        android:src="@mipmap/refresh"
+        app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
+        app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
+    <ImageView
+        android:id="@+id/iv_location"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="15dp"
+        android:src="@mipmap/mine_location"
+        app:layout_constraintLeft_toLeftOf="@id/iv_refrish"
+        app:layout_constraintTop_toBottomOf="@id/iv_refrish" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/filter.png b/app/src/main/res/mipmap-xxhdpi/filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe1035f388fd811a79c44f2b76cb231bcd25585a
GIT binary patch
literal 2144
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
Wkv&It>?xrD0000<MNUMnLSTZ}krb`~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/footprint.png b/app/src/main/res/mipmap-xxhdpi/footprint.png
new file mode 100644
index 0000000000000000000000000000000000000000..a95140e646a5a62b5d6633808eebcbb4ce32f64c
GIT binary patch
literal 2236
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
KMNUMnLSTZ2Y@B`o

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/footprint_select.png b/app/src/main/res/mipmap-xxhdpi/footprint_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..27cd18f876c27e1d842ac19e2c7f5890def530aa
GIT binary patch
literal 2257
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/map_type.png b/app/src/main/res/mipmap-xxhdpi/map_type.png
new file mode 100644
index 0000000000000000000000000000000000000000..5765eca4fd78734b0cad0c9c59ac9f94d140ab37
GIT binary patch
literal 2083
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
N002ovPDHLkV1m9dP^ka_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/map_type_select.png b/app/src/main/res/mipmap-xxhdpi/map_type_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..45e6a8e47faa0c4cdfe8c7bcf864270b37a85dd3
GIT binary patch
literal 1951
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/mine_location.png b/app/src/main/res/mipmap-xxhdpi/mine_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..4776aeea277cf98757b8a83d6640d289cc23f1d6
GIT binary patch
literal 1808
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/refresh.png b/app/src/main/res/mipmap-xxhdpi/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..115b58650c75ba4a822e4620ab6bd7c16d5744e5
GIT binary patch
literal 2099
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/submit.png b/app/src/main/res/mipmap-xxhdpi/submit.png
new file mode 100644
index 0000000000000000000000000000000000000000..62fb298db79e1805e54925e428028dcc3d53b0d8
GIT binary patch
literal 2642
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
A9{>OV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/zoom_add.png b/app/src/main/res/mipmap-xxhdpi/zoom_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa8e3a03493e60125cdd747a3be2c2a25431fd1e
GIT binary patch
literal 1551
zcmV+q2JrcbP)<h;3K|Lk000e1NJLTq003G5003GD0{{R34|cII0002_P)t-s00017
zZj(`DepF$4Qeb*wX_iu7dRbk1PF;9UTzOAlcvWF}P+WUYTY64icu-z=PhELUTX;-d
zc>n+ZO<Q+NTX;-dcvWM7|NsB|{Qc+Y?fw4#{QUj<`~3Fz`Q6{+QD1xh{{H*>{Py?w
z_4fDs`~11T%H!qh&ePn9k)!?n{r>*`_xJex{QdCq^YHQW`T6?p@bcc_=H=(>@bL5X
z_4nD_<L&M7?CkKVvA?UazqGo@l%21grnS=6;9+lvtFyrO_xSw${Py_z#>>{r(AluH
z!^q3jzs1hf*WJ<B+~?=(d3~09iJQK@$Z>s?e1n_+|Nl8cS;4JbRR910QFKyHQvd@B
z1`Y)f2qzpF6&4dCAT2K*`6@Ia68-C_@8jN?IyC3k%)q*3NGlWa@Ym4Ayt18|lZu6d
zb6Z<gQ%prbIUL-?lyz}oT2xa=KR-A#D<LNAFM$961awJ6K~z}7#M9ks!axuO;C4)0
z>JJ6?!W1<jwn0M?EL8MLq+Y2YPT&7wI&PMZDKWnTJvW64ABVG(hyTrEMg(2gZP~c4
zh@PnADNqVb=&z!GBz_~86o7cP-bd5%NbAvf8tvD!7=V7LtJ}T+r`4CnKha;S6M*er
z3sx{+P4G@8t2wCZxPbwJrH483mH~jltHBC_2n!Phws~op;GOSbiFp2waJEZqu?ewc
z!VRxdLXLf`5I<(SXpH#+D`hd~QSxMPf)Fbv3>+|az6`T>tep257`s5$SR>lnd2+y=
ztMv|Y?BoSQteG%*%WT<I5HGNH7BMI{%QpAy_}Cymok^B$&TfN^vN0!^DeqpI(Jwo;
z({r?aY#6`IlcY*-y{5Fc<=VH`F^sTrq9I=imu_!SAltUB&85NVFD2+@-vL{jOP@Un
z+B>If)6!1=6GigbcWCX@d2}Z-^rUN#g!edNVZJF?nB(mtB-0*JG%Z5*P3hjN6#d$>
zwJkloXenA>hD^KkhzFFS@zA}VHs8luj$S7>@;mj19Q|R(wshxBj(+PfO`l?CDo0N{
z^g$ABU-4-yM~|QEI})vk9_4`9!Fw4ItrEI*rL`QbuXHP+!RZYo=|Rta>gM(al7kHB
z`j~!}e8%TA{nMP;tTqlqQJ4WUNU|fzLYAplh88bENFaeg{s@KsEn52iZ!^bI!p&fs
zIJOqmCSH9xoO@(n>BbD-|7a6)%XmYmj4?O5FC&F-9S^<s;iE0{9uNKQw+wCc?|7er
zZ@<y$^(5ncz@&dY(M#2>Vxd=#UaBG3AF<FMD!W9(Y!<7<VVs(rP)E6ngI>u{MQRp=
zI>c!w4@yw85X?4g5d*zo=43TBW?b%Kpm&l}V|I?8Vo&4APfQ6Cea;AEk3S~uB;|uz
zci~ty7F{tXsCB18a``p(Nctr?74hPj1h-$up<m%N9g{9(!);rQvctk@FS>Iig={?=
zPM&FqrX%U4Y+uR4!(gKizJ?^4WQR)H?Q|G<y0xK(UUWxxDGamCuxqWxG9yY7-LV90
z-Ao5)ZZybbN5_(oK)rpq+vlzJx$D|NDM11q)BD+-+1P95kUL68*OD{)SlyN9<CzRQ
zu3RC4t(eVU9(tScl3S)gzIi<fwlH9SR{gHVt51-PAo5i<aw3_|H}l)%`6ky)A{#`$
z#!iqE?jXF_EUu3s7MlW+9Y;12B4524Ps&WFR(P>r{yaQc?u%Bk5?Pt_nHT&C`GzSx
zz>Bx#V|V29xO^)Dn8S?Zo?!umr*K6wtMj@(HtTBs90pa-^J?83>pIt#NqCV$axXHO
zf@)@7c}vghqApGgk9o`WiZj%Y%;-Jxfh$mMTuZlF=Q_v2kG3t>87PJqosmyZR}wFs
zD<`F7r-etSxEGv|7x$0XAiYe}On}dgQOXz&s>sr`gkT!44H^o94*X<-KWG=AlS%3I
z(ok^3C=+<_lfPK_X|XiQ{A~l+TVvzjJnSC6{sDh9yv(ZkxefpT002ovPDHLkV1jh^
B7<>Q#

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/zoom_del.png b/app/src/main/res/mipmap-xxhdpi/zoom_del.png
new file mode 100644
index 0000000000000000000000000000000000000000..d24f63a5ad33c13ad73854027b2d707a4588a920
GIT binary patch
literal 1544
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d397903..6a00f53 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
     <color name="colorPrimary">#6200EE</color>
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorPrimaryBlue">#03A9F4</color>
+    <color name="colormap">#CBC2C5C6</color>
     <color name="colorBlue">#2196F3</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="colorBack">#000000</color>
diff --git a/build.gradle b/build.gradle
index ea50806..55e93f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,15 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        //友盟 检测bug
         maven { url 'https://repo1.maven.org/maven2/' }
+        //腾讯地图
+        maven{
+            url "https://oss.sonatype.org/content/groups/public"
+        }
+
 
     }
     dependencies {
@@ -21,6 +28,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
         maven { url 'https://repo1.maven.org/maven2/' }