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

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

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

@@ -42,7 +42,7 @@ class GridMapAdapter(val context: Context, var list: List<VrmapBean.Internal>?)
             //设置点击跳转
             RxUtils.onMultiClick(holder.itemView){
                 //页面跳转
-                MintsWebViewActivity.startWebView(name, url = url)
+                MintsWebViewActivity.startWebView(name, url = url,is720 = true)
             }
             holder.binding.llstart.setNumber(stars?.toInt()?:5)
         }

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

@@ -24,35 +24,40 @@ import me.goldze.mvvmhabit.utils.KLog
  */
 class MintsWebViewActivity : BaseActivity<ActivityMintsWebViewBinding, MintsWebViewModel>() {
 
-    companion object{
+    companion object {
         //打开地图的webView
-        fun startWebView(name:String?=null,url:String?=null){
+        fun startWebView(name: String? = null, url: String? = null, is720: Boolean? = false) {
             AppManager.getAppManager().currentActivity?.apply {
-                val intent = Intent(this,MintsWebViewActivity::class.java)
-                intent.putExtra("name",name)
-                intent.putExtra("url",url)
+                val intent = Intent(this, MintsWebViewActivity::class.java)
+                intent.putExtra("name", name)
+                intent.putExtra("url", url)
+                intent.putExtra("is720", is720)
                 this.startActivity(intent)
             }
         }
+
         //谷歌地址拼接
-        fun toGoogleVR(u:String?,gk:String?,base:String?,lat:String?,lng:String?,ut:String?):String{
-            KLog.i("MintsWebViewActivity","file:///android_asset/web/streets.html?u=${u
+        fun toGoogleVR(u: String?, gk: String?, base: String?, lat: String?, lng: String?, ut: String?): String {
+            KLog.i("MintsWebViewActivity", "file:///android_asset/web/streets.html?u=${u
             }&gk=${gk}&base=${base}&lat=${lat}&lng=${lng}&ut=${ut}")
             return "file:///android_asset/web/streets.html?u=${u
             }&gk=${gk}&base=${base}&lat=${lat}&lng=${lng}&ut=${ut}"
         }
+
         //地图上跳转百度的地址拼接
-        fun toBaduVR(d:String?,bk:String?):String{
-            KLog.i("MintsWebViewActivity","file:///android_asset/web/mr.html?d=${d}&bk=${bk}")
+        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/mr.html?d=${d}&bk=${bk}"
         }
+
         //其他的跳转百度的地址拼接
-        fun toBaduVR(lat:String?,lng:String?,bk:String?):String{
-            KLog.i("MintsWebViewActivity","file:///android_asset/web/m.html?lat=${lat}&lng=${lng}&bk=${bk}")
+        fun toBaduVR(lat: String?, lng: String?, bk: String?): String {
+            KLog.i("MintsWebViewActivity", "file:///android_asset/web/m.html?lat=${lat}&lng=${lng}&bk=${bk}")
             return "file:///android_asset/web/m.html?lat=${lat}&lng=${lng}&bk=${bk}"
         }
     }
 
+
     private var audioManager : AudioManager?=null
     private var listener : AudioManager.OnAudioFocusChangeListener?=null
 
@@ -63,13 +68,13 @@ class MintsWebViewActivity : BaseActivity<ActivityMintsWebViewBinding, MintsWebV
     override fun initData() {
         super.initData()
         binding.ctbTitle.setTitle(intent.getStringExtra("name"))
-       if(intent.getStringExtra("url")!=null && "" != intent.getStringExtra("url")){
-           binding.webview.loadUrl(intent.getStringExtra("url")?:"")
-       }
+        if (intent.getStringExtra("url") != null && "" != intent.getStringExtra("url")) {
+            binding.webview.loadUrl(intent.getStringExtra("url") ?: "")
+        }
 
         binding.webview.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
-                KLog.i("MintsWebViewActivity",url)
+                KLog.i("MintsWebViewActivity", url)
                 //使用WebView加载显示url
                 if (url != null) {
                     view?.loadUrl(url)
@@ -86,13 +91,18 @@ class MintsWebViewActivity : BaseActivity<ActivityMintsWebViewBinding, MintsWebV
         binding.webview.setDefaultHandler(object : DefaultHandler() {
             override fun handler(data: String, function: CallBackFunction) {
                 showMessage(AppManager.getAppManager().currentActivity
-                    ,content = data,confirmListener = OnConfirmListener{
+                        , content = data, confirmListener = OnConfirmListener {
 
                 })
             }
         })
 
+        if (intent?.getBooleanExtra("is720",false)?:false){
+            binding.v720Bg.visibility = View.VISIBLE
+        }else{
+            binding.v720Bg.visibility = View.GONE
 
+        }
 
     }
     override fun onResume() {

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <data>
+
         <variable
             name="viewModel"
             type="com.mints.street.webview.MintsWebViewModel" />
     </data>
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
+
         <com.fry.base.ui.widget.CommonTitleBar
             android:id="@+id/ctb_title"
             android:layout_width="match_parent"
@@ -17,9 +20,18 @@
             app:ctb_theme="dark"
             app:layout_constraintTop_toTopOf="parent" />
 
-            <com.github.lzyzsd.jsbridge.BridgeWebView
+        <com.github.lzyzsd.jsbridge.BridgeWebView
             android:id="@+id/webview"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
+            android:layout_height="match_parent"
+            app:layout_constraintTop_toBottomOf="@id/ctb_title" />
+
+        <View
+            android:id="@+id/v_720_bg"
+            android:layout_width="match_parent"
+            android:layout_height="55dp"
+            android:background="@color/white"
+            android:visibility= "gone"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file