From 4e20d0006fd21722d940a5c4ca94f8813ac6f9e8 Mon Sep 17 00:00:00 2001 From: nemukemo Date: Sun, 14 Jul 2024 01:12:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=97=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/oplogy/FirestoreReception.java | 5 ++- .../main/java/com/example/oplogy/Maps.java | 31 ++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java index 0d69f20..006c41b 100644 --- a/app/src/main/java/com/example/oplogy/FirestoreReception.java +++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java @@ -27,8 +27,11 @@ public class FirestoreReception { //ClassIdを引数にデータの作成を行う public void getDocumentsByClassId(int classId) { myDataList.clear(); - CollectionReference collectionRef = db.collection("testDistinct"); + //pixel6a + CollectionReference collectionRef = db.collection("test0711Data"); + //xiaomi +// CollectionReference collectionRef = db.collection("testDistinct"); // classIdが引数のものを取得する collectionRef.whereEqualTo("classId", classId).get() .addOnCompleteListener(new OnCompleteListener() { diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java index d94af0a..b6867c1 100644 --- a/app/src/main/java/com/example/oplogy/Maps.java +++ b/app/src/main/java/com/example/oplogy/Maps.java @@ -42,9 +42,6 @@ import java.util.Map; public class Maps extends FragmentActivity implements OnMapReadyCallback, View.OnClickListener, GoogleMap.OnMarkerClickListener { - ImageView backMain; - private GoogleMap mMap; - private LinearLayout locationsName; //GoogleMapAPiで使用可能な色 private static final int[] COLORS = new int[]{Color.parseColor("#007FFF"), // HUE_AZURE Color.parseColor("#0000FF"), // HUE_BLUE @@ -57,13 +54,14 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O Color.parseColor("#8A2BE2"), // HUE_VIOLET Color.parseColor("#FFFF00") // HUE_YELLOW }; - private int colorIndex = 0; private final List latLngList = new ArrayList<>(); private final List nameList = new ArrayList<>(); private final List colorList = new ArrayList<>(); - private final Map dateMap = new HashMap<>(); - + ImageView backMain; + private GoogleMap mMap; + private LinearLayout locationsName; + private int colorIndex = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -213,11 +211,22 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O //家庭訪問のscheduleを7桁の整数から○月〇日●時〇分(6041200→06月12日05時20分)に変換 private String formatSchedule(String schedule) { - String monthString = "0" + schedule.substring(0, 1); - String dayString = schedule.substring(1, 3); - String hourString = schedule.substring(3, 5); - String minuteString = schedule.substring(5, 7); - return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分"; + Log.d("Maps", "schedule: " + schedule); + if (schedule.length() != 7) { + schedule = "0" + schedule; + String monthString = schedule.substring(0, 2); + String dayString = schedule.substring(2, 4); + String hourString = "0" + schedule.substring(4, 5); + String minuteString = schedule.substring(5, 7); + return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分"; + } else { + String monthString = "0" + schedule.substring(0, 1); + String dayString = schedule.substring(1, 3); + String hourString = schedule.substring(3, 5); + String minuteString = schedule.substring(5, 7); + return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分"; + + } } // 共有プリファレンスからMyDataListを取得するメソッド -- 2.45.1