From 22ed9e3a315760521c76efae7fd36b13f3451fa2 Mon Sep 17 00:00:00 2001 From: it232115 Date: Wed, 19 Jun 2024 15:34:13 +0900 Subject: [PATCH 1/5] =?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; + } } From b3f6d3a9ab7ac8712bfec7d069184afc68422982 Mon Sep 17 00:00:00 2001 From: it232115 Date: Wed, 19 Jun 2024 18:38:40 +0900 Subject: [PATCH 2/5] =?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 From 6fc1e6daa5e34b977a094b1560258d4a5c104c7d Mon Sep 17 00:00:00 2001 From: it232115 Date: Thu, 20 Jun 2024 18:21:47 +0900 Subject: [PATCH 3/5] =?UTF-8?q?room=E5=80=A4=E3=82=92=E6=8B=BE=E3=81=86?= =?UTF-8?q?=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 --- .../java/com/example/oplogy/AppDatabase.java | 2 +- .../java/com/example/oplogy/CreateRoot.java | 32 +++++++++++++++++-- .../example/oplogy/FirestoreReception.java | 16 +++++++--- .../java/com/example/oplogy/MainActivity.java | 32 ++++++++++++------- .../com/example/oplogy/SetUpTableDao.java | 8 +++-- 5 files changed, 67 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/AppDatabase.java b/app/src/main/java/com/example/oplogy/AppDatabase.java index b9f4998..bdb2773 100644 --- a/app/src/main/java/com/example/oplogy/AppDatabase.java +++ b/app/src/main/java/com/example/oplogy/AppDatabase.java @@ -1,7 +1,7 @@ package com.example.oplogy; + import androidx.room.Database; import androidx.room.RoomDatabase; -import androidx.room.TypeConverters; @Database(entities = {SetUpTable.class}, version = 1) public abstract class AppDatabase extends RoomDatabase { diff --git a/app/src/main/java/com/example/oplogy/CreateRoot.java b/app/src/main/java/com/example/oplogy/CreateRoot.java index 9812283..51352a1 100644 --- a/app/src/main/java/com/example/oplogy/CreateRoot.java +++ b/app/src/main/java/com/example/oplogy/CreateRoot.java @@ -1,7 +1,10 @@ package com.example.oplogy; +import android.content.Context; import android.util.Log; +import androidx.room.Room; + import com.google.firebase.Timestamp; import java.text.SimpleDateFormat; @@ -9,11 +12,22 @@ import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + public class CreateRoot { - public void receiveData(List myDataList) { + private Context context; + private AppDatabase db; + public CreateRoot(MainActivity activity) { + this.context = activity; + this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build(); + } + + public void receiveData(List myDataList) { for (int i = 0; i < myDataList.size(); i++) { + //希望時間帯の終了時刻から開始時刻を引いて希望時間帯の長さ(timezone)に入れる MyDataClass data = myDataList.get(i); List firstDay = data.getFirstDay(); Timestamp startTime = firstDay.get(0); @@ -21,6 +35,7 @@ public class CreateRoot { Long timezone = endTime.getSeconds() - startTime.getSeconds(); data.setTimezone(timezone); + //TimeStampを日付に変換 Date startDate = new Date(startTime.getSeconds() * 1000); Date endDate = new Date(endTime.getSeconds() * 1000); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -37,7 +52,7 @@ public class CreateRoot { Log.d("CreateRoot", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString()); Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i)); } - // timezoneを比較するComparatorを作成 + // timezoneを比較するComparator→timezoneが短い順に並べる Comparator comparator = new Comparator() { @Override public int compare(MyDataClass data1, MyDataClass data2) { @@ -51,6 +66,17 @@ public class CreateRoot { 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)); + } + + ExecutorService executor = Executors.newSingleThreadExecutor(); + executor.execute(new Runnable() { + @Override + public void run() { + SetUpTableDao setUpTableDao = db.setUpTableDao(); + String startTime=setUpTableDao.getStartTime(); + Log.d("CreateRoot", "開始時間" + startTime); + } + }); } -} \ 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 8713d5c..dcf0663 100644 --- a/app/src/main/java/com/example/oplogy/FirestoreReception.java +++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java @@ -11,7 +11,6 @@ import com.google.firebase.firestore.QueryDocumentSnapshot; import com.google.firebase.firestore.QuerySnapshot; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,7 +23,7 @@ public class FirestoreReception { } //firestoreから受け取ったデータを束ねるためのマップ - public ListmyDataList = new ArrayList<>(); + public List myDataList = new ArrayList<>(); //ClassIdを引数にデータの作成を行う public void getDocumentsByClassId(int classId) { @@ -61,11 +60,10 @@ public class FirestoreReception { //取得したデータをログ表示 - for(MyDataClass data :myDataList){ + 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()); } @@ -73,4 +71,12 @@ public class FirestoreReception { }); } + + public int getMyDataListSize() { + return myDataList.size(); + } + + public List getMyDataList() { + return myDataList; + } } diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java index 1ed5e10..693b507 100644 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ b/app/src/main/java/com/example/oplogy/MainActivity.java @@ -14,7 +14,10 @@ import androidx.appcompat.app.AppCompatActivity; import com.google.firebase.firestore.FirebaseFirestore; -public class MainActivity extends AppCompatActivity implements View.OnClickListener{ +import java.util.ArrayList; +import java.util.List; + +public class MainActivity extends AppCompatActivity implements View.OnClickListener { // ID作成のTextViewとImageView private TextView creatUUID; @@ -68,39 +71,44 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe firestoreReception.getDocumentsByClassId(100); - - } -// クリック処理 + // クリック処理 @Override public void onClick(View view) { // ID作成のクリック処理 - if(view == creatUUID){ + if (view == creatUUID) { imageUuid.setImageResource(R.drawable.ischecked_uuid); showUUIDYesNoDialog();//UUIDを表示するかのダイアログ } // セットアップのクリック処理 - if(view == setUp){ + if (view == setUp) { imageSetup.setImageResource(R.drawable.ischecked_uuid); - Intent toSetup = new Intent(MainActivity.this,SetUpActivity.class); + Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class); startActivity(toSetup); } // ルート作成のクリック処理 - if(view == root){ + if (view == root) { + //CreateRootにmyDataListを渡す imageRoot.setImageResource(R.drawable.pin); - Intent toRoot = new Intent(MainActivity.this,Maps.class); + List myDataList = firestoreReception.getMyDataList(); + CreateRoot createRoot = new CreateRoot(MainActivity.this); + createRoot.receiveData(myDataList); + Intent toRoot = new Intent(MainActivity.this, CreateRoot.class); + toRoot.putExtra("myDataList", (ArrayList) myDataList); startActivity(toRoot); + } // 提出状況のクリック処理 - if(view == submission){ - Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class); + if (view == submission) { + Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class); startActivity(toSubmission); } } + private void showUUIDYesNoDialog() { //ダイアログの表示 AlertDialog.Builder builder = new AlertDialog.Builder(this); @@ -119,7 +127,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe builder.setNegativeButton("No", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Log.d("DialogNO","DialogでNoが選ばれました"); + Log.d("DialogNO", "DialogでNoが選ばれました"); } }); builder.show(); diff --git a/app/src/main/java/com/example/oplogy/SetUpTableDao.java b/app/src/main/java/com/example/oplogy/SetUpTableDao.java index 0ebc1df..b0a5477 100644 --- a/app/src/main/java/com/example/oplogy/SetUpTableDao.java +++ b/app/src/main/java/com/example/oplogy/SetUpTableDao.java @@ -1,11 +1,10 @@ package com.example.oplogy; + import androidx.room.Dao; import androidx.room.Insert; import androidx.room.Query; import androidx.room.Update; -import java.util.List; - @Dao public interface SetUpTableDao { @Insert @@ -16,4 +15,9 @@ public interface SetUpTableDao { //名前が一致しているかの確認 @Query("SELECT * FROM SetUpTable WHERE teacherName = :name LIMIT 1") SetUpTable findByName(String name); + //開始時間と終了時間の取得 + @Query("SELECT startTime FROM SetUpTable") + String getStartTime(); + @Query("SELECT endTime FROM SetUpTable") + String getEndTime(); } From 4dfc928571203ce77c3049ae8f9d43ae0a6656ec Mon Sep 17 00:00:00 2001 From: it232115 Date: Thu, 20 Jun 2024 19:51:17 +0900 Subject: [PATCH 4/5] =?UTF-8?q?Room=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/oplogy/AppDatabase.java | 2 +- .../java/com/example/oplogy/CreateRoot.java | 14 ++++---- .../java/com/example/oplogy/MainActivity.java | 5 --- .../com/example/oplogy/SetUpActivity.java | 5 +-- .../java/com/example/oplogy/SetUpTable.java | 34 +++++-------------- 5 files changed, 20 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/AppDatabase.java b/app/src/main/java/com/example/oplogy/AppDatabase.java index bdb2773..8d655f3 100644 --- a/app/src/main/java/com/example/oplogy/AppDatabase.java +++ b/app/src/main/java/com/example/oplogy/AppDatabase.java @@ -3,7 +3,7 @@ package com.example.oplogy; import androidx.room.Database; import androidx.room.RoomDatabase; -@Database(entities = {SetUpTable.class}, version = 1) +@Database(entities = {SetUpTable.class}, version = 2) public abstract class AppDatabase extends RoomDatabase { // データベースにアクセスするためのメソッドを提供する public abstract SetUpTableDao setUpTableDao(); diff --git a/app/src/main/java/com/example/oplogy/CreateRoot.java b/app/src/main/java/com/example/oplogy/CreateRoot.java index 51352a1..2fd7d4f 100644 --- a/app/src/main/java/com/example/oplogy/CreateRoot.java +++ b/app/src/main/java/com/example/oplogy/CreateRoot.java @@ -70,13 +70,13 @@ public class CreateRoot { } ExecutorService executor = Executors.newSingleThreadExecutor(); - executor.execute(new Runnable() { - @Override - public void run() { - SetUpTableDao setUpTableDao = db.setUpTableDao(); - String startTime=setUpTableDao.getStartTime(); - Log.d("CreateRoot", "開始時間" + startTime); - } + executor.execute(() -> { + SetUpTableDao setUpTableDao = db.setUpTableDao(); + String startTime=setUpTableDao.getStartTime(); + String endTime=setUpTableDao.getEndTime(); + Log.d("CreateRoot", "開始時間" + startTime); + Log.d("CreateRoot", "終了時刻" + endTime); + }); } } diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java index 693b507..f7b5be3 100644 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ b/app/src/main/java/com/example/oplogy/MainActivity.java @@ -14,7 +14,6 @@ import androidx.appcompat.app.AppCompatActivity; import com.google.firebase.firestore.FirebaseFirestore; -import java.util.ArrayList; import java.util.List; public class MainActivity extends AppCompatActivity implements View.OnClickListener { @@ -92,14 +91,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe } // ルート作成のクリック処理 if (view == root) { - //CreateRootにmyDataListを渡す imageRoot.setImageResource(R.drawable.pin); List myDataList = firestoreReception.getMyDataList(); CreateRoot createRoot = new CreateRoot(MainActivity.this); createRoot.receiveData(myDataList); - Intent toRoot = new Intent(MainActivity.this, CreateRoot.class); - toRoot.putExtra("myDataList", (ArrayList) myDataList); - startActivity(toRoot); } // 提出状況のクリック処理 diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java index 3ce761b..68078db 100644 --- a/app/src/main/java/com/example/oplogy/SetUpActivity.java +++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java @@ -19,7 +19,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.room.Room; import java.util.Locale; -import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -125,7 +124,9 @@ public class SetUpActivity extends FragmentActivity getApplicationContext(), AppDatabase.class, "SetUpTable" - ).build(); + ) + .fallbackToDestructiveMigration() + .build(); SetUpTableDao setUpTableDao = db.setUpTableDao(); // Roomの操作を行う SetUpTable setUpTable = new SetUpTable( diff --git a/app/src/main/java/com/example/oplogy/SetUpTable.java b/app/src/main/java/com/example/oplogy/SetUpTable.java index e3d8992..bc43841 100644 --- a/app/src/main/java/com/example/oplogy/SetUpTable.java +++ b/app/src/main/java/com/example/oplogy/SetUpTable.java @@ -9,22 +9,24 @@ public class SetUpTable { public int id; public String teacherName; public String startPoint; - public String endPoint; public String startTime; public String endTime; - public String breakStartTime; - public String breakEndTime; + public String intervalTime; + public String startBreakTime; + public String endBreakTime; public int totalStudent; + //コンストラクタ - public SetUpTable(String teacherName, String startPoint, String endPoint, String startTime, String endTime, String breakStartTime,String breakEndTime, int totalStudent) { + public SetUpTable(String teacherName, String startPoint, String startTime, String endTime, + String intervalTime, String startBreakTime, String endBreakTime, int totalStudent) { this.teacherName = teacherName; this.startPoint = startPoint; - this.endPoint = endPoint; this.startTime = startTime; this.endTime = endTime; - this.breakStartTime = breakStartTime; - this.breakEndTime = breakEndTime; + this.intervalTime = intervalTime; + this.startBreakTime = startBreakTime; + this.endBreakTime = endBreakTime; this.totalStudent = totalStudent; } //getter @@ -37,21 +39,12 @@ public class SetUpTable { public String getStartPoint() { return startPoint; } - public String getEndPoint() { - return endPoint; - } public String getStartTime() { return startTime; } public String getEndTime() { return endTime; } - public String getBreakStartTime() { - return breakStartTime; - } - public String getBreakEndTime() { - return breakEndTime; - } public int getTotalStudent() { return totalStudent; } @@ -65,21 +58,12 @@ public class SetUpTable { public void setStartPoint(String startPoint) { this.startPoint = startPoint; } - public void setEndPoint(String endPoint) { - this.endPoint = endPoint; - } public void setStartTime(String startTime) { this.startTime = startTime; } public void setEndTime(String endTime) { this.endTime = endTime; } - public void setBreakStartTime(String breakStartTime) { - this.breakStartTime = breakStartTime; - } - public void setBreakEndTime(String breakEndTime) { - this.breakEndTime = breakEndTime; - } public void setTotalStudent(int totalStudent) { this.totalStudent = totalStudent; } From d6c834e4ca3bca344dc62beacc43101332dc4c29 Mon Sep 17 00:00:00 2001 From: it232115 Date: Thu, 20 Jun 2024 19:56:41 +0900 Subject: [PATCH 5/5] =?UTF-8?q?room=E3=81=8B=E3=82=89intervalTime,startBre?= =?UTF-8?q?akTime,endBreakTime=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/example/oplogy/SetUpTableDao.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/com/example/oplogy/SetUpTableDao.java b/app/src/main/java/com/example/oplogy/SetUpTableDao.java index b0a5477..5315b20 100644 --- a/app/src/main/java/com/example/oplogy/SetUpTableDao.java +++ b/app/src/main/java/com/example/oplogy/SetUpTableDao.java @@ -20,4 +20,13 @@ public interface SetUpTableDao { String getStartTime(); @Query("SELECT endTime FROM SetUpTable") String getEndTime(); + //インターバル時間の取得 + @Query("SELECT intervalTime FROM SetUpTable") + String getIntervalTime(); + //休憩開始時間の取得 + @Query("SELECT startBreakTime FROM SetUpTable") + String getStartBreakTime(); + //休憩終了時間の取得 + @Query("SELECT endBreakTime FROM SetUpTable") + String getEndBreakTime(); }