Merge branch 'dev_1.0.1' of http://gitlab.mints-id.com/android/android_street into fry_dev

 Conflicts:
	app/src/main/assets/web/common/ap.js
	app/src/main/assets/web/common/zsc.js
	app/src/main/assets/web/zsmap.html
	app/src/main/assets/web/zsmap.js

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

+// var initZsMap = function (data) {
+//     console.log(data)
+// }
+
+var isWindowLoad = false;//页面加载
+var BridgeIsLoad = false;//框架加载
+
+//[h（街道图）、m（街道图）、p（街道图）、r（街道图）、s（影像无注记）、y（影像含注记）、t（地形图）]
+
+
+function tryAllIsOk() {
+    //console.log("tryAllIsOk", "isWindowLoad", isWindowLoad, "BridgeIsLoad", BridgeIsLoad)
+    if (isWindowLoad) {
+        try {
+            doAppFun("allIsOk");
+        } catch (e) {
+            // console.log('allisOk', e)
+            //  alert("app未接受开始自动跳转" + e)
+            setTimeout(function () {
+                doAppFun("allIsOk");
+
+            }, 1500);
+        }
+    }
+
+}
+
+
+function toVurl(a, innerData) {
+    var data = JSON.stringify(innerData);
+    if (a == 'b') {
+        try {
+            doAppFun("toBVr", data);
+        } catch (e) {
+            console.log('tobvr', data)
+            //  alert("app未接受开始自动跳转" + e)
+        }
+    }
+
+    if (a == 'g') {
+        try {
+            doAppFun("toVr", data);
+        } catch (e) {
+            // console.log('toVr', data)
+
+            //alert("app未接受开始自动跳转" + e)
+        }
+    }
+}
+
+function toVurl(a, innerData) {
+    var data = JSON.stringify(innerData);
+    if (a == 'b') {
+        try {
+            doAppFun("toBVr", data);
+        } catch (e) {
+            console.log('tobvr', data)
+            //  alert("app未接受开始自动跳转" + e)
+        }
+    }
+
+    if (a == 'g') {
+        try {
+            doAppFun("toVr", data);
+        } catch (e) {
+            // console.log('toVr', data)
+
+            //alert("app未接受开始自动跳转" + e)
+        }
+    }
+}
+
+
+function allIsOk(a, data) {
+    //console.log("innerAllIsOk")
+    isWindowLoad = true;
+    tryAllIsOk();
+//         setTimeout(function(){
+//
+//         },1000);
+
+}
+
+
+function doAppFun(funstr, params) {
+    //参数一：调用java中的方法   submitFromWeb是方法名，必须和Android中注册时候的方法名称保持一致
+    //参数二：返回给Android端的数据，可以为字符串，json等信息
+    //参数三：js接收到Android传递过来的数据之后的相应处理逻辑
+
+    window.WebViewJavascriptBridge.callHandler(
+        funstr
+        , params
+        , function (responseData) {
+            // console.log(responseData)
+        }
+    );
+}
+
+function centerChanged() {
+    try {
+        doAppFun("centerChanged");
+    } catch (e) {
+        // console.log("tips", msg)
+        //alert("app未弹框==>" + msg + e)
+    }
+}
+
+function tips(msg) {
+    try {
+        doAppFun("tips", msg);
+    } catch (e) {
+        //console.log("tips", msg)
+        //alert("app未弹框==>" + msg + e)
+    }
+}
+
+function openScenicsFrame(params) {
+    try {
+        doAppFun("openScenicsFrame", params);
+    } catch (e) {
+    }
+}
+
+//JS注册事件监听
+function connectWebViewJavascriptBridge(callback) {
+    if (window.WebViewJavascriptBridge) {
+        callback(WebViewJavascriptBridge)
+    } else {
+        document.addEventListener(
+            'WebViewJavascriptBridgeReady'
+            , function () {
+                callback(WebViewJavascriptBridge)
+                BridgeIsLoad = true;
+                tryAllIsOk()
+            },
+            false
+        );
+    }
+}
+
+
+function getVmMsg(msg) {
+    return {
+        event: msg,
+        showVrButton: vm.showVrButton,
+        showScenics: vm.showScenics,
+        mapType: showScenics.mapType,
+    }
+}
+
+//注册回调函数，第一次连接时调用 初始化函数
+connectWebViewJavascriptBridge(function (bridge) {
+    //初始化
+    bridge.init(function (message, responseCallback) {
+        var data = {
+            'Javascript Responds': 'Wee!'
+        };
+        responseCallback(data);
+    });
+
+
+    //Android调用js方法：functionInJs方法名称需要保持一致 ，并返回给Android通知
+
+    bridge.registerHandler("initZsMap", function (data, responseCallback) {
+        data = JSON.parse(data)
+        vm.initZsMap(data);
+        responseCallback(getVmMsg("suc:initZsMap"));
+    });
+
+    bridge.registerHandler("addZoom", function (data, responseCallback) {
+        vm.addZoom();
+        responseCallback(getVmMsg("suc:addZoom"));
+    });
+    bridge.registerHandler("reduceZoom", function (data, responseCallback) {
+        vm.reduceZoom();
+        responseCallback(getVmMsg("suc:reduceZoom"));
+    });
+    bridge.registerHandler("changeVrButton", function (data, responseCallback) {
+        data = JSON.parse(data)
+        vm.showVrButton = data.show == "1";
+        responseCallback(getVmMsg("suc:changeVrButton"));
+    });
+    bridge.registerHandler("showScenics", function (data, responseCallback) {
+        data = JSON.parse(data)
+        vm.doShowScenics(data.list);
+        responseCallback(getVmMsg("suc:showScenics"));
+    });
+
+    bridge.registerHandler("closeScenics", function (data, responseCallback) {
+        vm.doCloseScenics();
+        responseCallback(getVmMsg("suc:closeScenics"));
+    });
+
+    bridge.registerHandler("changeMapType", function (data, responseCallback) {
+        data = JSON.parse(data)
+        G_MAP.setMapTypeId(data.type);
+        responseCallback(getVmMsg("suc:changeMapType"));
+    });
+
+
+})
+
+
+

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

+<!DOCTYPE html>
+<!-- saved from url=(0078)file:///Users/wmh/workspace1/worldMap/zs-api/src/main/resources/h5/map/ag.html -->
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1; ">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link type="text/css" rel="stylesheet" href="./zsmap_files/css">
+    <link type="text/css" rel="stylesheet" href="./zsmap_files/css(1)">
+
+    <title></title>
+    <script src="./zsmap_files/polyfill.min.js"></script>
+    <style>
+        html,
+        body {
+            height: 100%;
+            margin: 0;
+            padding: 0;
+        }
+
+        #map {
+            width: 100%;
+            height: 100%;
+            position: relative;
+        }
+
+
+        .d1 {
+            width: 70px;
+            height: 90px;
+            /*background: #00e5ffff;*/
+            position: fixed;
+            top: 50%;
+            margin-top: -90px;
+            left: 50%;
+            margin-left: -35px;
+        }
+
+        #bmap {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            margin: 0;
+            position: absolute;
+            font-family: "微软雅黑";
+        }
+
+        .anchorBL,
+        a {
+            display: none !important;
+        }
+
+        #map .gmnoprint {
+            display: none !important;
+        }
+
+        .zsmaker {
+            margin-top: 35px;
+        }
+
+
+        .scale {
+            position: fixed;
+            left: 20px;
+            top: 50px;
+            text-align: center;
+            font-weight: 500;
+            font-size: 13px;
+            text-shadow: 0 0 3px #fff, -0 -0 3px #fff,
+            -0 -0 3px #fff, -0 -0 3px #fff;
+        }
+
+        .scale-size,
+        .left-side,
+        .right-side {
+            float: left;
+        }
+
+        .left-side,
+        .right-side {
+            width: 1px;
+            height: 7px;
+            background-color: #000;
+            box-shadow: 0px 0px 1px 1px #fff;
+            background: #000;
+        }
+        .scale-size {
+            margin: 5px 1px 0 1.5px;
+            height: 1px;
+            box-shadow: 0px 0px 1px 2px #fff;
+            background: #000;
+        }
+
+        #__vconsole .vc-switch {
+            display: fixed;
+            top: 20px;
+            height: 20px;
+        }
+
+        #map .gmnoprint {
+            display: none !important;
+        }
+        [v-cloak] {display: none;}
+
+
+
+    </style>
+
+
+</head>
+<body>
+<div id="map"></div>
+<div id="maps" style="" v-cloak>
+    <div class="scale">
+        <div>
+            {{mapScale}}
+        </div>
+        <div id="scale">
+            <div class="left-side"></div>
+            <div class="scale-size" id="scaleSize" :style="'width:'+pxValue+'px'"></div>
+            <div class="right-side"></div>
+        </div>
+    </div>
+    <img src="./common/icon.jpg" @click="vrs()" v-show="showVrButton" class="d1" id="im">
+</div>
+
+
+</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>
+<!--<script src="vconsole.min.js"></script>-->
+<!--<script>-->
+<!--    var vConsole = new VConsole();-->
+<!--</script>-->
+</html>

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

@@ -43,7 +43,7 @@ class ItemHotViewAdapter(val context: Context, val dialog: BottomSheetDialog?, v
             //设置点击事件
             RxUtils.onMultiClick(holder.itemView) {
                 //判断是否当前是否是会员，
-                if (!UserManager.INSTANCE.userIsLogin()) {
+                if (!UserManager.INSTANCE.userIsLogin()&&!UserManager.INSTANCE.getVipFlag()) {
                     dialog?.dismiss()
                     //否-跳转到开通vip界面
                     startActivity(OpenvipActivity::class.java)

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

@@ -220,7 +220,9 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
                     override fun onItemClick(position: Int, itemBean: HotViewBean.Dataslist?) {
                         itemBean?.apply {
                             //todo 冯瑞雨   修改toDouble
+                            //点击调转页面
                             viewModel.authorized(bvid,name)
+                            //更新当前坐标（控制js页面做回调）
                             binding.webview.callHandler("initZsMap"
                                 ,Gson().toJson(GPS(lat?.toDouble()?:0.0,
                                     lng?.toDouble()?:0.0,0)) ) {

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

@@ -26,6 +26,7 @@ import com.mints.street.R
 import com.mints.street.bean.MapBean
 import com.mints.street.bean.PositioningBean
 import com.mints.street.databinding.FragmentHomeBinding
+import com.mints.street.main.my.OpenvipActivity
 import com.mints.street.manager.UmengManager
 import com.mints.street.widget.ScrollLayout
 import com.mints.street.widget.dialog.DialogMapStyle
@@ -127,15 +128,11 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding, HomeViewModel>(), Senso
                     false
             )
         }
+        //地图样式
         RxUtils.onMultiClick(binding.imageMapChangeIcon) {
-//            context?.apply {
-//                if (dialogMapStyle == null) {
-//                    dialogMapStyle = DialogMapStyle(this)
-//                }
-//                if (this@HomeFragment.fragmentManager != null) {
-//                    dialogMapStyle?.show(this@HomeFragment.fragmentManager!!, "dialogMapStyle")
-//                }
-//            }
+           if (!com.mints.street.manager.UserManager.INSTANCE.userIsLogin()&&!com.mints.street.manager.UserManager.INSTANCE.getVipFlag()){
+               startActivity(OpenvipActivity::class.java)
+           }
 
         }
         //点击热门景点

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

@@ -221,6 +221,9 @@ class HomeViewModel(application: Application) : BaseViewModel(application) {
         )
     }
 
+    /**
+     * 跳转百度坐标页面
+     */
     fun authorized(bvid:String?,name:String?) {
         ApiModel.authorized().safeSubscribe(object
             : HttpSubscribeImpl<BaseResponse<AuthorizedBean>>(

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
 
         <com.github.lzyzsd.jsbridge.BridgeWebView
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="40dp"
             android:id="@+id/webview"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-             />
+            android:layout_marginBottom="40dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <ImageView
-            android:visibility="gone"
             android:id="@+id/image_map_history"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginTop="15dp"
             android:src="@mipmap/map_history_icon"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
-           app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_location_icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginBottom="220dp"
             android:layout_marginTop="15dp"
+            android:layout_marginBottom="220dp"
             android:src="@mipmap/location_icon"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -46,18 +44,18 @@
             android:id="@+id/image_map_change_icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginBottom="220dp"
             android:layout_marginTop="40dp"
+            android:layout_marginBottom="220dp"
             android:src="@mipmap/map_change_icon"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
+
         <ImageView
             android:id="@+id/ly_hotview"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:padding="3dp"
             android:layout_marginTop="10dp"
+            android:padding="3dp"
             android:src="@mipmap/icon_hotview"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
@@ -66,8 +64,8 @@
             android:id="@+id/map_a_d"
             android:layout_width="36dp"
             android:layout_height="73dp"
-            android:layout_marginBottom="10dp"
             android:layout_marginEnd="2dp"
+            android:layout_marginBottom="10dp"
             android:background="@drawable/shape_gold_card"
             android:orientation="vertical"
             app:layout_constraintBottom_toTopOf="@id/image_location_icon"
@@ -80,14 +78,15 @@
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:padding="10dp"
-                android:src="@mipmap/scale_add_icon" />  
+                android:src="@mipmap/scale_add_icon" />
+
             <View
-            android:layout_width="wrap_content"
-            android:layout_height="1dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginStart="12dp"
-            android:background="@color/color_333" />
-            
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:background="@color/color_333" />
+
 
             <ImageView
                 android:id="@+id/image_out"
@@ -96,7 +95,6 @@
                 android:padding="10dp"
                 android:src="@mipmap/scale_shrink_icon" />
 
-          
 
         </LinearLayout>
 
@@ -114,8 +112,8 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/cursor_bg"
                 android:gravity="center_horizontal"
-                android:paddingBottom="10dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingBottom="10dp">
 
                 <ImageView
                     android:id="@+id/image_under"
@@ -131,53 +129,53 @@
                     android:id="@+id/stb_bg_search"
                     android:layout_width="match_parent"
                     android:layout_height="37dp"
-                    android:layout_marginEnd="10dp"
                     android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/image_under"
                     app:stv_corner="20dp"
                     app:stv_solid="#F5F9FA"
                     app:stv_stroke_color="#ffe1e1e1"
-                    app:stv_stroke_width="1dp"
-                    />
+                    app:stv_stroke_width="1dp" />
 
                 <ImageView
-                    android:layout_marginStart="16dp"
                     android:id="@+id/im_search"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
                     android:src="@mipmap/search_icon"
                     app:layout_constraintBottom_toBottomOf="@id/stb_bg_search"
                     app:layout_constraintStart_toStartOf="@id/stb_bg_search"
                     app:layout_constraintTop_toTopOf="@id/stb_bg_search" />
 
                 <View
-                    android:background="#A1A3AF"
                     android:layout_width="0.5dp"
                     android:layout_height="14dp"
                     android:layout_marginStart="16dp"
+                    android:background="#A1A3AF"
                     app:layout_constraintBottom_toBottomOf="@id/stb_bg_search"
                     app:layout_constraintStart_toEndOf="@id/im_search"
                     app:layout_constraintTop_toTopOf="@id/stb_bg_search" />
+
                 <TextView
-                    android:layout_marginStart="27dp"
-                    app:layout_constraintBottom_toBottomOf="@id/stb_bg_search"
-                    app:layout_constraintStart_toEndOf="@id/im_search"
-                    app:layout_constraintTop_toTopOf="@id/stb_bg_search"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="27dp"
                     android:text="搜索境内、境外地址"
                     android:textColor="#A2A4B1"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toBottomOf="@id/stb_bg_search"
+                    app:layout_constraintStart_toEndOf="@id/im_search"
+                    app:layout_constraintTop_toTopOf="@id/stb_bg_search" />
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <com.mints.street.widget.ScrollRecyclerView
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
                 app:itemBinding="@{viewModel.addressItemBinding}"
                 app:items="@{viewModel.addressList}"
                 tools:listitem="@layout/item_home_button">

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

@@ -11,108 +11,18 @@
             android:id="@+id/bmapView"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginBottom="80dp"
+            android:layout_marginBottom="40dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/iv_click"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="40dp"
-            android:src="@mipmap/positioning_icon"
-            app:layout_constraintBottom_toBottomOf="@id/bmapView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/bmapView" />
-
-        <ImageView
-            android:id="@+id/image_map_history"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="25dp"
-            android:src="@mipmap/map_history_icon"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
-
-        <ImageView
-            android:id="@+id/ly_hotview"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:padding="3dp"
-            android:layout_marginTop="10dp"
-            android:src="@mipmap/icon_hotview"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
-
-        <ImageView
-            android:id="@+id/image_location_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginBottom="220dp"
-            android:src="@mipmap/location_icon"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-        <ImageView
-            android:id="@+id/image_map_change_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginBottom="220dp"
-            android:layout_marginTop="35dp"
-            android:src="@mipmap/map_change_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            />
-
-        <LinearLayout
-            android:id="@+id/map_a_d"
-            android:layout_width="36dp"
-            android:layout_height="73dp"
-            android:layout_marginEnd="2dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_gold_card"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toTopOf="@id/image_location_icon"
-            app:layout_constraintEnd_toEndOf="parent">
-
-            <ImageView
-                android:id="@+id/image_in"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:padding="10dp"
-                android:src="@mipmap/scale_add_icon" />
-            <View
-                android:layout_width="wrap_content"
-                android:layout_height="1dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:background="@color/color_333" />
-
-            <ImageView
-                android:id="@+id/image_out"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:padding="10dp"
-                android:src="@mipmap/scale_shrink_icon" />
-
-
-
-        </LinearLayout>
-
-
         <com.mints.street.widget.ScrollLayout
             android:id="@+id/scroll_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="#00000000"
-            android:fillViewport="true"
-            tools:layout_editor_absoluteX="0dp"
-            tools:layout_editor_absoluteY="0dp">
+            android:fillViewport="true">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -192,6 +102,94 @@
         </com.mints.street.widget.ScrollLayout>
 
 
+        <ImageView
+            android:id="@+id/iv_click"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="40dp"
+            android:src="@mipmap/positioning_icon"
+            app:layout_constraintBottom_toBottomOf="@id/bmapView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/bmapView" />
+
+        <ImageView
+            android:id="@+id/image_map_history"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="25dp"
+            android:src="@mipmap/map_history_icon"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
+
+        <ImageView
+            android:id="@+id/ly_hotview"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="10dp"
+            android:padding="3dp"
+            android:src="@mipmap/icon_hotview"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
+
+        <ImageView
+            android:id="@+id/image_location_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginBottom="220dp"
+            android:src="@mipmap/location_icon"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <ImageView
+            android:id="@+id/image_map_change_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="35dp"
+            android:layout_marginBottom="220dp"
+            android:src="@mipmap/map_change_icon"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/map_a_d"
+            android:layout_width="36dp"
+            android:layout_height="73dp"
+            android:layout_marginEnd="2dp"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/shape_gold_card"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toTopOf="@id/image_location_icon"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <ImageView
+                android:id="@+id/image_in"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:padding="10dp"
+                android:src="@mipmap/scale_add_icon" />
+
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:background="@color/color_333" />
+
+            <ImageView
+                android:id="@+id/image_out"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:padding="10dp"
+                android:src="@mipmap/scale_shrink_icon" />
+
+
+        </LinearLayout>
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <data>

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

@@ -59,9 +59,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/image2"
-            app:url="@{viewModel.image3}"
-
-            />
+            app:url="@{viewModel.image3}" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -15,6 +15,6 @@
         android:layout_gravity="end"/>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
-        android:layout_height="300dp"
+        android:layout_height="400dp"
         android:layout_width="match_parent" />
 </LinearLayout>
\ No newline at end of file