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

Merge pull request '修正中、バグあり' (#34) from hotfix-isInCar into main

Browse Source 
Reviewed-on: #34
This commit is contained in:
asura146 2024-08-10 14:04:38 +00:00
commit 266d228fc6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
super.onResume();
Log.d("HomeFragment", "onResume: called");
this.updateUiState(getIsInCarLocal());
Log.d("isIncar", "onResume: " + getIsInCarLocal());
this.updateBluetoothSituation(isBluetoothConnected());
}
@ -93,7 +94,9 @@ public class HomeFragment extends Fragment implements OnEventListener {
private boolean getIsInCarLocal() {
SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
return pref.getBoolean("isInCar", false);
Boolean isInCar = pref.getBoolean("isInCarPref", false);
Log.d("isInCarPref","isInCar"+ isInCar);
return pref.getBoolean("isInCarPref", false);
}
//画面遷移メソッド
@ -119,8 +122,8 @@ public class HomeFragment extends Fragment implements OnEventListener {
TextView tv;
FrameLayout fl;
try {
tv = requireView().findViewById(R.id.situation);
fl = requireView().findViewById(R.id.situation_bg);
tv = requireView().findViewById(R.id.car_situation);
fl = requireView().findViewById(R.id.car_situation_bg);
} catch (NullPointerException e) {
Log.d("HomeFragment", "updateUiState: view is null");
return false;

4
app/src/main/res/layout/fragment_home.xml
View File

@ -19,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
android:id="@+id/situation_bg"
android:id="@+id/car_situation_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
@ -37,7 +37,7 @@
android:textSize="25dp" />
<TextView
android:id="@+id/situation"
android:id="@+id/car_situation"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginTop="10dp"