Skip to content

Commit 63c2ee0

Browse files
committed
Webカメラをタップしたら ii-nami を表示
1 parent 40d8884 commit 63c2ee0

3 files changed

Lines changed: 41 additions & 1 deletion

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package net.lmlab.m_tsunami_android.ui
2+
3+
import android.app.Activity
4+
import android.os.Bundle
5+
import android.webkit.WebView
6+
import net.lmlab.m_tsunami_android.R
7+
8+
class WebViewActivity: Activity() {
9+
10+
override fun onCreate(savedInstanceState: Bundle?) {
11+
super.onCreate(savedInstanceState)
12+
setContentView(R.layout.activity_web_view)
13+
val url = intent.getStringExtra("url")
14+
val view = findViewById(R.id.webView) as WebView
15+
view.settings.javaScriptEnabled = true
16+
view.loadUrl(url)
17+
}
18+
}

app/src/main/java/net/lmlab/m_tsunami_android/ui/map/MapFragment.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.lmlab.m_tsunami_android.ui.map
22

33
import android.Manifest
4+
import android.content.Intent
45
import android.content.pm.PackageManager
56
import android.graphics.Color
67
import android.os.Bundle
@@ -18,6 +19,7 @@ import com.google.android.gms.maps.model.*
1819
import com.google.maps.android.PolyUtil
1920
import net.lmlab.m_tsunami_android.R
2021
import net.lmlab.m_tsunami_android.entity.Route
22+
import net.lmlab.m_tsunami_android.ui.WebViewActivity
2123

2224
class MapFragment : Fragment(), OnMapReadyCallback {
2325

@@ -33,6 +35,12 @@ class MapFragment : Fragment(), OnMapReadyCallback {
3335
if (googleMap != null) {
3436
this.googleMap = googleMap
3537
this.googleMap.setOnMarkerClickListener { marker : Marker ->
38+
if (marker.snippet.startsWith("https")) {
39+
val intent = Intent(activity, WebViewActivity::class.java)
40+
intent.putExtra("url", marker.snippet)
41+
activity?.startActivity(intent)
42+
return@setOnMarkerClickListener false
43+
}
3644
clearMarkersAndRoute()
3745
val origin = googleMap.myLocation.latitude.toString() + "," + googleMap.myLocation.longitude.toString()
3846
val destination = marker.position.latitude.toString() + "," + marker.position.longitude.toString()
@@ -152,7 +160,7 @@ class MapFragment : Fragment(), OnMapReadyCallback {
152160
MarkerOptions()
153161
.position(latLng)
154162
.title(it.name)
155-
.snippet("Powered by ii-nami.com")
163+
.snippet(it.url)
156164
.icon(icon)
157165
)
158166
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:layout_width="match_parent"
3+
android:layout_height="match_parent">
4+
5+
<WebView
6+
android:layout_width="wrap_content"
7+
android:layout_height="wrap_content"
8+
android:id="@+id/webView"
9+
android:layout_alignParentTop="true"
10+
android:layout_alignParentStart="true"
11+
android:layout_alignParentBottom="true"
12+
android:layout_alignParentEnd="true" />
13+
14+
</RelativeLayout>

0 commit comments

Comments
 (0)