hwf453
/
DYWOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.2.7 release

Browse Source
master
wenfei 2 months ago
parent bb4b66df72
commit e8c1432537
8 changed files with 145 additions and 85 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa"
minSdk 24
targetSdk 36
versionCode 27
versionName "1.2.6"
versionCode 28
versionName "1.2.7"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

36
app/src/main/java/com/rehome/dywoa/bleUtil/BlueToothDeviceSdkActivity.java
Unescape Escape View File

@ -109,17 +109,22 @@ public class BlueToothDeviceSdkActivity extends BaseActivity {
tvNodata.setVisibility(View.GONE);
lv.setVisibility(View.VISIBLE);
mHandler = new Handler();
}
@Override
public void initData() {
deviceAddressSave = (String) SPUtils.get(context, Contans.KEY_BLUE_TOOTH_ADDRESS,"");
showLog("-------deviceAddressSave-------");
showLog(deviceAddressSave);
deviceNameSave = (String) SPUtils.get(context, Contans.KEY_BLUE_TOOTH_NAME,"");
showLog("-------deviceNameSave-------");
showLog(mBleName);
if(!TextUtils.isEmpty(deviceNameSave) && !TextUtils.isEmpty(deviceAddressSave)){
mHandler.postDelayed(this::reConnectBle, 1000);
}else{
//initPermission();
}
@Override
public void initData() {
initPermission();
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
Toast.makeText(this, R.string.ble_not_supported, Toast.LENGTH_SHORT).show();
//finish();
@ -127,7 +132,8 @@ public class BlueToothDeviceSdkActivity extends BaseActivity {
}
setAdapter();
LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter());
mHandler.postDelayed(this::reConnectBle, 1000);
}
private void reConnectBle(){
@ -220,15 +226,15 @@ public class BlueToothDeviceSdkActivity extends BaseActivity {
timer = new Timer();
timer.schedule(new TimerTask() {
public void run() {
if(mBluetoothLeService!=null){
bleSendType++;
if(bleSendType%2==0){
mBluetoothLeService.writeHex("0B0B6300");
}
if(bleSendType%3==0){
mBluetoothLeService.writeString("BV");
}
}
// if(mBluetoothLeService!=null){
// bleSendType++;
// if(bleSendType%2==0){
// mBluetoothLeService.writeHex("0B0B6300");
// }
// if(bleSendType%3==0){
// mBluetoothLeService.writeString("BV");
// }
// }
}
}, 6000, 6000);
// 设定指定的时间time,此处为10000毫秒
@ -274,9 +280,11 @@ public class BlueToothDeviceSdkActivity extends BaseActivity {
} else {
mScanning = false;
//mBluetoothAdapter.stopLeScan(mLeScanCallback);
if(bluetoothLeScanner!=null){
bluetoothLeScanner.stopScan(leScanCallback);
}
}
}
//扫描到每台设备后调用回调函数callback.
// private BluetoothAdapter.LeScanCallback mLeScanCallback = new BluetoothAdapter.LeScanCallback() {
@ -544,7 +552,9 @@ public class BlueToothDeviceSdkActivity extends BaseActivity {
protected void onDestroy() {
scanLeDevice(false);
mLeDeviceListAdapter.clear();
if(mBluetoothLeService!=null){
unbindService(mServiceConnection);
}
// 注销广播接收器
LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver);
if(timer!=null){

5
app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -214,8 +214,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etPassword.setText("CS20251119.")
//黄文飞
binding.etUsername.setText("RH00002")
binding.etPassword.setText("RH20251029.")
// binding.etUsername.setText("RH00002")
// binding.etPassword.setText("RH20251029.")
// binding.etUsername.setText("972526")
// binding.etPassword.setText("Wq20001221.")
@ -306,7 +306,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
//checkVpnLogin()
// appLogin() //登录
})
}
override fun onRestart() {

80
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java
Unescape Escape View File

@ -33,6 +33,7 @@ import com.rehome.dywoa.bleUtil.BluetoothLeService;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.SPUtils;
import com.rehome.dywoa.utils.UiUtlis;
import com.rehome.dywoa.weiget.ListDialog;
import com.yolanda.nohttp.NoHttp;
@ -95,6 +96,9 @@ public class CJFragment extends BaseFragment {
private double bjsx = 0;//报警上限
private double bjxx = 0;//报警下限
private String deviceNameSave;
private String deviceAddressSave;
private BluetoothLeService mBluetoothLeService;
public CJFragment() {
@ -124,6 +128,8 @@ public class CJFragment extends BaseFragment {
findView();
et_jg.setEnabled(isEdit);
btn_selectCheckResult.setEnabled(isEdit);
deviceAddressSave = (String) SPUtils.get(context, Contans.KEY_BLUE_TOOTH_ADDRESS,"");
deviceNameSave = (String) SPUtils.get(context, Contans.KEY_BLUE_TOOTH_NAME,"");
updata(info, index, zj);
}
@ -213,9 +219,51 @@ public class CJFragment extends BaseFragment {
if(isEdit){
if(!TextUtils.isEmpty(info.getPOINTNAME())){
if(info.getPOINTNAME().contains("温度")){
mBluetoothLeService.writeHex("0B0B6301");
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
mBluetoothLeService.writeString("BV");
}
}, 3000);
}
if(info.getPOINTNAME().contains("测温")){
mBluetoothLeService.writeHex("0B0B6301");
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
mBluetoothLeService.writeString("BV");
}
}, 3000);
}
if(info.getPOINTNAME().contains("环境温度")){
mBluetoothLeService.writeHex("0B0B6300");
}
if(info.getPOINTNAME().contains("环境测温")){
mBluetoothLeService.writeHex("0B0B6300");
}
if(info.getPOINTNAME().contains("振动")){
mBluetoothLeService.writeHex("1F12");
}
if(info.getPOINTNAME().contains("振动加速度")){
mBluetoothLeService.writeHex("1F11");
}
if(info.getPOINTNAME().contains("振动速度")){
mBluetoothLeService.writeHex("1F12");
}
if(info.getPOINTNAME().contains("振动位移")){
mBluetoothLeService.writeHex("1F13");
}
if(info.getPOINTNAME().contains("测振")){
mBluetoothLeService.writeHex("1F12");
}
if(info.getPOINTNAME().contains("测振加速度")){
mBluetoothLeService.writeHex("1F11");
}
if(info.getPOINTNAME().contains("测振速度")){
mBluetoothLeService.writeHex("1F12");
}
if(info.getPOINTNAME().contains("测振位移")){
mBluetoothLeService.writeHex("1F13");
}
}
@ -394,12 +442,44 @@ public class CJFragment extends BaseFragment {
//et_jg.setText("正常");
if(isEdit){
if(!TextUtils.isEmpty(info.getPOINTNAME())){
if(!TextUtils.isEmpty(deviceNameSave) && !TextUtils.isEmpty(deviceAddressSave)){
if(info.getPOINTNAME().contains("温度")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("测温")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("环境温度")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("环境测温")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("振动")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("振动加速度")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("振动速度")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("振动位移")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("测振")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("测振加速度")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("测振速度")){
btn_cj.setVisibility(View.VISIBLE);
}
if(info.getPOINTNAME().contains("测振位移")){
btn_cj.setVisibility(View.VISIBLE);
}
}
}
}
}else{

1
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java
Unescape Escape View File

@ -517,4 +517,3 @@ public class SdjgzActivity extends BaseActivity {
}
}
}
// 6217003090002510800

34
app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java
Unescape Escape View File

@ -96,6 +96,16 @@ public class SjcjFragment extends BaseFragment {
}
}
@Override
public int getLayoutId() {
return R.layout.fragment_scjsj;
}
@Override
protected void initView() {
findView();
}
private void findView() {
vp = view.findViewById(R.id.vp);
rb1 = view.findViewById(R.id.rb1);
@ -237,16 +247,6 @@ public class SjcjFragment extends BaseFragment {
});
}
@Override
protected void initView() {
findView();
}
@Override
public int getLayoutId() {
return R.layout.fragment_scjsj;
}
public void initData() {
if (!isEdit) {
@ -413,15 +413,27 @@ public class SjcjFragment extends BaseFragment {
}
}
//bleData = "温度:" + data.substring(2, 6);
} else if("d".equals(type)) {
} else if("a".equals(type)) {
List<String> strWenDu = stringToList(resultReceive);
if(!strWenDu.isEmpty()){
bleData = strWenDu.get(1);
}
}else if("v".equals(type)) {
List<String> strWenDu = stringToList(resultReceive);
if(!strWenDu.isEmpty()){
bleData = strWenDu.get(1);
}
}else if("d".equals(type)) {
List<String> strWenDu = stringToList(resultReceive);
if(!strWenDu.isEmpty()){
bleData = strWenDu.get(1);
}
}
if(!TextUtils.isEmpty(bleData)){
cj.getBlueToothData(bleData);
}
}
}
};
static IntentFilter makeGattUpdateIntentFilter() {

44
app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java
Unescape Escape View File

@ -112,7 +112,6 @@ public class HomeFragment extends BaseFragment {
SimpleDateFormat sp = new SimpleDateFormat("yyyy-MM-dd");
private BleManager ble;
//人脸识别
ActivityResultLauncher<Intent> launcherResultFaceRecognition;
@ -134,45 +133,6 @@ public class HomeFragment extends BaseFragment {
username = App.getInstance().getUserInfo().getManid();
firstDeparment = App.getInstance().getUserInfo().getFirstDeparment();
ble= BleManager.getInstance();
String str=ble.init(requireActivity());
if("OK".equals(str)){
}
ble.setOnReceiveListener(new BleManager.OnReceiveListener() {
@Override
public void onShowMessage(Context context, Intent intent) {
final String action = intent.getAction();
if (BluetoothDevice.ACTION_FOUND.equals(action)) {
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
if (ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
}
showLog("扫描发现设备" + device.getName() + "," + device.getAddress());
String deviceName = device.getName();
if (deviceName != null && !deviceName.isEmpty()){
showLog(new Gson().toJson(device));
}
} else if (BluetoothLeService.ACTION_GATT_CONNECTED.equals(action)) {
showLog("连接");
} else if (BluetoothLeService.ACTION_GATT_DISCONNECTED.equals(action)) {
showLog("断开");
} else if (BluetoothLeService.ACTION_GATT_SERVICES_DISCOVERED.equals(action)) {
showLog("数据传输通道准备就绪,可以发送数据了。");
} else if (BluetoothLeService.ACTION_DATA_AVAILABLE.equals(action)) {
byte[] data= intent.getByteArrayExtra(BluetoothLeService.EXTRA_DATA);
showLog("收到传感器数据" + new String(data));
}
}
});
//android 10 以上
if (context.getExternalFilesDir(null) != null) {
@ -544,12 +504,12 @@ public class HomeFragment extends BaseFragment {
// String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","应急预案","用车","用印","BI"};
// int[] imgIds = {R.drawable.icon_runlog_home,R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_yjya,R.drawable.icon_use_car,R.drawable.icon_use_seal,R.drawable.icon_bi};
String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","kks码查询","应急预案","BI","高风险","人脸识别","隐患随手拍","每日作业管控风险清单","蓝牙传感器"};
String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","kks码查询","应急预案","BI","高风险","人脸识别","隐患随手拍","每日作业管控风险清单"};
int[] imgIds = {R.drawable.icon_gkyth,R.drawable.icon_lpqt, R.drawable.icon_sis_new_first,
R.drawable.icon_jzcs_new,R.drawable.icon_qj_new,R.drawable.icon_dj_new,
R.drawable.icon_kks_search,R.drawable.icon_yjya,R.drawable.icon_bi,
R.drawable.icon_high_risk,R.drawable.icon_face_re,R.drawable.icon_rinhuan_take,
R.drawable.icon_zyfx,R.drawable.icon_rinhuan_take};
R.drawable.icon_zyfx};

6
app/src/main/res/layout/fragment_cj.xml
Unescape Escape View File

@ -314,7 +314,7 @@
style="@style/editTextTheme"
android:layout_height="70px"
android:layout_margin="0dp"
android:layout_width="200px"
android:layout_width="180px"
android:layout_gravity="center_vertical"
android:inputType="numberSigned|numberDecimal"/>
@ -325,7 +325,7 @@
android:gravity="center_vertical"
android:layout_marginStart="5dp"
android:text="MM/S"
android:textSize="@dimen/sbtextSize" />
android:textSize="13sp" />
<Button
android:id="@+id/btn_cj"
@ -336,7 +336,7 @@
android:background="@drawable/border_line_while"
android:minWidth="80dp"
android:minHeight="70px"
android:text="传感器采集"
android:text="采集"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:visibility="visible" />

Write Preview
Loading…
Cancel
Save