From 22ed9e3a315760521c76efae7fd36b13f3451fa2 Mon Sep 17 00:00:00 2001 From: it232115 Date: Wed, 19 Jun 2024 15:34:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?firstDay=E3=81=AETimeStamp=E3=81=AE?= =?UTF-8?q?=EF=BC=90=E7=95=AA=E7=9B=AE=E3=81=A8=EF=BC=91=E7=95=AA=E7=9B=AE?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=AE=B6=E5=BA=AD=E8=A8=AA=E5=95=8F=E3=81=AE?= =?UTF-8?q?=E5=B8=8C=E6=9C=9B=E6=99=82=E9=96=93=E5=B8=AF=E3=81=AE=E9=95=B7?= =?UTF-8?q?=E3=81=95timezone=E3=82=92data=E3=81=AB=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/example/oplogy/CreateRoot.java | 12 +++++++++++- .../main/java/com/example/oplogy/MyDataClass.java | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/oplogy/CreateRoot.java b/app/src/main/java/com/example/oplogy/CreateRoot.java index 9502d05..951a473 100644 --- a/app/src/main/java/com/example/oplogy/CreateRoot.java +++ b/app/src/main/java/com/example/oplogy/CreateRoot.java @@ -2,6 +2,8 @@ package com.example.oplogy; import android.util.Log; +import com.google.firebase.Timestamp; + import java.util.List; public class CreateRoot { @@ -13,6 +15,14 @@ public class CreateRoot { } Log.d("CreateRoot", "myDataList[0]: " + myDataList.get(0).toString()); + for (MyDataClass data : myDataList) { + Log.d("CreateRoot", "data: " + data.toString()); + Timestamp startTime = data.getFirstDay().get(0); + Timestamp endTime = data.getFirstDay().get(1); + Long timezone = endTime.getSeconds() - startTime.getSeconds(); + data.setTimezone(timezone); + Log.d("CreateRoot", "timezone: " + timezone); + } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/oplogy/MyDataClass.java b/app/src/main/java/com/example/oplogy/MyDataClass.java index f81066f..7bf34dc 100644 --- a/app/src/main/java/com/example/oplogy/MyDataClass.java +++ b/app/src/main/java/com/example/oplogy/MyDataClass.java @@ -14,6 +14,7 @@ public class MyDataClass { List thirdDay; List secondDay; double latitude; + private Long Timezone; public MyDataClass(String patronName, int classId, List address, List firstDay, int studentNumber, String childName, List thirdDay, List secondDay) { this.patronName = patronName; @@ -52,6 +53,8 @@ public class MyDataClass { public List getFirstDay() { return firstDay; } + + public int getStudentNumber() { return studentNumber; } @@ -95,4 +98,8 @@ public class MyDataClass { public void setLatitude(double latitude) { this.latitude = latitude; } + + public void setTimezone(Long Timezone) { + this.Timezone=Timezone; + } } -- 2.45.1 From b3f6d3a9ab7ac8712bfec7d069184afc68422982 Mon Sep 17 00:00:00 2001 From: it232115 Date: Wed, 19 Jun 2024 18:38:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?timezone=E3=81=AE=E9=95=B7=E3=81=95?= =?UTF-8?q?=E3=81=8C=E7=9F=AD=E3=81=84=E9=A0=86=E3=81=ABmyDataList?= =?UTF-8?q?=E3=81=AE=E8=A6=81=E7=B4=A0=E3=82=92=E4=B8=A6=E3=81=B3=E6=9B=BF?= =?UTF-8?q?=E3=81=88=E3=82=8B=E5=87=A6=E7=90=86=E3=81=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit timestampを日付に変換する処理を実装 --- .../java/com/example/oplogy/CreateRoot.java | 54 +++++++++--- .../java/com/example/oplogy/MyDataClass.java | 85 +++++++++++++------ .../example/oplogy/RootSearchActivity.java | 4 +- 3 files changed, 102 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/CreateRoot.java b/app/src/main/java/com/example/oplogy/CreateRoot.java index 951a473..9812283 100644 --- a/app/src/main/java/com/example/oplogy/CreateRoot.java +++ b/app/src/main/java/com/example/oplogy/CreateRoot.java @@ -4,25 +4,53 @@ import android.util.Log; import com.google.firebase.Timestamp; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; import java.util.List; public class CreateRoot { public void receiveData(List myDataList) { - // デバッグ用ログ - for(MyDataClass data : myDataList){ - Log.d("CreateRoot", "data: "+ data.toString()); - } - Log.d("CreateRoot", "myDataList[0]: " + myDataList.get(0).toString()); - - for (MyDataClass data : myDataList) { - Log.d("CreateRoot", "data: " + data.toString()); - Timestamp startTime = data.getFirstDay().get(0); - Timestamp endTime = data.getFirstDay().get(1); + for (int i = 0; i < myDataList.size(); i++) { + MyDataClass data = myDataList.get(i); + List firstDay = data.getFirstDay(); + Timestamp startTime = firstDay.get(0); + Timestamp endTime = firstDay.get(1); Long timezone = endTime.getSeconds() - startTime.getSeconds(); data.setTimezone(timezone); - Log.d("CreateRoot", "timezone: " + timezone); - } + Date startDate = new Date(startTime.getSeconds() * 1000); + Date endDate = new Date(endTime.getSeconds() * 1000); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String startDateString = sdf.format(startDate); + String endDateString = sdf.format(endDate); + + // myDataList の中の data に追加する処理 + myDataList.get(i).setTimezone(timezone); + myDataList.get(i).setStartDateString(startDateString); + myDataList.get(i).setEndDateString(endDateString); + + // ログ出力 + Log.d("CreateRoot", "(index: " + i + ") timezone: " + myDataList.get(i).getTimezone()); + Log.d("CreateRoot", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString()); + Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i)); + } + // timezoneを比較するComparatorを作成 + Comparator comparator = new Comparator() { + @Override + public int compare(MyDataClass data1, MyDataClass data2) { + return data1.getTimezone().compareTo(data2.getTimezone()); + } + }; + // myDataListをtimezoneの値でソート + Collections.sort(myDataList, comparator); + // ソート後のmyDataListをログ出力 + for (int i = 0; i < myDataList.size(); i++) { + Log.d("CreateRoot", "(index: " + i + ") timezone: " + myDataList.get(i).getTimezone()); + Log.d("CreateRoot", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString()); + Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i)); + } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/MyDataClass.java b/app/src/main/java/com/example/oplogy/MyDataClass.java index 7bf34dc..476c355 100644 --- a/app/src/main/java/com/example/oplogy/MyDataClass.java +++ b/app/src/main/java/com/example/oplogy/MyDataClass.java @@ -15,6 +15,8 @@ public class MyDataClass { List secondDay; double latitude; private Long Timezone; + private String startDateString; + private String endDateString; public MyDataClass(String patronName, int classId, List address, List firstDay, int studentNumber, String childName, List thirdDay, List secondDay) { this.patronName = patronName; @@ -40,66 +42,97 @@ public class MyDataClass { ", secondDay=" + secondDay + '}'; } + //getter public String getPatronName() { return patronName; } - public int getClassId() { - return classId; - } - public List getAddress() { - return address; - } - public List getFirstDay() { - return firstDay; - } - - public int getStudentNumber() { - return studentNumber; - } - public String getChildName() { - return childName; - } - public List getThirdDay() { - return thirdDay; - } - public List getSecondDay() { - return secondDay; - } - public double getLatitude() { - return latitude; - } //setter public void setPatronName(String patronName) { this.patronName = patronName; } + + public int getClassId() { + return classId; + } + public void setClassId(int classId) { this.classId = classId; } + + public List getAddress() { + return address; + } + public void setAddress(List address) { this.address = address; } + + public List getFirstDay() { + return firstDay; + } + public void setFirstDay(List firstDay) { this.firstDay = firstDay; } + + public int getStudentNumber() { + return studentNumber; + } + public void setStudentNumber(int studentNumber) { this.studentNumber = studentNumber; } + + public String getChildName() { + return childName; + } + public void setChildName(String childName) { this.childName = childName; } + + public List getThirdDay() { + return thirdDay; + } + public void setThirdDay(List thirdDay) { this.thirdDay = thirdDay; } + + public List getSecondDay() { + return secondDay; + } + public void setSecondDay(List secondDay) { this.secondDay = secondDay; } + + public double getLatitude() { + return latitude; + } + public void setLatitude(double latitude) { this.latitude = latitude; } + public void setEndDateString(String endDateString) { + this.endDateString = endDateString; + } + + public Long getTimezone() { + return Timezone; + } + public void setTimezone(Long Timezone) { - this.Timezone=Timezone; + this.Timezone = Timezone; + } + + public String getStartDateString() { + return startDateString; + } + public void setStartDateString(String startDateString) { + this.startDateString = startDateString; } } diff --git a/app/src/main/java/com/example/oplogy/RootSearchActivity.java b/app/src/main/java/com/example/oplogy/RootSearchActivity.java index 645f113..bd1f5b9 100644 --- a/app/src/main/java/com/example/oplogy/RootSearchActivity.java +++ b/app/src/main/java/com/example/oplogy/RootSearchActivity.java @@ -1,9 +1,9 @@ package com.example.oplogy; -import androidx.appcompat.app.AppCompatActivity; - import android.os.Bundle; +import androidx.appcompat.app.AppCompatActivity; + public class RootSearchActivity extends AppCompatActivity { @Override -- 2.45.1