Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa6ee4f035 | ||
|
|
d817dfaf58 | ||
|
|
dfc9440ab5 |
No files matched your search
@@ -80,6 +80,12 @@ public class HomeFragment extends Fragment implements OnEventListener {
|
||||
super.onResume();
|
||||
Log.d("HomeFragment", "onResume: called");
|
||||
this.updateUiState(getIsInCarLocal());
|
||||
this.updateBluetoothSituation(isBluetoothConnected());
|
||||
}
|
||||
|
||||
private boolean isBluetoothConnected() {
|
||||
SharedPreferences pref = requireActivity().getSharedPreferences("Bluetooth_situation", requireActivity().MODE_PRIVATE);
|
||||
return pref.getBoolean("status", false);
|
||||
}
|
||||
|
||||
private boolean getIsInCarLocal() {
|
||||
@@ -174,17 +180,5 @@ public class HomeFragment extends Fragment implements OnEventListener {
|
||||
|
||||
return updateUiState(isInCar);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEvent2(boolean BluetoothConnect) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onEvent2(Boolean BluetoothConnect) {//Bluetoothの接続切断を受け取ってupdateBluetoothSituation()に渡す
|
||||
updateBluetoothSituation(BluetoothConnect);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -427,9 +427,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
|
||||
//Do something if connected
|
||||
//Bluetoothデバイスが接続されたときの処理
|
||||
e.putBoolean("change", true);
|
||||
e.apply();
|
||||
changeBluetooth();//HomeFragmentの表示を接続にする
|
||||
changeBluetooth(true);
|
||||
Log.d("BT", "Device connected");
|
||||
|
||||
Log.d("BT_Judge", "Registered: " + registeredId);
|
||||
@@ -450,9 +448,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
//Do something if disconnected
|
||||
//デバイスが切断されたときの処理
|
||||
e.putBoolean("change", false);
|
||||
e.apply();
|
||||
changeBluetooth();//HomeFragmentの表示を切断にする
|
||||
changeBluetooth(false);
|
||||
if (deviceHardwareAddress.equals(registeredId)) {
|
||||
// 5分待機する
|
||||
Handler handler = new Handler();
|
||||
@@ -471,12 +467,8 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
};
|
||||
|
||||
public void changeBluetooth(){
|
||||
SharedPreferences pref=getSharedPreferences("Bluetooth_situation",MODE_PRIVATE);
|
||||
SharedPreferences.Editor e=pref.edit();
|
||||
Boolean BluetoothConnect = pref.getBoolean("change", false);
|
||||
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
|
||||
((HomeFragment) fragment).onEvent2(BluetoothConnect);
|
||||
public void changeBluetooth(boolean actual){
|
||||
getSharedPreferences("Bluetooth_situation",MODE_PRIVATE).edit().putBoolean("status",actual).apply();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.example.childguard;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link NotificationFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
public class NotificationFragment extends Fragment {
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||
private static final String ARG_PARAM1 = "param1";
|
||||
private static final String ARG_PARAM2 = "param2";
|
||||
|
||||
// TODO: Rename and change types of parameters
|
||||
private String mParam1;
|
||||
private String mParam2;
|
||||
|
||||
public NotificationFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
/**
|
||||
* Use this factory method to create a new instance of
|
||||
* this fragment using the provided parameters.
|
||||
*
|
||||
* @param param1 Parameter 1.
|
||||
* @param param2 Parameter 2.
|
||||
* @return A new instance of fragment NotificationFragment.
|
||||
*/
|
||||
// TODO: Rename and change types and number of parameters
|
||||
public static NotificationFragment newInstance(String param1, String param2) {
|
||||
NotificationFragment fragment = new NotificationFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString(ARG_PARAM1, param1);
|
||||
args.putString(ARG_PARAM2, param2);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_notification, container, false);
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,4 @@ package com.example.childguard;
|
||||
public interface OnEventListener {
|
||||
|
||||
boolean onEvent(boolean state);
|
||||
|
||||
void onEvent2(boolean BluetoothConnect);
|
||||
|
||||
boolean onEvent2(Boolean BluetoothConnect);
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout 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"
|
||||
tools:context=".NotificationFragment">
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
<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:weightSum="10"
|
||||
android:orientation="vertical"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="9">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recyclerView1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scrollbars="vertical"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</FrameLayout>
|
||||
Reference in new issue
Block a user