Merge remote-tracking branch 'origin/master'

base_library/build.gradle

@@ -124,6 +124,8 @@ dependencies {
     api 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.8'
     api 'com.aliyun.dpa:oss-android-sdk:+'
 
+    api 'com.airbnb.android:lottie:3.5.0'
+
     testImplementation lib.junit
     androidTestImplementation lib.runner
     androidTestImplementation lib.espresso

base_library/src/main/java/com/mgtech/base_library/bean/GPS.java

@@ -0,0 +1,45 @@
+package com.mgtech.base_library.bean;
+
+/**
+ * @ProjectName: BaseLibrary
+ * @Package: com.mgtech.base_library.bean
+ * @ClassName: GPS
+ * @Description: java类作用描述
+ * @Author: niusongtao
+ * @CreateDate: 2020/12/4 16:03
+ * @UpdateUser: 更新者：niusongtao
+ * @UpdateDate: 2020/12/4 16:03
+ * @UpdateRemark: 更新说明：
+ * @Version: 1.0
+ */
+public class GPS {
+
+
+    private double lat;
+    private double lon;
+
+    public GPS(double lat, double lon) {
+        this.lat = lat;
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public String toString() {
+        return "lat:" + lat + "," + "lon:" + lon;
+    }
+}

base_library/src/main/java/com/mgtech/base_library/util/GPSConverterUtils.java

@@ -0,0 +1,153 @@
+package com.mgtech.base_library.util;
+
+import com.mgtech.base_library.bean.GPS;
+
+/**
+ * @ProjectName: BaseLibrary
+ * @Package: com.mgtech.base_library.util
+ * @ClassName: GPSConverterUtils
+ * @Description: 坐标转换工具类
+ * WGS84: Google Earth采用，Google Map中国范围外使用
+ * GCJ02: 火星坐标系，中国国家测绘局制定的坐标系统，由WGS84机密后的坐标。Google Map中国和搜搜地图使用，高德
+ * BD09:百度坐标，GCJ02机密后的坐标系
+ * 搜狗坐标系，图吧坐标等，估计也是在GCJ02基础上加密而成的
+ * @Author: niusongtao
+ * @CreateDate: 2020/12/4 16:02
+ * @UpdateUser: 更新者：niusongtao
+ * @UpdateDate: 2020/12/4 16:02
+ * @UpdateRemark: 更新说明：
+ * @Version: 1.0
+ */
+public class GPSConverterUtils {
+
+    public static final String BAIDU_LBS_TYPE = "bd09ll";
+    public static double pi = 3.1415926535897932384626;
+    public static double a = 6378245.0;
+    public static double ee = 0.00669342162296594323;
+
+    /**
+     * 84 to 火星坐标系 (GCJ-02) World Geodetic System ==> Mars Geodetic System
+     * @param lat
+     * @param lon
+     */
+    public static GPS gps84_To_Gcj02(double lat, double lon) {
+        if (outOfChina(lat, lon)) {
+            return null;
+        }
+        double dLat = transformLat(lon - 105.0, lat - 35.0);
+        double dLon = transformLon(lon - 105.0, lat - 35.0);
+        double radLat = lat / 180.0 * pi;
+        double magic = Math.sin(radLat);
+        magic = 1 - ee * magic * magic;
+        double sqrtMagic = Math.sqrt(magic);
+        dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+        dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+        double mgLat = lat + dLat;
+        double mgLon = lon + dLon;
+        return new GPS(mgLat, mgLon);
+    }
+
+    /**
+     * * 火星坐标系 (GCJ-02) to 84 * * @param lon * @param lat * @return
+     */
+    public static GPS gcj_To_Gps84(double lat, double lon) {
+        GPS gps = transform(lat, lon);
+        double lontitude = lon * 2 - gps.getLon();
+        double latitude = lat * 2 - gps.getLat();
+        return new GPS(latitude, lontitude);
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标
+     *
+     * @param gg_lat
+     * @param gg_lon
+     */
+    public static GPS gcj02_To_Bd09(double gg_lat, double gg_lon) {
+        double x = gg_lon, y = gg_lat;
+        double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * pi);
+        double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * pi);
+        double bd_lon = z * Math.cos(theta) + 0.0065;
+        double bd_lat = z * Math.sin(theta) + 0.006;
+        return new GPS(bd_lat, bd_lon);
+    }
+
+    /**
+     * * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 * * 将 BD-09 坐标转换成GCJ-02 坐标 * * @param
+     * bd_lat * @param bd_lon * @return
+     */
+    public static GPS bd09_To_Gcj02(double bd_lat, double bd_lon) {
+        double x = bd_lon - 0.0065, y = bd_lat - 0.006;
+        double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * pi);
+        double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * pi);
+        double gg_lon = z * Math.cos(theta);
+        double gg_lat = z * Math.sin(theta);
+        return new GPS(gg_lat, gg_lon);
+    }
+
+    /**
+     * (BD-09)-->84
+     * @param bd_lat
+     * @param bd_lon
+     * @return
+     */
+    public static GPS bd09_To_Gps84(double bd_lat, double bd_lon) {
+
+        GPS gcj02 = bd09_To_Gcj02(bd_lat, bd_lon);
+        GPS map84 = gcj_To_Gps84(gcj02.getLat(),
+                gcj02.getLon());
+        return map84;
+
+    }
+
+    /**
+     * is or not outOfChina
+     * @param lat
+     * @param lon
+     * @return
+     */
+    public static boolean outOfChina(double lat, double lon) {
+        if (lon < 72.004 || lon > 137.8347)
+            return true;
+        if (lat < 0.8293 || lat > 55.8271)
+            return true;
+        return false;
+    }
+
+    public static GPS transform(double lat, double lon) {
+        if (outOfChina(lat, lon)) {
+            return new GPS(lat, lon);
+        }
+        double dLat = transformLat(lon - 105.0, lat - 35.0);
+        double dLon = transformLon(lon - 105.0, lat - 35.0);
+        double radLat = lat / 180.0 * pi;
+        double magic = Math.sin(radLat);
+        magic = 1 - ee * magic * magic;
+        double sqrtMagic = Math.sqrt(magic);
+        dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+        dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+        double mgLat = lat + dLat;
+        double mgLon = lon + dLon;
+        return new GPS(mgLat, mgLon);
+    }
+
+    public static double transformLat(double x, double y) {
+        double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y
+                + 0.2 * Math.sqrt(Math.abs(x));
+        ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+        ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
+        ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
+        return ret;
+    }
+
+
+    public static double transformLon(double x, double y) {
+        double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1
+                * Math.sqrt(Math.abs(x));
+        ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+        ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
+        ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0
+                * pi)) * 2.0 / 3.0;
+        return ret;
+    }
+}

base_library/src/main/java/com/mgtech/base_library/util/GoogleLocationUtil.java

@@ -23,6 +23,7 @@ import androidx.core.content.ContextCompat;
 
 import com.coorchice.library.utils.LogUtils;
 import com.mgtech.base_library.R;
+import com.mgtech.base_library.bean.GPS;
 
 import java.util.List;
 
@@ -51,6 +52,10 @@ public class GoogleLocationUtil{
     private MyLocationListener myLocationListener = new MyLocationListener();
     private LocationManager locationManager;
 
+    private Location lastKnownLocation;
+
+    private GPS gpsBean;
+
 
     public GoogleLocationUtil(Activity context, LocationInfoListener locationInfoListener) {
         this.context = context;
@@ -149,20 +154,29 @@ public class GoogleLocationUtil{
         criteria.setPowerRequirement(Criteria.POWER_MEDIUM);
         String provider = locationManager.getBestProvider(criteria, true);
 
-//        LogUtils.e("nst","getLocationInfo: -----" + provider);
         if (provider ==  null){
             locationInfoListener.locationFailed(context.getString(R.string.map_permission_failure));
             return;
         }
-        Location location = locationManager.getLastKnownLocation(provider);
-        if (location != null){
-//            ToastUtils.showShort("getLastKnownLocation:"+location.getLatitude()+"--------"+location.getLongitude());
-            LogUtil.e("nst","getLastKnownLocation:"+location.getLatitude()+"--------"+location.getLongitude());
-            locationInfoListener.locationSuccess(location.getLatitude(),location.getLongitude());
-        }else{
-            //如果位置移动超过MIN_DISTANCE米那将会重新定位
-            locationManager.requestLocationUpdates(provider, MIN_TIME, MIN_DISTANCE,myLocationListener);
-        }
+        lastKnownLocation = locationManager.getLastKnownLocation(provider);
+//        if (location != null){
+////            ToastUtils.showShort("getLastKnownLocation:"+location.getLatitude()+"--------"+location.getLongitude());
+//
+//            gpsBean = GPSConverterUtils.gps84_To_Gcj02(location.getLatitude(),location.getLongitude());
+//            if ( gpsBean == null)
+//                locationInfoListener.locationSuccess(location.getLatitude(),location.getLongitude());
+//            else
+//                locationInfoListener.locationSuccess(gpsBean.getLat(),gpsBean.getLon());
+//
+//            LogUtil.e("nst","getLastKnownLocation:"+location.getLatitude()+","+location.getLongitude());
+//            if (gpsBean != null)
+//                LogUtil.e("nst","getLastKnownLocation:"+gpsBean.getLat()+","+gpsBean.getLon());
+//        }else{
+//            //如果位置移动超过MIN_DISTANCE米那将会重新定位
+//            locationManager.requestLocationUpdates(provider, MIN_TIME, MIN_DISTANCE,myLocationListener);
+//        }
+
+        locationManager.requestLocationUpdates(provider, MIN_TIME, MIN_DISTANCE,myLocationListener);
 
 //        locationManager.requestLocationUpdates(provider, MIN_TIME, MIN_DISTANCE,listeners[0]);
 //        locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, MIN_TIME, MIN_DISTANCE,listeners[0]);
@@ -170,6 +184,22 @@ public class GoogleLocationUtil{
     }
 
 
+    private void getLastKnownLocation(){
+        if (lastKnownLocation != null){
+            gpsBean = GPSConverterUtils.gps84_To_Gcj02(lastKnownLocation.getLatitude(),lastKnownLocation.getLongitude());
+            if ( gpsBean == null)
+                locationInfoListener.locationSuccess(lastKnownLocation.getLatitude(),lastKnownLocation.getLongitude());
+            else
+                locationInfoListener.locationSuccess(gpsBean.getLat(),gpsBean.getLon());
+
+            LogUtil.e("nst","getLastKnownLocation:"+lastKnownLocation.getLatitude()+","+lastKnownLocation.getLongitude());
+            if (gpsBean != null)
+                LogUtil.e("nst","getLastKnownLocation:"+gpsBean.getLat()+","+gpsBean.getLon());
+        } else {
+            locationInfoListener.locationFailed(context.getString(R.string.map_location_failure));
+        }
+    }
+
     private class MyLocationListener implements LocationListener {
 
         @Override
@@ -177,12 +207,19 @@ public class GoogleLocationUtil{
             if (locationInfoListener == null)
                 return;
             if(location != null){
-//                ToastUtils.showShort("onLocationChanged:"+location.getLatitude()+"--------"+location.getLongitude());
-//                LogUtil.e("nst","onLocationChanged:"+location.getLatitude()+"--------"+location.getLongitude());
-                locationInfoListener.locationSuccess(location.getLatitude(),location.getLongitude());
+                LogUtil.e("nst","onLocationChanged:"+location.getLatitude()+"--------"+location.getLongitude());
+
+                gpsBean = GPSConverterUtils.gps84_To_Gcj02(location.getLatitude(),location.getLongitude());
+                if ( gpsBean == null)
+                    locationInfoListener.locationSuccess(location.getLatitude(),location.getLongitude());
+                else
+                    locationInfoListener.locationSuccess(gpsBean.getLat(),gpsBean.getLon());
             }else{
-                locationInfoListener.locationFailed(context.getString(R.string.map_location_failure));
+//                locationInfoListener.locationFailed(context.getString(R.string.map_location_failure));
+                getLastKnownLocation();
             }
+            if (gpsBean != null)
+                LogUtil.e("nst","onLocationChanged:"+gpsBean.getLat()+","+gpsBean.getLon());
         }
 
         @Override