Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_street
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
android
android_street
Commits
03d08c58
Commit
03d08c58
authored
Sep 09, 2021
by
张释方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改720多余按钮问题
parent
2925c18b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
18 deletions
+29
-18
GridMapAdapter.kt
app/src/main/java/com/mints/street/adapter/GridMapAdapter.kt
+1
-1
MintsWebViewActivity.kt
...ain/java/com/mints/street/webview/MintsWebViewActivity.kt
+27
-16
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
app/src/main/java/com/mints/street/adapter/GridMapAdapter.kt
View file @
03d08c58
...
...
@@ -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
View file @
03d08c58
...
...
@@ -2,6 +2,7 @@ package com.mints.street.webview
import
android.content.Intent
import
android.os.Bundle
import
android.view.View
import
android.view.ViewGroup
import
android.webkit.WebChromeClient
import
android.webkit.WebView
...
...
@@ -22,34 +23,39 @@ 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}"
}
}
override
fun
initContentView
(
savedInstanceState
:
Bundle
?)
=
R
.
layout
.
activity_mints_web_view
override
fun
initVariableId
()
=
BR
.
viewModel
...
...
@@ -57,13 +63,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
)
...
...
@@ -80,13 +86,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
}
}
...
...
app/src/main/res/values/strings.xml
View file @
03d08c58
<resources>
<string
name=
"app_name"
>
3D高清街景
</string>
<string
name=
"app_name"
>
世界
3D高清街景
</string>
</resources>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment