Compare commits
No commits in common. "master" and "finishing" have entirely different histories.
|
|
@ -18,9 +18,6 @@
|
|||
android:theme="@style/Theme.Oplogy"
|
||||
tools:ignore="ExtraText"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".SettingView"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".SetUpActivity"
|
||||
android:exported="false" />
|
||||
|
|
@ -43,9 +40,15 @@
|
|||
android:name=".Maps"
|
||||
android:exported="false"
|
||||
android:label="@string/title_activity_maps" />
|
||||
<activity
|
||||
android:name=".TutorialActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".SubmissionActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".RootSearchActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".CreateUUID"
|
||||
android:exported="false" />
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 367 KiB |
|
|
@ -16,11 +16,11 @@ public class Converters {
|
|||
// タイムスタンプを文字列(yyyy-mm-dd,日時)に変換
|
||||
@TypeConverter
|
||||
public static List<String> fromTimestampList(List<Timestamp> timestamps) {
|
||||
List<String> stringsList = new ArrayList<>();
|
||||
List<String> strings = new ArrayList<>();
|
||||
for (Timestamp timestamp : timestamps) {
|
||||
stringsList.add(format.format(timestamp.toDate()));
|
||||
strings.add(format.format(timestamp.toDate()));
|
||||
}
|
||||
return stringsList;
|
||||
return strings;
|
||||
}
|
||||
|
||||
@TypeConverter
|
||||
|
|
|
|||
|
|
@ -42,22 +42,21 @@ public class CreateSchedule {
|
|||
private final AppDatabase db;
|
||||
private int arraySizeInt;
|
||||
|
||||
private boolean notSecondDuplicatesBoolean;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
|
||||
boolean notSecondDuplicatesBoolean = true;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
|
||||
|
||||
String[] homeVisitDaysString;
|
||||
|
||||
|
||||
public CreateSchedule(AppCompatActivity activity) {
|
||||
this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build();
|
||||
this.notSecondDuplicatesBoolean = true; // 初期値をtrueに設定する
|
||||
SharedPreferences sharedPreferences = activity.getSharedPreferences("visitingDate", Context.MODE_PRIVATE);
|
||||
|
||||
String firstDay = sharedPreferences.getString("day1", null);
|
||||
String secondDay = sharedPreferences.getString("day2", null);
|
||||
String thirdDay = sharedPreferences.getString("day3", null);
|
||||
|
||||
Log.d("createSchedule","day1"+firstDay+"day2"+secondDay+"thirdday"+thirdDay);
|
||||
homeVisitDaysString = new String[]{firstDay, secondDay, thirdDay};
|
||||
|
||||
}
|
||||
|
||||
//MainActivityからデータを受け取る
|
||||
|
|
@ -123,12 +122,11 @@ public class CreateSchedule {
|
|||
Log.d("CreateSchedule", "startPointLatLngString" + startPointLatLngString);
|
||||
outPutLogSchedule(myDataList);
|
||||
return startPointLatLngString;
|
||||
} else {
|
||||
}
|
||||
//重複があるときは""を返す
|
||||
Log.d("CreateSchedule", "重複によるエラー");
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void setData(List<MyDataClass> myDataList) {
|
||||
|
|
@ -349,7 +347,6 @@ public class CreateSchedule {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
for (int i = 0; i < myDataList.size(); i++) {
|
||||
if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
|
||||
return false;
|
||||
|
|
@ -362,9 +359,8 @@ public class CreateSchedule {
|
|||
//保護者の希望時間の開始と終了の間にまだ保護者の割り当てがされていないスケジュールの空き時間があるかの判定
|
||||
if (intervalArrayInt[x][j][0] >= Integer.parseInt(myDataList.get(i).getParentStartTimeString()) && intervalArrayInt[x][j + 1][0] <= Integer.parseInt(myDataList.get(i).getParentEndTimeString()) && intervalArrayInt[x][j][1] == 0) {
|
||||
intervalArrayInt[x][j][1] += 1;//その時間が割り当て済みでありこと
|
||||
myDataList.get(i).setScheduleDay(homeVisitDaysString[x]);
|
||||
Log.d("CreateSchedule","getScheduleDay"+myDataList.get(i).getScheduleDay());
|
||||
myDataList.get(i).setSchedule(Integer.parseInt(desiredDateString.substring(4, 8) + intervalArrayInt[x][j][0]));//スケジュールをmyDataListに入れる(例:6041240(6月4日12時40分))
|
||||
myDataList.get(i).setScheduleDay(homeVisitDaysString[x]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ public class CreateUUID {
|
|||
|
||||
public static int generateUUID(List<Integer> classIdList ){
|
||||
while (true){
|
||||
int uuidInt = (int) (Math.random() * 1000000);
|
||||
int uuid = (int)(Math.random() * 1000000);
|
||||
boolean isDuplicate = false;
|
||||
for (int classIdInt : classIdList) {
|
||||
if (classIdInt == uuidInt) {
|
||||
for(int classId : classIdList){
|
||||
if(classId==uuid){
|
||||
//重複があればフラグを立て、ループを抜ける
|
||||
isDuplicate = true;
|
||||
break;
|
||||
|
|
@ -20,8 +20,10 @@ public class CreateUUID {
|
|||
if (!isDuplicate) {
|
||||
//firestoreに挿入処理
|
||||
InsertClassIdforFirebase insertClassIdforFirebase = new InsertClassIdforFirebase();
|
||||
insertClassIdforFirebase.insertClassId(uuidInt);
|
||||
return uuidInt;
|
||||
insertClassIdforFirebase.insertClassId(uuid);
|
||||
//テスト用
|
||||
uuid=100;
|
||||
return uuid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ import android.widget.DatePicker;
|
|||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Objects;
|
||||
|
||||
public class DatePick extends DialogFragment implements
|
||||
DatePickerDialog.OnDateSetListener {
|
||||
|
|
@ -19,16 +19,16 @@ public class DatePick extends DialogFragment implements
|
|||
|
||||
//デフォルトのタイムゾーンおよびロケールを使用してカレンダを取得
|
||||
final Calendar c = Calendar.getInstance();
|
||||
int yearInt = c.get(Calendar.YEAR);
|
||||
int monthInt = c.get(Calendar.MONTH);
|
||||
int dayInt = c.get(Calendar.DAY_OF_MONTH);
|
||||
int year = c.get(Calendar.YEAR);
|
||||
int month = c.get(Calendar.MONTH);
|
||||
int day = c.get(Calendar.DAY_OF_MONTH);
|
||||
|
||||
return new DatePickerDialog(requireActivity(), (DatePickerDialog.OnDateSetListener) getActivity(), yearInt, monthInt, dayInt);
|
||||
return new DatePickerDialog(requireActivity(), (DatePickerDialog.OnDateSetListener) getActivity(), year, month, day);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onDateSet(DatePicker datePicker, int yearInt, int monthInt, int dayInt) {
|
||||
public void onDateSet(DatePicker datePicker, int year, int month, int day) {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,20 +16,21 @@ import java.util.Map;
|
|||
|
||||
public class FirestoreReception {
|
||||
|
||||
//firestoreから受け取ったデータを束ねるためのマップ
|
||||
public List<MyDataClass> myDataList = new ArrayList<>();
|
||||
private FirebaseFirestore db;
|
||||
|
||||
public FirestoreReception() {
|
||||
db = FirebaseFirestore.getInstance();
|
||||
}
|
||||
|
||||
//firestoreから受け取ったデータを束ねるためのマップ
|
||||
public List<MyDataClass> myDataList = new ArrayList<>();
|
||||
|
||||
//ClassIdを引数にデータの作成を行う
|
||||
public void getDocumentsByClassId(int classId) {
|
||||
myDataList.clear();
|
||||
CollectionReference collectionRef = db.collection("QuestionForm");
|
||||
|
||||
CollectionReference collectionRef = db.collection("QuestionnaireForms");
|
||||
|
||||
// classIdが引数のものを取得する
|
||||
collectionRef.whereEqualTo("classId", classId).get()
|
||||
.addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import android.util.Log;
|
|||
|
||||
import com.google.android.gms.tasks.OnCompleteListener;
|
||||
import com.google.android.gms.tasks.Task;
|
||||
import com.google.firebase.firestore.CollectionReference;
|
||||
import com.google.firebase.firestore.DocumentSnapshot;
|
||||
import com.google.firebase.firestore.FirebaseFirestore;
|
||||
import com.google.firebase.firestore.QueryDocumentSnapshot;
|
||||
import com.google.firebase.firestore.QuerySnapshot;
|
||||
|
|
@ -12,6 +14,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
public class FirestoreReception_classIdDatabase {
|
||||
private FirebaseFirestore db;
|
||||
private List<Integer> classIdList= new ArrayList<>();
|
||||
|
|
|
|||
59
app/src/main/java/com/example/oplogy/GeoCoder.java
Normal file
59
app/src/main/java/com/example/oplogy/GeoCoder.java
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.content.Context;
|
||||
import android.location.Address;
|
||||
import android.location.Geocoder;
|
||||
import android.util.Log;
|
||||
|
||||
import com.google.android.gms.maps.model.LatLng;
|
||||
import com.google.firebase.Timestamp;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
public class GeoCoder {
|
||||
private Context context;
|
||||
|
||||
public void processData(Map<String, Object> data, Context context) {
|
||||
try {
|
||||
this.context = context;
|
||||
|
||||
//家庭訪問先の住所
|
||||
List<String> address = (List<String>) data.get("address");
|
||||
//家庭訪問の第一希望日(配列0が希望時間帯のはじめ、配列1がおわり)
|
||||
List<Timestamp> firstDay = (List<Timestamp>) data.get("firstDay");
|
||||
//出席番号
|
||||
Long studentNumber = (Long) data.get("studentNumber");
|
||||
// 住所を緯度経度に変換
|
||||
LatLng latLng = geocodeAddress(address.get(0));
|
||||
|
||||
//デバッグ用ログ
|
||||
Log.d("FirestoreReception", "address: " + address.get(0));
|
||||
Log.d("FirestoreReception", "firstDay: " + firstDay.get(0));
|
||||
Log.d("FirestoreReception", "firstDay: " + firstDay.get(1));
|
||||
Log.d("FirestoreReception", "studentNumber: " + studentNumber);
|
||||
Log.d("FirestoreReception", "latLng: " + latLng);
|
||||
|
||||
} catch (NullPointerException e) {
|
||||
Log.e("NullPointerException", "getの中身がnull" + e);
|
||||
}
|
||||
}
|
||||
|
||||
private LatLng geocodeAddress(String address) {
|
||||
try {
|
||||
Geocoder geocoder = new Geocoder(context, Locale.getDefault());
|
||||
List<Address> addresses = geocoder.getFromLocationName(address, 1);
|
||||
if (addresses != null && !addresses.isEmpty()) {
|
||||
Address addressResult = addresses.get(0);
|
||||
double latitude = addressResult.getLatitude();
|
||||
double longitude = addressResult.getLongitude();
|
||||
return new LatLng(latitude, longitude);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Log.e("GeocodingException", "Error geocoding address: " + address, e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
|
|
@ -19,39 +19,58 @@ import com.google.gson.Gson;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
|
||||
|
||||
|
||||
// ダイアログの宣言
|
||||
private AlertDialog alertDialog;
|
||||
|
||||
// ID作成のTextViewとImageView
|
||||
private TextView creatUUID;
|
||||
private ImageView imageUuid;
|
||||
|
||||
|
||||
// セットアップのTextViewとImageView
|
||||
private TextView setUp;
|
||||
private ImageView imageSetup;
|
||||
|
||||
// セットアップのTextViewとImageView
|
||||
private TextView root;
|
||||
private ImageView imageRoot;
|
||||
// 提出状況のTextViewとImageView
|
||||
private TextView submission;
|
||||
private ImageView imageSubmission;
|
||||
private TextView SettingView;
|
||||
private ImageView imageSettingView;
|
||||
|
||||
//firestoreの受信関連
|
||||
private FirebaseFirestore db;
|
||||
private FirestoreReception firestoreReception;
|
||||
private FirestoreReception_classIdDatabase firestoreReception_classIdDatabase;
|
||||
|
||||
//取得するためのクラスID
|
||||
private int classId;
|
||||
private String address;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.main);
|
||||
// ID作成用のインテント
|
||||
creatUUID = findViewById(R.id.creatUUID);
|
||||
creatUUID.setOnClickListener(this);
|
||||
imageUuid = findViewById(R.id.imageUuid);
|
||||
imageUuid.setOnClickListener(this);
|
||||
|
||||
|
||||
// セットアップ用のインテント
|
||||
setUp = findViewById(R.id.setUp);
|
||||
setUp.setOnClickListener(this);
|
||||
imageSetup = findViewById(R.id.imageSetup);
|
||||
imageSetup.setOnClickListener(this);
|
||||
|
||||
// ルート作成用のインテント
|
||||
root = findViewById(R.id.root);
|
||||
root.setOnClickListener(this);
|
||||
|
|
@ -64,12 +83,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
imageSubmission = findViewById(R.id.imageSubmission);
|
||||
imageSubmission.setOnClickListener(this);
|
||||
|
||||
// 設定用のインテント
|
||||
SettingView = findViewById(R.id.setting);
|
||||
SettingView.setOnClickListener(this);
|
||||
imageSettingView = findViewById(R.id.imageSetting);
|
||||
imageSettingView.setOnClickListener(this);
|
||||
|
||||
// firestoreの受信関連
|
||||
db = FirebaseFirestore.getInstance();
|
||||
firestoreReception = new FirestoreReception();
|
||||
|
|
@ -93,108 +106,102 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
}
|
||||
|
||||
|
||||
|
||||
// クリック処理
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
// ID作成のクリック処理
|
||||
if (view == creatUUID) {
|
||||
imageUuid.setImageResource(R.drawable.ischecked_uuid);
|
||||
showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
|
||||
}
|
||||
if (view == imageUuid) {
|
||||
imageUuid.setImageResource(R.drawable.ischecked_uuid);
|
||||
showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
|
||||
}
|
||||
// セットアップのクリック処理
|
||||
if (view == setUp) {
|
||||
imageSetup.setImageResource(R.drawable.ischecked_uuid);
|
||||
Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
|
||||
toSetup.putExtra("classId", classId);
|
||||
startActivity(toSetup);
|
||||
finish(); // 画面遷移後元の状態に戻す
|
||||
}
|
||||
if (view == imageSetup) {
|
||||
imageSetup.setImageResource(R.drawable.ischecked_uuid);
|
||||
Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
|
||||
startActivity(toSetup);
|
||||
finish(); // 画面遷移後元の状態に戻す
|
||||
}
|
||||
|
||||
// ルート作成のクリック処理
|
||||
if (view == root) {
|
||||
imageRoot.setImageResource(R.drawable.pin);
|
||||
checkSetupAndCreateRoute(this::fetchDataAndCreateRoute);
|
||||
fetchDataAndCreateRoute();
|
||||
|
||||
}
|
||||
if (view == imageRoot) {
|
||||
imageRoot.setImageResource(R.drawable.pin);
|
||||
checkSetupAndCreateRoute(this::fetchDataAndCreateRoute);
|
||||
fetchDataAndCreateRoute();
|
||||
}
|
||||
// 提出状況のクリック処理
|
||||
if (view == submission) {
|
||||
checkSetupAndCreateRoute(() -> {
|
||||
ArrayList<SubmissionStudent> submissionStudents = getSubmissionStudents();
|
||||
Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class);
|
||||
toSubmission.putParcelableArrayListExtra("submissionStudents", submissionStudents);
|
||||
startActivity(toSubmission);
|
||||
});
|
||||
}
|
||||
if (view == imageSubmission) {
|
||||
checkSetupAndCreateRoute(() -> {
|
||||
ArrayList<SubmissionStudent> submissionStudents = getSubmissionStudents();
|
||||
Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class);
|
||||
toSubmission.putParcelableArrayListExtra("submissionStudents", submissionStudents);
|
||||
startActivity(toSubmission);
|
||||
}
|
||||
}
|
||||
|
||||
//UUIDを表示するかのダイアログ
|
||||
private void showUUIDYesNoDialog() {
|
||||
firestoreReception_classIdDatabase = new FirestoreReception_classIdDatabase();
|
||||
List<Integer> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
|
||||
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle("クラスID");
|
||||
builder.setMessage("あなたのクラスIDを表示しますか？");
|
||||
|
||||
builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
classId = CreateUUID.generateUUID(classIdList);
|
||||
Toast.makeText(MainActivity.this, "クラスID: " + classId, Toast.LENGTH_SHORT).show();
|
||||
imageUuid.setImageResource(R.drawable.checked_image);
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
Log.d("DialogNO", "DialogでNoが選ばれました");
|
||||
imageUuid.setImageResource(R.drawable.checked_image);
|
||||
}
|
||||
if (view == SettingView) {
|
||||
Intent toSettingView = new Intent(MainActivity.this, SettingView.class);
|
||||
startActivity(toSettingView);
|
||||
}
|
||||
if (view == imageSettingView) {
|
||||
Intent toSettingView = new Intent(MainActivity.this, SettingView.class);
|
||||
startActivity(toSettingView);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//ルート作成、提出状況の遷移を行う前のチェックを行う処理
|
||||
private void checkSetupAndCreateRoute(Runnable onSetupComplete) {
|
||||
if (isClassIdSet()) {
|
||||
isSetupExists(classId).thenAccept(setupExists -> {
|
||||
if (setupExists) {
|
||||
runOnUiThread(onSetupComplete);
|
||||
} else {
|
||||
runOnUiThread(() -> {
|
||||
Toast.makeText(this, "先に設定画面で情報を入力してください", Toast.LENGTH_SHORT).show();
|
||||
});
|
||||
}
|
||||
}).exceptionally(ex -> {
|
||||
ex.printStackTrace();
|
||||
runOnUiThread(() -> {
|
||||
Toast.makeText(this, "エラーが発生しました", Toast.LENGTH_LONG).show();
|
||||
});
|
||||
return null;
|
||||
});
|
||||
} else {
|
||||
Toast.makeText(this, "先に設定画面で情報を入力してください", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
// クラスIDが設定されているかどうかを判定
|
||||
private boolean isClassIdSet() {
|
||||
// classIdが0より大きい場合、trueを返す
|
||||
return classId > 0;
|
||||
}
|
||||
alertDialog = builder.create();
|
||||
alertDialog.show();
|
||||
|
||||
// セットアップが存在するかどうかを判定
|
||||
private CompletableFuture<Boolean> isSetupExists(int classId) {
|
||||
final ExecutorService executorService = Executors.newSingleThreadExecutor();
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
AppDatabase db = getDatabaseInstance();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
//データベースの値を全取得
|
||||
List<SetUpTable> checkData = setUpTableDao.getAll();
|
||||
for (SetUpTable setUpTable : checkData) {
|
||||
//SetUpTableのclassIdと引数のclassIdが一致する場合、trueを返す
|
||||
if (setUpTable.classId == classId) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
//処理完了時にexecutorServiceをシャットダウン
|
||||
}, executorService).whenComplete((result, throwable) -> executorService.shutdown());
|
||||
}
|
||||
|
||||
|
||||
//ルート作成の非同期処理
|
||||
private void fetchDataAndCreateRoute() {
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
executor.execute(() -> {
|
||||
AppDatabase db = getDatabaseInstance();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
int totalStudentInt = setUpTableDao.getTotalStudent();
|
||||
int myDataListSizeInt = firestoreReception.getMyDataListSize();
|
||||
AppDatabase db = getDatabaseInstance(); SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
int totalStudent = setUpTableDao.getTotalStudent();
|
||||
int myDataListSize = firestoreReception.getMyDataListSize();
|
||||
|
||||
//総生徒数と提出済みになっている生徒の数が一致するかの確認
|
||||
runOnUiThread(() -> {
|
||||
if (totalStudentInt != myDataListSizeInt) {
|
||||
if (totalStudent != myDataListSize) {
|
||||
//未提出者がいることの警告ダイアログ
|
||||
showRouteCreationDialog();
|
||||
} else {
|
||||
|
|
@ -207,7 +214,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
// `fetchDataAndCreateRoute`メソッド内では、shutdownを呼び出さない
|
||||
}
|
||||
|
||||
// 未提出者がいることの警告ダイアログ
|
||||
private void showRouteCreationDialog() {
|
||||
new AlertDialog.Builder(MainActivity.this)
|
||||
.setTitle("警告")
|
||||
|
|
@ -224,15 +230,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
.show();
|
||||
}
|
||||
|
||||
// ルート作成の非同期処理
|
||||
|
||||
private void createRoute(ExecutorService executor) {
|
||||
// ProgressDialogを作成
|
||||
ProgressDialog progressDialog = new ProgressDialog(MainActivity.this);
|
||||
progressDialog.setMessage("Loading...");
|
||||
progressDialog.setCancelable(false);
|
||||
progressDialog.show();
|
||||
|
||||
executor.execute(() -> {
|
||||
List<MyDataClass> myDataList = null;
|
||||
while (myDataList == null) {
|
||||
|
|
@ -241,7 +239,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
Thread.sleep(3000);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
runOnUiThread(progressDialog::dismiss); // 進行状況ダイアログを閉じる
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -250,21 +247,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
final List<MyDataClass> finalMyDataList = myDataList;
|
||||
CreateSchedule createSchedule = new CreateSchedule(MainActivity.this);
|
||||
String startPointLatLngString = createSchedule.receiveData(myDataList, getApplicationContext());
|
||||
Boolean notDuplicatesBoolean = null;
|
||||
for (int i = 0; i < myDataList.size(); i++) {
|
||||
if (myDataList.get(i).getSchedule() == 0) {
|
||||
notDuplicatesBoolean = false;
|
||||
break;
|
||||
} else {
|
||||
notDuplicatesBoolean = true;
|
||||
}
|
||||
}
|
||||
Boolean finalNotDuplicatesBoolean = notDuplicatesBoolean;
|
||||
Log.d("MainActivity", "重複判定" + String.valueOf(finalNotDuplicatesBoolean));
|
||||
|
||||
runOnUiThread(() -> {
|
||||
progressDialog.dismiss(); // 進行状況ダイアログを閉じる
|
||||
if (finalNotDuplicatesBoolean) {
|
||||
if ( !startPointLatLngString.equals("")) {
|
||||
Log.d("MainActivity", "スケジュール作成成功");
|
||||
saveMyDataList(finalMyDataList);
|
||||
Intent toRoot = new Intent(MainActivity.this, Maps.class);
|
||||
|
|
@ -280,8 +265,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
executor.shutdown();
|
||||
});
|
||||
}
|
||||
|
||||
// 作成したルートを(Mapに渡せるように)保存するメソッド
|
||||
private void saveMyDataList(List<MyDataClass> myDataList) {
|
||||
// 共有プリファレンスのインスタンスを取得
|
||||
SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);
|
||||
|
|
@ -289,14 +272,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
|
||||
// MyDataListをJSON形式に変換
|
||||
Gson gson = new Gson();
|
||||
String jsonString = gson.toJson(myDataList);
|
||||
String json = gson.toJson(myDataList);
|
||||
|
||||
// JSON形式のデータを共有プリファレンスに保存
|
||||
editor.putString("myDataList", jsonString);
|
||||
editor.putString("myDataList", json);
|
||||
editor.apply();
|
||||
}
|
||||
|
||||
// 保護者の重複による警告ダイアログ
|
||||
private void showErrorDialog(List<MyDataClass> myDataList) {
|
||||
List<Integer> studentNumbers = new ArrayList<>();
|
||||
for (MyDataClass data : myDataList) {
|
||||
|
|
@ -304,22 +286,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
studentNumbers.add(data.getStudentNumber());
|
||||
}
|
||||
}
|
||||
StringBuilder message = new StringBuilder("保護者の重複が重大でルート作成ができません。保護者に連絡して調整してください。\n\n");
|
||||
StringBuilder message = new StringBuilder("保護者の重複が重大でルート作成ができません。調整してください。\n出席番号: ");
|
||||
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(" " + 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(" " + 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));
|
||||
message.append(":" + myDataList.get(i).getSecondDayParentEndTimeString().substring(2, 4) + "\n\n");
|
||||
message.append(studentNumbers.get(i));
|
||||
if (i < studentNumbers.size() - 1) {
|
||||
message.append(", ");
|
||||
}
|
||||
}
|
||||
new AlertDialog.Builder(MainActivity.this)
|
||||
.setTitle("警告")
|
||||
|
|
@ -330,14 +302,15 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
.show();
|
||||
}
|
||||
|
||||
// データベースのインスタンスを取得するメソッド
|
||||
|
||||
private AppDatabase getDatabaseInstance() {
|
||||
return Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
|
||||
}
|
||||
|
||||
|
||||
|
||||
//提出状況の取得
|
||||
public ArrayList<SubmissionStudent> getSubmissionStudents() {
|
||||
private ArrayList<SubmissionStudent> getSubmissionStudents() {
|
||||
ArrayList<SubmissionStudent> submissionStudents = new ArrayList<>();
|
||||
List<MyDataClass> myDataList = firestoreReception.getMyDataList();
|
||||
|
||||
|
|
@ -345,44 +318,40 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
CountDownLatch latch = new CountDownLatch(1);
|
||||
|
||||
executor.execute(() -> {
|
||||
try {
|
||||
// 1. Roomデータベースから全生徒数を取得
|
||||
AppDatabase db = getDatabaseInstance();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
int totalStudentInt = setUpTableDao.getTotalStudent();
|
||||
|
||||
int totalStudent = setUpTableDao.getTotalStudent();
|
||||
// 2. Firestoreから生徒番号のリストを取得
|
||||
ArrayList<Integer> firestoreStudentNumbersList = new ArrayList<>();
|
||||
ArrayList<Integer> firestoreStudentNumbers = new ArrayList<>();
|
||||
for (MyDataClass myData : myDataList) {
|
||||
int studentNumberInt = myData.getStudentNumber();
|
||||
firestoreStudentNumbersList.add(studentNumberInt);
|
||||
int studentNumber = myData.getStudentNumber();
|
||||
firestoreStudentNumbers.add(studentNumber);
|
||||
}
|
||||
|
||||
// 3. SubmissionStudentオブジェクトのリストを作成
|
||||
for (int i = 1; i <= totalStudentInt; i++) {
|
||||
boolean submitted = firestoreStudentNumbersList.contains(i);
|
||||
for (int i = 1; i <= totalStudent; i++) {
|
||||
boolean submitted = firestoreStudentNumbers.contains(i);
|
||||
submissionStudents.add(new SubmissionStudent(i, submitted));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace(); // ログにエラーメッセージを出力
|
||||
} finally {
|
||||
|
||||
// 4. データベース操作が完了したことを通知
|
||||
latch.countDown();
|
||||
}
|
||||
});
|
||||
|
||||
try {
|
||||
latch.await(); // 非同期処理が完了するまで待機
|
||||
// データベース操作が完了するのを待つ
|
||||
latch.await();
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
executor.shutdown(); // ExecutorServiceをシャットダウン
|
||||
}
|
||||
|
||||
executor.shutdown();
|
||||
|
||||
// SubmissionStudentオブジェクトのリストを返す
|
||||
return submissionStudents;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ package com.example.oplogy;
|
|||
|
||||
import android.content.SharedPreferences;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.ShapeDrawable;
|
||||
import android.graphics.drawable.shapes.OvalShape;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
|
@ -44,8 +42,14 @@ import java.util.Map;
|
|||
|
||||
public class Maps extends FragmentActivity implements OnMapReadyCallback, View.OnClickListener, GoogleMap.OnMarkerClickListener {
|
||||
|
||||
ImageView backMain;
|
||||
private GoogleMap mMap;
|
||||
private MapsBinding binding;
|
||||
private LinearLayout locationsName;
|
||||
private Spinner dateSpinner;
|
||||
//GoogleMapAPiで使用可能な色
|
||||
private static final int[] COLORS = new int[]{Color.parseColor("#007FFF"), // HUE_AZURE
|
||||
private static final int[] COLORS = new int[]{
|
||||
Color.parseColor("#007FFF"), // HUE_AZURE
|
||||
Color.parseColor("#0000FF"), // HUE_BLUE
|
||||
Color.parseColor("#00FFFF"), // HUE_CYAN
|
||||
Color.parseColor("#00FF00"), // HUE_GREEN
|
||||
|
|
@ -56,37 +60,37 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
Color.parseColor("#8A2BE2"), // HUE_VIOLET
|
||||
Color.parseColor("#FFFF00") // HUE_YELLOW
|
||||
};
|
||||
private final List<LatLng> latLngList = new ArrayList<>();
|
||||
private final List<String> nameList = new ArrayList<>();
|
||||
private final List<Integer> colorList = new ArrayList<>();
|
||||
private final Map<String, Runnable> dateMap = new HashMap<>();
|
||||
ImageView backMain;
|
||||
private GoogleMap mMap;
|
||||
private LinearLayout locationsName;
|
||||
private int colorIndex = 0;
|
||||
private List<LatLng> latLngList = new ArrayList<>();
|
||||
private List<String> nameList = new ArrayList<>();
|
||||
private List<Integer> colorList = new ArrayList<>();
|
||||
|
||||
private Map<String, Runnable> dateMap = new HashMap<>();
|
||||
|
||||
private AppDatabase db = null;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
// バインディングの設定
|
||||
com.example.oplogy.databinding.MapsBinding binding = MapsBinding.inflate(getLayoutInflater());
|
||||
|
||||
binding = MapsBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
|
||||
// マップフラグメントの設定
|
||||
SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
|
||||
SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
|
||||
.findFragmentById(R.id.map);
|
||||
mapFragment.getMapAsync(this);
|
||||
|
||||
// 各UI要素の設定
|
||||
backMain = findViewById(R.id.BackMain);
|
||||
backMain.setOnClickListener(this);
|
||||
|
||||
locationsName = findViewById(R.id.locationsName);
|
||||
|
||||
// スピナーの設定
|
||||
String dateDataString = formatDate(getSharedPreferencesData(0)) + "/" + formatDate(getSharedPreferencesData(1)) + "/" + formatDate(getSharedPreferencesData(2));
|
||||
String dateData = formatDate(getSharedPreferencesData(0)) + "/" + formatDate(getSharedPreferencesData(1)) + "/" + formatDate(getSharedPreferencesData(2));
|
||||
|
||||
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
|
||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||
String[] dates = dateDataString.split("/");
|
||||
String[] dates = dateData.split("/");
|
||||
for (String date : dates) {
|
||||
adapter.add(date);
|
||||
}
|
||||
|
|
@ -96,18 +100,22 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
int finalI = i;
|
||||
String dayString = getSharedPreferencesData(i);
|
||||
String formattedDayString = formatDate(dayString);
|
||||
dateMap.put(formattedDayString, () -> loadMapAndNames(createlocationData(finalI), getscrollViewlData(finalI)));
|
||||
if (i == 0) {
|
||||
dateMap.put(formattedDayString, () -> firstMapAndNames(createlocationData(finalI), getData(finalI)));
|
||||
} else if (i == 1) {
|
||||
dateMap.put(formattedDayString, () -> secondMapAndNames(createlocationData(finalI), getData(finalI)));
|
||||
} else {
|
||||
dateMap.put(formattedDayString, () -> thirdMapAndNames(createlocationData(finalI), getData(finalI)));
|
||||
}
|
||||
|
||||
Spinner dateSpinner = findViewById(R.id.date);
|
||||
}
|
||||
dateSpinner = findViewById(R.id.date);
|
||||
dateSpinner.setAdapter(adapter);
|
||||
|
||||
// スピナーのアイテム選択リスナーを設定
|
||||
dateSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
String selectedItemString = (String) parent.getItemAtPosition(position);
|
||||
Runnable mapLoader = dateMap.get(selectedItemString);
|
||||
String selectedItem = (String) parent.getItemAtPosition(position);
|
||||
Runnable mapLoader = dateMap.get(selectedItem);
|
||||
if (mapLoader != null) {
|
||||
mapLoader.run();
|
||||
}
|
||||
|
|
@ -120,22 +128,16 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
});
|
||||
}
|
||||
|
||||
//ルート表示を押して最初に表示されるルート(3日間の家庭訪問における1日目)の設定
|
||||
|
||||
@Override
|
||||
public void onMapReady(GoogleMap googleMap) {
|
||||
//Google mapの定義
|
||||
mMap = googleMap;
|
||||
mMap.setOnMarkerClickListener(this);
|
||||
//家庭訪問1日目のスケジュール順に緯度経度の情報をString型の変数に格納
|
||||
//35.1711355,136.88552149999998/35.1696089,136.884084/35.1732838,136.88832890000003/...
|
||||
String locationDataString = createlocationData(0);
|
||||
//家庭訪問1日目のスケジュール順に住所や出席番号、家庭訪問の開始時間の情報をString型の変数に格納
|
||||
//開始地点/出席番号2番:鈴木次郎<〒453-0015 愛知県名古屋市中村区椿町６−９ 地下１階～５階> 06月04日12時00分/...
|
||||
String scrollViewlDataString = getscrollViewlData(0);
|
||||
loadMapAndNames(locationDataString, scrollViewlDataString);
|
||||
String latlngString = createlocationData(0);
|
||||
String homeVisitDataString = getData(0);
|
||||
firstMapAndNames(latlngString, homeVisitDataString);
|
||||
}
|
||||
|
||||
//家庭訪問の〇日目が何月何日かを返すメソッド
|
||||
private String getSharedPreferencesData(int i) {
|
||||
SharedPreferences sharedPreferences = getSharedPreferences("visitingDate", MODE_PRIVATE);
|
||||
// SetUpで設定した8桁の数字表記の家庭訪問日を日付表記に変更
|
||||
|
|
@ -150,59 +152,49 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
return dayString;
|
||||
}
|
||||
|
||||
//家庭訪問の日付を8桁の整数表記から○月〇日(20240707→07月07日)表記に変更する
|
||||
|
||||
private String formatDate(String date) {
|
||||
if (date == null || date.length() != 8) {
|
||||
return "";
|
||||
}
|
||||
String monthString = date.substring(4, 6);
|
||||
String dayString = date.substring(6, 8);
|
||||
return monthString + "月" + dayString + "日";
|
||||
String month = date.substring(4, 6);
|
||||
String day = date.substring(6, 8);
|
||||
return month + "月" + day + "日";
|
||||
}
|
||||
|
||||
//家庭訪問1日目のスケジュール順に緯度経度の情報をString型の変数に格納
|
||||
private String createlocationData(int i) {
|
||||
//家庭訪問の開始地点の緯度経度
|
||||
String startPointLatLngString = getIntent().getStringExtra("startPointLatLngString");
|
||||
List<MyDataClass> myDataList = getMyDataList();
|
||||
//家庭訪問の緯度経度情報をまとめる変数
|
||||
StringBuilder latlngString = new StringBuilder();
|
||||
|
||||
for (int y = -1; y < myDataList.size(); y++) {
|
||||
if (y < 0) {
|
||||
//家庭訪問の開始地点を追加
|
||||
latlngString.append(startPointLatLngString);
|
||||
} else if (myDataList.get(y).getScheduleDay().equals(getSharedPreferencesData(i))) {
|
||||
if (latlngString.length() > 0) {
|
||||
//区切りのスラッシュ
|
||||
latlngString.append("/");
|
||||
}
|
||||
//mydataListから取り出した家庭訪問の各家庭の住所の緯度経度を追加
|
||||
//この時点ではlongitude latitudeのような不要な文字があるのでformatLatLngメソッドで緯度経度だけのデータにする
|
||||
latlngString.append(formatLatLng(myDataList.get(y)));
|
||||
}
|
||||
}
|
||||
//各家庭の緯度経度をまとめたものを返す
|
||||
|
||||
return latlngString.toString();
|
||||
}
|
||||
|
||||
//緯度と経度は(35.1711355,136.88552149999998)のように()の中に入っているのでそこだけを取り出す
|
||||
private String formatLatLng(MyDataClass myData) {
|
||||
String latlngString = myData.getLatLngString();
|
||||
int startIndex = latlngString.indexOf("(") + 1;
|
||||
int endIndex = latlngString.indexOf(")");
|
||||
return latlngString.substring(startIndex, endIndex);
|
||||
String latlng = myData.getLatLngString();
|
||||
int startIndex = latlng.indexOf("(") + 1;
|
||||
int endIndex = latlng.indexOf(")");
|
||||
return latlng.substring(startIndex, endIndex);
|
||||
}
|
||||
|
||||
//ScrollViewにて表示するdataの作成メソッド
|
||||
private String getscrollViewlData(int i) {
|
||||
private String getData(int i) {
|
||||
List<MyDataClass> myDataList = getMyDataList();
|
||||
String homeVisitDataString = "";
|
||||
for (int y = -1; y < myDataList.size(); y++) {
|
||||
if (y < 0) {
|
||||
//家庭訪問の開始地点
|
||||
homeVisitDataString += "開始地点/";
|
||||
} else if (myDataList.get(y).getScheduleDay().equals(getSharedPreferencesData(i)) && y + 1 < myDataList.size()) {
|
||||
//出席番号:生徒の名前 <住所> 家庭訪問の開始時間+/
|
||||
homeVisitDataString += "出席番号" + String.valueOf(myDataList.get(y).getStudentNumber()) + "番:" + myDataList.get(y).getChildName() + "<" + myDataList.get(y).getAddress().get(0) + "> " + formatSchedule(String.valueOf(myDataList.get(y).getSchedule())) + "/";
|
||||
} else if (myDataList.get(y).getScheduleDay().equals(getSharedPreferencesData(i))) {
|
||||
homeVisitDataString += "出席番号" + String.valueOf(myDataList.get(y).getStudentNumber()) + "番:" + myDataList.get(y).getChildName() + " <" + myDataList.get(y).getAddress().get(0) + "> " + formatSchedule(String.valueOf(myDataList.get(y).getSchedule()));
|
||||
|
|
@ -211,24 +203,12 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
return homeVisitDataString;
|
||||
}
|
||||
|
||||
//家庭訪問のscheduleを7桁の整数から○月〇日●時〇分(6041200→06月12日05時20分)に変換
|
||||
private String formatSchedule(String schedule) {
|
||||
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 + "分";
|
||||
|
||||
}
|
||||
String month = "0" + schedule.substring(0, 1);
|
||||
String day = schedule.substring(1, 3);
|
||||
String hour = schedule.substring(3, 5);
|
||||
String minute = schedule.substring(5, 7);
|
||||
return month + "月" + day + "日" + hour + "時" + minute + "分";
|
||||
}
|
||||
|
||||
// 共有プリファレンスからMyDataListを取得するメソッド
|
||||
|
|
@ -237,22 +217,40 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);
|
||||
|
||||
// 共有プリファレンスからJSON形式のデータを取得
|
||||
String jsonString = sharedPreferences.getString("myDataList", "");
|
||||
String json = sharedPreferences.getString("myDataList", "");
|
||||
|
||||
// JSON形式のデータをMyDataListに変換
|
||||
Gson gson = new Gson();
|
||||
Type type = new TypeToken<List<MyDataClass>>() {
|
||||
}.getType();
|
||||
List<MyDataClass> myDataList = gson.fromJson(jsonString, type);
|
||||
List<MyDataClass> myDataList = gson.fromJson(json, type);
|
||||
|
||||
return myDataList;
|
||||
}
|
||||
|
||||
private void firstMapAndNames(String latlngStringFirstDay, String homeVisitDataString) {
|
||||
String locationData = latlngStringFirstDay;
|
||||
String labelData = homeVisitDataString;
|
||||
Log.d("maps", "locationData" + locationData);
|
||||
Log.d("maps", "labelData" + labelData);
|
||||
loadMapAndNames(locationData, labelData);
|
||||
}
|
||||
|
||||
private void secondMapAndNames(String latlngStringSeconfDay, String homeVisitDataString) {
|
||||
String locationData = latlngStringSeconfDay;
|
||||
String labelData = homeVisitDataString;
|
||||
loadMapAndNames(locationData, labelData);
|
||||
}
|
||||
|
||||
private void thirdMapAndNames(String latlngStringThirdDay, String homeVisitDataString) {
|
||||
String locationData = latlngStringThirdDay;
|
||||
String labelData = homeVisitDataString;
|
||||
loadMapAndNames(locationData, labelData);
|
||||
}
|
||||
|
||||
|
||||
//mapやgetscrollViewlに値を渡すハブの役割のメソッド
|
||||
private void loadMapAndNames(String locationData, String nameData) {
|
||||
try {
|
||||
//mapに関するすべてのデータをリセット
|
||||
latLngList.clear();
|
||||
nameList.clear();
|
||||
colorList.clear();
|
||||
|
|
@ -260,31 +258,31 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
mMap.clear();
|
||||
|
||||
// locationDataをスラッシュで分割して緯度経度リストを取得
|
||||
String[] locArrayString = locationData.split("/");
|
||||
String[] locArray = locationData.split("/");
|
||||
// nameDataをスラッシュで分割して名前リストを取得
|
||||
String[] nameArrayString = nameData.split("/");
|
||||
String[] nameArray = nameData.split("/");
|
||||
|
||||
for (int i = 0; i < locArrayString.length; i++) {
|
||||
for (int i = 0; i < locArray.length; i++) {
|
||||
// 緯度経度をカンマで分割してLatLngオブジェクトを作成
|
||||
String[] latLngString = locArrayString[i].split(",");
|
||||
if (latLngString.length == 2) {
|
||||
double latitudeDouble = Double.parseDouble(latLngString[0]);
|
||||
double longitudeDouble = Double.parseDouble(latLngString[1]);
|
||||
LatLng position = new LatLng(latitudeDouble, longitudeDouble);
|
||||
String[] latLng = locArray[i].split(",");
|
||||
if (latLng.length == 2) {
|
||||
double latitude = Double.parseDouble(latLng[0]);
|
||||
double longitude = Double.parseDouble(latLng[1]);
|
||||
LatLng position = new LatLng(latitude, longitude);
|
||||
latLngList.add(position);
|
||||
|
||||
// 名前リストから対応する名前を取得
|
||||
String nameString = nameArrayString.length > i ? nameArrayString[i] : "Unknown";
|
||||
nameList.add(nameString);
|
||||
String name = nameArray.length > i ? nameArray[i] : "Unknown";
|
||||
nameList.add(name);
|
||||
|
||||
// 色リストから次の色を取得
|
||||
int colorInt = getNextColor();
|
||||
colorList.add(colorInt);
|
||||
int color = getNextColor();
|
||||
colorList.add(color);
|
||||
|
||||
// 地図にピンを追加
|
||||
addPinToMap(nameString, position, colorInt);
|
||||
addPinToMap(name, position, color);
|
||||
// スクロールビューに場所を追加
|
||||
addLocationToScrollView(nameString, colorInt);
|
||||
addLocationToScrollView(name, color);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -294,12 +292,10 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
drawRoute(); // ルートを描画するメソッドを呼び出す
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e("Maps", "エラーが発生しました。原因は以下", e);
|
||||
Log.e("Maps", "Error loading maps and names", e);
|
||||
}
|
||||
}
|
||||
|
||||
// ルートを描画するメソッド
|
||||
// Google マップの Directions API を使用してルート情報を取得し、ポリラインで描画
|
||||
private void drawRoute() {
|
||||
new Thread(() -> {
|
||||
try {
|
||||
|
|
@ -316,27 +312,25 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
}
|
||||
}
|
||||
urlBuilder.append("&mode=driving");
|
||||
//APiキーの設定
|
||||
urlBuilder.append("&key=").append("AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw");
|
||||
urlBuilder.append("&key=").append(getString(R.string.maps_api_key));
|
||||
|
||||
String urlString = urlBuilder.toString();
|
||||
Log.d("Maps", "Directions API URL: " + urlString);
|
||||
|
||||
// Directions APIにリクエストを送信してレスポンスを取得
|
||||
URL url = new URL(urlString);
|
||||
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
|
||||
conn.setRequestMethod("GET");
|
||||
InputStreamReader isr = new InputStreamReader(conn.getInputStream());
|
||||
BufferedReader br = new BufferedReader(isr);
|
||||
StringBuilder jsonResults = new StringBuilder();
|
||||
String lineString;
|
||||
while ((lineString = br.readLine()) != null) {
|
||||
jsonResults.append(lineString);
|
||||
String line;
|
||||
while ((line = br.readLine()) != null) {
|
||||
jsonResults.append(line);
|
||||
}
|
||||
br.close();
|
||||
|
||||
Log.d("Maps", "API response: " + jsonResults.toString());
|
||||
// レスポンスからルート情報を取得してポリラインで描画
|
||||
|
||||
JsonObject jsonObject = new Gson().fromJson(jsonResults.toString(), JsonObject.class);
|
||||
JsonArray routes = jsonObject.getAsJsonArray("routes");
|
||||
if (routes.size() > 0) {
|
||||
|
|
@ -349,41 +343,36 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
|
||||
runOnUiThread(() -> mMap.addPolyline(new PolylineOptions().addAll(points).width(5).color(Color.BLUE)));
|
||||
} else {
|
||||
// ルートが見つからなかった場合のエラーメッセージを表示
|
||||
JsonPrimitive errorMessage = jsonObject.getAsJsonPrimitive("error_message");
|
||||
if (errorMessage != null) {
|
||||
Log.e("Maps", "エラーが発生しました。原因は以下: " + errorMessage.getAsString());
|
||||
Log.e("Maps", "Error: " + errorMessage.getAsString());
|
||||
} else {
|
||||
Log.e("Maps", "原因不明のエラー");
|
||||
Log.e("Maps", "No routes found and no error message provided");
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e("Maps", "ルートの描画に失敗しました", e);
|
||||
Log.e("Maps", "Error drawing route", e);
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
|
||||
// エンコードされた文字列から座標情報をデコードするためのメソッド
|
||||
private List<LatLng> decodePoly(String encoded) {
|
||||
List<LatLng> poly = new ArrayList<>(); // 座標情報を格納するリスト
|
||||
int index = 0, len = encoded.length();// 文字列のインデックスと長さ
|
||||
int latInt = 0, lng = 0; // 緯度と経度の初期値
|
||||
List<LatLng> poly = new ArrayList<>();
|
||||
int index = 0, len = encoded.length();
|
||||
int lat = 0, lng = 0;
|
||||
|
||||
// 文字列の長さに達するまで繰り返す
|
||||
while (index < len) {
|
||||
int b, shift = 0, result = 0;
|
||||
// バイト値を取得し、ビットシフトとOR演算を行って座標値を復元する
|
||||
do {
|
||||
b = encoded.charAt(index++) - 63;
|
||||
result |= (b & 0x1f) << shift;
|
||||
shift += 5;
|
||||
} while (b >= 0x20);
|
||||
int dlat = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
|
||||
latInt += dlat;
|
||||
lat += dlat;
|
||||
|
||||
shift = 0;
|
||||
result = 0;
|
||||
// バイト値を取得し、ビットシフトとOR演算を行って座標値を復元する
|
||||
do {
|
||||
b = encoded.charAt(index++) - 63;
|
||||
result |= (b & 0x1f) << shift;
|
||||
|
|
@ -391,87 +380,68 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
} while (b >= 0x20);
|
||||
int dlng = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
|
||||
lng += dlng;
|
||||
// LatLngオブジェクトを作成してリストに追加する
|
||||
LatLng p = new LatLng((((double) latInt / 1E5)), (((double) lng / 1E5)));
|
||||
|
||||
LatLng p = new LatLng((((double) lat / 1E5)), (((double) lng / 1E5)));
|
||||
poly.add(p);
|
||||
}
|
||||
// 座標情報のリストを返す
|
||||
return poly;
|
||||
}
|
||||
|
||||
// Colorクラスを使用して、与えられた色から色相値を計算するメソッド
|
||||
|
||||
private float getHueFromColor(int color) {
|
||||
float[] hsv = new float[3];
|
||||
Color.colorToHSV(color, hsv);//整数の色値をHSV（色相、彩度、明度）の形式に変換し、色相値を取得します。
|
||||
Color.colorToHSV(color, hsv);
|
||||
return hsv[0];
|
||||
}
|
||||
|
||||
//mapにピンを追加するメソッド
|
||||
private void addPinToMap(String locationName, LatLng position, int color) {
|
||||
// マーカーオプションを作成し、位置、タイトル、色を設定する
|
||||
Marker marker = mMap.addMarker(new MarkerOptions().position(position).title(locationName).icon(BitmapDescriptorFactory.defaultMarker(getHueFromColor(color))));
|
||||
Marker marker = mMap.addMarker(new MarkerOptions()
|
||||
.position(position)
|
||||
.title(locationName)
|
||||
.icon(BitmapDescriptorFactory.defaultMarker(getHueFromColor(color)))
|
||||
);
|
||||
if (marker != null) {
|
||||
marker.setTag(locationName);
|
||||
}
|
||||
}
|
||||
|
||||
// スクロールビューに位置情報を追加するメソッド
|
||||
// スクロールビューに位置情報を追加するメソッド
|
||||
// スクロールビューに位置情報を追加するメソッド
|
||||
private void addLocationToScrollView(String locationName, int color) {
|
||||
runOnUiThread(() -> {
|
||||
try {
|
||||
// テキストビューの作成
|
||||
TextView textView = new TextView(this);
|
||||
textView.setText(locationName);
|
||||
textView.setTextSize(20);
|
||||
textView.setPadding(16, 16, 16, 16);
|
||||
textView.setTextColor(Color.BLACK); // 文字色を黒に設定
|
||||
textView.setBackgroundColor(Color.WHITE); // 背景色を白に設定
|
||||
|
||||
// 円を作成
|
||||
ShapeDrawable circle = new ShapeDrawable(new OvalShape());
|
||||
circle.setIntrinsicWidth(30);
|
||||
circle.setIntrinsicHeight(30);
|
||||
circle.getPaint().setColor(color);
|
||||
|
||||
// 左側に円を表示するためにDrawableを設定
|
||||
textView.setCompoundDrawablesWithIntrinsicBounds(circle, null, null, null);
|
||||
textView.setCompoundDrawablePadding(16);
|
||||
textView.setBackgroundColor(color);
|
||||
|
||||
// テキストビューにクリックリスナーを追加
|
||||
textView.setOnClickListener(v -> {
|
||||
for (int j = 0; j < nameList.size(); j++) {
|
||||
if (nameList.get(j).equals(locationName)) {
|
||||
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(latLngList.get(j), 17));
|
||||
break;
|
||||
}
|
||||
// 名前リストからインデックスを取得
|
||||
int index = nameList.indexOf(locationName);
|
||||
if (index != -1) {
|
||||
LatLng position = latLngList.get(index);
|
||||
// カメラを該当ピンの位置に移動
|
||||
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(position, 17));
|
||||
}
|
||||
});
|
||||
|
||||
// ボーダーラインの作成
|
||||
View border = new View(this);
|
||||
border.setLayoutParams(new LinearLayout.LayoutParams(
|
||||
LinearLayout.LayoutParams.MATCH_PARENT, // 横幅は親と同じ
|
||||
2 // 高さは2dp
|
||||
));
|
||||
border.setBackgroundColor(Color.GRAY); // ボーダーラインの色を設定
|
||||
View underline = new View(this);
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
||||
LinearLayout.LayoutParams.MATCH_PARENT,
|
||||
3
|
||||
);
|
||||
params.setMargins(0, 0, 0, 16);
|
||||
underline.setLayoutParams(params);
|
||||
underline.setBackgroundColor(Color.BLACK);
|
||||
|
||||
// レイアウトの作成
|
||||
LinearLayout layout = new LinearLayout(this);
|
||||
layout.setOrientation(LinearLayout.VERTICAL);
|
||||
layout.addView(textView);
|
||||
layout.addView(border);
|
||||
|
||||
// スクロールビューにレイアウトを追加
|
||||
locationsName.addView(layout);
|
||||
locationsName.addView(textView);
|
||||
locationsName.addView(underline);
|
||||
} catch (Exception e) {
|
||||
Log.e("Maps", "エラーが発生しました。原因は以下", e);
|
||||
Log.e("Maps", "Error adding location to scroll view", e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private int getNextColor() {
|
||||
int color = COLORS[colorIndex];
|
||||
colorIndex = (colorIndex + 1) % COLORS.length;
|
||||
|
|
@ -485,20 +455,13 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
//マーカーがクリックされた際の処理を行うメソッド
|
||||
public boolean onMarkerClick(Marker marker) {
|
||||
// マーカーから場所の名前を取得します。
|
||||
String locationName = (String) marker.getTag();
|
||||
// 場所の名前がnullではない場合に処理を実行します。
|
||||
if (locationName != null) {
|
||||
// マーカーのタイトルとして場所の名前を設定します。
|
||||
marker.setTitle(locationName);
|
||||
// マーカーの情報ウィンドウを表示します。
|
||||
marker.showInfoWindow();
|
||||
}
|
||||
// デフォルトの動作も実行するためにfalseを返します。
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
14
app/src/main/java/com/example/oplogy/RootSearchActivity.java
Normal file
14
app/src/main/java/com/example/oplogy/RootSearchActivity.java
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
public class RootSearchActivity extends AppCompatActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.root_search);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@ package com.example.oplogy;
|
|||
|
||||
import static android.content.ContentValues.TAG;
|
||||
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.DatePickerDialog;
|
||||
import android.app.TimePickerDialog;
|
||||
|
|
@ -30,27 +31,17 @@ import java.util.concurrent.Executors;
|
|||
public class SetUpActivity extends FragmentActivity
|
||||
implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
|
||||
|
||||
String teacherNameString;
|
||||
String startPointString;
|
||||
String firstDayString;
|
||||
String secondDayString;
|
||||
String thirdDayString;
|
||||
String startTimeString;
|
||||
String endTimeString;
|
||||
String intervalTimeString;
|
||||
String startBreakTimeString;
|
||||
String endBreakTimeString;
|
||||
int totalStudentString;
|
||||
String stringYearString;
|
||||
String stringMonthString;
|
||||
String stringDayOfMonthString;
|
||||
String stringHourOfDayString;
|
||||
String stringMinuteString;
|
||||
Button setFirstDay;
|
||||
Button setSecondDay;
|
||||
Button setThirdDay;
|
||||
Button setStartTimeButton;
|
||||
Button setEndTimeButton;
|
||||
String teacherName;
|
||||
String startPoint;
|
||||
String firstDay;
|
||||
String secondDay;
|
||||
String thirdDay;
|
||||
String startTime;
|
||||
String endTime;
|
||||
String intervalTime;
|
||||
String startBreakTime;
|
||||
String endBreakTime;
|
||||
int totalStudent;
|
||||
private TextView setTeacherName;
|
||||
private TextView setStartPoint;
|
||||
private TextView setStartTime;
|
||||
|
|
@ -58,8 +49,24 @@ public class SetUpActivity extends FragmentActivity
|
|||
private TextView setStartBreakTime;
|
||||
private TextView setEndBreakTime;
|
||||
private TextView setTotalStudent;
|
||||
private int isDateSelectedInt;
|
||||
private int isStartTimeSelectedInt;
|
||||
private int isDateSelected;
|
||||
private int isStartTimeSelected;
|
||||
|
||||
String stringYear;
|
||||
String stringMonth;
|
||||
String stringDayOfMonth;
|
||||
|
||||
|
||||
String stringHourOfDay;
|
||||
String stringMinute;
|
||||
|
||||
Button setFirstDay;
|
||||
Button setSecondDay;
|
||||
Button setThirdDay;
|
||||
Button setStartTimeButton;
|
||||
Button setEndTimeButton;
|
||||
|
||||
|
||||
|
||||
@SuppressLint("MissingInflatedId")
|
||||
@Override
|
||||
|
|
@ -67,7 +74,7 @@ public class SetUpActivity extends FragmentActivity
|
|||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_set_up);
|
||||
|
||||
int classIdInt = getIntent().getIntExtra("classId", 100000);
|
||||
int classId= getIntent().getIntExtra("classId", 100000);
|
||||
|
||||
setTeacherName = findViewById(R.id.teacherName); //先生の名前
|
||||
setStartPoint = findViewById(R.id.startPoint); //開始地点
|
||||
|
|
@ -97,50 +104,38 @@ public class SetUpActivity extends FragmentActivity
|
|||
Button reset = findViewById(R.id.resetButton);
|
||||
|
||||
toMain.setOnClickListener(view -> {
|
||||
Intent intent = new Intent(SetUpActivity.this, SettingView.class); //main画面へ戻る処理
|
||||
Intent intent = new Intent(SetUpActivity.this,MainActivity.class); //main画面へ戻る処理
|
||||
startActivity(intent);
|
||||
});
|
||||
|
||||
setUp.setOnClickListener(view -> {
|
||||
|
||||
teacherNameString = setTeacherName.getText().toString(); //各変数に値を挿入
|
||||
startPointString = setStartPoint.getText().toString();
|
||||
firstDayString = setFirstDay.getText().toString();
|
||||
secondDayString = setSecondDay.getText().toString();
|
||||
thirdDayString = setThirdDay.getText().toString();
|
||||
startTimeString = setStartTime.getText().toString();
|
||||
endTimeString = setEndTime.getText().toString();
|
||||
startBreakTimeString = setStartBreakTime.getText().toString();
|
||||
endBreakTimeString = setEndBreakTime.getText().toString();
|
||||
|
||||
try {
|
||||
totalStudentString = Integer.parseInt(setTotalStudent.getText().toString());
|
||||
} catch (NumberFormatException e) {
|
||||
Toast.makeText(SetUpActivity.this, "記入欄にすべて入力を済ませてから押してください", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
Log.d(TAG, "Teacher Name: " + teacherNameString);
|
||||
Log.d(TAG, "Start Point: " + startPointString);
|
||||
Log.d(TAG, "First Day:" + firstDayString);
|
||||
Log.d(TAG, "Second Day:" + secondDayString);
|
||||
Log.d(TAG, "Third Day:" + thirdDayString);
|
||||
Log.d(TAG, "Start Time" + startTimeString);
|
||||
Log.d(TAG, "End Time" + endTimeString);
|
||||
teacherName = setTeacherName.getText().toString(); //各変数に値を挿入
|
||||
Log.d(TAG, "Teacher Name: " + teacherName);
|
||||
startPoint = setStartPoint.getText().toString();
|
||||
Log.d(TAG, "Start Point: " + startPoint);
|
||||
Log.d(TAG, "First Day:" + firstDay);
|
||||
Log.d(TAG, "Second Day:" + secondDay);
|
||||
Log.d(TAG, "Third Day:" + thirdDay);
|
||||
Log.d(TAG, "Start Time" + startTime);
|
||||
Log.d(TAG, "End Time" + endTime);
|
||||
if (setTenMinute.isChecked()){ //ラジオボタンの状態を取得
|
||||
intervalTimeString = "10";
|
||||
intervalTime = "10";
|
||||
} else if (setFifteenMinute.isChecked()) {
|
||||
intervalTimeString = "15";
|
||||
intervalTime = "15";
|
||||
} else if (setThirtyMinute.isChecked()) {
|
||||
intervalTimeString = "30";
|
||||
intervalTime = "30";
|
||||
} else {
|
||||
intervalTimeString = "0";
|
||||
intervalTime = "0";
|
||||
}
|
||||
Log.d(TAG, "Interval Time" + intervalTimeString);
|
||||
Log.d(TAG, "Start Break Time" + startBreakTimeString);
|
||||
Log.d(TAG, "End Break Time" + endBreakTimeString);
|
||||
Log.d(TAG, "Total Student" + totalStudentString);
|
||||
Log.d(TAG, "Interval Time" + intervalTime);
|
||||
Log.d(TAG, "Start Break Time" + startBreakTime);
|
||||
Log.d(TAG, "End Break Time" + endBreakTime);
|
||||
totalStudent = Integer.parseInt(setTotalStudent.getText().toString()); //数値型に変更
|
||||
Log.d(TAG, "Total Student" + totalStudent);
|
||||
Log.d(TAG, "onClick: できてるよ");
|
||||
|
||||
|
||||
// データベースへの登録処理
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
|
|
@ -152,19 +147,19 @@ public class SetUpActivity extends FragmentActivity
|
|||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
// Roomの操作を行う
|
||||
SetUpTable setUpTable = new SetUpTable(
|
||||
teacherNameString,
|
||||
startPointString,
|
||||
startTimeString,
|
||||
endTimeString,
|
||||
intervalTimeString,
|
||||
startBreakTimeString,
|
||||
endBreakTimeString,
|
||||
totalStudentString,
|
||||
classIdInt
|
||||
teacherName,
|
||||
startPoint,
|
||||
startTime,
|
||||
endTime,
|
||||
intervalTime,
|
||||
startBreakTime,
|
||||
endBreakTime,
|
||||
totalStudent,
|
||||
classId
|
||||
);
|
||||
|
||||
// 同じ名前のエントリが存在するかどうかを確認
|
||||
SetUpTable existingSetUpTable = setUpTableDao.findByName(teacherNameString);
|
||||
SetUpTable existingSetUpTable = setUpTableDao.findByName(teacherName);
|
||||
if (existingSetUpTable != null) {
|
||||
// エントリが存在する場合は、そのエントリを更新
|
||||
setUpTable.setId(existingSetUpTable.getId()); // 既存のIDを設定
|
||||
|
|
@ -180,48 +175,49 @@ public class SetUpActivity extends FragmentActivity
|
|||
SharedPreferences sharedPreferences=getSharedPreferences("visitingDate",MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor= sharedPreferences.edit();
|
||||
|
||||
editor.putString("day1", firstDayString);
|
||||
editor.putString("day2", secondDayString);
|
||||
editor.putString("day3", thirdDayString);
|
||||
editor.putString("day1",firstDay);
|
||||
editor.putString("day2",secondDay);
|
||||
editor.putString("day3",thirdDay);
|
||||
|
||||
editor.apply();
|
||||
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
setFirstDay.setOnClickListener(v ->{
|
||||
isDateSelectedInt = 1;
|
||||
isDateSelected = 1;
|
||||
showDatePickerDialog(); //DatePickerの表示
|
||||
});
|
||||
|
||||
setSecondDay.setOnClickListener(v ->{
|
||||
isDateSelectedInt = 2;
|
||||
isDateSelected = 2;
|
||||
showDatePickerDialog();
|
||||
});
|
||||
|
||||
setThirdDay.setOnClickListener(v ->{
|
||||
isDateSelectedInt = 3;
|
||||
isDateSelected = 3;
|
||||
showDatePickerDialog();
|
||||
});
|
||||
|
||||
setStartTimeButton.setOnClickListener(v -> {
|
||||
isStartTimeSelectedInt = 1; //ボタンの判別
|
||||
isStartTimeSelected = 1; //ボタンの判別
|
||||
showTimePickerDialog(); //TimePickerの表示
|
||||
});
|
||||
|
||||
setEndTimeButton.setOnClickListener(v -> {
|
||||
isStartTimeSelectedInt = 2;
|
||||
isStartTimeSelected = 2;
|
||||
showTimePickerDialog();
|
||||
});
|
||||
|
||||
setStartBreakTime.setOnClickListener(v -> {
|
||||
isStartTimeSelectedInt = 3;
|
||||
isStartTimeSelected = 3;
|
||||
showTimePickerDialog();
|
||||
});
|
||||
|
||||
setEndBreakTime.setOnClickListener(v -> {
|
||||
isStartTimeSelectedInt = 4;
|
||||
isStartTimeSelected = 4;
|
||||
showTimePickerDialog();
|
||||
});
|
||||
|
||||
|
|
@ -246,31 +242,30 @@ public class SetUpActivity extends FragmentActivity
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onDateSet(DatePicker datePicker, int year, int month, int dayOfMonth) { //Dateを成形する
|
||||
// DatePickerDialogで選択された日付を処理する
|
||||
String str = String.format(Locale.JAPAN, "%02d/%02d", month + 1, dayOfMonth); // TextViewに表示する日付の形式を設定
|
||||
|
||||
if (isDateSelectedInt == 1) {
|
||||
stringYearString = String.valueOf(year); //年
|
||||
stringMonthString = String.format(Locale.JAPAN, "%02d", month + 1); //月
|
||||
stringDayOfMonthString = String.format(Locale.JAPAN, "%02d", dayOfMonth); //日
|
||||
firstDayString = stringYearString + stringMonthString + stringDayOfMonthString;
|
||||
if (isDateSelected == 1) {
|
||||
stringYear = String.valueOf(year); //年
|
||||
stringMonth = String.format(Locale.JAPAN, "%02d", month + 1); //月
|
||||
stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth); //日
|
||||
firstDay = stringYear + stringMonth + stringDayOfMonth;
|
||||
setFirstDay.setText(str);
|
||||
} else if (isDateSelectedInt == 2) {
|
||||
stringYearString = String.valueOf(year);
|
||||
stringMonthString = String.format(Locale.JAPAN, "%02d", month + 1);
|
||||
stringDayOfMonthString = String.format(Locale.JAPAN, "%02d", dayOfMonth);
|
||||
secondDayString = stringYearString + stringMonthString + stringDayOfMonthString;
|
||||
} else if (isDateSelected == 2) {
|
||||
stringYear = String.valueOf(year);
|
||||
stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
|
||||
stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
|
||||
secondDay = stringYear + stringMonth + stringDayOfMonth;
|
||||
setSecondDay.setText(str);
|
||||
|
||||
|
||||
} else if (isDateSelectedInt == 3) {
|
||||
stringYearString = String.valueOf(year);
|
||||
stringMonthString = String.format(Locale.JAPAN, "%02d", month + 1);
|
||||
stringDayOfMonthString = String.format(Locale.JAPAN, "%02d", dayOfMonth);
|
||||
thirdDayString = stringYearString + stringMonthString + stringDayOfMonthString;
|
||||
} else if (isDateSelected == 3) {
|
||||
stringYear = String.valueOf(year);
|
||||
stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
|
||||
stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
|
||||
thirdDay = stringYear + stringMonth + stringDayOfMonth;
|
||||
setThirdDay.setText(str);
|
||||
|
||||
}
|
||||
|
|
@ -281,28 +276,28 @@ public class SetUpActivity extends FragmentActivity
|
|||
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
|
||||
String str = String.format(Locale.JAPAN, "%02d:%02d", hourOfDay, minute); // Textviewに保存する形式を設定
|
||||
|
||||
if (isStartTimeSelectedInt == 1) {
|
||||
stringHourOfDayString = String.format("%02d", hourOfDay);
|
||||
stringMinuteString = String.format("%02d", minute);
|
||||
startTimeString = stringHourOfDayString + stringMinuteString;
|
||||
if (isStartTimeSelected == 1) {
|
||||
stringHourOfDay = String.format("%02d", hourOfDay);
|
||||
stringMinute = String.format("%02d", minute);
|
||||
startTime = stringHourOfDay + stringMinute;
|
||||
setStartTime.setText(str);
|
||||
|
||||
} else if (isStartTimeSelectedInt == 2) {
|
||||
stringHourOfDayString = String.format("%02d", hourOfDay);
|
||||
stringMinuteString = String.format("%02d", minute);
|
||||
endTimeString = stringHourOfDayString + stringMinuteString;
|
||||
} else if (isStartTimeSelected == 2) {
|
||||
stringHourOfDay = String.format("%02d", hourOfDay);
|
||||
stringMinute = String.format("%02d", minute);
|
||||
endTime = stringHourOfDay + stringMinute;
|
||||
setEndTime.setText(str);
|
||||
|
||||
} else if (isStartTimeSelectedInt == 3) {
|
||||
stringHourOfDayString = String.format("%02d", hourOfDay);
|
||||
stringMinuteString = String.format("%02d", minute);
|
||||
startBreakTimeString = stringHourOfDayString + stringMinuteString;
|
||||
} else if (isStartTimeSelected == 3) {
|
||||
stringHourOfDay = String.format("%02d", hourOfDay);
|
||||
stringMinute = String.format("%02d", minute);
|
||||
startBreakTime =stringHourOfDay + stringMinute;
|
||||
setStartBreakTime.setText(" " + str + " ");
|
||||
|
||||
} else if (isStartTimeSelectedInt == 4) {
|
||||
stringHourOfDayString = String.format("%02d", hourOfDay);
|
||||
stringMinuteString = String.format("%02d", minute);
|
||||
endBreakTimeString = stringHourOfDayString + stringMinuteString;
|
||||
} else if (isStartTimeSelected == 4) {
|
||||
stringHourOfDay = String.format("%02d", hourOfDay);
|
||||
stringMinute = String.format("%02d", minute);
|
||||
endBreakTime = stringHourOfDay + stringMinute;
|
||||
setEndBreakTime.setText(" " + str + " ");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,190 +0,0 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.content.ClipData;
|
||||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.room.Room;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
public class SettingView extends AppCompatActivity implements View.OnClickListener {
|
||||
// formコピー用のURL
|
||||
private static final String URL_TO_COPY = "https://docs.google.com/forms/d/e/1FAIpQLScKI_ca01nO7die7SqZyThiqa7NB7gcucMJtiV_-sc3eZX6KQ/viewform";
|
||||
|
||||
private View backButton;
|
||||
private View creatUUID;
|
||||
private View imageUuid;
|
||||
private View setUp;
|
||||
private View imageSetup;
|
||||
private View formURL;
|
||||
private View imageFormURL;
|
||||
private AlertDialog alertDialog;
|
||||
private int classId;
|
||||
private FirestoreReception_classIdDatabase firestoreReception_classIdDatabase;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_setting_view);
|
||||
|
||||
// 戻るボタンの処理
|
||||
backButton = findViewById(R.id.BackMain_fromSetting);
|
||||
backButton.setOnClickListener(this);
|
||||
|
||||
// ID作成用のインテント
|
||||
creatUUID = findViewById(R.id.creatUUID);
|
||||
creatUUID.setOnClickListener(this);
|
||||
imageUuid = findViewById(R.id.imageUuid);
|
||||
imageUuid.setOnClickListener(this);
|
||||
|
||||
|
||||
// セットアップ用のインテント
|
||||
setUp = findViewById(R.id.setUp);
|
||||
setUp.setOnClickListener(this);
|
||||
imageSetup = findViewById(R.id.imageSetup);
|
||||
imageSetup.setOnClickListener(this);
|
||||
|
||||
// formコピー用のインテント
|
||||
formURL = findViewById(R.id.formURL);
|
||||
formURL.setOnClickListener(this);
|
||||
imageFormURL = findViewById(R.id.imageFormURL);
|
||||
imageFormURL.setOnClickListener(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
if (view == backButton) {
|
||||
Intent intent = new Intent(SettingView.this, MainActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
// ID作成のクリック処理
|
||||
if (view == creatUUID) {
|
||||
showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
|
||||
}
|
||||
if (view == imageUuid) {
|
||||
showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
|
||||
}
|
||||
// セットアップのクリック処理
|
||||
if (view == setUp) {
|
||||
Intent toSetup = new Intent(SettingView.this, SetUpActivity.class);
|
||||
toSetup.putExtra("classId", classId);
|
||||
startActivity(toSetup);
|
||||
}
|
||||
if (view == imageSetup) {
|
||||
Intent toSetup = new Intent(SettingView.this, SetUpActivity.class);
|
||||
startActivity(toSetup);
|
||||
}
|
||||
|
||||
// formコピー用のクリック処理
|
||||
if (view == formURL) {
|
||||
copyUrlToClipboard(URL_TO_COPY);
|
||||
}
|
||||
if (view == imageFormURL) {
|
||||
copyUrlToClipboard(URL_TO_COPY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//ID作成、表示に関する処理
|
||||
private void showUUIDYesNoDialog() {
|
||||
firestoreReception_classIdDatabase = new FirestoreReception_classIdDatabase();
|
||||
List<Integer> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
|
||||
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle("ID");
|
||||
builder.setMessage("あなたのIDを表示/もしくは新規で作成しますか？");
|
||||
|
||||
//作成処理
|
||||
builder.setPositiveButton("作成", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
classId = CreateUUID.generateUUID(classIdList);
|
||||
// 生成されたIDを表示するメソッド
|
||||
showClassIdDialog("生成されたID", classId);
|
||||
}
|
||||
});
|
||||
//表示処理
|
||||
builder.setNegativeButton("表示", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
//roomを扱うため非同期処理
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
executor.execute(() -> {
|
||||
// 現在のクラスIDを取得
|
||||
int currentClassId = getCurrentClassIdFromRoom();
|
||||
if (currentClassId == 0) {
|
||||
currentClassId = classId;
|
||||
}
|
||||
final int showDialogClassId = currentClassId;
|
||||
runOnUiThread(() -> {
|
||||
// 現在のクラスIDを表示するダイアログ
|
||||
showClassIdDialog("現在のID", showDialogClassId);
|
||||
});
|
||||
});
|
||||
executor.shutdown();
|
||||
}
|
||||
});
|
||||
|
||||
alertDialog = builder.create();
|
||||
alertDialog.show();
|
||||
|
||||
}
|
||||
|
||||
//Roomから現在のクラスIDを取得するメソッド
|
||||
private int getCurrentClassIdFromRoom() {
|
||||
AppDatabase db = getDatabaseInstance();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
|
||||
// 現在のクラスIDを取得
|
||||
return setUpTableDao.getClassId();
|
||||
}
|
||||
|
||||
//クラスIDを表示するダイアログ
|
||||
private void showClassIdDialog(String title, int classId) {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle(title);
|
||||
builder.setMessage("ID: " + classId);
|
||||
builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
AlertDialog dialog = builder.create();
|
||||
dialog.show();
|
||||
}
|
||||
|
||||
//クリップボードにURLをコピーする処理
|
||||
private void copyUrlToClipboard(String url) {
|
||||
try {
|
||||
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
ClipData clip = ClipData.newPlainText("URL", url);
|
||||
if (clipboard != null) {
|
||||
clipboard.setPrimaryClip(clip);
|
||||
Toast.makeText(this, "GoogleFormのURLをコピーしました", Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
Toast.makeText(this, "エラー コピーできませんでした", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Toast.makeText(this, "Error copying URL: " + e.getMessage(), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
// データベースのインスタンスを取得するメソッド
|
||||
private AppDatabase getDatabaseInstance() {
|
||||
return Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,21 +1,23 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.example.oplogy.databinding.SubmissionBinding;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SubmissionActivity extends AppCompatActivity {
|
||||
private final List<SubmissionStudent> studentsList = new ArrayList<>();
|
||||
private RecyclerView recyclerView;
|
||||
private SubmissionAdapter submissionAdapter;
|
||||
private List<SubmissionStudent> students = new ArrayList<>();
|
||||
ArrayList<Integer> studentNumbers = new ArrayList<>();
|
||||
private int totalStudent = 10;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
|
@ -24,32 +26,33 @@ public class SubmissionActivity extends AppCompatActivity {
|
|||
|
||||
// 戻るボタンの処理
|
||||
ImageView backButton = findViewById(R.id.BackMain_fromSubmission);
|
||||
backButton.setOnClickListener(v -> finish());
|
||||
backButton.setOnClickListener(v -> {
|
||||
finish();
|
||||
});
|
||||
|
||||
|
||||
// インテントから提出状況の生徒の数を取得
|
||||
studentNumbers=getIntent().getIntegerArrayListExtra("submissionStudents");
|
||||
|
||||
// RecyclerViewとアダプターの初期化
|
||||
recyclerView = findViewById(R.id.recyclerView);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
submissionAdapter = new SubmissionAdapter(studentsList);
|
||||
submissionAdapter = new SubmissionAdapter(students);
|
||||
recyclerView.setAdapter(submissionAdapter);
|
||||
|
||||
// 生徒のリストを取得
|
||||
fetchStudents();
|
||||
}
|
||||
|
||||
private void fetchStudents() {
|
||||
// インテントから生徒のリストを取得
|
||||
ArrayList<SubmissionStudent> submissionStudentsList = getIntent().getParcelableArrayListExtra("submissionStudents");
|
||||
ArrayList<SubmissionStudent> submissionStudents = getIntent().getParcelableArrayListExtra("submissionStudents");
|
||||
|
||||
if (submissionStudentsList != null) {
|
||||
Log.d("SubmissionActivity", "Size of submissionStudentsList: " + submissionStudentsList.size());
|
||||
|
||||
studentsList.addAll(submissionStudentsList);
|
||||
} else {
|
||||
Log.e("SubmissionActivity", "submissionStudentsList is null");
|
||||
Toast.makeText(this, "生徒のリストが取得できませんでした", Toast.LENGTH_SHORT).show();
|
||||
// 生徒のリストを反復処理し、それをRecyclerViewに表示
|
||||
for (SubmissionStudent student : submissionStudents) {
|
||||
students.add(student);
|
||||
}
|
||||
|
||||
// データが変更されたことをアダプターに通知
|
||||
submissionAdapter.notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,58 +5,12 @@ import android.view.LayoutInflater;
|
|||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SubmissionAdapter extends RecyclerView.Adapter<SubmissionAdapter.StudentViewHolder> {
|
||||
|
||||
private final List<SubmissionStudent> studentsList;
|
||||
|
||||
public SubmissionAdapter(List<SubmissionStudent> students) {
|
||||
this.studentsList = students;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public StudentViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.row_submission, parent, false);
|
||||
return new StudentViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(StudentViewHolder holder, int position) {
|
||||
SubmissionStudent student = studentsList.get(position);
|
||||
holder.studentNumberTextView.setText(String.valueOf(student.getStudentNumber()));
|
||||
updateStatus(holder, student.isSubmitted());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return studentsList.size();
|
||||
}
|
||||
|
||||
//真偽値に応じて提出済みか未提出をセットする
|
||||
private void updateStatus(StudentViewHolder holder, boolean isSubmitted) {
|
||||
if (isSubmitted) {
|
||||
holder.statusTextView.setText("提出済み");
|
||||
setColors(holder, Color.BLACK, Color.WHITE);
|
||||
} else {
|
||||
holder.statusTextView.setText("未提出");
|
||||
setColors(holder, Color.RED, Color.WHITE);
|
||||
}
|
||||
}
|
||||
|
||||
//真偽値に応じて色をセットする
|
||||
private void setColors(StudentViewHolder holder, int backgroundColor, int textColor) {
|
||||
holder.statusTextView.setBackgroundColor(backgroundColor);
|
||||
holder.statusTextView.setTextColor(textColor);
|
||||
holder.studentNumberTextView.setBackgroundColor(backgroundColor);
|
||||
holder.studentNumberTextView.setTextColor(textColor);
|
||||
}
|
||||
private List<SubmissionStudent> students;
|
||||
|
||||
public static class StudentViewHolder extends RecyclerView.ViewHolder {
|
||||
public TextView studentNumberTextView;
|
||||
|
|
@ -69,4 +23,40 @@ public class SubmissionAdapter extends RecyclerView.Adapter<SubmissionAdapter.St
|
|||
statusTextView = view.findViewById(R.id.statusTextView);
|
||||
}
|
||||
}
|
||||
|
||||
public SubmissionAdapter(List<SubmissionStudent> students) {
|
||||
this.students = students;
|
||||
}
|
||||
|
||||
@Override
|
||||
public StudentViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.row_submission, parent, false);
|
||||
return new StudentViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(StudentViewHolder holder, int position) {
|
||||
SubmissionStudent student = students.get(position);
|
||||
holder.studentNumberTextView.setText(String.valueOf(student.getStudentNumber()));
|
||||
// 提出済みかどうかで表示を変える
|
||||
if (student.isSubmitted()) {
|
||||
holder.statusTextView.setText("提出済み");
|
||||
holder.statusTextView.setBackgroundColor(Color.BLACK);
|
||||
holder.statusTextView.setTextColor(Color.WHITE);
|
||||
holder.studentNumberTextView.setBackgroundColor(Color.BLACK);
|
||||
holder.studentNumberTextView.setTextColor(Color.WHITE);
|
||||
} else {
|
||||
holder.statusTextView.setText("未提出");
|
||||
holder.statusTextView.setBackgroundColor(Color.RED);
|
||||
holder.statusTextView.setTextColor(Color.WHITE);
|
||||
holder.studentNumberTextView.setBackgroundColor(Color.RED);
|
||||
holder.studentNumberTextView.setTextColor(Color.WHITE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return students.size();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@ import android.os.Parcel;
|
|||
import android.os.Parcelable;
|
||||
|
||||
public class SubmissionStudent implements Parcelable {
|
||||
private int studentNumberInt;
|
||||
private int studentNumber;
|
||||
private boolean submitted;
|
||||
|
||||
public SubmissionStudent(int studentNumber, boolean submitted) {
|
||||
this.studentNumberInt = studentNumber;
|
||||
this.studentNumber = studentNumber;
|
||||
this.submitted = submitted;
|
||||
}
|
||||
|
||||
protected SubmissionStudent(Parcel in) {
|
||||
studentNumberInt = in.readInt();
|
||||
studentNumber = in.readInt();
|
||||
submitted = in.readByte() != 0;
|
||||
}
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ public class SubmissionStudent implements Parcelable {
|
|||
};
|
||||
|
||||
public int getStudentNumber() {
|
||||
return studentNumberInt;
|
||||
return studentNumber;
|
||||
}
|
||||
|
||||
public boolean isSubmitted() {
|
||||
|
|
@ -43,7 +43,7 @@ public class SubmissionStudent implements Parcelable {
|
|||
|
||||
@Override
|
||||
public void writeToParcel(Parcel parcel, int i) {
|
||||
parcel.writeInt(studentNumberInt);
|
||||
parcel.writeInt(studentNumber);
|
||||
parcel.writeByte((byte) (submitted ? 1 : 0));
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@ package com.example.oplogy;
|
|||
|
||||
import android.app.Dialog;
|
||||
import android.app.TimePickerDialog;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.widget.TimePicker;
|
||||
|
||||
|
|
@ -17,14 +18,14 @@ public class TimePick extends DialogFragment implements
|
|||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) { // TimePeckerの生成
|
||||
final Calendar c = Calendar.getInstance();
|
||||
int hourInt = c.get(Calendar.HOUR_OF_DAY);
|
||||
int minuteInt = c.get(Calendar.MINUTE);
|
||||
int hour = c.get(Calendar.HOUR_OF_DAY);
|
||||
int minute = c.get(Calendar.MINUTE);
|
||||
|
||||
return new TimePickerDialog(getActivity(),
|
||||
(TimePickerDialog.OnTimeSetListener) getActivity(), hourInt, minuteInt, true);
|
||||
return new TimePickerDialog((Context) getActivity(),
|
||||
(TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTimeSet(TimePicker view, int hourOfDayInt, int minuteInt) {
|
||||
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
|
||||
}
|
||||
}
|
||||
14
app/src/main/java/com/example/oplogy/TutorialActivity.java
Normal file
14
app/src/main/java/com/example/oplogy/TutorialActivity.java
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
public class TutorialActivity extends AppCompatActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.tutorial);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:weightSum="13"
|
||||
tools:context=".SettingView">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="2"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="10">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/BackMain_fromSetting"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="74dp"
|
||||
android:layout_weight="3"
|
||||
android:src="@drawable/back_button" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/Setting"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="7"
|
||||
android:padding="8dp"
|
||||
android:text="設定"
|
||||
android:textSize="40dp" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- ID作成のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="3"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageUuid"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:padding="16dp"
|
||||
android:src="@drawable/createid" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/creatUUID"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="ID作成"
|
||||
android:textSize="50dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<!-- セットアップのレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="3"
|
||||
android:orientation="horizontal"
|
||||
|
||||
android:weightSum="2">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageSetup"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:padding="16dp"
|
||||
android:src="@drawable/settingsetup" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/setUp"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="家庭訪問情報"
|
||||
android:textSize="36dp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- フォームのURLのレイアウト-->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="3"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageFormURL"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:padding="16dp"
|
||||
android:src="@drawable/form" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/formURL"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="GoogleformのURL"
|
||||
android:textSize="28dp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,148 +1,146 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:weightSum="20"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"/>
|
||||
|
||||
|
||||
<!-- タイトルのレイアウト-->
|
||||
|
||||
|
||||
<!-- ID作成のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="400dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="4"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="3">
|
||||
android:layout_weight="3"
|
||||
android:weightSum="2"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageTitle"
|
||||
android:id="@+id/imageUuid"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/checked_image"
|
||||
android:layout_weight="1"
|
||||
android:src="@drawable/app_icon" />
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:id="@+id/creatUUID"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="2"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="OPLOGY"
|
||||
android:textSize="60dp"
|
||||
android:textStyle="bold" />
|
||||
android:text="ID作成"
|
||||
android:textSize="50dp"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<!-- セットアップのレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="3"
|
||||
android:weightSum="2"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageSetup"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/checked_image"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/setUp"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="セットアップ"
|
||||
android:textSize="40dp"
|
||||
android:textStyle="bold"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2" />
|
||||
android:layout_weight="3"/>
|
||||
|
||||
|
||||
<!-- ルート表示のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="400dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="3"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2">
|
||||
android:weightSum="2"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageRoot"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/pin"
|
||||
android:layout_weight="1"
|
||||
android:src="@drawable/pin" />
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/root"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="ルート表示"
|
||||
android:textSize="40dp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.5" />
|
||||
|
||||
|
||||
<!-- 提出状況のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="350dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="3"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2">
|
||||
android:layout_gravity="center"
|
||||
android:weightSum="2"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageSubmission"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/submission"
|
||||
android:layout_weight="1"
|
||||
android:src="@drawable/submission" />
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/submission"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="提出状況"
|
||||
android:textSize="40dp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.5" />
|
||||
|
||||
<!-- 諸々の設定のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="350dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="3"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageSetting"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:src="@drawable/setting" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/setting"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:textStyle="bold"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="設定"
|
||||
android:textSize="40dp"
|
||||
android:textStyle="bold" />
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
9
app/src/main/res/layout/root_search.xml
Normal file
9
app/src/main/res/layout/root_search.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".RootSearchActivity">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/studentNumberTextView"
|
||||
android:layout_width="0dp"
|
||||
|
|
@ -21,10 +22,10 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"
|
||||
android:background="@android:color/white"
|
||||
android:text="提出状況"
|
||||
android:textSize="36sp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="8dp"
|
||||
android:text="提出状況"
|
||||
android:textColor="@android:color/black"
|
||||
android:textSize="36sp" />
|
||||
android:background="@android:color/white"
|
||||
android:textColor="@android:color/black" />
|
||||
</LinearLayout>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
@ -9,7 +10,7 @@
|
|||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
|
|
@ -28,15 +29,15 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="4"
|
||||
android:hint="提出状況"
|
||||
android:textSize="40dp"
|
||||
android:padding="8dp"
|
||||
android:textSize="40dp" />
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="9"
|
||||
android:scrollbars="vertical" />
|
||||
android:layout_height="match_parent"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
9
app/src/main/res/layout/tutorial.xml
Normal file
9
app/src/main/res/layout/tutorial.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".TutorialActivity">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 982 B |
Binary file not shown.
|
Before Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 45 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 5.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 75 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 7.6 KiB |
|
|
@ -1,4 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#FFFFFF</color>
|
||||
</resources>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<string name="maps_api_key">AIzaSyBqLqPm76UFpwbpU8b3oiH0wbkhosrPWpU</string>
|
||||
<string name="title_activity_maps">MapsActivity</string>
|
||||
<string name="setUp">設定</string>
|
||||
<string name="reset">データ削除</string>
|
||||
<string name="reset">リセット</string>
|
||||
<string name="teacherName">担任の名前</string>
|
||||
<string name="startPoint">開始地点</string>
|
||||
<string name="startTime">開始時刻</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user