From 79042493f6ff10b4aab6f24d4dada1d30e52f095 Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Wed, 19 Jun 2024 14:40:51 +0900
Subject: [PATCH] =?UTF-8?q?GeoCoder.class=E3=81=B8=E3=81=AE=E9=81=B7?=
 =?UTF-8?q?=E7=A7=BB=E3=82=92=E5=BE=8C=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FirestoreReception.javaから直接 CreateRoot.javaにmyDataListを渡すコードに
---
 .../java/com/example/oplogy/CreateRoot.java   | 27 +++------
 .../example/oplogy/FirestoreReception.java    |  4 ++
 .../java/com/example/oplogy/GeoCoder.java     |  5 --
 .../java/com/example/oplogy/MyDataClass.java  | 57 +++++++++++++++++++
 4 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/CreateRoot.java b/app/src/main/java/com/example/oplogy/CreateRoot.java
index d8890d5..9502d05 100644
--- a/app/src/main/java/com/example/oplogy/CreateRoot.java
+++ b/app/src/main/java/com/example/oplogy/CreateRoot.java
@@ -2,28 +2,17 @@ package com.example.oplogy;
 
 import android.util.Log;
 
-import com.google.android.gms.maps.model.LatLng;
-import com.google.firebase.Timestamp;
+import java.util.List;
 
 public class CreateRoot {
-    private String address;
-    private Timestamp startTimestamp;
-    private Timestamp endTimestamp;
-    private long studentNumber;
-    private LatLng latLng;
+    public void receiveData(List<MyDataClass> myDataList) {
+
+        // デバッグ用ログ
+        for(MyDataClass data : myDataList){
+            Log.d("CreateRoot", "data: "+ data.toString());
+        }
+            Log.d("CreateRoot", "myDataList[0]: " + myDataList.get(0).toString());
 
-    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);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java
index a270c94..835ee53 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java
@@ -58,10 +58,14 @@ public class FirestoreReception {
                                 //リストに追加
                                 myDataList.add(myData);
                             }
+
+
                             //取得したデータをログ表示
                             for(MyDataClass data :myDataList){
                                 Log.i("FirestoreReceptiond", "data: " + data.toString());
                             }
+                            CreateRoot createRoot=new CreateRoot();
+                            createRoot.receiveData(myDataList);
                         } else {
                             Log.w("FirestoreReceptiond", "Error getting documents.", task.getException());
                         }
diff --git a/app/src/main/java/com/example/oplogy/GeoCoder.java b/app/src/main/java/com/example/oplogy/GeoCoder.java
index ddff733..c09996a 100644
--- a/app/src/main/java/com/example/oplogy/GeoCoder.java
+++ b/app/src/main/java/com/example/oplogy/GeoCoder.java
@@ -36,11 +36,6 @@ public class GeoCoder {
             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);
-
         } catch (NullPointerException e) {
             Log.e("NullPointerException", "getの中身がnull" + e);
         }
diff --git a/app/src/main/java/com/example/oplogy/MyDataClass.java b/app/src/main/java/com/example/oplogy/MyDataClass.java
index 3080d0f..2f7ec2b 100644
--- a/app/src/main/java/com/example/oplogy/MyDataClass.java
+++ b/app/src/main/java/com/example/oplogy/MyDataClass.java
@@ -39,4 +39,61 @@ public class MyDataClass {
                 ", secondDay=" + secondDay +
                 '}';
     }
+
+    //getter
+    public String getPatronName() {
+        return patronName;
+    }
+    public int getClassId() {
+        return classId;
+    }
+    public List<String> getAddress() {
+        return address;
+    }
+    public List<Timestamp> getFirstDay() {
+        return firstDay;
+    }
+    public int getStudentNumber() {
+        return studentNumber;
+    }
+    public String getChildName() {
+        return childName;
+    }
+    public List<Timestamp> getThirdDay() {
+        return thirdDay;
+    }
+    public List<Timestamp> getSecondDay() {
+        return secondDay;
+    }
+    public double getLatitude() {
+        return latitude;
+    }
+    //setter
+    public void setPatronName(String patronName) {
+        this.patronName = patronName;
+    }
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+    public void setAddress(List<String> address) {
+        this.address = address;
+    }
+    public void setFirstDay(List<Timestamp> firstDay) {
+        this.firstDay = firstDay;
+    }
+    public void setStudentNumber(int studentNumber) {
+        this.studentNumber = studentNumber;
+    }
+    public void setChildName(String childName) {
+        this.childName = childName;
+    }
+    public void setThirdDay(List<Timestamp> thirdDay) {
+        this.thirdDay = thirdDay;
+    }
+    public void setSecondDay(List<Timestamp> secondDay) {
+        this.secondDay = secondDay;
+    }
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
 }
-- 
2.45.1