From 9b56412cb0b4581ebb09ed7a003579ad3eeda3c9 Mon Sep 17 00:00:00 2001
From: nemukemo <hiroaka201432@gmail.com>
Date: Wed, 26 Jun 2024 16:30:37 +0900
Subject: [PATCH] =?UTF-8?q?classId=E3=82=92=E5=8F=97=E3=81=91=E5=8F=96?=
 =?UTF-8?q?=E3=82=8B=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E3=81=8C=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E9=81=B7=E7=A7=BB=E3=81=8B=E3=82=89=E6=88=BB=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=8D=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=82=82?=
 =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                       |  1 +
 app/src/main/java/com/example/oplogy/AppDatabase.java  |  2 +-
 app/src/main/java/com/example/oplogy/CreateUUID.java   | 10 ++++++----
 app/src/main/java/com/example/oplogy/MainActivity.java | 10 +++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..360b82e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/app/src/main/java/com/example/oplogy/AppDatabase.java b/app/src/main/java/com/example/oplogy/AppDatabase.java
index 8d655f3..c52259d 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 = 2)
+@Database(entities = {SetUpTable.class}, version = 2, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     // データベースにアクセスするためのメソッドを提供する
     public abstract SetUpTableDao setUpTableDao();
diff --git a/app/src/main/java/com/example/oplogy/CreateUUID.java b/app/src/main/java/com/example/oplogy/CreateUUID.java
index e246aab..f61e643 100644
--- a/app/src/main/java/com/example/oplogy/CreateUUID.java
+++ b/app/src/main/java/com/example/oplogy/CreateUUID.java
@@ -5,12 +5,12 @@ import java.util.List;
 
 public class CreateUUID {
 
-    public static String generateUUID(List<String> classIdList ){
+    public static int generateUUID(List<String> classIdList ){
         while (true){
-            String uuid = String.valueOf((int)(Math.random()*100000));
+            String uuid = String.valueOf((int)(Math.random() * 1000000));
             boolean isDuplicate = false;
             for(String classId : classIdList){
-                if(Integer.parseInt(classId) == Integer.parseInt(uuid)){
+                if(classId.equals(uuid)){
                     //重複があればフラグを立て、ループを抜ける
                     isDuplicate = true;
                     break;
@@ -19,7 +19,9 @@ public class CreateUUID {
             //重複がなければ生成したUUIDを返す
             if (!isDuplicate) {
                 //firestoreに挿入処理
-                return uuid;
+                //テスト用
+                uuid="100";
+                return Integer.parseInt(uuid);
             }
         }
     }
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 5783546..2ce5148 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -156,7 +156,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                String classId = CreateUUID.generateUUID(classIdList);
+                classId = CreateUUID.generateUUID(classIdList);
                 Toast.makeText(MainActivity.this, "クラスID: " + classId, Toast.LENGTH_SHORT).show();
                 Log .d("classIdList", classIdList.toString());
 
@@ -292,4 +292,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
+    @Override
+    protected void onResume(){
+        super.onResume();
+        if (classId != 100000) {
+            firestoreReception.getDocumentsByClassId(classId);
+        }
+    }
+
 }
\ No newline at end of file