Ns1-j/oplogy
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'CreateRoot' (#2) from CreateRoot into master

Browse Source 
Reviewed-on: #2
This commit is contained in:
Utahshi 2024-06-19 04:55:22 +00:00
commit 507cfc739c
6 changed files with 34 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@ -37,9 +37,6 @@
android:name=".Maps"
android:exported="false"
android:label="@string/title_activity_maps" />
<activity
android:name=".Map_Activity"
android:exported="false" />
<activity
android:name=".TutorialActivity"
android:exported="false" />

28
app/src/main/java/com/example/oplogy/CreateRoot.java
View File

@ -1,5 +1,29 @@
package com.example.oplogy;
public class CreateRoot {
import android.util.Log;
}
import com.google.android.gms.maps.model.LatLng;
import com.google.firebase.Timestamp;
public class CreateRoot {
private String address;
private Timestamp startTimestamp;
private Timestamp endTimestamp;
private long studentNumber;
private LatLng latLng;
public void receiveData(String address, Timestamp startTimestamp, Timestamp endTimestamp, long studentNumber, LatLng latLng) {
this.address = address;
this.startTimestamp = startTimestamp;
this.endTimestamp = endTimestamp;
this.studentNumber = studentNumber;
this.latLng = latLng;
// 受け取ったデータを利用してログを出力
Log.d("CreateRoot", "address: " + address);
Log.d("CreateRoot", "startTimestamp: " + startTimestamp);
Log.d("CreateRoot", "endTimestamp: " + endTimestamp);
Log.d("CreateRoot", "studentNumber: " + studentNumber);
Log.d("CreateRoot", "latLng: " + latLng);
}
}

9
app/src/main/java/com/example/oplogy/GeoCoder.java
View File

@ -29,13 +29,18 @@ public class GeoCoder {
// 住所を緯度経度に変換
LatLng latLng = geocodeAddress(address.get(0));
//デバッグ用ログ
Log.d("FirestoreReception", "address: " + address.get(0));
Log.d("FirestoreReception", "firstDay: " + firstDay.get(0));
Log.d("FirestoreReception", "firstDay: " + firstDay.get(1));
Log.d("FirestoreReception", "studentNumber: " + studentNumber);
Log.d("FirestoreReception", "latLng: "+latLng );
// CreateRootクラスのインスタンスを作成
CreateRoot createRoot = new CreateRoot();
// データを渡す
createRoot.receiveData(address.get(0), firstDay.get(0), firstDay.get(1), studentNumber, latLng);
// 緯度経度をLogに出力
Log.d("緯度経度", "latLng: "+latLng );
} catch (NullPointerException e) {
Log.e("NullPointerException", "getの中身がnull" + e);
}

2
app/src/main/java/com/example/oplogy/MainActivity.java
View File

@ -92,7 +92,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
// ルート作成のクリック処理
if(view == root){
imageRoot.setImageResource(R.drawable.pin);
Intent toRoot = new Intent(MainActivity.this, Map_Activity.class);
Intent toRoot = new Intent(MainActivity.this,Maps.class);
startActivity(toRoot);
}
// 提出状況のクリック処理

50
app/src/main/java/com/example/oplogy/Map_Activity.java
View File

@ -1,50 +0,0 @@
package com.example.oplogy;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapFragment;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment;
public class Map_Activity extends AppCompatActivity implements View.OnClickListener, OnMapReadyCallback {
ImageView toMain;
private GoogleMap mMap;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.map_activity);
// ボタンの戻る処理
toMain = findViewById(R.id.toMain);
toMain.setOnClickListener(this);
}
@Override
public void onClick(View view) {
if(view == toMain){
Intent toMain = new Intent(Map_Activity.this,MainActivity.class);
startActivity(toMain);
}
}
@Override
public void onMapReady(@NonNull GoogleMap googleMap) {
mMap = googleMap;
FragmentManager fragmentManager = getSupportFragmentManager();
}
}

52
app/src/main/java/com/example/oplogy/MapsActivity.java
View File

@ -1,52 +0,0 @@
package com.example.oplogy;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.example.oplogy.databinding.MapsBinding;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapFragment;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment;
import com.google.common.collect.MapMaker;
public class MapsActivity extends AppCompatActivity implements View.OnClickListener, OnMapReadyCallback{
ImageView toMain;
private GoogleMap mMap;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_maps);
// ボタンの戻る処理
toMain = findViewById(R.id.toMain);
toMain.setOnClickListener(this);
}
@Override
public void onClick(View view) {
// メイン画面に戻る
if(view == toMain){
Intent toMain = new Intent(MapsActivity.this,MainActivity.class);
startActivity(toMain);
}
}
@Override
public void onMapReady(@NonNull GoogleMap googleMap) {
mMap = googleMap;
FragmentManager fragmentManager = getSupportFragmentManager();
}
}