ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix-notifivation #31

Merged
asura146 merged 2 commits from hotfix-notifivation into main 2024-08-03 15:20:20 +00:00
Conversation 0 Commits 2 Files Changed 2 +22 -7
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d92652385 - Show all commits

13
app/src/main/java/com/example/childguard/HomeFragment.java
View File

@ -31,6 +31,9 @@ public class HomeFragment extends Fragment implements OnEventListener {
private String str_key; private String str_key;
private String mParam2; private String mParam2;
final String GET_ON = "\n乗車状態";
final String GET_OFF = "\n降車状態";
public HomeFragment() { public HomeFragment() {
// Required empty public constructor // Required empty public constructor
@ -107,6 +110,9 @@ public class HomeFragment extends Fragment implements OnEventListener {
transaction.commit(); transaction.commit();
} }
/**
* 乗車状態の画面を切り替える
*/
private boolean updateUiState(boolean isInCar) { private boolean updateUiState(boolean isInCar) {
Log.d("HomeFragment", "updateUiState: called"); Log.d("HomeFragment", "updateUiState: called");
// Init // Init
@ -124,16 +130,15 @@ public class HomeFragment extends Fragment implements OnEventListener {
updateUiState(isInCar); updateUiState(isInCar);
return false; return false;
} }
String get_on = "\n乗車状態";
String get_off = "\n降車状態";
if (!isInCar) { if (!isInCar) {
//乗車状態にする //乗車状態にする
fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null)); fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
tv.setText(get_on); tv.setText(GET_ON);
} else { } else {
//降車状態にする //降車状態にする
fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null)); fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
tv.setText(get_off); tv.setText(GET_OFF);
} }
return true; return true;

16
app/src/main/java/com/example/childguard/MainActivity.java
View File

@ -240,8 +240,10 @@ public class MainActivity extends AppCompatActivity {
initNotification(mDocRef);//現在の位置を引数に initNotification()を処理 initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
} }
} }
/**
public void ResetReported() {//FireBaseのisReportedをfalseに初期化するメソッド * FireBaseのisReportedをfalseに初期化するメソッド
*/
public void ResetReported() {
//共有プリファレンス全体の準備 //共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得 String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
@ -252,6 +254,9 @@ public class MainActivity extends AppCompatActivity {
isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e)); isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
} }
/**
* 乗車状態の変更
*/
public void changeIsInCar() { public void changeIsInCar() {
//共有プリファレンス全体の準備 //共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
@ -272,6 +277,9 @@ public class MainActivity extends AppCompatActivity {
E.apply(); E.apply();
} }
/**
* 第三者通知に関する設定のメソッド
*/
public void NotificationSetting() {//通知に関する設定の処理を行うメソッド public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
int importance = NotificationManager.IMPORTANCE_DEFAULT; int importance = NotificationManager.IMPORTANCE_DEFAULT;
//通知チャネルの実装 //通知チャネルの実装
@ -280,9 +288,11 @@ public class MainActivity extends AppCompatActivity {
NotificationManager notificationManager = getSystemService(NotificationManager.class); NotificationManager notificationManager = getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel); notificationManager.createNotificationChannel(channel);
} }
/**
* 第三者通知を行うメソッド
*/
public void Notification(Context context) {//実際に通知を行うメソッド public void Notification(Context context) {//実際に通知を行うメソッド
final String CHANNEL_ID = "my_channel_id"; final String CHANNEL_ID = "my_channel_id";
// 通知がクリックされたときに送信されるIntent // 通知がクリックされたときに送信されるIntent