From ecbb551c351c4b67c06af6c750f3d837aad29f05 Mon Sep 17 00:00:00 2001 From: nemukemo Date: Fri, 12 Jul 2024 10:15:21 +0900 Subject: [PATCH] =?UTF-8?q?classId=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=99?= =?UTF-8?q?=E3=82=8B=E6=99=82=E3=80=810=E3=81=AB=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/oplogy/MainActivity.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java index c58cfaa..425f7a5 100644 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ b/app/src/main/java/com/example/oplogy/MainActivity.java @@ -20,7 +20,6 @@ import com.google.gson.Gson; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -190,9 +189,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe executor.execute(() -> { // 現在のクラスIDを取得 int currentClassId = getCurrentClassIdFromRoom(); + if (currentClassId == 0) { + currentClassId = classId; + } + final int showDialogClassId = currentClassId; runOnUiThread(() -> { // 現在のクラスIDを表示するダイアログ - showClassIdDialog("現在のID", currentClassId); + showClassIdDialog("現在のID", showDialogClassId); }); }); executor.shutdown(); @@ -389,14 +392,14 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe for (int i = 0; i < studentNumbers.size(); i++) { message.append("出席番号:" + studentNumbers.get(i)); message.append("\n保護者名:" + myDataList.get(i).getPatronName()); - message.append("\n第一希望 " + myDataList.get(i).getStartDateString().substring(4,6)+"月"); - message.append(myDataList.get(i).getStartDateString().substring(6,8)+"日"); + message.append("\n第一希望 " + myDataList.get(i).getStartDateString().substring(4, 6) + "月"); + message.append(myDataList.get(i).getStartDateString().substring(6, 8) + "日"); message.append(" " + myDataList.get(i).getParentStartTimeString().substring(0, 2)); message.append(":" + myDataList.get(i).getParentStartTimeString().substring(2, 4)); message.append("～" + myDataList.get(i).getParentEndTimeString().substring(0, 2)); message.append(":" + myDataList.get(i).getParentEndTimeString().substring(2, 4)); - message.append("\n第二希望 " + myDataList.get(i).getSecondDayStartDateString().substring(4,6)+"月"); - message.append(myDataList.get(i).getSecondDayStartDateString().substring(6,8)+"日"); + message.append("\n第二希望 " + myDataList.get(i).getSecondDayStartDateString().substring(4, 6) + "月"); + message.append(myDataList.get(i).getSecondDayStartDateString().substring(6, 8) + "日"); message.append(" " + myDataList.get(i).getSecondDayParentStartTimeString().substring(0, 2)); message.append(":" + myDataList.get(i).getSecondDayParentStartTimeString().substring(2, 4)); message.append("～" + myDataList.get(i).getSecondDayParentEndTimeString().substring(0, 2));