Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54950e9d38 | ||
|
|
9d431bd297 | ||
|
|
e84b21288f |
No files matched your search
@@ -14,9 +14,6 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import com.google.firebase.firestore.DocumentReference;
|
||||
import com.google.firebase.firestore.FirebaseFirestore;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link HomeFragment#newInstance} factory method to
|
||||
@@ -72,52 +69,20 @@ public class HomeFragment extends Fragment implements OnEventListener{
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_home, container, false);
|
||||
|
||||
view.findViewById(R.id.situation_bg).setOnClickListener(v -> {
|
||||
if (updateStateByServer()) {
|
||||
Log.d("HomeFragment", "onCreateView: updateStateByServer() success");
|
||||
} else {
|
||||
Log.d("HomeFragment", "onCreateView: updateStateByServer() failed");
|
||||
}
|
||||
});
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
// TODO: updateUiState()を切り出す
|
||||
private boolean updateStateByServer() {
|
||||
SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
|
||||
String key = pref.getString("ID", null);
|
||||
DocumentReference documentReference;
|
||||
if (key == null) {
|
||||
Log.d("HomeFragment", "updateStateCache: key is null");
|
||||
return false;
|
||||
} else {
|
||||
Log.d("HomeFragment", "updateStateCache: key is " + key);
|
||||
documentReference = FirebaseFirestore.getInstance().document("status/" + key);
|
||||
|
||||
documentReference.get().addOnCompleteListener(task -> {
|
||||
if (task.isSuccessful()) {
|
||||
Log.d("HomeFragment", "updateStateCache: get document success");
|
||||
Log.d("HomeFragment", "updateStateCache: isInCar is " + task.getResult().getBoolean("isInCar"));
|
||||
if (pref.getBoolean("isInCar", false) != task.getResult().getBoolean("isInCar")) {
|
||||
SharedPreferences.Editor editor = pref.edit();
|
||||
editor.putBoolean("isInCar", task.getResult().getBoolean("isInCar"));
|
||||
editor.apply();
|
||||
}
|
||||
updateUiState(pref.getBoolean("isInCar", false)); // UpdateUI
|
||||
} else {
|
||||
Log.d("HomeFragment", "updateStateCache: get document failed");
|
||||
}
|
||||
});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
Log.d("HomeFragment", "onResume: called");
|
||||
this.updateUiState(getIsInCarLocal());
|
||||
}
|
||||
|
||||
private boolean getIsInCarLocal() {
|
||||
SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
|
||||
return pref.getBoolean("isInCar", false);
|
||||
}
|
||||
|
||||
//画面遷移メソッド
|
||||
@@ -153,7 +118,7 @@ public class HomeFragment extends Fragment implements OnEventListener{
|
||||
}
|
||||
String get_on = "\n乗車状態";
|
||||
String get_off = "\n降車状態";
|
||||
if (isInCar) {
|
||||
if (!isInCar) {
|
||||
//乗車状態にする
|
||||
fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
|
||||
tv.setText(get_on);
|
||||
|
||||
@@ -24,7 +24,6 @@ import android.widget.FrameLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.result.ActivityResultLauncher;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.browser.customtabs.CustomTabsIntent;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
@@ -37,9 +36,6 @@ import com.google.firebase.firestore.FirebaseFirestore;
|
||||
import com.journeyapps.barcodescanner.ScanContract;
|
||||
import com.journeyapps.barcodescanner.ScanOptions;
|
||||
|
||||
// Manifest
|
||||
import android.Manifest;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -83,11 +79,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
setContentView(R.layout.activity_main);
|
||||
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
|
||||
|
||||
if (!hasPermissions()) {
|
||||
requestPermissions();
|
||||
}
|
||||
|
||||
|
||||
BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
|
||||
|
||||
this.homeFragment = HomeFragment.newInstance("test", "tset");
|
||||
@@ -146,50 +137,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
Log.d("onResume", "called");
|
||||
Log.d("onResume", "mDocRef is null");
|
||||
firebaselink();
|
||||
}
|
||||
|
||||
private boolean hasPermissions() {
|
||||
return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED &&
|
||||
ActivityCompat.checkSelfPermission(this, Manifest.permission.FOREGROUND_SERVICE) == PackageManager.PERMISSION_GRANTED;
|
||||
}
|
||||
|
||||
private void requestPermissions() {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
new String[]{
|
||||
Manifest.permission.BLUETOOTH,
|
||||
Manifest.permission.BLUETOOTH_ADMIN,
|
||||
Manifest.permission.BLUETOOTH_SCAN,
|
||||
Manifest.permission.BLUETOOTH_CONNECT,
|
||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
||||
Manifest.permission.POST_NOTIFICATIONS,
|
||||
Manifest.permission.VIBRATE,
|
||||
Manifest.permission.FOREGROUND_SERVICE
|
||||
},
|
||||
2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
if (requestCode == 2) {
|
||||
if (!hasPermissions()) {
|
||||
Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
else {
|
||||
Toast.makeText(this, "Permissions granted.", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
|
||||
// 共有プリファレンス全体の準備
|
||||
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
|
||||
@@ -208,9 +159,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
Log.d("nt", "レスポンスを検知しました1");
|
||||
//FireBaseで更新された情報の判定
|
||||
if (documentSnapshot.getBoolean("isReported") == false) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
|
||||
// if (fragment instanceof HomeFragment) {//fragementがHomeFragmentのインスタンスかの判定
|
||||
// ((HomeFragment) fragment).onEvent(!isInCar);//onEvent()メソッドを処理→HomeFragmentのonEvent()メソッドを処理
|
||||
// }
|
||||
if (fragment instanceof HomeFragment) {//fragementがHomeFragmentのインスタンスかの判定
|
||||
// changessituation();// changessituation()メソッドを処理→アプリ側の乗降状態を変化
|
||||
((HomeFragment) fragment).onEvent(!isInCar);
|
||||
}
|
||||
} else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき=乗車状態のとき→いたずら防止
|
||||
int importance = NotificationManager.IMPORTANCE_DEFAULT;
|
||||
NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
|
||||
@@ -349,13 +301,12 @@ public class MainActivity extends AppCompatActivity {
|
||||
notificationManager.notify(R.string.app_name, builder.build());//通知の表示
|
||||
}
|
||||
|
||||
|
||||
// @Override
|
||||
// public void onStop() {//アプリをバックグラウンドにした時のメソッド
|
||||
// super.onStop();
|
||||
// Intent intent = new Intent(getApplication(), TestService.class);
|
||||
// startService(intent);//TestServiceを起動
|
||||
// }
|
||||
@Override
|
||||
public void onStop() {//アプリをバックグラウンドにした時のメソッド
|
||||
super.onStop();
|
||||
Intent intent = new Intent(getApplication(), TestService.class);
|
||||
startService(intent);//TestServiceを起動
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user