Merge pull request 'CreateLot' (#24) from CreateLot into master
Reviewed-on: #24
This commit is contained in:
commit
05f916afba
|
|
@ -1,120 +1,75 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.webkit.WebSettings;
|
||||
import android.webkit.WebView;
|
||||
import android.webkit.WebViewClient;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.Color;
|
||||
import android.media.Image;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.google.android.gms.maps.CameraUpdateFactory;
|
||||
import com.google.android.gms.maps.GoogleMap;
|
||||
import com.google.android.gms.maps.OnMapReadyCallback;
|
||||
import com.google.android.gms.maps.SupportMapFragment;
|
||||
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
|
||||
import com.google.android.gms.maps.model.LatLng;
|
||||
import com.google.android.gms.maps.model.Marker;
|
||||
import com.google.android.gms.maps.model.MarkerOptions;
|
||||
import com.example.oplogy.databinding.MapsBinding;
|
||||
import com.google.android.gms.maps.model.Polyline;
|
||||
import com.google.android.gms.maps.model.PolylineOptions;
|
||||
import com.google.maps.DirectionsApi;
|
||||
import com.google.maps.DirectionsApiRequest;
|
||||
import com.google.maps.GeoApiContext;
|
||||
import com.google.maps.model.DirectionsResult;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
public class Maps extends FragmentActivity implements View.OnClickListener {
|
||||
|
||||
public class Maps extends FragmentActivity implements OnMapReadyCallback,View.OnClickListener{
|
||||
|
||||
// ボタンの戻る処理
|
||||
private WebView webView;
|
||||
ImageView backMain;
|
||||
private GoogleMap mMap;
|
||||
private MapsBinding binding;
|
||||
|
||||
private LatLng loc;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
binding = MapsBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
|
||||
// Obtain the SupportMapFragment and get notified when the map is ready to be used.
|
||||
SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
|
||||
.findFragmentById(R.id.map);
|
||||
mapFragment.getMapAsync(this);
|
||||
binding = MapsBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
|
||||
backMain = findViewById(R.id.BackMain);
|
||||
backMain.setOnClickListener(this);
|
||||
|
||||
webView = findViewById(R.id.webView);
|
||||
WebSettings webSettings = webView.getSettings();
|
||||
webSettings.setJavaScriptEnabled(true);
|
||||
webView.setWebViewClient(new WebViewClient());
|
||||
|
||||
// ここにデータを入れておいてください、処理は[/]で区切っています
|
||||
loadMapInWebView("35.09050879999539,136.87845379325216/35.09284820618655,136.88165119390393/35.09364708442631,136.88171563326418");
|
||||
}
|
||||
|
||||
// WebViewの処理です（Mapの中の処理をやっています）
|
||||
private void loadMapInWebView(String locations) {
|
||||
// 区切ることで、追加の地点を入れて、最終地点にピンを打ってある状態です
|
||||
String[] locArray = locations.split("/");
|
||||
// ↓URLで経路案内（車）での表示をしています
|
||||
StringBuilder urlBuilder = new StringBuilder("https://www.google.com/maps/dir/?api=1&travelmode=driving");
|
||||
|
||||
if (locArray.length > 0) {
|
||||
urlBuilder.append("&origin=").append(locArray[0]);
|
||||
|
||||
/**
|
||||
* Manipulates the map once available.
|
||||
* This callback is triggered when the map is ready to be used.
|
||||
* This is where we can add markers or lines, add listeners or move the camera. In this case,
|
||||
* we just add a marker near Sydney, Australia.
|
||||
* If Google Play services is not installed on the device, the user will be prompted to install
|
||||
* it inside the SupportMapFragment. This method will only be triggered once the user has
|
||||
* installed Google Play services and returned to the app.
|
||||
*/
|
||||
@Override
|
||||
public void onMapReady(GoogleMap googleMap) {
|
||||
mMap = googleMap;
|
||||
if (locArray.length > 1) {
|
||||
urlBuilder.append("&destination=").append(locArray[locArray.length - 1]);
|
||||
|
||||
/// 地図の倍率を指定
|
||||
if (locArray.length > 2) {
|
||||
urlBuilder.append("&waypoints=");
|
||||
for (int i = 1; i < locArray.length - 1; i++) {
|
||||
urlBuilder.append(locArray[i]);
|
||||
if (i < locArray.length - 2) {
|
||||
urlBuilder.append("|");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ↓ここに地点の処理を書いておく↓
|
||||
// Add a marker in Sydney and move the camera
|
||||
loc = new LatLng(35.09050879999539, 136.87845379325216);
|
||||
mMap.addMarker(new MarkerOptions().position(loc).title("名古屋港水族館"));
|
||||
/// 表示位置を地図に指定
|
||||
mMap.moveCamera(CameraUpdateFactory.newLatLng(loc));
|
||||
|
||||
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, 17));
|
||||
|
||||
LatLng startLatLng = new LatLng(35.09050879999539, 136.87845379325216);
|
||||
LatLng secandLatLng = new LatLng(35.09284820618655, 136.88165119390393);
|
||||
LatLng thirdLatLng = new LatLng(35.09364708442631, 136.88171563326418);
|
||||
|
||||
|
||||
Marker startMaker = mMap.addMarker(new MarkerOptions()
|
||||
.position(startLatLng)
|
||||
.title("名古屋港水族館")
|
||||
);
|
||||
|
||||
Marker secondMaker = mMap.addMarker(new MarkerOptions()
|
||||
.position(secandLatLng)
|
||||
.title("2番目")
|
||||
);
|
||||
|
||||
Marker thirdMaker = mMap.addMarker(new MarkerOptions()
|
||||
.position(thirdLatLng)
|
||||
.title("3番目")
|
||||
);
|
||||
|
||||
drowRoute(startLatLng,secandLatLng,thirdLatLng);
|
||||
}
|
||||
|
||||
private void drowRoute(LatLng startLatLng,LatLng secondLatLung,LatLng thirdLatLng){
|
||||
GeoApiContext context = new GeoApiContext.Builder()
|
||||
.apiKey("AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw")
|
||||
.build();
|
||||
webView.loadUrl(urlBuilder.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
if(view == backMain){
|
||||
Intent backMain = new Intent(Maps.this,MainActivity.class);
|
||||
if (view == backMain) {
|
||||
Intent backMain = new Intent(Maps.this, MainActivity.class);
|
||||
startActivity(backMain);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
app/src/main/res/drawable/all_ok.png
Normal file
BIN
app/src/main/res/drawable/all_ok.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
|
|
@ -10,7 +10,7 @@
|
|||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"/>
|
||||
android:layout_weight="3"/>
|
||||
|
||||
|
||||
<!-- ID作成のレイアウト-->
|
||||
|
|
@ -43,6 +43,7 @@
|
|||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
<!-- セットアップのレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -72,8 +73,15 @@
|
|||
</LinearLayout>
|
||||
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"/>
|
||||
|
||||
<!-- ルート表示のレイアウト-->
|
||||
|
||||
|
||||
|
||||
<!-- ルート表示のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="400dp"
|
||||
android:layout_height="0dp"
|
||||
|
|
@ -102,12 +110,6 @@
|
|||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"/>
|
||||
|
||||
|
||||
<!-- 提出状況のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="350dp"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:weightSum="10"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="vertical"
|
||||
tools:context=".Maps">
|
||||
|
||||
<!-- <fragment xmlns:android="http://schemas.android.com/apk/res/android"-->
|
||||
<!-- xmlns:tools="http://schemas.android.com/tools"-->
|
||||
<!-- xmlns:map="http://schemas.android.com/apk/res-auto"-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="match_parent"-->
|
||||
<!-- android:id="@+id/map"-->
|
||||
<!-- android:name="com.google.android.gms.maps.SupportMapFragment"/>-->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -28,34 +20,28 @@
|
|||
android:layout_width="40dp"
|
||||
android:layout_height="90dp"
|
||||
android:src="@drawable/back_button"
|
||||
android:layout_weight="5"
|
||||
/>
|
||||
android:layout_weight="5" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="4"
|
||||
android:id="@+id/date"
|
||||
android:hint="今日の日付"
|
||||
android:textSize="40dp"
|
||||
/>
|
||||
android:textSize="40dp" />
|
||||
</LinearLayout>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/map"
|
||||
android:name="com.google.android.gms.maps.SupportMapFragment"
|
||||
<!-- Webの処理 -->
|
||||
<WebView
|
||||
android:id="@+id/webView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="6"
|
||||
tools:context=".Maps" />
|
||||
|
||||
android:layout_weight="6" />
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/scrollable"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"
|
||||
/>
|
||||
android:layout_weight="3" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user