所有广播 改为 本地广播

master
hwf452 1 year ago
parent 4614e6e2b8
commit 557efc4b75

@ -45,11 +45,11 @@ android {
signingConfig signingConfigs.release //
}
}
sourceSets {
main {
jniLibs.srcDirs = ['libs']
}
}
// sourceSets {
// main {
// jniLibs.srcDirs = ['libs']
// }
// }
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
@ -110,7 +110,6 @@ dependencies {
implementation 'io.github.azhon:appupdate:4.2.6'
implementation 'com.tencent.bugly:crashreport:3.2.1'
implementation 'com.github.xuexiangjys:XUI:1.1.4'
implementation files('libs/rinsunMT.jar')
implementation 'org.greenrobot:eventbus:3.0.0'
implementation 'com.github.bumptech.glide:glide:4.11.0'

Binary file not shown.

Binary file not shown.

@ -94,6 +94,7 @@
<activity
android:name="com.bjzc.zjyxdxj.activity.MainActivity"
android:exported="false"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="portrait">
</activity>
@ -300,6 +301,7 @@
<service
android:name="com.bjzc.zjyxdxj.bleUtil.BluetoothLeService"
android:exported="false"
android:enabled="true" />
<provider

@ -7,9 +7,8 @@ import android.os.Bundle;
import android.view.View;
import android.view.Window;
import android.widget.TextView;
import com.bjzc.zjyxdxj.R;
import com.rinsun.mtdriver.MTnativeInterface;
public class CustomDialogActivity extends Activity {
private TextView title;
@ -17,7 +16,6 @@ public class CustomDialogActivity extends Activity {
private TextView btnStart;
private TextView btnClose;
MTnativeInterface mt = MTnativeInterface.getInstance();//获取传感器调用接口
String type = "7";
@Override
@ -42,42 +40,20 @@ public class CustomDialogActivity extends Activity {
@Override
public void onClick(View view) {
if(type.equals("7")){
startCheckTemp();
}
if(type.equals("11")){
startCheckVibration();
}
}
});
btnClose.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
finish();
}
});
//回调函数自动返回数据。CMDtype:数据类型,参数说明见“说明文档.txt”
mt.setOnReceiveListener(new MTnativeInterface.OnReceiveListener() {
@Override
public void onShowMessage(byte[] recBuff, int CMDtype, int tag) {
/* 根据CMDtype区分数据类型普通测量值/频谱数据/配置数据。如果10秒没读到数据会返回超时提示并关闭电源 */
System.out.println("-------------");
System.out.println(new String(recBuff) + "/" + CMDtype + "/" + tag);
if (CMDtype == MTnativeInterface.CMD_VIBD_R) {
//收到普通测量值
updateUIByVibration(new String(recBuff));//可直接显示数据
}
if (CMDtype == MTnativeInterface.CMD_TEMP_R) {
//收到普通测量值
updateUIByTemp(new String(recBuff));//可直接显示数据
}
}
});
}
private void initData() {
Intent intent = getIntent();
@ -89,31 +65,10 @@ public class CustomDialogActivity extends Activity {
title.setText("测振" + "(mm)");
}
}
public void startCheckTemp() {
/*=====测温示例,参数说明见“说明文档.txt”=================================================================*/
mt.IRTopen(MTnativeInterface.TEMP_25);//开启电源。
mt.IRTread(95);
}
public void startCheckVibration() {
/*=======测振示例,参数说明见“说明文档.txt”================================================================*/
mt.VIBopen();//开启电源。
//振动值测量。(振动值测量和频谱采集同时只能使用其中一个)
//读振动加速度加速度回传了2个值取第一个就可以
//CMD_VIBA_R 振动加速度加速度回传了2个值取第一个就可以
//CMD_VIBD_R 振动位移
//CMD_VIBA_R 振动速度
mt.VIBread(MTnativeInterface.CMD_VIBD_R, 0);
}
@Override
protected void onPause() {
super.onPause();
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
}
@Override
protected void onResume() {
@ -125,15 +80,7 @@ public class CustomDialogActivity extends Activity {
title.setText("测振" + "(mm)");
}
}
@Override
public void onDestroy() {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
super.onDestroy();
}
public void updateUIByTemp(final String info) {
runOnUiThread(new Runnable() {
@Override

@ -26,6 +26,7 @@ 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;
@ -182,7 +183,7 @@ public class MainActivity extends BaseActivity3 {
auditDialog.show();
}
});
//sendBroadcast(new Intent("android.intent.action.STATUSBAR_DISABLE"));
//LocalBroadcastManager.getInstance(context).sendBroadcast(intent);(new Intent("android.intent.action.STATUSBAR_DISABLE"));
}
// @Override
@ -774,7 +775,7 @@ public class MainActivity extends BaseActivity3 {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_DELETE_REFRESHPLANDOWNLOAD);
//发送广播,刷新任务下载页面
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
updatePlanData();
}
//检查是否需要删除计划
@ -854,7 +855,7 @@ public class MainActivity extends BaseActivity3 {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHPLANDOWNLOAD);
//发送广播,刷新任务下载页面
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
}

@ -4,13 +4,13 @@ import android.view.View;
import android.widget.TextView;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.base.BaseActivity3;
import com.rinsun.mtdriver.MTnativeInterface;
public class NfcinfoActivity extends BaseActivity3 {
TextView tvNfc;
MTnativeInterface mt = MTnativeInterface.getInstance();//获取传感器调用接口
@Override
@ -27,48 +27,18 @@ public class NfcinfoActivity extends BaseActivity3 {
}
});
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
initNFC();
//回调函数自动返回数据。CMDtype:数据类型,参数说明见“说明文档.txt”
mt.setOnReceiveListener(new MTnativeInterface.OnReceiveListener() {
@Override
public void onShowMessage(byte[] recBuff, int CMDtype, int tag) {
/* 根据CMDtype区分数据类型普通测量值/频谱数据/配置数据。如果10秒没读到数据会返回超时提示并关闭电源 */
System.out.println("-------------");
System.out.println(new String(recBuff) + "/" + CMDtype + "/" + tag);
if (CMDtype == MTnativeInterface.CMD_RFID_R) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if (recBuff != null) {
//RFID数据
String recv = new String(recBuff);
if(tvNfc!=null){
tvNfc.setText(recv);
}
}
}
});
}
}
});
}
@Override
public void initData() {
readRFID();
}
public void readRFID() {
/*========读卡示例,参数说明见“说明文档.txt”============================================================*/
mt.RFIDopen(MTnativeInterface.CARD_14443);//开启电源。(不可与振动同时打开,它们共用硬件资源)
mt.RFIDread(-1, "");
}
@Override
public void handleNfc(String result) {
super.handleNfc(result);
@ -83,13 +53,5 @@ public class NfcinfoActivity extends BaseActivity3 {
});
}
@Override
protected void onDestroy() {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
super.onDestroy();
}
}

@ -13,13 +13,14 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.zjyxdxj.DBModel.Dqgz;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.contans.Contans;
import com.bjzc.zjyxdxj.utils.SPUtils;
import com.bjzc.zjyxdxj.weight.AuditDialog;
import com.bjzc.zjyxdxj.weight.EditDialog;
import com.rinsun.mtdriver.MTnativeInterface;
import com.bjzc.zjyxdxj.base.BaseActivity3;
import org.litepal.crud.DataSupport;
@ -57,7 +58,6 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
private int pplen; // 1024, 4096, 8192
///////////////////////////////////////////////
MTnativeInterface mt= MTnativeInterface.getInstance();//获取传感器调用接口
Intent intentTemplate;
//页面传过来的数据
Dqgz dqgz;
@ -99,22 +99,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
}
noticeValue.setKeyListener(null);
//回调函数自动返回数据。CMDtype:数据类型,参数说明见“说明文档.txt”
mt.setOnReceiveListener(new MTnativeInterface.OnReceiveListener() {
@Override
public void onShowMessage(byte[] recBuff,int CMDtype, int tag) {
/* 根据CMDtype区分数据类型普通测量值/频谱数据/配置数据。如果10秒没读到数据会返回超时提示并关闭电源 */
System.out.println("-------------");
System.out.println(new String(recBuff)+"/"+CMDtype+"/"+tag);
//收到普通测量值
updateUI(new String(recBuff));//可直接显示数据
//收到频谱采集部分
//recBuff 原始数据数组CMDtype 返回数据类型tag 数据长度
System.out.println((recBuff.length)+"/"+CMDtype+"/"+tag);
}
});
btnSubmit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -142,7 +127,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
bundle.putParcelable("bean", dqgz);
intent.putExtras(bundle);
//发送广播
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
@ -177,7 +162,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
//让软键盘隐藏
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm.isActive()) {
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); // 隐藏
//imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); // 隐藏
}
editDialog.dismiss();
}
@ -188,7 +173,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
//让软键盘隐藏
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm.isActive()) {
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); // 隐藏
//imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); // 隐藏
}
editDialog.dismiss();
}
@ -222,15 +207,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
super.onResume();
}
@Override
protected void onPause() {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
super.onPause();
}
public void demo(){
/*========读卡示例,参数说明见“说明文档.txt”============================================================*/
@ -242,8 +219,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
//mt.RPMopen();//开启电源。
/*=====测温示例,参数说明见“说明文档.txt”=================================================================*/
mt.IRTopen(MTnativeInterface.TEMP_25);//开启电源。
mt.IRTread(95);
/*=======测振示例,参数说明见“说明文档.txt”================================================================*/
// mt.VIBopen();//开启电源。
@ -275,18 +251,7 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
// });
}
private double getRK(int type){
double res=0.0;
switch(type) {
case MTnativeInterface.CMD_VIBA_P:
res = edit16LA;
case MTnativeInterface.CMD_VIBV_P:
res=edit16LV;
case MTnativeInterface.CMD_VIBD_P:
res=edit16LD;
}
return res;
}
public void updateUI(final String info) {
runOnUiThread(new Runnable() {
@ -302,13 +267,5 @@ public class CheckTemperatureDqgzActivity extends BaseActivity3 {
});
}
@Override
protected void onDestroy() {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
super.onDestroy();
}
}

@ -12,6 +12,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.zjyxdxj.DBModel.Dqgz;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.base.BaseActivity3;
@ -19,8 +22,8 @@ import com.bjzc.zjyxdxj.contans.Contans;
import com.bjzc.zjyxdxj.utils.SPUtils;
import com.bjzc.zjyxdxj.weight.AuditDialog;
import com.bjzc.zjyxdxj.weight.EditDialog;
import com.rinsun.mtdriver.MTnativeInterface;
import org.litepal.crud.DataSupport;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -40,7 +43,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
private String vibrationValue;
public static final int RESULT_SUCCESS = 1;
//private String checkType;
int checkVibrationType = MTnativeInterface.CMD_VIBD_R;
int level = 0;
// 振动位移单位 mm
//振动速度单位 mm/s
@ -64,7 +67,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
private int pplen; // 1024, 4096, 8192
///////////////////////////////////////////////
MTnativeInterface mt= MTnativeInterface.getInstance();//获取传感器调用接口
Intent intentTemplate;
private String username;
@ -94,7 +97,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
initToolbar("测振", "开始测量", new View.OnClickListener() {
@Override
public void onClick(View v) {
demo();
}
});
} else {
@ -110,31 +113,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
noticeValue.setKeyListener(null);
//回调函数自动返回数据。CMDtype:数据类型,参数说明见“说明文档.txt”
mt.setOnReceiveListener(new MTnativeInterface.OnReceiveListener() {
@Override
public void onShowMessage(byte[] recBuff,int CMDtype, int tag) {
/* 根据CMDtype区分数据类型普通测量值/频谱数据/配置数据。如果10秒没读到数据会返回超时提示并关闭电源 */
System.out.println("-------------");
System.out.println(new String(recBuff)+"/"+CMDtype+"/"+tag);
if(CMDtype==MTnativeInterface.CMD_VIBA_R){
if(recBuff!=null){
String recv = new String(recBuff);
String cut = " ";
String[] newStr = recv.split(cut); // 分割成数组
updateUI(newStr[0]);//可直接显示数据
}
}else{
//收到普通测量值
updateUI(new String(recBuff));//可直接显示数据
}
//收到频谱采集部分
//recBuff 原始数据数组CMDtype 返回数据类型tag 数据长度
System.out.println((recBuff.length)+"/"+CMDtype+"/"+tag);
}
});
btnSubmit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -162,7 +141,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
bundle.putParcelable("bean", dqgz);
intent.putExtras(bundle);
//发送广播
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
Intent intent = new Intent();
@ -185,11 +164,11 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
public void onCheckedChanged(RadioGroup radioGroup, int i) {
if(i==R.id.rb1){
level = 0;
demo();//测量
}
if(i==R.id.rb2){
level = 1;
demo();//测量
}
}
});
@ -197,24 +176,24 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
@Override
public void onCheckedChanged(RadioGroup radioGroup, int i) {
if(i==R.id.rb3){
checkVibrationType = MTnativeInterface.CMD_VIBD_R;
etRealTitle.setText("实际值(mm):");
if(isEdit){
demo();//测量
}
}
if(i==R.id.rb4){
checkVibrationType = MTnativeInterface.CMD_VIBV_R;
etRealTitle.setText("实际值(mm/s):");
if(isEdit){
demo();//测量
}
}
if(i==R.id.rb5){
checkVibrationType = MTnativeInterface.CMD_VIBA_R;
etRealTitle.setText("实际值(mm/(s^2)):");
if(isEdit){
demo();//测量
}
}
}
@ -234,7 +213,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
//让软键盘隐藏
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm.isActive()) {
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); // 隐藏
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0); // 隐藏
}
editDialog.dismiss();
}
@ -245,7 +224,7 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
//让软键盘隐藏
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm.isActive()) {
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); // 隐藏
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0); // 隐藏
}
editDialog.dismiss();
}
@ -279,27 +258,9 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
super.onResume();
}
@Override
protected void onPause() {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
super.onPause();
}
public void demo(){
/*=======测振示例,参数说明见“说明文档.txt”================================================================*/
mt.VIBopen();//开启电源。
//振动值测量。(振动值测量和频谱采集同时只能使用其中一个)
//读振动加速度加速度回传了2个值取第一个就可以
//CMD_VIBA_R 振动加速度加速度回传了2个值取第一个就可以
//CMD_VIBD_R 振动位移
//CMD_VIBA_R 振动速度
mt.VIBread(checkVibrationType,level);
}
public void updateUI(final String info) {
runOnUiThread(new Runnable() {
@ -314,14 +275,5 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
});
}
@Override
protected void onDestroy() {
//使用完一定记得关闭电源
mt.RFIDclose();
mt.IRTclose();
mt.VIBclose();
mt.RPMclose();
super.onDestroy();
}
}

@ -11,6 +11,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.zjyxdxj.DBModel.Dqgz;
import com.bjzc.zjyxdxj.DBModel.XSJJHDataBean;
import com.bjzc.zjyxdxj.R;
@ -114,7 +117,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() {
@ -244,7 +247,7 @@ public class DqgzActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}

@ -14,6 +14,8 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.zjyxdxj.DBModel.Dqgz;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.base.BaseActivity3;
@ -102,7 +104,7 @@ public class DqgzCheckActivity extends BaseActivity3 {
}
});
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Bundle bundle = DqgzCheckActivity.this.getIntent().getExtras();
if (bundle != null) {
isEdit = bundle.getBoolean("edit");
@ -295,7 +297,7 @@ public class DqgzCheckActivity extends BaseActivity3 {
bundle.putParcelable("bean", dqgzTemp);
intent.putExtras(bundle);
//发送广播
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
@Override
@ -337,7 +339,7 @@ public class DqgzCheckActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
unregisterReceiver(mGattUpdateReceiver);
LocalBroadcastManager.getInstance(context).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}

@ -37,6 +37,7 @@ 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;
@ -163,7 +164,7 @@ public class DqgzDownFragment extends BaseFragment {
Intent intent = new Intent(Contans.ACTION_REFRESHPLANUPLOAD);
//发送广播,刷新任务上传页面
requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
} else {
showToast("没有可下载计划");
}

@ -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;
@ -72,7 +73,7 @@ public class DqgzUpAndDownActivity extends BaseActivity3 {
Intent intent = new Intent(Contans.ACTION_PROFESSIONCHANGE);
intent.putExtra("professionId",profession.getZyid());
//专业选择改变发送广播,刷新任务下载页面
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
});

@ -42,6 +42,8 @@ import java.util.List;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/**
* Created by huang on 2021/12/09
* -
@ -348,7 +350,7 @@ public class DqgzUpFragment extends BaseFragment {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN);
//发送广播,刷新任务下载页面
DqgzUpFragment.this.requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
} else {
@ -404,7 +406,7 @@ public class DqgzUpFragment extends BaseFragment {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN);
//发送广播,刷新任务下载页面
DqgzUpFragment.this.requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
if (adapter != null) {
adapter.notifyDataSetChanged();

@ -33,6 +33,9 @@ import org.litepal.crud.DataSupport;
import java.util.ArrayList;
import java.util.List;
import static com.bjzc.zjyxdxj.utils.GsonUtils.GsonToBean;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.zjyxdxj.DBModel.Profession;
/**
@ -111,7 +114,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")){
@ -170,7 +173,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);
}
@ -259,6 +262,6 @@ public class RegularActivity extends BaseActivity {
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class ChangeYulActivity extends BaseActivity {
@ -100,7 +102,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() {
@ -174,6 +176,6 @@ public class ChangeYulActivity extends BaseActivity {
protected void onDestroy() {
super.onDestroy();
//反注册广播(注销)
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -8,6 +8,9 @@ import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.zjyxdxj.DBModel.QYDDATABean;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.adapter.DlbAdapter;
@ -81,7 +84,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() {
@ -123,6 +126,6 @@ public class SbSelectActivity extends BaseActivity {
protected void onDestroy() {
super.onDestroy();
//反注册广播(注销)
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/**
@ -133,7 +134,7 @@ public class SbxdjcjsbActivity extends BaseActivity3 {
}
});
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Bundle bundle = SbxdjcjsbActivity.this.getIntent().getExtras();
if (bundle != null) {
@ -245,7 +246,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);
}
@ -279,7 +280,7 @@ public class SbxdjcjsbActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
unregisterReceiver(mGattUpdateReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}
}

@ -21,6 +21,8 @@ import java.util.ArrayList;
import java.util.List;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class YulActivity extends BaseActivity {
ListView lv;
@ -99,7 +101,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() {
@ -211,6 +213,6 @@ public class YulActivity extends BaseActivity {
protected void onDestroy() {
super.onDestroy();
//反注册广播(注销)
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -25,6 +25,8 @@ import java.util.List;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class Yul_SBActivity extends BaseActivity {
private static final int Req = 101;
@ -116,7 +118,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,6 +270,6 @@ public class Yul_SBActivity extends BaseActivity {
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -29,6 +29,7 @@ import java.util.Date;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/**
@ -173,7 +174,8 @@ public class SbxjcjsbActivity extends BaseActivity3 {
});
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Bundle bundle = SbxjcjsbActivity.this.getIntent().getExtras();
if (bundle != null) {
isEdit = bundle.getBoolean("edit");
@ -320,7 +322,7 @@ public class SbxjcjsbActivity extends BaseActivity3 {
intent.putExtra(Contans.KEY_NAME, name);
intent.putExtra(Contans.SCID, scid);
//发送广播
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
@ -364,7 +366,7 @@ public class SbxjcjsbActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
unregisterReceiver(mGattUpdateReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}
}

@ -46,6 +46,8 @@ import java.util.Map;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/**
* -
*/
@ -153,7 +155,7 @@ public class ScxsjhFragment extends BaseFragment {
});
IntentFilter filter = new IntentFilter();
filter.addAction(Contans.ACTION_REFRESHPLANUPLOAD);
ScxsjhFragment.this.requireActivity().registerReceiver(myReceiver, filter);
LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter);
}
@ -381,7 +383,7 @@ public class ScxsjhFragment extends BaseFragment {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN);
//发送广播,刷新任务下载页面
requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
} else {
showToast("上传数据失败");
}
@ -534,7 +536,7 @@ public class ScxsjhFragment extends BaseFragment {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN);
//发送广播,刷新任务下载页面
requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
} else {
showToast("上传数据失败");
}
@ -591,7 +593,7 @@ public class ScxsjhFragment extends BaseFragment {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHDOWNLOADPLAN);
//发送广播,刷新任务下载页面
ScxsjhFragment.this.requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
@Override
@ -605,6 +607,6 @@ public class ScxsjhFragment extends BaseFragment {
@Override
public void onDestroyView() {
super.onDestroyView();
ScxsjhFragment.this.requireActivity().unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver);
}
}

@ -19,6 +19,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.bjzc.zjyxdxj.DBModel.UploadLocation;
import com.bjzc.zjyxdxj.DBModel.XSJJHDataBean;
@ -147,7 +148,7 @@ public class SxgzActivity extends BaseActivity3 {
IntentFilter filter = new IntentFilter();
filter.addAction(Contans.ACTION_DELETE_REFRESHPLANDOWNLOAD);
registerReceiver(myReceiver, filter);
LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter);
auditDialog = new BaCheckDialog(context, "", new BaCheckDialog.AuditDialogListener() {
@Override
@ -743,7 +744,7 @@ public class SxgzActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -14,6 +14,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;
@ -63,7 +64,7 @@ public class XjMainActivity extends BaseActivity3 implements View.OnClickListene
Intent intent = new Intent(Contans.ACTION_PROFESSIONCHANGE);
intent.putExtra("professionId",profession.getZyid());
//专业选择改变发送广播,刷新任务下载页面
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
});

@ -34,6 +34,8 @@ import java.util.TimerTask;
import static com.bjzc.zjyxdxj.activity.sbxdj.SbxdjcjsbActivity.Req;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class XjYulActivity extends BaseActivity3 {
ListView lv;
@ -127,7 +129,7 @@ public class XjYulActivity extends BaseActivity3 {
setListAdapter();
IntentFilter filter = new IntentFilter();
filter.addAction(Contans.ACTION_YULONE);
registerReceiver(myReceiver, filter);
LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter);
if (isEdit) {
initToolbar("浏览巡检记录", "记录缺陷", new View.OnClickListener() {
@Override
@ -326,7 +328,7 @@ public class XjYulActivity extends BaseActivity3 {
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
public void rightBtnClickAllCheck() {

@ -52,6 +52,8 @@ import java.util.List;
import static com.bjzc.zjyxdxj.utils.GsonUtils.GsonToBean;
import static org.litepal.crud.DataSupport.where;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/**
*
*/
@ -156,7 +158,7 @@ public class XscbglActivity 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")) {
@ -228,7 +230,7 @@ public class XscbglActivity extends BaseActivity {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHPLANDOWNLOAD);
//发送广播,刷新任务下载页面
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
} else {
DataSupport.deleteAll(Xjjh.class, "download = 0 and username = ?", username);
}
@ -288,7 +290,7 @@ public class XscbglActivity extends BaseActivity {
//刷新计划下载界面
Intent intent = new Intent(Contans.ACTION_REFRESHPLANDOWNLOAD);
//发送广播,刷新任务下载页面
sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
}
}
@ -374,11 +376,6 @@ public class XscbglActivity extends BaseActivity {
return jsonZY;
}
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(myReceiver);
}
//保安计划下载
private void downDataBA(String zxid) {
@ -453,4 +450,12 @@ public class XscbglActivity extends BaseActivity {
showLog(json);
return json;
}
@Override
protected void onDestroy() {
super.onDestroy();
// 注销广播接收器
LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver);
}
}

@ -47,6 +47,7 @@ import java.util.Iterator;
import java.util.List;
import androidx.appcompat.app.AlertDialog;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import static org.litepal.crud.DataSupport.where;
@ -232,7 +233,7 @@ public class XzxsjhFragment extends BaseFragment {
IntentFilter filter = new IntentFilter();
filter.addAction(Contans.ACTION_REFRESHPLANDOWNLOAD);
filter.addAction(Contans.ACTION_PROFESSIONCHANGE);
XzxsjhFragment.this.requireActivity().registerReceiver(myReceiver, filter);
LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(myReceiver, filter);
}
public void initData() {
@ -438,7 +439,7 @@ public class XzxsjhFragment extends BaseFragment {
showToast("下载成功");
Intent intent = new Intent(Contans.ACTION_REFRESHPLANUPLOAD);
//发送广播,刷新任务上传页面
XzxsjhFragment.this.requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
dialog.dismiss();
}
} catch (Exception e) {
@ -515,7 +516,7 @@ public class XzxsjhFragment extends BaseFragment {
showToast("下载成功");
Intent intent = new Intent(Contans.ACTION_REFRESHPLANUPLOAD);
//发送广播,刷新任务上传页面
XzxsjhFragment.this.requireActivity().sendBroadcast(intent);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
dialog.dismiss();
}
} catch (Exception e) {
@ -590,6 +591,6 @@ public class XzxsjhFragment extends BaseFragment {
@Override
public void onDestroyView() {
super.onDestroyView();
XzxsjhFragment.this.requireActivity().unregisterReceiver(myReceiver);
LocalBroadcastManager.getInstance(requireActivity()).unregisterReceiver(myReceiver);
}
}

@ -35,6 +35,7 @@ import java.util.ArrayList;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class BlueTestInfoActivity extends BaseActivity3 {
@ -94,7 +95,7 @@ public class BlueTestInfoActivity extends BaseActivity3 {
return;
}
setAdapter();
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Intent gattServiceIntent = new Intent(BlueTestInfoActivity.this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
initconn = true;
@ -243,7 +244,7 @@ public class BlueTestInfoActivity extends BaseActivity3 {
if (initconn) {
if (!mConnected) mBluetoothLeService.connect(mDeviceAddress);
} else {
registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
Intent gattServiceIntent = new Intent(BlueTestInfoActivity.this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
initconn = true;
@ -398,7 +399,7 @@ public class BlueTestInfoActivity extends BaseActivity3 {
scanLeDevice(false);
mLeDeviceListAdapter.clear();
unbindService(mServiceConnection);
unregisterReceiver(mGattUpdateReceiver);
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
super.onDestroy();
}

@ -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(this).sendBroadcast(intent);
}
public class LocalBinder extends Binder {

Loading…
Cancel
Save