From 4dfc928571203ce77c3049ae8f9d43ae0a6656ec Mon Sep 17 00:00:00 2001 From: it232115 Date: Thu, 20 Jun 2024 19:51:17 +0900 Subject: [PATCH] =?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; }