From 488aa1521cd6b9915a629f8f0bb013de3bc9f5c7 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Sat, 20 Jan 2024 18:40:56 +0800 Subject: [PATCH] change to localbrocasereceive --- YFDXJ/app/build.gradle | 2 ++ .../activity/CheckTemperatureActivity.java | 5 ++++- .../yfdxj/activity/CheckVibrationActivity.java | 5 ++++- .../com/bjzc/yfdxj/activity/LoginActivity.java | 17 ++--------------- .../com/bjzc/yfdxj/activity/MainActivity.java | 16 +++++++++++++--- .../regular/CheckTemperatureDqgzActivity.java | 4 +++- .../regular/CheckVibrationDqgzActivity.java | 4 +++- .../yfdxj/activity/regular/DqgzActivity.java | 7 +++++-- .../activity/regular/DqgzCheckActivity.java | 5 ++++- .../activity/regular/DqgzDownFragment.java | 7 ++++--- .../yfdxj/activity/regular/DqgzFragment.java | 5 +++-- .../yfdxj/activity/regular/DqgzUpFragment.java | 9 +++++---- .../yfdxj/activity/regular/LLSJFragment.java | 6 ++++-- .../yfdxj/activity/regular/QtgzFragment.java | 6 ++++-- .../activity/regular/RegularActivity.java | 9 ++++++--- .../activity/sbxdj/ChangeYulActivity.java | 6 ++++-- .../yfdxj/activity/sbxdj/SbSelectActivity.java | 6 ++++-- .../activity/sbxdj/SbxdjcjsbActivity.java | 3 ++- .../bjzc/yfdxj/activity/sbxdj/YulActivity.java | 7 +++++-- .../yfdxj/activity/sbxdj/Yul_SBActivity.java | 7 +++++-- .../yfdxj/activity/sbxj/SbxjcjsbActivity.java | 13 ++++++++++--- .../yfdxj/activity/sbxj/ScxsjhFragment.java | 18 +++++++++++++----- .../yfdxj/activity/sbxj/XjMainActivity.java | 3 ++- .../yfdxj/activity/sbxj/XjYulActivity.java | 10 ++++++++-- .../yfdxj/activity/sbxj/XscbglActivity.java | 12 +++++++++--- .../yfdxj/activity/sbxj/XzxsjhFragment.java | 14 ++++++++++---- .../bjzc/yfdxj/bleUtil/BluetoothLeService.java | 6 ++++-- 27 files changed, 142 insertions(+), 70 deletions(-) diff --git a/YFDXJ/app/build.gradle b/YFDXJ/app/build.gradle index b986aea..72c6321 100755 --- a/YFDXJ/app/build.gradle +++ b/YFDXJ/app/build.gradle @@ -92,6 +92,8 @@ dependencies { implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1' implementation 'org.bouncycastle:bcpkix-jdk15on:1.56' implementation 'commons-codec:commons-codec:1.15' + //本地广播 + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckTemperatureActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckTemperatureActivity.java index 258de64..65deb83 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckTemperatureActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckTemperatureActivity.java @@ -12,6 +12,9 @@ import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.TextView; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.XSJJHDataBean; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.base.BaseActivity3; @@ -148,7 +151,7 @@ public class CheckTemperatureActivity extends BaseActivity3 { intent.putExtra(Contans.KEY_NAME, temperatureValue); intent.putExtra(Contans.SCID, xSJJHDataBean.getScid()); //发送广播 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckVibrationActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckVibrationActivity.java index 5519ff2..c395422 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckVibrationActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckVibrationActivity.java @@ -13,6 +13,9 @@ import android.widget.Button; import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.XSJJHDataBean; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.base.BaseActivity3; @@ -174,7 +177,7 @@ public class CheckVibrationActivity extends BaseActivity3 { intent.putExtra(Contans.KEY_NAME, vibrationValue); intent.putExtra(Contans.SCID, xSJJHDataBean.getScid()); //发送广播 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } } Intent intent = new Intent(); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java index 1f2df06..8c6221c 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java @@ -182,8 +182,8 @@ public class LoginActivity extends BaseActivity { } if (BuildConfig.LOG_ERROR) { - etUse.setText("161619"); - etPwd.setText("lgy12345"); +// etUse.setText("161619"); +// etPwd.setText("lgy12345"); // etUse.setText("161619"); // etPwd.setText("161619"); @@ -251,7 +251,6 @@ public class LoginActivity extends BaseActivity { } } else { checkUpdateApk(); - SetPermission();//设置权限 } } @@ -283,18 +282,6 @@ public class LoginActivity extends BaseActivity { mt.RFIDread(-1, ""); } - private void SetPermission() { -// AndPermission.with(this).runtime().permission( -// Permission.ACCESS_COARSE_LOCATION, -// Permission.READ_PHONE_STATE, -// Permission.READ_EXTERNAL_STORAGE, -// Permission.WRITE_EXTERNAL_STORAGE, -// Permission.CAMERA -// ).onGranted(data -> { -// }).onDenied(data -> { -// }).start(); - } - private void onclick() { btnLogin.setOnClickListener(view -> { if (isLogin()) { diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java index 3235733..d408a96 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java @@ -27,6 +27,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.azhon.appupdate.listener.OnButtonClickListener; import com.azhon.appupdate.listener.OnDownloadListener; import com.azhon.appupdate.manager.DownloadManager; @@ -89,6 +91,8 @@ public class MainActivity extends BaseActivity3 { //定时器 private Timer timer; + private LocalBroadcastManager localBroadcastManager; + private BroadcastReceiver myReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -169,8 +173,10 @@ public class MainActivity extends BaseActivity3 { AuditDialog auditDialog = new AuditDialog(context, "确定要退出登录吗？", new AuditDialog.AuditDialogListener() { @Override public void confirm() { + SPUtils.remove(MainActivity.this,"save"); SPUtils.remove(MainActivity.this,Contans.USERID); SPUtils.remove(MainActivity.this,Contans.USERPWD); + SPUtils.remove(MainActivity.this,Contans.LOGIN_TOKEN); SPUtils.remove(MainActivity.this,Contans.USERNAME); SPUtils.remove(MainActivity.this,Contans.BZBH); SPUtils.remove(MainActivity.this,Contans.BZMC); @@ -179,6 +185,7 @@ public class MainActivity extends BaseActivity3 { SPUtils.remove(MainActivity.this,Contans.NFCBM); SPUtils.remove(MainActivity.this,Contans.LASTLOGINDATE); SPUtils.clear(MainActivity.this); + Intent intent = new Intent(MainActivity.this, LoginActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); @@ -195,10 +202,9 @@ public class MainActivity extends BaseActivity3 { }); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION__MEMBER_CALL_BACK); - registerReceiver(myReceiver, filter); + //registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); - - //sendBroadcast(new Intent("android.intent.action.STATUSBAR_DISABLE")); } // @Override @@ -614,6 +620,10 @@ public class MainActivity extends BaseActivity3 { } Intent intent = new Intent(this, BluetoothLeService.class); stopService(intent); + + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); + super.onDestroy(); } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckTemperatureDqgzActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckTemperatureDqgzActivity.java index 0ef28ab..3f7e2ef 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckTemperatureDqgzActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckTemperatureDqgzActivity.java @@ -13,6 +13,8 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.Dqgz; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.base.BaseActivity3; @@ -144,7 +146,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 { bundle.putParcelable("bean", dqgz); intent.putExtras(bundle); //发送广播 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckVibrationDqgzActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckVibrationDqgzActivity.java index 1347416..2efe788 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckVibrationDqgzActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckVibrationDqgzActivity.java @@ -13,6 +13,8 @@ import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.Dqgz; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.base.BaseActivity3; @@ -166,7 +168,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 { bundle.putParcelable("bean", dqgz); intent.putExtras(bundle); //发送广播 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } } Intent intent = new Intent(); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzActivity.java index 83c0596..167e650 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzActivity.java @@ -10,6 +10,9 @@ import android.util.Log; import android.view.View; import android.widget.ListView; import android.widget.TextView; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.Dqgz; import com.bjzc.yfdxj.DBModel.XSJJHDataBean; import com.bjzc.yfdxj.R; @@ -111,7 +114,7 @@ public class DqgzActivity extends BaseActivity3 { setListAdapter(); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULTWO); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void setListAdapter() { @@ -241,7 +244,7 @@ public class DqgzActivity extends BaseActivity3 { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } public void rightBtnClickAllCheck() { diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzCheckActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzCheckActivity.java index 87783f3..f7bdbe0 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzCheckActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzCheckActivity.java @@ -13,6 +13,9 @@ import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.Dqgz; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.base.BaseActivity3; @@ -296,7 +299,7 @@ public class DqgzCheckActivity extends BaseActivity3 { bundle.putParcelable("bean", dqgzTemp); intent.putExtras(bundle); //发送广播 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzDownFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzDownFragment.java index e34f24d..d990125 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzDownFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzDownFragment.java @@ -34,6 +34,7 @@ import org.litepal.crud.DataSupport; import java.util.ArrayList; import java.util.List; import androidx.appcompat.app.AlertDialog; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import static org.litepal.crud.DataSupport.where; @@ -160,7 +161,7 @@ public class DqgzDownFragment extends BaseFragment { Intent intent = new Intent(Contans.ACTION_REFRESHPLANUPLOAD); //发送广播,刷新任务上传页面 - requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } else { showToast("没有可下载计划"); } @@ -226,7 +227,7 @@ public class DqgzDownFragment extends BaseFragment { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANDOWNLOAD); filter.addAction(Contans.ACTION_PROFESSIONCHANGE); - requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } public void initData() { @@ -314,6 +315,6 @@ public class DqgzDownFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzFragment.java index 15d6036..16003ed 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzFragment.java @@ -52,6 +52,7 @@ import java.util.List; import java.util.Objects; import androidx.appcompat.app.AlertDialog; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import static org.litepal.crud.DataSupport.where; @@ -138,7 +139,7 @@ public class DqgzFragment extends BaseFragment { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANDOWNLOAD); filter.addAction(Contans.ACTION_PROFESSIONCHANGE); - requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } public void initData() { @@ -224,6 +225,6 @@ public class DqgzFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } \ No newline at end of file diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzUpFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzUpFragment.java index 2e52631..83d5a97 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzUpFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/DqgzUpFragment.java @@ -56,6 +56,7 @@ import java.util.Objects; import java.util.logging.Logger; import androidx.appcompat.app.AlertDialog; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import static org.litepal.crud.DataSupport.where; @@ -162,7 +163,7 @@ public class DqgzUpFragment extends BaseFragment { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANUPLOAD); - requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } @@ -360,7 +361,7 @@ public class DqgzUpFragment extends BaseFragment { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN); //发送广播,刷新任务下载页面 - requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } else { @@ -416,7 +417,7 @@ public class DqgzUpFragment extends BaseFragment { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN); //发送广播,刷新任务下载页面 - requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; if (adapter != null) { adapter.notifyDataSetChanged(); @@ -435,6 +436,6 @@ public class DqgzUpFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/LLSJFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/LLSJFragment.java index e6eff19..bbfff14 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/LLSJFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/LLSJFragment.java @@ -55,6 +55,8 @@ import java.util.Arrays; import java.util.List; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Created by huang on 2021/12/09 * 定期工作-任务下载 @@ -137,7 +139,7 @@ public class LLSJFragment extends BaseFragment { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANDOWNLOAD); filter.addAction(Contans.ACTION_PROFESSIONCHANGE); - requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } public void initData() { @@ -284,6 +286,6 @@ public class LLSJFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } \ No newline at end of file diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/QtgzFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/QtgzFragment.java index ab09a1d..bd80f99 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/QtgzFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/QtgzFragment.java @@ -49,6 +49,8 @@ import java.util.List; import java.util.Objects; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * Created by huang on 2021/12/09 * 定期工作-任务下载 @@ -131,7 +133,7 @@ public class QtgzFragment extends BaseFragment { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANDOWNLOAD); filter.addAction(Contans.ACTION_PROFESSIONCHANGE); - requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } public void initData() { @@ -228,6 +230,6 @@ public class QtgzFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } \ No newline at end of file diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/RegularActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/RegularActivity.java index bb8590c..cdba421 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/RegularActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/RegularActivity.java @@ -34,6 +34,9 @@ import org.litepal.crud.DataSupport; import java.util.ArrayList; import java.util.List; import static com.bjzc.yfdxj.utils.GsonUtils.GsonToBean; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.Profession; /** @@ -108,7 +111,7 @@ public class RegularActivity extends BaseActivity { }); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHDOWNLOADPLAN); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); requestDatas(); if(type.equals("YX")){ @@ -167,7 +170,7 @@ public class RegularActivity extends BaseActivity { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHPLANDOWNLOAD); //发送广播,刷新任务下载页面 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } else { DataSupport.deleteAll(Dqgz.class, "download = 0 and username = ?",username); } @@ -256,6 +259,6 @@ public class RegularActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/ChangeYulActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/ChangeYulActivity.java index 6ba40ff..e5f82a8 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/ChangeYulActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/ChangeYulActivity.java @@ -12,6 +12,8 @@ import java.util.ArrayList; import java.util.List; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.QYDDATABean; import com.bjzc.yfdxj.DBModel.XDJJHXZDataBean; import com.bjzc.yfdxj.R; @@ -99,7 +101,7 @@ public class ChangeYulActivity extends BaseActivity { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); //注册广播 - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void searchdata() { @@ -173,6 +175,6 @@ public class ChangeYulActivity extends BaseActivity { protected void onDestroy() { super.onDestroy(); //反注册广播（注销） - unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbSelectActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbSelectActivity.java index eeecfe5..ff0a93c 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbSelectActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbSelectActivity.java @@ -10,6 +10,8 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ListView; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.QYDDATABean; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.adapter.DlbAdapter; @@ -83,7 +85,7 @@ public class SbSelectActivity extends BaseActivity { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); //注册广播 - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void setListAdapter() { @@ -125,6 +127,6 @@ public class SbSelectActivity extends BaseActivity { protected void onDestroy() { super.onDestroy(); //反注册广播（注销） - unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbxdjcjsbActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbxdjcjsbActivity.java index 9ec2312..be3b165 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbxdjcjsbActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/SbxdjcjsbActivity.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.bjzc.yfdxj.DBModel.QYDDATABean; import com.bjzc.yfdxj.R; @@ -249,7 +250,7 @@ public class SbxdjcjsbActivity extends BaseActivity3 { Intent intent = new Intent(Contans.ACTION_YULONE); intent.putExtra(Contans.KEY_POSITION, position); intent.putExtra(Contans.KEY_NAME, name); - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/YulActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/YulActivity.java index dd39193..200284a 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/YulActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/YulActivity.java @@ -14,6 +14,9 @@ import java.util.ArrayList; import java.util.List; import static org.litepal.crud.DataSupport.where; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.QYDDATABean; import com.bjzc.yfdxj.DBModel.XDJJHXZDataBean; import com.bjzc.yfdxj.R; @@ -102,7 +105,7 @@ public class YulActivity extends BaseActivity { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void searchdata() { @@ -214,6 +217,6 @@ public class YulActivity extends BaseActivity { protected void onDestroy() { super.onDestroy(); //反注册广播（注销） - unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/Yul_SBActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/Yul_SBActivity.java index 28c5f2d..39303b8 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/Yul_SBActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxdj/Yul_SBActivity.java @@ -16,6 +16,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import static org.litepal.crud.DataSupport.where; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bjzc.yfdxj.DBModel.QYDDATABean; import com.bjzc.yfdxj.R; import com.bjzc.yfdxj.adapter.DlbAdapter; @@ -116,7 +119,7 @@ public class Yul_SBActivity extends BaseActivity { TYOnclick(); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void TYOnclick() { @@ -268,7 +271,7 @@ public class Yul_SBActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SbxjcjsbActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SbxjcjsbActivity.java index 7d1dea9..61d57b9 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SbxjcjsbActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SbxjcjsbActivity.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.bjzc.yfdxj.DBModel.XSJJHDataBean; import com.bjzc.yfdxj.R; @@ -151,7 +152,10 @@ public class SbxjcjsbActivity extends BaseActivity3 { } }); - registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + //registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + + Bundle bundle = SbxjcjsbActivity.this.getIntent().getExtras(); if (bundle != null) { isEdit = bundle.getBoolean("edit"); @@ -276,7 +280,8 @@ public class SbxjcjsbActivity extends BaseActivity3 { intent.putExtra(Contans.KEY_NAME, name); intent.putExtra(Contans.SCID, scid); //发送广播 - sendBroadcast(intent); + //sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent); } @@ -319,7 +324,9 @@ public class SbxjcjsbActivity extends BaseActivity3 { @Override protected void onDestroy() { - unregisterReceiver(mGattUpdateReceiver); +// unregisterReceiver(mGattUpdateReceiver); super.onDestroy(); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java index 43f460d..91462bb 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java @@ -45,6 +45,8 @@ import java.util.Map; import java.util.Objects; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * 设备巡点检管理-点检点上传 */ @@ -147,7 +149,8 @@ public class ScxsjhFragment extends BaseFragment { }); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANUPLOAD); - requireActivity().registerReceiver(myReceiver, filter); + //requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } @@ -376,7 +379,8 @@ public class ScxsjhFragment extends BaseFragment { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN); //发送广播,刷新任务下载页面 - requireActivity().sendBroadcast(intent); + //requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(requireActivity()).sendBroadcast(intent); } else { showToast("上传数据失败"); } @@ -526,7 +530,8 @@ public class ScxsjhFragment extends BaseFragment { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN); //发送广播,刷新任务下载页面 - requireActivity().sendBroadcast(intent); + //requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(requireActivity()).sendBroadcast(intent); } else { showToast("上传数据失败"); } @@ -583,7 +588,8 @@ public class ScxsjhFragment extends BaseFragment { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN); //发送广播,刷新任务下载页面 - requireActivity().sendBroadcast(intent); + //requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(requireActivity()).sendBroadcast(intent); } @Override @@ -597,6 +603,8 @@ public class ScxsjhFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + //requireActivity().unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } \ No newline at end of file diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjMainActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjMainActivity.java index 84fd41b..ef55899 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjMainActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjMainActivity.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.List; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.viewpager.widget.ViewPager; import org.litepal.crud.DataSupport; @@ -61,7 +62,7 @@ public class XjMainActivity extends BaseActivity3 { Intent intent = new Intent(Contans.ACTION_PROFESSIONCHANGE); intent.putExtra("professionId",profession.getZyid()); //专业选择改变发送广播,刷新任务下载页面 - sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent);; } } }); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjYulActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjYulActivity.java index 02e167a..4c3f1f8 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjYulActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XjYulActivity.java @@ -37,6 +37,8 @@ import java.util.Timer; import java.util.TimerTask; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + public class XjYulActivity extends BaseActivity3 { ListView lv; @@ -120,7 +122,9 @@ public class XjYulActivity extends BaseActivity3 { setListAdapter(); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); - registerReceiver(myReceiver, filter); + //registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); + if (isEdit) { initToolbar("浏览巡检记录", "记录缺陷", new View.OnClickListener() { @Override @@ -333,7 +337,9 @@ public class XjYulActivity extends BaseActivity3 { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + //unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } private void allCheckNow() { diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XscbglActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XscbglActivity.java index 707cd1c..58e9f23 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XscbglActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XscbglActivity.java @@ -42,6 +42,8 @@ import java.util.Objects; import static com.bjzc.yfdxj.utils.GsonUtils.GsonToBean; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + /** * 巡视抄表管理 */ @@ -145,7 +147,8 @@ public class XscbglActivity extends BaseActivity { }); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHDOWNLOADPLAN); - registerReceiver(myReceiver, filter); + //registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); requestDatas(); if(type.equals("YX")){ @@ -215,7 +218,8 @@ public class XscbglActivity extends BaseActivity { //刷新计划下载界面 Intent intent = new Intent(Contans.ACTION_REFRESHPLANDOWNLOAD); //发送广播,刷新任务下载页面 - sendBroadcast(intent); + //sendBroadcast(intent); + LocalBroadcastManager.getInstance(context).sendBroadcast(intent); } else { DataSupport.deleteAll(Xjjh.class, "download = 0 and username = ?",username); } @@ -301,6 +305,8 @@ public class XscbglActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + //unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java index cc453f9..0810bab 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java @@ -51,6 +51,7 @@ import java.util.List; import java.util.Objects; import androidx.appcompat.app.AlertDialog; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.recyclerview.widget.RecyclerView; @@ -239,7 +240,8 @@ public class XzxsjhFragment extends BaseFragment { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_REFRESHPLANDOWNLOAD); filter.addAction(Contans.ACTION_PROFESSIONCHANGE); - requireActivity().registerReceiver(myReceiver, filter); + //requireActivity().registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter); } public void initData() { @@ -445,7 +447,8 @@ public class XzxsjhFragment extends BaseFragment { showToast("下载成功"); Intent intent = new Intent(Contans.ACTION_REFRESHPLANUPLOAD); //发送广播,刷新任务上传页面 - requireActivity().sendBroadcast(intent); + //requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(requireActivity()).sendBroadcast(intent); dialog.dismiss(); } } catch (Exception e) { @@ -522,7 +525,8 @@ public class XzxsjhFragment extends BaseFragment { showToast("下载成功"); Intent intent = new Intent(Contans.ACTION_REFRESHPLANUPLOAD); //发送广播,刷新任务上传页面 - requireActivity().sendBroadcast(intent); + //requireActivity().sendBroadcast(intent); + LocalBroadcastManager.getInstance(requireActivity()).sendBroadcast(intent); dialog.dismiss(); } } catch (Exception e) { @@ -594,6 +598,8 @@ public class XzxsjhFragment extends BaseFragment { @Override public void onDestroyView() { super.onDestroyView(); - requireActivity().unregisterReceiver(myReceiver); + //requireActivity().unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/bleUtil/BluetoothLeService.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/bleUtil/BluetoothLeService.java index e0d158e..d7b1efa 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/bleUtil/BluetoothLeService.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/bleUtil/BluetoothLeService.java @@ -15,6 +15,8 @@ import android.os.Binder; import android.os.IBinder; import android.util.Log; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import java.util.List; import java.util.UUID; @@ -101,7 +103,7 @@ public class BluetoothLeService extends Service { private void broadcastUpdate(final String action) { final Intent intent = new Intent(action); - sendBroadcast(intent); + LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);; } //收到数据后，触发广播 @@ -115,7 +117,7 @@ public class BluetoothLeService extends Service { stringBuilder.append(String.format("%02X ", byteChar)); intent.putExtra(EXTRA_DATA, new String(data) + "\n" + stringBuilder.toString()); } - sendBroadcast(intent); + LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);; } public class LocalBinder extends Binder {