Merge branch 'dev_1.0.0' into dev_ad

app/build.gradle

@@ -24,7 +24,8 @@ android {
 
         //配置so文件
         ndk {
-            abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+            //abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
 
         manifestPlaceholders = [CHANNEL_NAME_VALUE: "street",
@@ -66,7 +67,7 @@ android {
             // 不显示Log
             buildConfigField "boolean", "LOG_DEBUG", "true"
             buildConfigField "String", "AppKeyPre", "\"abcd\""
-            buildConfigField "String", "MainIp", DEBUG_URL
+            buildConfigField "String", "MainIp", RELEASE_URL
 
             //混淆
             minifyEnabled false

app/src/main/assets/map.json

@@ -106,6 +106,16 @@
   },
   "homePlaces": {
     "places": [
+      {
+        "images": [
+          "http://cdn.xinzhi.space/default/30FE64076B4C9E06F544BF175AC65983.jpg",
+          "http://cdn.xinzhi.space/default/DA8F94CCEAC8659BE383E49770ADD0E7.jpg",
+          "http://cdn.xinzhi.space/default/5522899728A44CFF8D44F92BA76A9E85.jpg"
+        ],
+        "name": "北京故宫博物馆",
+        "latitude": 39.913959,
+        "longitude": 116.40399
+      },
       {
         "images": [
           "http://cdn.xinzhi.space/default/CBCAD69A2EC1401E479F0BFC36B69C4D.jpg",
@@ -126,16 +136,7 @@
         "latitude": 28.192888,
         "longitude": 112.968618
       },
-      {
-        "images": [
-          "http://cdn.xinzhi.space/default/30FE64076B4C9E06F544BF175AC65983.jpg",
-          "http://cdn.xinzhi.space/default/DA8F94CCEAC8659BE383E49770ADD0E7.jpg",
-          "http://cdn.xinzhi.space/default/5522899728A44CFF8D44F92BA76A9E85.jpg"
-        ],
-        "name": "北京故宫博物馆",
-        "latitude": 39.913959,
-        "longitude": 116.40399
-      },
+
       {
         "images": [
           "http://cdn.xinzhi.space/default/5BEF22B14C879F3F686F3EAE9AB7C508.jpg",

app/src/main/assets/web/common/ap.js

@@ -2,28 +2,28 @@
 //     console.log(data)
 // }
 
-var isWindowLoad=false;
-var BridgeIsLoad=false;
+var isWindowLoad = false;//页面加载
+var BridgeIsLoad = false;//框架加载
 
-function tryAllIsOk(){
-console.log("tryAllIsOk","isWindowLoad",isWindowLoad,"BridgeIsLoad",BridgeIsLoad)
-    if(isWindowLoad){
+function tryAllIsOk() {
+    //console.log("tryAllIsOk", "isWindowLoad", isWindowLoad, "BridgeIsLoad", BridgeIsLoad)
+    if (isWindowLoad) {
         try {
             doAppFun("allIsOk");
         } catch (e) {
-                         console.log('allisOk',e)
+           // console.log('allisOk', e)
             //  alert("app未接受开始自动跳转" + e)
-                                  setTimeout(function(){
+            setTimeout(function () {
                 doAppFun("allIsOk");
 
-                                  },1500);
+            }, 1500);
         }
     }
 
 }
 
 function toVurl(a, innerData) {
-    var data=JSON.stringify(innerData);
+    var data = JSON.stringify(innerData);
     if (a == 'b') {
         try {
             doAppFun("toBVr", data);
@@ -37,7 +37,7 @@ function toVurl(a, innerData) {
         try {
             doAppFun("toVr", data);
         } catch (e) {
-            console.log('toVr', data)
+           // console.log('toVr', data)
 
             //alert("app未接受开始自动跳转" + e)
         }
@@ -46,11 +46,10 @@ function toVurl(a, innerData) {
 }
 
 
-
 function allIsOk(a, data) {
-console.log("innerAllIsOk")
-isWindowLoad=true;
-tryAllIsOk();
+    //console.log("innerAllIsOk")
+    isWindowLoad = true;
+    tryAllIsOk();
 //         setTimeout(function(){
 //
 //         },1000);
@@ -67,15 +66,16 @@ function doAppFun(funstr, params) {
         funstr
         , params
         , function (responseData) {
-            console.log(responseData)
+           // console.log(responseData)
         }
     );
 }
+
 function centerChanged() {
     try {
         doAppFun("centerChanged");
     } catch (e) {
-        console.log("tips",msg)
+       // console.log("tips", msg)
         //alert("app未弹框==>" + msg + e)
     }
 }
@@ -84,7 +84,7 @@ function tips(msg) {
     try {
         doAppFun("tips", msg);
     } catch (e) {
-        console.log("tips",msg)
+       //console.log("tips", msg)
         //alert("app未弹框==>" + msg + e)
     }
 }
@@ -98,7 +98,7 @@ function connectWebViewJavascriptBridge(callback) {
             'WebViewJavascriptBridgeReady'
             , function () {
                 callback(WebViewJavascriptBridge)
-                BridgeIsLoad=true;
+                BridgeIsLoad = true;
                 tryAllIsOk()
             },
             false
@@ -115,24 +115,23 @@ connectWebViewJavascriptBridge(function (bridge) {
             'Javascript Responds': 'Wee!'
         };
         responseCallback(data);
-
     });
 
 
     //Android调用js方法：functionInJs方法名称需要保持一致 ，并返回给Android通知
 
     bridge.registerHandler("initZsMap", function (data, responseCallback) {
-        initZsMap(data);
+        vm.initZsMap(data);
         responseCallback("suc:initZsMap");
     });
 
     bridge.registerHandler("addZoom", function (data, responseCallback) {
-        addZoom();
+        vm.addZoom();
         responseCallback("suc:addZoom");
     });
 
     bridge.registerHandler("reduceZoom", function (data, responseCallback) {
-        reduceZoom();
+        vm.reduceZoom();
         responseCallback("suc:reduceZoom");
     });
 

app/src/main/assets/web/common/baidu.js

@@ -10,9 +10,9 @@ function CheckChinese(val) {
 // function toBLatLng(point, f) {
 //     // 百度地图API功能
 //
-//     var ggPoint = new BMapGL.Point(point.lng, point.lat);
+//     var ggPoint = new BMap.Point(point.lng, point.lat);
 //
-//     var convertor = new BMapGL.Convertor();
+//     var convertor = new BMap.Convertor();
 //     var pointArr = [];
 //     pointArr.push(ggPoint);
 //
@@ -20,7 +20,7 @@ function CheckChinese(val) {
 //
 //         console.log("转换后百度ip", );
 // console.log(data.points[0])
-//         var geoc = new BMapGL.Geocoder();
+//         var geoc = new BMap.Geocoder();
 //
 //         geoc.getLocation(data.points[0], function (rs) {
 //             //console.log(rs)
@@ -50,31 +50,33 @@ function CheckChinese(val) {
 //
 // }
 
+//var rpoint = CoordinateUtil.wgs84_to_bd(point)
 
-function toBLatLng(point, f) {
+function toGPoint(point) {
+    return CoordinateUtil.getWgs84xy(point);
+}
 
-    var rpoint = CoordinateUtil.wgs84_to_bd(point)
+function toBPoint(point) {
+    return CoordinateUtil.wgs84_to_bd(point);
+}
 
-    console.log("工具类转换后", rpoint);
 
-    var geoc = new BMapGL.Geocoder();
 
-    var data = new BMapGL.Point(rpoint.lng,rpoint.lat);
+function getLocation(rpoint, f) {
+    // console.log("工具类转换后", rpoint);
+    var geoc = new BMap.Geocoder();
+    var data = new BMap.Point(rpoint.lng, rpoint.lat);
     geoc.getLocation(data, function (rs) {
-        console.log(rs)
         var addComp = rs.addressComponents;
-        console.log(addComp.province + ", " + addComp.city + ", " + addComp.district + ", " +
-            addComp.street + ", " + addComp.streetNumber);
+        console.log(addComp.province);
+        //+ ", " + addComp.city + ", " + addComp.district + ", " addComp.street + ", " + addComp.streetNumber);
         // console.log( CheckChinese(addComp.province),typeof(addComp.province),addComp.province.indexOf("台湾")!=-1,CheckChinese(addComp.province)&&addComp.province!="台湾省")
         var res = data;
-        res.c = CheckChinese(addComp.province)&&addComp.province!="台湾省";
+        res.c = CheckChinese(addComp.province) && addComp.province != "台湾省";
         f && f(res)
     })
-
 }
 
-// 	getBAr(data.points[0])
-// function getBAr(point){
 function bvr(point) {
     var panoramaService = new BMap.PanoramaService();
     panoramaService.getPanoramaByLocation(new BMap.Point(point.lng, point.lat), 10000, function (data) {
@@ -84,9 +86,9 @@ function bvr(point) {
             tips("暂无街景")
             return;
         }
-        panoramaInfo += '全景id为：' + data.id + '\n';
-        panoramaInfo += '<br/>全景路段名为：' + data.description + '\n';
-        panoramaInfo += '<br/>坐标为：' + data.position.lng + ':' + data.position.lat + '\n';
+        // panoramaInfo += '全景id为：' + data.id + '\n';
+        panoramaInfo = '全景路段名为：' + data.description;
+        // panoramaInfo += '<br/>坐标为：' + data.position.lng + ':' + data.position.lat + '\n';
 
         console.log(panoramaInfo);
         // tips("准备跳转国内" + data.description)
@@ -95,22 +97,11 @@ function bvr(point) {
             "d": data.id,
             "title": data.description
         }
-        toVurl('b',params)
+        toVurl('b', params)
 
     });
 }
 
 
-// function getblc(f) {
-//
-//     var geolocation = new BMap.Geolocation();
-//     geolocation.getCurrentPosition(function (r) {
-//         if (this.getStatus() == BMAP_STATUS_SUCCESS) {
-//             f&&f(r.point)
-//             //alert('您的位置：' + r.point.lng + ',' + r.point.lat);
-//         } else {
-//            // alert('failed' + this.getStatus());
-//         }
-//     });
-// }
+
 

app/src/main/assets/web/common/bmap.js

+

app/src/main/assets/web/common/gmap.js

+window.google = window.google || {};
+google.maps = google.maps || {};
+//强行阻断地图加载
+//获取加载参数
+var G_ZSYDA;//gmapinitneed
+function loadGoogleMap(Yda) {
+    //window.google.maps.Load&&window.google.maps.Load(Yda);
+    G_ZSYDA = Yda;
+}
+
+var initMap;//gneedfun
+
+function tosh(center) {
+    console.log("查询国外或中国台湾街景")
+    var ser = new google.maps.StreetViewService();
+    const request = {
+        location: {
+            lat: center.lat(),
+            lng: center.lng()
+        },
+        radius: 10000,
+        preference: 'nearest', //google.maps.StreetViewPreference.NEAREST,
+    };
+
+    ser.getPanorama(request, function (a) {
+        if (a == null || a.location == null) {
+            tips("暂无街景")
+            return;
+        }
+        console.log(a.location.description)
+        //console.log(a.location.latLng.lat() + ',' + a.location.latLng.lng())
+
+        // console.log("准备模拟app跳转至外国街景:" + a.location.description + "==>./streets.html?a=" + a.location.latLng
+        //     .lat() + "&b=" + a.location.latLng.lng())
+
+        var params = {
+            "lng": a.location.latLng.lng(),
+            "lat": a.location.latLng.lat(),
+            "title": a.location.description
+        }
+        toVurl('g', params)
+
+    })
+}
+
+
+(function () {
+
+    var modules = google.maps.modules = {};
+    google.maps.__gjsload__ = function (name, text) {
+        modules[name] = text;
+    };
+
+    google.maps.Load = function (apiLoad) {
+        delete google.maps.Load;
+        apiLoad([
+            0.009999999776482582,
+            [
+                null,
+                [
+                    getMb1U(),
+                    null,
+                    null,
+                    null,
+                    1,
+                    "904",
+                    [
+                        "http://khms0.google.com/kh?v=904\u0026hl=zh-CN\u0026",
+                        "http://khms1.google.com/kh?v=904\u0026hl=zh-CN\u0026"
+                    ]
+                ],
+                null,
+                null,
+                null,
+                null,
+                [
+                    [
+                        "http://cbks0.googleapis.com/cbk?",
+                        "http://cbks1.googleapis.com/cbk?"
+                    ]
+                ],
+                [
+                    getMb2U(),
+                    null,
+                    null,
+                    null,
+                    null,
+                    "130",
+                    [
+                        "http://khms0.google.com/kh?v=130\u0026hl=zh-CN\u0026",
+                        "http://khms1.google.com/kh?v=130\u0026hl=zh-CN\u0026"
+                    ]
+                ]
+            ],
+            [
+                "zh-CN",
+                "US",
+                null,
+                0,
+                null,
+                null,
+                "http://maps.gstatic.com/mapfiles/",
+                null,
+                getRequestUrl(),
+                getRequestUrl(''),
+                null,
+                "http://maps.google.com",
+                null,
+                "http://maps.gstatic.com/maps-api-v3/api/images/",
+                "http://www.google.com/maps",
+                null,
+                "http://www.google.com",
+                1,
+                "http://maps.googleapis.com/maps_api_js_slo/log?hasfast=true"
+            ],
+            [
+                getRequestUrl() + "/maps-api-v3/api/js/45/7/intl/zh_cn",
+                "3.45.7"
+            ],
+            [
+                3420973460
+            ],
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            "initMap",
+            null,
+            null,
+            1,
+            "http://khms.googleapis.com/mz?v=904\u0026",
+            getZsKey(),
+            "http://earthbuilder.googleapis.com",
+            "http://earthbuilder.googleapis.com",
+            null,
+            "http://mts.googleapis.com/maps/vt/icon",
+            [
+                [
+                    getRequestUrl() + "/maps/vt"
+
+                ],
+                [
+                    getRequestUrl() + "/maps/vt"
+                ],
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                [
+                    "http://www.google.com/maps/vt"
+                ],
+                "/maps/vt",
+                565000000,
+                565,
+                565290767
+            ],
+            2,
+            500,
+            [
+                null,
+                null,
+                null,
+                null,
+                "http://www.google.com/maps/preview/log204",
+                "",
+                "http://static.panoramio.com.storage.googleapis.com/photos/",
+                [
+                    "http://geo0.ggpht.com/cbk",
+                    "http://geo1.ggpht.com/cbk",
+                    "http://geo2.ggpht.com/cbk",
+                    "http://geo3.ggpht.com/cbk"
+                ],
+                getRequestUrl() + "/maps/api/js/GeoPhotoService.GetMetadata",
+                getRequestUrl() + "/maps/api/js/GeoPhotoService.SingleImageSearch",
+                getVrUrls(),
+            ],
+            null,
+            null,
+            null,
+            null,
+            "/maps/api/js/ApplicationService.GetEntityDetails",
+            0,
+            null,
+            null,
+            null,
+            null,
+            [],
+            [
+                "45.7"
+            ],
+            1,
+            0,
+            [
+                1
+            ],
+            null,
+            null,
+            null,
+            0.009999999776482582
+        ], loadScriptTime);
+
+
+    };
+    var loadScriptTime = (new Date).getTime();
+})();

app/src/main/assets/web/common/latlng.js

@@ -86,18 +86,35 @@ var CoordinateUtil = {
 		ret += (150.0 * Math.sin(lng / 12.0 * CoordinateUtil.pi) + 300.0 * Math.sin(lng / 30.0 * CoordinateUtil.pi)) * 2.0 / 3.0;
 		return ret;
 	},
-	getWgs84xy:function(x,y){
+	getWgs84xy:function(point){
 		//先转 国测局坐标
-		var doubles_gcj = CoordinateUtil.bd09togcj02(x, y); //（x 117.   y 36. ）
+		var doubles_gcj = CoordinateUtil.bd09togcj02(point.lng, point.lat); //（x 117.   y 36. ）
 		//国测局坐标转wgs84
 		var doubles_wgs84 = CoordinateUtil.gcj02towgs84(doubles_gcj.lng, doubles_gcj.lat);
 		//返回 纠偏后 坐标
-		 
 		return doubles_wgs84;
 	},
 	wgs84_to_bd:function(point){
+		var lng=point.lng;
+
+		if(lng>180){
+			console.log("lng>>",lng)
+			lng=lng%360;
+			if(lng>180){
+				lng=lng-360;
+			}
+			console.log("lng>>>>",lng)
+		}
+		if(lng<-180){
+			console.log("lng>>",lng)
+			lng=lng%360;
+			if(lng<-180){
+				lng=lng+360;
+			}
+			console.log("lng>>>>",lng)
+		}
 		//先转 国测局坐标
-		var doubles_gcj = CoordinateUtil.wgs84togcj02(point.lng, point.lat); //（x 117.   y 36. ）
+		var doubles_gcj = CoordinateUtil.wgs84togcj02(lng, point.lat); //（x 117.   y 36. ）
 		//国测局坐标转bd
 		var doubles_bd = CoordinateUtil.gcj02tobd09(doubles_gcj.lng, doubles_gcj.lat);
 		//返回 纠偏后 坐标

app/src/main/assets/web/mr.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="./common/url.js"></script>
     <script>
         document.write('<script type="text/javascript"' +
             '  src="https://api.map.baidu.com/api?v=3.0&ak=' + getParam("bk") + '"><\/script>')
@@ -48,8 +49,6 @@
 
 
 
-
-
     //全景图展示
     var panorama = new BMap.Panorama('panorama');
     // panorama.setPosition(new BMap.Point(120.320032, 31.589666)); //根据经纬度坐标展示全景图
@@ -86,7 +85,7 @@
     }
     var map = new BMap.Map("normal_map", mapOption);
     var testpoint = new BMap.Point(120.320032, 31.589666);
-    map.centerAndZoom(testpoint, 18);
+    map.centerAndZoom(testpoint, 15);
     // 创建小车图标
     var myIcon = new BMap.Icon("./common/bm.jpg", new BMap.Size(40, 63),{
         // anchor: new BMap.Size(0, 0)

app/src/main/assets/web/zsmap.html

@@ -21,9 +21,12 @@
         }
 
         #map {
+            width: 100%;
             height: 100%;
+            position: relative;
         }
 
+
         .d1 {
             width: 70px;
             height: 90px;
@@ -34,41 +37,54 @@
             left: 50%;
             margin-left: -35px;
         }
-        /*.gmnoprint{*/
-        /*    display: none !important;*/
-        /*}*/
-    </style>
-    <script type="text/javascript" charset="UTF-8" src="./common/latlng.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="./common/url.js"></script>
-
-    <script type="text/javascript" charset="UTF-8" src="./common/zsc.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="./zsmap.js"></script>
-    <script>
-        document.write('<script type="text/javascript"' +
-            '  src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak='+getParam("bk")+'"><\/script>'
 
-       +'<script type="text/javascript"' +
-            '            src="https://api.map.baidu.com/api?v=3.0&ak='+getParam("bk")+'"><\/script>');
-    </script>
+        #bmap {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            margin: 0;
+            position:absolute;
+            font-family: "微软雅黑";
+        }
 
-    <script src="https://code.bdstatic.com/npm/jquery@1.12.4/dist/jquery.min.js"></script>
+        .anchorBL,a{
+            display: none !important;
+        }
+        #map .gmnoprint{
+            display: none !important;
+        }
 
-    <script src="./common/baidu.js" async=""></script>
+    </style>
 
-    <script type="text/javascript" charset="UTF-8" src="./common/ap.js" async=""></script>
-    <script type="text/javascript" charset="UTF-8" src="./zsmap_files/common.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="./zsmap_files/util.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="./zsmap_files/map.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="./zsmap_files/onion.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="./zsmap_files/controls.js"></script>
 
 </head>
 <body>
-
-<div id="map" style="position: relative; overflow: hidden;">
+<div id="maps" style="height: 100%;width: 100%;padding: 0;margin:0;">
+    <div id="map" v-show="!NOWUSEBAIDU"></div>
+    <div id="bmap" v-show="true||NOWUSEBAIDU"></div>
+    <img src="./common/icon.jpg" @click="vrs()" class="d1" id="im">
 </div>
-<img src="./common/icon.jpg" onclick="al()" class="d1" id="im">
-</img>
-<script src="./zsmap_files/js" async=""></script>
+
+
 </body>
+<script type="text/javascript" charset="UTF-8" src="./common/vue.min.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./common/latlng.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./common/url.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./common/zsc.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./common/gmap.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./common/bmap.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./zsmap.js"></script>
+<script>
+    document.write('<script type="text/javascript"' +
+        '            src="https://api.map.baidu.com/api?v=3.0&ak=' + getParam("bk") + '"><\/script>');
+</script>
+<script src="./common/jquery.min.js"></script>
+<script src="./common/baidu.js" async=""></script>
+<script type="text/javascript" charset="UTF-8" src="./common/ap.js" async=""></script>
+<script type="text/javascript" charset="UTF-8" src="./zsmap_files/common.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./zsmap_files/util.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./zsmap_files/map.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./zsmap_files/onion.js"></script>
+<script type="text/javascript" charset="UTF-8" src="./zsmap_files/controls.js"></script>
+<script src="./zsmap_files/js" async=""></script>
 </html>

app/src/main/java/com/mints/street/adapter/GridPaymentAdapter.kt

@@ -52,7 +52,8 @@ class GridPaymentAdapter(val context: Context, val list: List<VipBean.ListBean>)
                 holder.binding.bg.setBackgroundResource(R.drawable.shape_bg_payment_down)
                 notifyDataSetChanged()
             }
-            holder.binding.tvDays.text = "${databean.days}天"
+//            holder.binding.tvDays.text = "${databean.days}天"
+            holder.binding.tvDays.text = databean.title
             holder.binding.tvOldprice.text = "原价¥${databean.oldPrice}"
             holder.binding.tvPrice.text = "¥${databean.price}"
             holder.binding.ivHot.visibility = if (databean.activityType == 0) View.GONE else View.VISIBLE

app/src/main/java/com/mints/street/adapter/HistoryRecordAdapter.kt

@@ -126,6 +126,7 @@ class HistoryRecordItemVHM(val activity: SearchMapActivity,val viewModel: Search
         val intent = Intent()
         intent.putExtra("latitude",historyBean.latitude)
         intent.putExtra("longitude",historyBean.longitude)
+        intent.putExtra("inner",viewModel.index.value)
         viewModel.finishData(SearchMapActivity.REQUEST_CODE,intent)
     })
 }
\ No newline at end of file

app/src/main/java/com/mints/street/api/MainApi.kt

@@ -68,7 +68,7 @@ interface MainApi {
     /**
      * 支付成功
      */
-    @POST("api/trade/queryVipOrder")
+    @POST("api/queryVipOrder")
     fun queryVipOrder(@Body vo:@JvmSuppressWildcards Map<String,Any>):Observable<Response<BaseResponse<Any>>>
 
     /**

app/src/main/java/com/mints/street/bean/GPS.java

@@ -16,8 +16,15 @@ public class GPS {
 
     private @Nullable double lng;
 
+    private @Nullable int inner=0;
+
     public GPS() {
 
+    }
+    public GPS(double lat, double lng,int inner) {
+        this.lat = lat;
+        this.lng = lng;
+        this.inner = inner;
     }
     public GPS(double lat, double lng) {
         this.lat = lat;
@@ -41,6 +48,6 @@ public class GPS {
     }
 
     public String toString() {
-        return "lat:" + lat + "," + "lng:" + lng;
+        return "lat:" + lat + "," + "lng:" + lng+"," + "inner:" + inner;
     }
 }
\ No newline at end of file

app/src/main/java/com/mints/street/bean/MutualBean.kt

@@ -8,4 +8,5 @@ class MutualBean {
     var d:String?=null
     var lat:String?=null
     var lng:String?=null
+    var inner:Int=0
 }
\ No newline at end of file

app/src/main/java/com/mints/street/main/MainActivity.kt

@@ -19,6 +19,7 @@ import com.mints.street.databinding.ActivityMainBinding
 import com.mints.street.main.googlemap.GoogleMapFragment
 import com.mints.street.main.home.HomeFragment
 import com.mints.street.main.my.MyFragment
+import com.mints.street.main.my.OpenvipActivity
 import com.mints.street.main.vr.VRFragment
 import com.mints.street.manager.UserManager
 import com.mints.street.manager.oaid.OaidManager
@@ -80,6 +81,16 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         })
         viewModel.checkUpgrade()
     }
+
+    override fun onResume() {
+        super.onResume()
+        if (binding.mainViewpager.currentItem == 0){
+            if (UserManager.INSTANCE.userIsLogin() && UserManager.INSTANCE.getVipFlag()) {
+                binding.mainViewpager.setCurrentItem(3, false)
+            }
+        }
+
+    }
     var oldTime: Long = 0
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         when (keyCode) {
@@ -112,7 +123,7 @@ private fun BottomNavigationViewEx.init(navigationItemSelectedAction: (Int) -> U
     return this
 }
 
-private fun ViewPager2.initMain(activity: FragmentActivity): ViewPager2 {
+private fun ViewPager2.initMain(activity: MainActivity): ViewPager2 {
     //是否可滑动
     this.isUserInputEnabled = false
     //预加载

app/src/main/java/com/mints/street/main/MainViewModel.kt

@@ -54,7 +54,7 @@ class MainViewModel(application: Application) : BaseViewModel(application) {
         ApiModel.checkUpgrade(lifecycleProvider, vo)
             .safeSubscribe(object
                 : HttpSubscribeImpl<BaseResponse<Version>>(
-                this@MainViewModel, false
+                null, false
             ) {
                 override fun onBusinessSuccess(response: BaseResponse<Version>) {
                     response.result?.apply {

app/src/main/java/com/mints/street/main/googlemap/GoogleMapFragment.kt

 package com.mints.street.main.googlemap
 
 import android.os.Bundle
+import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -41,13 +42,18 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
 
     var mLocationClient: LocationClient? = null
     private val myListener: MyLocationListener = MyLocationListener()
+    private var isScrollLayoutClose: Boolean = false
 
-    private var gps = GPS()
+    private var gps = GPS(39.915121, 116.403947,0)
 
     inner class MyLocationListener : BDLocationListener {
-        override fun onReceiveLocation(location: BDLocation?) {
-            gps.lat = location?.latitude?:0.0
-            gps.lng = location?.longitude?:0.0
+        override fun onReceiveLocation(location: BDLocation?) {//4.9E-324 4.9E-324
+            if( location?.latitude == 4.9E-324 ||location?.longitude == 4.9E-324){
+                return
+            }
+            gps.lat = location?.latitude?:39.915121
+            gps.lng = location?.longitude?:116.403947
+            KLog.e("onReceiveLocation","${location?.latitude} --- ${location?.longitude}")
         }
     }
 
@@ -68,6 +74,8 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
 
     override fun initData() {
         super.initData()
+        Handler().postDelayed({ isScrollLayoutClose = true }, 2000)
+
         binding.webview.setDefaultHandler(DefaultHandler())
         binding.webview.webChromeClient = WebChromeClient()
         binding.webview.setOnLongClickListener { true }
@@ -125,13 +133,14 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
         //地图改变时
         binding.webview.registerHandler("centerChanged") { data, _ ->
             KLog.a("js - > android centerChanged", data)
-            if (!binding.scrollLayout.isClose){
-                binding.scrollLayout.toggle(STATUS_CLOSE)
+            if (!binding.scrollLayout.isClose && isScrollLayoutClose) {
+                binding.scrollLayout.post {
+                    binding.scrollLayout.toggle(ScrollLayout.STATUS_CLOSE)
+                }
             }
         }
         //加载完成
         binding.webview.registerHandler("allIsOk") { _, _ ->
-            KLog.e("Sfsadfa","allIsOk")
             initZsMap()
         }
 
@@ -166,7 +175,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
      */
     private fun initZsMap() {
         binding.webview.callHandler("initZsMap"
-            ,Gson().toJson(GPSConverterUtils.bd09_To_Gcj02(gps.lat,gps.lng)) ) {
+            ,Gson().toJson(gps) ) {
         }
     }
 
@@ -227,6 +236,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
             }
         })
         viewModel.pt.observe(this, Observer {
+            KLog.a("GPSConverterUtils.bd09_To_Gcj02", Gson().toJson(it))
             binding.webview.callHandler("initZsMap"
                 ,Gson().toJson(it) ) {
             }

app/src/main/java/com/mints/street/main/home/HomeViewModel.kt

@@ -34,6 +34,7 @@ class HomeViewModel(application: Application) : BaseViewModel(application) {
     var addressItemBinding =
         ItemBinding.of<HomeButtonItemVM>(BR.viewModel, R.layout.item_home_button)
 
+    //搜索页面回调 谷歌GPS
     var pt = MutableLiveData<GPS>()
     val authorizedBean = MutableLiveData<AuthorizedBean>()
 
@@ -60,22 +61,15 @@ class HomeViewModel(application: Application) : BaseViewModel(application) {
                 this@HomeViewModel, false
             ) {
                 override fun onBusinessSuccess(response: BaseResponse<AuthorizedBean>) {
-                    if (!Gson().toJson(response.result)
-                            .equals(Gson().toJson(authorizedBean.value))
-                    ) {
-                        authorizedBean.value = response.result
-                    }
                     MintsWebViewActivity.startWebView(
                         name,
                         MintsWebViewActivity.toBaduVR(lat, lng, response.result?.bk)
                     )
-
                 }
-
             })
 
         } else {
-            if ((!UserManager.INSTANCE.userIsLogin() && !UserManager.INSTANCE.getVipFlag())) {
+            if ((!UserManager.INSTANCE.userIsLogin() || !UserManager.INSTANCE.getVipFlag())) {
                 startActivity(OpenvipActivity::class.java)
                 return
             }
@@ -182,7 +176,9 @@ class HomeViewModel(application: Application) : BaseViewModel(application) {
             if (requestCode == 200 && resultCode == SearchMapActivity.REQUEST_CODE) {
                 data?.let {
                     pt.value = GPS(
-                        it.getDoubleExtra("latitude", 0.0), it.getDoubleExtra("longitude", 0.0)
+                        it.getDoubleExtra("latitude", 0.0),
+                        it.getDoubleExtra("longitude", 0.0),
+                        it.getIntExtra("inner", 0)
                     )
                 }
             }

app/src/main/java/com/mints/street/main/home/SearchAfterItem.kt

@@ -23,9 +23,8 @@ class SearchAfterItem(viewModel: SearchMapViewModel,val name:String?
      * 点击名称回调回调
      */
     val onClick = BindingCommand<Any>(BindingAction {
-        if(viewModel.index.value==1&&
-            !UserManager.INSTANCE.userIsLogin() &&
-            !UserManager.INSTANCE.getVipFlag()){
+        if(viewModel.index.value==1&&( !UserManager.INSTANCE.userIsLogin() ||
+                    !UserManager.INSTANCE.getVipFlag())){
                 viewModel.startActivity(OpenvipActivity::class.java)
             return@BindingAction
         }
@@ -34,6 +33,7 @@ class SearchAfterItem(viewModel: SearchMapViewModel,val name:String?
         val intent = Intent()
         intent.putExtra("latitude",pt?.lat)
         intent.putExtra("longitude",pt?.lng)
+        intent.putExtra("inner",viewModel.index.value)
         viewModel.finishData(SearchMapActivity.REQUEST_CODE,intent)
     })
 }

app/src/main/java/com/mints/street/main/my/MoresettingsActivity.kt

@@ -100,8 +100,22 @@ class MoresettingsActivity : BaseActivity<ActivityMoresettingsBinding, Moresetti
 
         if (userManager.userIsLogin()) {
             btn_switch.visibility = View.VISIBLE
+            item_invitedCode.visibility = View.VISIBLE
+            item_invitedCode_line.visibility = View.VISIBLE
+
+            item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "用户ID"
+            val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite)
+            invitedCode.setBounds(0, 0, 56, 56)
+            item_invitedCode.findViewById<TextView>(R.id.tv_title)
+                    .setCompoundDrawables(invitedCode, null, null, null)
+            item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
+            item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
+            item_invitedCode.findViewById<TextView>(R.id.tv_right).text =
+                    "街景-${UserManager.INSTANCE.getCodeID()}"
         } else {
             btn_switch.visibility = View.GONE
+            item_invitedCode.visibility = View.GONE
+            item_invitedCode_line.visibility = View.GONE
 
         }
     }

app/src/main/java/com/mints/street/main/my/MyFragment.kt

@@ -176,20 +176,20 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
         ic_theme.findViewById<TextView>(R.id.tv_me2).text = "国内外街景"
         ic_theme.findViewById<TextView>(R.id.tv_me3).text = "VR全景"
         ic_theme.findViewById<TextView>(R.id.tv_me4).text = "3D地图"
-        ic_theme.findViewById<TextView>(R.id.tv_me5).text = "国外搜索"
-        ic_theme.findViewById<TextView>(R.id.tv_me6).text = "高清地图"
-        ic_theme.findViewById<TextView>(R.id.tv_me7).text = "历史影像"
+        ic_theme.findViewById<TextView>(R.id.tv_me5).text = "高清地图"
+        ic_theme.findViewById<TextView>(R.id.tv_me6).text = "全球景象"
+        ic_theme.findViewById<TextView>(R.id.tv_me7).text = "国内外搜索"
         ic_theme.findViewById<TextView>(R.id.tv_me8).text = "景点推荐"
         ic_theme.findViewById<ImageView>(R.id.iv_decorate1).setImageResource(R.mipmap.icon_me_tiao)
         ic_theme.findViewById<ImageView>(R.id.iv_decorate2).setImageResource(R.mipmap.icon_me_tiao)
-        ic_theme.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_me1)
-        ic_theme.findViewById<ImageView>(R.id.iv_me2).setImageResource(R.mipmap.icon_me2)
-        ic_theme.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_me3)
-        ic_theme.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_me4)
-        ic_theme.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_me5)
-        ic_theme.findViewById<ImageView>(R.id.iv_me6).setImageResource(R.mipmap.icon_me6)
-        ic_theme.findViewById<ImageView>(R.id.iv_me7).setImageResource(R.mipmap.icon_me7)
-        ic_theme.findViewById<ImageView>(R.id.iv_me8).setImageResource(R.mipmap.icon_me8)
+        ic_theme.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_privilege5)
+        ic_theme.findViewById<ImageView>(R.id.iv_me2).setImageResource(R.mipmap.icon_privilege2)
+        ic_theme.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_privilege4)
+        ic_theme.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_privilege3)
+        ic_theme.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_privilege1)
+        ic_theme.findViewById<ImageView>(R.id.iv_me6).setImageResource(R.mipmap.icon_privilege6)
+        ic_theme.findViewById<ImageView>(R.id.iv_me7).setImageResource(R.mipmap.icon_privilege7)
+        ic_theme.findViewById<ImageView>(R.id.iv_me8).setImageResource(R.mipmap.icon_privilege8)
     }
 }
 

app/src/main/java/com/mints/street/main/my/OpenvipActivity.kt

@@ -2,7 +2,6 @@ package com.mints.street.main.my
 
 import android.annotation.SuppressLint
 import android.app.Dialog
-import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.text.TextUtils
@@ -22,21 +21,15 @@ import com.mints.street.bean.PaymentBean
 import com.mints.street.bean.VipBean
 import com.mints.street.bean.WxPayParamBean
 import com.mints.street.databinding.ActivityOpenvipBinding
-import com.mints.street.main.MainActivity
 import com.mints.street.manager.UserManager
-import com.mints.street.utils.json.JsonUtil
 import com.mints.street.widget.dialog.DialogListener
 import com.mints.street.widget.dialog.DialogUtils
 import com.mints.street.widget.dialog.WxLoginDialog
 import kotlinx.android.synthetic.main.activity_openvip.*
-import kotlinx.android.synthetic.main.activity_openvip.bt_try
-import kotlinx.android.synthetic.main.fragment_my.*
 import kotlinx.android.synthetic.main.include_header.*
-import me.goldze.mvvmhabit.base.AppManager
 import me.goldze.mvvmhabit.utils.AppUtils
 import me.goldze.mvvmhabit.utils.KLog
 import me.goldze.mvvmhabit.utils.ToastUtils
-import me.goldze.mvvmhabit.utils.systembar.StatusBarUtil
 
 
 class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>(), View.OnClickListener {
@@ -81,7 +74,7 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         ly_weixin.setOnClickListener(this)
         ly_alipay.setOnClickListener(this)
 
-        loginDialog.setListener(object:WxLoginDialog.WxLoginListener{
+        loginDialog.setListener(object : WxLoginDialog.WxLoginListener {
             override fun loginSuc(wxInfo: String) {
                 viewModel.wechatlogin(wxInfo)
             }
@@ -108,11 +101,18 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         list.add(page2)
         list.add(page3)
         list.add(page4)
-        list.add(page5)
         list.add(page6)
         list.add(page7)
+        list.add(page5)
         list.add(page8)
 
+//        page1.setOnClickListener {
+//            if (UserManager.INSTANCE.userIsLogin()) {
+//                payVip()
+//            } else {
+//                loginDialog.show()
+//            }
+//        }
         //设置显示的数据
         cfp_data_viewpager.setViewList(list)
 
@@ -127,12 +127,12 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
 
         //设置特权推荐
         privilege.findViewById<TextView>(R.id.tv_theme_name).text = "享8大特权"
-        privilege.findViewById<TextView>(R.id.tv_me1).text = "高清地图"
+        privilege.findViewById<TextView>(R.id.tv_me1).text = "无限缩放"
         privilege.findViewById<TextView>(R.id.tv_me2).text = "国内外街景"
-        privilege.findViewById<TextView>(R.id.tv_me3).text = "3D地图"
-        privilege.findViewById<TextView>(R.id.tv_me4).text = "VR全景"
-        privilege.findViewById<TextView>(R.id.tv_me5).text = "无限缩放"
-        privilege.findViewById<TextView>(R.id.tv_me6).text = "历史影像"
+        privilege.findViewById<TextView>(R.id.tv_me3).text = "VR全景"
+        privilege.findViewById<TextView>(R.id.tv_me4).text = "3D地图"
+        privilege.findViewById<TextView>(R.id.tv_me5).text = "高清地图"
+        privilege.findViewById<TextView>(R.id.tv_me6).text = "全球景象"
         privilege.findViewById<TextView>(R.id.tv_me7).text = "国内外搜索"
         privilege.findViewById<TextView>(R.id.tv_me8).text = "景点推荐"
         privilege.findViewById<ImageView>(R.id.iv_decorate1).setImageResource(R.mipmap.icon_privilege_tiao2)
@@ -143,11 +143,11 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         privilege.findViewById<ImageView>(R.id.iv_decorate2).layoutParams.width = AppUtils.dp2Px(this, 100F)
         privilege.findViewById<ImageView>(R.id.iv_decorate2).layoutParams.height = AppUtils.dp2Px(this, 50F)
         privilege.findViewById<ImageView>(R.id.iv_decorate2).setPadding(AppUtils.dp2Px(this, 50F), 0, 0, 0)
-        privilege.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_privilege1)
+        privilege.findViewById<ImageView>(R.id.iv_me1).setImageResource(R.mipmap.icon_privilege5)
         privilege.findViewById<ImageView>(R.id.iv_me2).setImageResource(R.mipmap.icon_privilege2)
-        privilege.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_privilege3)
-        privilege.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_privilege4)
-        privilege.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_privilege5)
+        privilege.findViewById<ImageView>(R.id.iv_me3).setImageResource(R.mipmap.icon_privilege4)
+        privilege.findViewById<ImageView>(R.id.iv_me4).setImageResource(R.mipmap.icon_privilege3)
+        privilege.findViewById<ImageView>(R.id.iv_me5).setImageResource(R.mipmap.icon_privilege1)
         privilege.findViewById<ImageView>(R.id.iv_me6).setImageResource(R.mipmap.icon_privilege6)
         privilege.findViewById<ImageView>(R.id.iv_me7).setImageResource(R.mipmap.icon_privilege7)
         privilege.findViewById<ImageView>(R.id.iv_me8).setImageResource(R.mipmap.icon_privilege8)
@@ -165,6 +165,17 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
         mAdapter = DelegateAdapter(vLayout, false)
         binding.listview.adapter = mAdapter
         binding.listview.layoutManager = vLayout
+
+
+    }
+
+    //添加page点击时间
+    fun pageOnClick(view: View?) {
+        if (UserManager.INSTANCE.userIsLogin()) {
+            payVip()
+        } else {
+            loginDialog.show()
+        }
     }
 
     override fun initViewObservable() {
@@ -191,7 +202,7 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
             }
         })
         viewModel.isPaySuc.observe(this, Observer<Boolean> {
-            if(it){
+            if (it) {
                 finish()
             }
         })
@@ -217,6 +228,13 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
             }
 
         })
+        viewModel.isloginSuc.observe(this, Observer {
+            if (it) {
+                payVip()
+            } else {
+                ToastUtils.showLong("登录失败")
+            }
+        })
 
     }
 
@@ -334,7 +352,8 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
                     if (isPay) {
                         //支付成功
                         UserManager.INSTANCE.setVipFlag(true)
-                        com.blankj.utilcode.util.ToastUtils.showShort("支付成功")
+                        viewModel.queryVipOrder(wxParanBean.tid)
+                        com.blankj.utilcode.util.ToastUtils.showLong("支付成功")
                         finish()
                     }
                 }) { throwable ->
@@ -348,7 +367,8 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
                     if (isPay) {
                         //支付成功
                         UserManager.INSTANCE.setVipFlag(true)
-                        com.blankj.utilcode.util.ToastUtils.showShort("支付成功")
+                        viewModel.queryVipOrder(wxParanBean.tid)
+                        com.blankj.utilcode.util.ToastUtils.showLong("支付成功")
                         finish()
                     }
                 }) { throwable ->
@@ -359,7 +379,7 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
 
     override fun onResume() {
         super.onResume()
-        KLog.e("OpenvipActivity","onResume")
+        KLog.e("OpenvipActivity", "onResume")
 //        if(userManager.userIsLogin()&&userManager.getVipFlag()){
 //            finish()
 //        }

app/src/main/java/com/mints/street/main/my/OpenvipViewModel.kt

@@ -94,7 +94,7 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
     /**
      * 支付成功
      */
-    fun queryVipOrder(tid: String) {
+    fun queryVipOrder(tid: Long) {
         val vo = HashMap<String, Any>()
         vo["tid"] = tid
         ApiModel.queryVipOrder(lifecycleProvider, vo).safeSubscribe(
@@ -110,6 +110,7 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
         )
     }
 
+    var isloginSuc: MutableLiveData<Boolean> = MutableLiveData()
     fun wechatlogin(wxInfo: String) {
         val vo = HashMap<String, Any>()
         vo["wxInfo"] = wxInfo
@@ -125,11 +126,13 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
                 KLog.e("wechatlogin","微信登录接口成功")
 
                 ToastUtils.showLong("登录成功")
+                isloginSuc.value=true
             }
 
             override fun onError(e: Throwable) {
                 super.onError(e)
                 KLog.e("wechatlogin", "微信登录接口失败")
+                isloginSuc.value=false
             }
         })
     }

app/src/main/java/com/mints/street/main/vr/FeaturedExperienceViewModel.kt

@@ -20,29 +20,6 @@ class FeaturedExperienceViewModel(application: Application):BaseViewModel(applic
     val VrmapBean: MutableLiveData<VrmapBean> = MutableLiveData()
     val VreperienceBean: MutableLiveData<VreperienceBean> = MutableLiveData()
 
-    fun vrPlaces(){//无参数传递
-        ApiModel.vrPlaces(lifecycleProvider).safeSubscribe(
-            object : HttpSubscribeImpl<BaseResponse<VrmapBean>>(
-                this@FeaturedExperienceViewModel,true){
-                override fun onBusinessSuccess(response: BaseResponse<VrmapBean>) {
-                    VrmapBean.value=response.result
-                    val a:MutableList<ScenicSpotBean> = ArrayList()
-                    for (item in response.result.internal!!){
-                        a.add(
-                            ScenicSpotBean(name = item.name,url = item.url
-                            ,starRating = item.stars,images = item.img)
-                        )
-                    }
-
-                }
-
-                override fun onError(e: Throwable) {
-                    KLog.e("vrPlaces","请求失败 : $e")
-                }
-            }
-        )
-    }
-
     fun getChooseExperienceHeadData(){
         val vo = HashMap<String, Any>()
         vo["pageNum"] = 1

app/src/main/java/com/mints/street/main/vr/FreeZoneFragment.kt

@@ -51,7 +51,7 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel
             //获取VR全景数据
             viewModel.vrPlaces()
         }
-        viewModel.vrPlaces()
+//        viewModel.vrPlaces()
 
     }
 

app/src/main/java/com/mints/street/utils/GPSConverterUtils.java

@@ -51,6 +51,7 @@ public class GPSConverterUtils {
     }
 
     /**
+     *  谷歌转百度
      * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标
      *
      * @param gg_lat
@@ -66,6 +67,7 @@ public class GPSConverterUtils {
     }
 
     /**
+     *  百度转谷歌
      * * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 * * 将 BD-09 坐标转换成GCJ-02 坐标 * * @param
      * bd_lat * @param bd_lon * @return
      */

app/src/main/java/com/mints/street/webview/MintsWebViewActivity.kt

@@ -39,7 +39,7 @@ class MintsWebViewActivity : BaseActivity<ActivityMintsWebViewBinding, MintsWebV
         }
         fun toBaduVR(d:String?,bk:String?):String{
             KLog.i("MintsWebViewActivity","file:///android_asset/web/mr.html?d=${d}&bk=${bk}")
-            return "file:///android_asset/web/m.html?d=${d}&bk=${bk}"
+            return "file:///android_asset/web/mr.html?d=${d}&bk=${bk}"
         }
         fun toBaduVR(lat:String?,lng:String?,bk:String?):String{
 

app/src/main/java/com/mints/street/widget/ScrollLayout.java

@@ -66,7 +66,7 @@ public class ScrollLayout extends ViewGroup {
     private void init(Context context) {
         touchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         slideSlop = AppUtils.dp2Px(context, 45);
-        offsetB = AppUtils.dp2Px(context, 60);
+        offsetB = AppUtils.dp2Px(context, 100);
         animator = ValueAnimator.ofFloat(0f, 1f);
         animator.setDuration(200);
         animator.setInterpolator(new LinearInterpolator());
@@ -199,8 +199,7 @@ public class ScrollLayout extends ViewGroup {
                 //下滑offset就是负数，上滑就是正数
                 int offset = (int) (lastY - eY);
                 lastY = eY;
-                if ((status == STATUS_EXTEND
-                        || status == STATUS_CLOSE)
+                if (status == STATUS_EXTEND
                         && super.dispatchTouchEvent(ev)) {
                     return true;
                 }

app/src/main/java/com/mints/street/widget/dialog/DialogUtils.kt

@@ -22,6 +22,12 @@ object DialogUtils {
         dialogListener.setDialog(bonusDialog)
     }
 
+    fun showupgradevipDialog(ctx: Context){
+        val weakReference = WeakReference<Context>(ctx)
+        val bonusDialog = UpgradeVipDialog(weakReference.get()!!)
+        bonusDialog.show()
+    }
+
 
     /**
      * 权限设置弹框

app/src/main/java/com/mints/street/widget/dialog/UpgradeVipDialog.kt

+package com.mints.street.widget.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.content.Intent
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.WindowManager
+import android.widget.Button
+import android.widget.ImageView
+import androidx.fragment.app.FragmentActivity
+import com.alibaba.android.vlayout.DelegateAdapter
+import com.alibaba.android.vlayout.VirtualLayoutManager
+import com.blankj.utilcode.util.ActivityUtils.startActivity
+import com.mints.street.R
+import com.mints.street.adapter.GridBenfitAdapter
+import com.mints.street.main.my.OpenvipActivity
+import me.goldze.mvvmhabit.utils.RxUtils
+
+class UpgradeVipDialog(context: Context)
+    : Dialog(context, R.style.dialog) {
+
+    private val lp: WindowManager.LayoutParams
+    private val iv_close:ImageView
+    private val bt_upgrade:Button
+    init {
+        setContentView(R.layout.layout_upgradevip)
+        // 设置window属性
+        lp = window!!.attributes
+        lp.gravity = Gravity.CENTER
+        lp.width = WindowManager.LayoutParams.WRAP_CONTENT
+        lp.windowAnimations = R.style.DialogAnimBottom
+        window!!.attributes = lp
+        iv_close=findViewById(R.id.iv_close)
+        bt_upgrade=findViewById(R.id.bt_upgrade)
+
+        // 设置外部不可关闭
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+        setOnKeyListener { _, i, _ ->
+            i == KeyEvent.KEYCODE_BACK
+        }
+        initView()
+    }
+    private fun initView() {
+
+        RxUtils.onMultiClick(iv_close){
+            dismiss()
+        }
+        RxUtils.onMultiClick(bt_upgrade){
+            startActivity(Intent(context,OpenvipActivity::class.java))
+            dismiss()
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/com/mints/street/widget/dialog/WxLoginDialog.kt

@@ -87,7 +87,7 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener {
                         })
                 mBottomSheetDialog!!.dismiss()
             } else {
-                ToastUtils.showShort("请先同意用户协议与隐私政策")
+                ToastUtils.showLong("请先同意用户协议与隐私政策")
             }
         }
 
@@ -96,7 +96,7 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener {
                 context.startActivity(Intent(context, LoginActivity::class.java))
                 mBottomSheetDialog!!.dismiss()
             } else {
-                ToastUtils.showShort("请先同意用户协议与隐私政策")
+                ToastUtils.showLong("请先同意用户协议与隐私政策")
             }
         }
 

app/src/main/res/drawable/checkbox_style.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@mipmap/ic_vip_enable" android:state_checked="true" />
+    <item android:drawable="@mipmap/ic_vip_none" android:state_checked="false" />
+    <item android:drawable="@mipmap/ic_vip_none" />
+
+</selector>
\ No newline at end of file

app/src/main/res/drawable/shape_upgrade_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="20dp" />
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file

app/src/main/res/drawable/shape_upgrade_btn_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="50dp"/>
+    <gradient
+        android:startColor="#FFC107"
+        android:endColor="#FF5722"
+        android:angle="90"/>
+</shape>
\ No newline at end of file

app/src/main/res/layout/activity_aboutus.xml

@@ -92,7 +92,7 @@
                         android:layout_marginLeft="30dp"
                         android:layout_marginRight="30dp"
                         android:gravity="center"
-                        android:text="Copyright © 2019 Inc.."
+                        android:text="Copyright © 2019-2021 Inc.."
                         android:textColor="@color/color_333"
                         android:textSize="12sp" />
                 </LinearLayout>

app/src/main/res/layout/activity_detailed.xml

@@ -49,6 +49,7 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="15dp"
                 android:paddingTop="5dp"
+                android:paddingRight="15dp"
                 android:textSize="12sp"
                 android:text="巴黎嫩作为文化十字路口的历史可以追溯到数千年前。探索其古老的以及和自然奇观。" />
 

app/src/main/res/layout/activity_google_map.xml

@@ -23,20 +23,19 @@
 
         <ImageView
             android:visibility="gone"
-
             android:id="@+id/image_map_history"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:layout_marginTop="15dp"
             android:src="@mipmap/map_history_icon"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image_map_change" />
+           app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_location_icon"
             android:layout_width="35dp"
             android:layout_height="35dp"
-            android:layout_marginBottom="120dp"
+            android:layout_marginBottom="220dp"
             android:layout_marginTop="15dp"
             android:src="@mipmap/location_icon"
             app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/activity_moresettings.xml

@@ -15,18 +15,6 @@
 
         <include layout="@layout/include_header" />
 
-        <com.mints.street.widget.ElasticScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:overScrollMode="never">
-
-            <LinearLayout
-                android:id="@+id/ly_linear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:elevation="5dp"
-                android:orientation="vertical">
-
         <include
             android:id="@+id/item_phone"
             layout="@layout/item_settings" />
@@ -35,7 +23,17 @@
             style="@style/view_line_E6E6E6"
             android:layout_alignParentBottom="true"
             android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp" />
+
+        <include
+            android:id="@+id/item_invitedCode"
+            layout="@layout/item_settings" />
 
+        <View
+            android:id="@+id/item_invitedCode_line"
+            style="@style/view_line_E6E6E6"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp" />
 
         <include
@@ -69,8 +67,4 @@
             android:layout_height="wrap_content"/>
 
     </LinearLayout>
-
-        </com.mints.street.widget.ElasticScrollView>
-
-    </LinearLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/dialog_backvip.xml

@@ -123,7 +123,7 @@
             app:layout_constraintEnd_toStartOf="@+id/guideline10"
             app:layout_constraintStart_toStartOf="@+id/guideline9"
             app:layout_constraintTop_toTopOf="@+id/imageView9"
-            app:srcCompat="@mipmap/icon_backvip2" />
+            app:srcCompat="@mipmap/icon_backvip6" />
 
         <TextView
             android:id="@+id/textView16"
@@ -188,7 +188,7 @@
             app:layout_constraintEnd_toStartOf="@+id/guideline10"
             app:layout_constraintStart_toStartOf="@+id/guideline9"
             app:layout_constraintTop_toTopOf="@+id/imageView15"
-            app:srcCompat="@mipmap/icon_backvip5" />
+            app:srcCompat="@mipmap/icon_backvip2" />
 
         <TextView
             android:id="@+id/textView19"
@@ -209,13 +209,13 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/guideline10"
             app:layout_constraintTop_toTopOf="@+id/imageView17"
-            app:srcCompat="@mipmap/icon_backvip6" />
+            app:srcCompat="@mipmap/icon_backvip5" />
 
         <TextView
             android:id="@+id/textView20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="历史影像"
+            android:text="全球景象"
             android:textColor="#F5CF8B"
             app:layout_constraintBottom_toBottomOf="@+id/textView19"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_home.xml

@@ -53,7 +53,7 @@
             android:id="@+id/image_location_icon"
             android:layout_width="35dp"
             android:layout_height="35dp"
-            android:layout_marginBottom="120dp"
+            android:layout_marginBottom="220dp"
             android:layout_marginTop="15dp"
             android:src="@mipmap/location_icon"
             app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/item_settings.xml

@@ -28,6 +28,7 @@
         android:id="@+id/tv_right"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="@color/black"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:visibility="gone" />

app/src/main/res/layout/layout_popupwindow.xml

@@ -65,8 +65,9 @@
         android:padding="10dp">
 
         <CheckBox
+            android:layout_marginRight="6dp"
             android:id="@+id/cb_checked"
-            style="@style/MyCheckBox"
+            style="@style/CustomCheckboxTheme"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 

app/src/main/res/layout/layout_upgradevip.xml

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_upgrade_bg">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="30dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center"
+            android:src="@mipmap/iv_upgrade" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:text="想要继续无限缩放又不模糊？"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:text="升级全球会员，连地面小车也能看清"
+            android:textColor="#B3000000"
+            android:textSize="12sp" />
+
+        <Button
+            android:id="@+id/bt_upgrade"
+            android:layout_width="200dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/shape_upgrade_btn_bg"
+            android:text="继续升级"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|top"
+        android:src="@mipmap/icon_upgrade_close" />
+</FrameLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page1.xml

@@ -5,6 +5,7 @@
     android:background="@mipmap/icon_card"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page2.xml

@@ -5,7 +5,8 @@
     android:background="@mipmap/icon_card1"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page3.xml

@@ -5,5 +5,6 @@
     android:background="@mipmap/icon_card2"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page4.xml

@@ -5,5 +5,6 @@
     android:background="@mipmap/icon_card3"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page5.xml

@@ -5,6 +5,7 @@
     android:background="@mipmap/icon_card4"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page6.xml

@@ -5,6 +5,7 @@
     android:background="@mipmap/icon_card5"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page7.xml

@@ -5,6 +5,7 @@
     android:background="@mipmap/icon_card6"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/view_data_page8.xml

@@ -5,6 +5,7 @@
     android:background="@mipmap/icon_card7"
     android:gravity="center_vertical"
     android:paddingLeft="15dp"
-    android:paddingTop="20dp">
+    android:paddingTop="20dp"
+    android:onClick="pageOnClick">
 
 </RelativeLayout>
\ No newline at end of file