From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 359 +++++++++++++++++++++++++++--------------------------------
1 files changed, 166 insertions(+), 193 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index e6c34c2..a8459c9 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -2,7 +2,6 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattService;
@@ -13,7 +12,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
-import android.os.Message;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
@@ -66,8 +64,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
/**
* ������������
@@ -75,6 +71,7 @@
*/
public class FragmentMonitor extends BaseFragment {
+ private String TGA = getClass().getSimpleName();
/**
* ������������
*/
@@ -96,39 +93,63 @@
//������������������������
private ArrayList<RecData> submitTempResult = new ArrayList<>();
- private Timer heartTimer, resTimer, chonglianTimer;
+ //������������
+ private int HEARTTIMES = 2;
+
+ //������������������
+ private boolean isMySelfPage = false;
+
+ //handler������������
private Handler handler = new Handler();
- private Runnable runnable = new Runnable() {
+ private Runnable heartRunnable = new Runnable() {
@Override
public void run() {
- checkTime();
- checkTimeCount++;
- handler.postDelayed(this, 5000);
+ if (MainApp.theApp.bleManager == null) {
+ return;
+ }
+ if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
+ return;
+ }
+ //������������
+ if (FragmentMonitor.this.mBluetoothService == null) {
+ return;
+ }
+ if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic() == null) {
+ return;
+ }
+ if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService() == null) {
+ return;
+ }
+ FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),
+ FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(),
+ BLECommon.BLE_HEART, null);
+ heart();
}
};
- private int checkTimeCount = 0;
+
+ private Runnable reconnectRunnable = new Runnable() {
+ @Override
+ public void run() {
+ //������
+ if (mBluetoothService == null) {
+ return;
+ }
+
+ String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
+ if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
+ mBluetoothService.scanAndConnect5(mac);
+ }
+ }
+ };
+
private void doHandleData(String result) {
if (StringUtils.isEmpty(result)) {
return;
}
-
- //������������"������������������������������"���������5������������������������������������������
- if (result.startsWith(BLECommon.BLE_REC_TIME) || checkTimeCount > 5) {
- DebugUtils.sendData("data", result);
-
- handler.removeCallbacks(runnable);
- checkTimeCount = 0;
-
- if (result.length() > 14) {
- result = result.substring(14);
- doHandleData(result);
- }
- }
-
if (result.startsWith("3A")) {
if (result.length() >= 16) {
DebugUtils.sendData("data", result);
@@ -171,15 +192,12 @@
*/
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void eventComing(EventMessage msg) {
- System.out.println("chenqi msge -> " + msg.getType());
+ mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
- if (chonglianTimer != null) {
- chonglianTimer.cancel();
- chonglianTimer = null;
- }
+ resetHandler();
+ textShowMac();//
pv.setStatusStr("���������");
//������������
- mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
((MainActivity) getActivity()).resetBLECallBack();
if (mBluetoothService != null) {
BluetoothGatt gatt = mBluetoothService.getGatt();
@@ -190,8 +208,8 @@
mBluetoothService.setService(service);
break;
}
- }
- //������������
+
+ }//������������
for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
int charaProp = characteristic.getProperties();
if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
@@ -203,7 +221,6 @@
mBluetoothService.setCharacteristic(characteristic);
}
}
-
}
/**
@@ -215,16 +232,17 @@
new BleCharacterCallback() {
@Override
public void onSuccess(final BluetoothGattCharacteristic characteristic) {
+ final String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
+ stringResult.append(result);
getActivity().runOnUiThread(new Runnable() {
+
@Override
public void run() {
- String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
- stringResult.append(result);
doHandleData(result);
-
- stringResult = new StringBuilder();
}
});
+ stringResult = new StringBuilder();
+ HEARTTIMES = 30;
}
@Override
@@ -234,39 +252,22 @@
@Override
public void onInitiatedResult(boolean result) {
-
}
});
- /**
- * ������������������
- */
- handler.postDelayed(runnable, 5000);
-
- /**
- * ������������������������
- */
- if (mBluetoothService == null) {
- return;
- }
- if (mBluetoothService.getWirteCharacteristic() == null) {
- return;
- }
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
+ //������handler
+ HEARTTIMES = 2;
+ //������������
heart();
}
} else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
preLevel = -1;
showStatus(-1);
- chonglian();
+ reconnect();
stop();
isVirating = false;
AudioUtils.virateCancle(getActivity());
-
} else if (msg.getType() == AppConfig.CHANGE_SETTING) {
- if (timer != null) {
- timer.cancel();
- timer = null;
- }
+ handler.removeCallbacks(taskRunnable);
submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
doTask();
@@ -297,6 +298,7 @@
}
} else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
showStatus(-1);
+ stopReconnect();
}
}
@@ -326,31 +328,33 @@
voiceBean.setName("������������");
voiceList.add(voiceBean);
}
-
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
- FragmentMonitor.this.mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
+ mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ isMySelfPage = true;
+ textShowMac();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ isMySelfPage = false;
+ stopReconnect();
}
@Override
public void onDestroy() {
super.onDestroy();
EventBus.getDefault().unregister(this);
- if (heartTimer != null) {
- heartTimer.cancel();
- heartTimer = null;
- }
- if (timer != null) {
- timer.cancel();
- timer = null;
- }
- if (chonglianTimer != null) {
- chonglianTimer.cancel();
- chonglianTimer = null;
- }
+ handler.removeCallbacksAndMessages(null);
stop();
isVirating = false;
AudioUtils.virateCancle(getActivity());
@@ -407,7 +411,7 @@
iv_search.setOnClickListener(this);
}
- int submitTime;
+ int submitTime = 0;
int isupLoad;
@Override
@@ -452,14 +456,13 @@
@Override
protected void processClick(View v) {
- Intent intent = null;
+ Intent intent;
switch (v.getId()) {
case R.id.pv:
if (MainApp.theApp.bleManager == null || !(MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isSupportBle())) {
return;
}
- intent = new Intent(getActivity(), BLESearchActivity.class);
- startActivity(intent);
+ startActivity(new Intent(getActivity(), BLESearchActivity.class));
break;
case R.id.iv_his:
intent = new Intent(getActivity(), ChartActivity.class);
@@ -477,94 +480,49 @@
}
- Timer timer;
+ Runnable taskRunnable = new Runnable() {
+ @Override
+ public void run() {
+ if (isupLoad == 1) {
+ //������������
+ submitData();
+ }
+ doTask();
+ }
+ };
private void doTask() {
- timer = new Timer();
- timer.schedule(new TimerTask() {
- @Override
- public void run() {
- if (isupLoad == 1) {
- //������������
- submitData();
- }
- }
- }, 0, submitTime * 1000);
+ if (submitTime == 0) {
+ submitTime = 20;
+ }
+ handler.postDelayed(taskRunnable, submitTime * 1000);
+ }
+
+ private void heart() {
+ handler.postDelayed(heartRunnable, 1000 * HEARTTIMES);
}
/**
- * ���������������������3������
+ * ������������
*/
- @SuppressLint("HandlerLeak")
- Handler heartHandler = new Handler() {
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case 1:
- if (MainApp.theApp.bleManager == null) {
- return;
- }
- if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
- return;
- }
- //������������
- if (FragmentMonitor.this.mBluetoothService == null) {
- return;
- }
- if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic() == null) {
- return;
- }
- if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService() == null) {
- return;
- }
- FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
- Log.d("xintiao", "������������");
- break;
- case 2:
- //������
- if (FragmentMonitor.this.mBluetoothService == null) {
- return;
- }
- String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
- if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
- if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
- return;
- }
- Log.d("chonglian", "������������");
- FragmentMonitor.this.mBluetoothService.scanAndConnect5(mac);
- }
- break;
- }
- super.handleMessage(msg);
- }
-
- };
-
- private void heart() {
- if (heartTimer == null) {
- heartTimer = new Timer();
- heartTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- Message message = new Message();
- message.what = 1;
- heartHandler.sendMessage(message);
- }
- }, 0, 1000 * 30);
+ private void reconnect() {
+ if (isMySelfPage) {
+ stopReconnect();
+ //���������������������
+ handler.postDelayed(reconnectRunnable, 0);
}
}
- private void chonglian() {
- if (chonglianTimer == null) {
- chonglianTimer = new Timer();
- chonglianTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- Message message = new Message();
- message.what = 2;
- heartHandler.sendMessage(message);
- }
- }, 0, 1000 * 8);
- }
+ /**
+ * ������������
+ */
+ private void stopReconnect() {
+ handler.removeCallbacks(reconnectRunnable);
+ }
+
+ private void resetHandler() {
+ handler.removeCallbacks(reconnectRunnable);
+ handler.removeCallbacks(heartRunnable);
}
private void submitData() {
@@ -606,25 +564,28 @@
* @param level
*/
private void showStatus(int level) {
+ System.out.println("chenqi level " + level + " ������ " + type);
int yanzhang = R.mipmap.icon_yanzhong;
int danger = R.mipmap.icon_danger;
+ iv_dianliang.setVisibility(View.VISIBLE);
if (type == 1) {
//������
yanzhang = R.mipmap.icon_yanzhong;
danger = R.mipmap.icon_danger;
tvLijiTitle.setText("������������(uSv)");
tvShishiTitle.setText("������������(uSv/h)");
- iv_dianliang.setEnabled(false);
+// iv_dianliang.setEnabled(false);
} else if (type == 2) {
//������
yanzhang = R.mipmap.dianliyanyang;
danger = R.mipmap.dianlidanger;
tvLijiTitle.setText("������������");
tvShishiTitle.setText("������������");
- iv_dianliang.setEnabled(true);
+// iv_dianliang.setEnabled(true);
}
if (level == 0) {
+ System.out.println("chenqi ������������");
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_green);
iv_bottom_status.setImageResource(R.mipmap.icon_good);
@@ -682,9 +643,29 @@
tv_status.setText("���������");
ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
pv.setPercent(0);
- pv.setStatusStr("���������");
+ pv.setStatusStr("���������");
tv_ljjl.setText("0");
tv_shishi.setText("0");
+ }
+ }
+
+ private void textShowMac() {
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ final TextView tv_text_mac = findView(R.id.tv_text_mac);
+ tv_desc.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ tv_text_mac.setText("Mac: " + MainApp.theApp.sharedPreferencesUtil.getBLE());
+ FlipAnimatorXViewShow(tv_desc, tv_text_mac, 100L);
+ }
+ });
+
+ tv_text_mac.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ FlipAnimatorXViewShow(tv_text_mac, tv_desc, 100L);
+ }
+ });
}
}
@@ -704,14 +685,13 @@
*/
//todo ������������������
private void parseCurrentData(String nowResult) {
- System.out.println("chenqi nowResult parseCurrentData");
+ System.out.println("chenqi nowResult parseCurrentData" + nowResult);
type = 1;
if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) {
int real = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16);
int leijiValue = Integer.parseInt(nowResult.substring(28, 30), 16) * 1024 + Integer.parseInt(nowResult.substring(30, 32), 16) * 512 + Integer.parseInt(nowResult.substring(32, 34), 16) * 256 + Integer.parseInt(nowResult.substring(34, 36), 16);
int b1 = Integer.parseInt(nowResult.substring(6, 8), 16);
int b2 = Integer.parseInt(nowResult.substring(12, 14), 16);
-// XLog.d("���������" + shunshiValue + "|���������" + leijiValue + "-----���������" + b1 + "|" + b2);
tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
tv_shishi.setText(realValue + "");
@@ -776,13 +756,14 @@
}
}
+
/**
* 7A������������������
* 7A0024010002D8B04CE90E6300000003000003EE0000000000000EC6000000000017347B0D0A
+ * <p>
* ������������������
*/
private void parseHoutData(String nowResult) {
- System.out.println("chenqi elec parseHoutData" + nowResult);
if (TextUtils.isEmpty(nowResult)) {
return;
}
@@ -791,13 +772,11 @@
if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {
String realString = StringUtils.subStrings(strings, 21, 23);
int electric_field = Integer.parseInt(realString, 16);
- int b1 = Integer.parseInt(strings[24], 16);
- int b2 = Integer.parseInt(strings[25], 16);
- int baojing = Integer.parseInt(strings[29], 16);
- int elec = Integer.parseInt(StringUtils.subStrings(strings, 13, 15));
-// T.show("bl = " + strings[24] + " -- b2 = " + strings[25]);
-//
-// System.out.println("bl = " + b1 + " -- b2 = " + b2);
+ int b1 = Integer.parseInt(strings[24].trim(), 16);
+ int b2 = Integer.parseInt(strings[25].trim(), 16);
+ int baojing = Integer.parseInt(strings[29].trim(), 16);
+
+ double elec = Integer.parseInt(StringUtils.subStrings(strings, 13, 15), 16);
double electricFieldValue = (electric_field) / 100.0;
double elecValue = (elec) / 100.0;
@@ -812,16 +791,11 @@
tv_ljjl.setText(elecValue + "(��T)");
- /**
- * ���������������������
- */
+ //���������������������
RecData data = new RecData();
data.setValue(electricFieldValue);
data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
data.setType(0);
-
-
- showStatus(Integer.parseInt(strings[21], 16));
if (baojing == 0) {
pv.setPercent((float) (0.125));
@@ -843,39 +817,30 @@
}
} else if (baojing == 2) {
data.setIs_warn(1);
- showStatus(2);
pv.setPercent((float) (0.625));
+ showStatus(2);
play(1);
if (!isVirating) {
isVirating = true;
AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
}
- } else if (baojing == 3) {
+ } else if (baojing == 3 || baojing == 4) {
data.setIs_warn(1);
+ if (baojing == 4) {
+ pv.setPercent((float) (1));
+ } else pv.setPercent((float) (0.875));
showStatus(3);
- pv.setPercent((float) (0.875));
- play(2);
- if (!isVirating) {
- isVirating = true;
- AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
- }
- } else if (baojing == 4) {
- data.setIs_warn(1);
- showStatus(3);
- pv.setPercent((float) (1.00));
play(2);
if (!isVirating) {
isVirating = true;
AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
}
}
- System.out.println("chenqi elec B-- " + b2);
/**
* ������������
*/
showPower(b1, b2);
submitResult.add(data);
- // realResult.clear();
}
}
@@ -919,10 +884,11 @@
*/
private void showPower(int b1, int b2) {
if (b1 == 1) {
+ iv_dianliang.setVisibility(View.VISIBLE);
ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
showStatus(-2);
} else if (b1 == 2) {
- ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
+ iv_dianliang.setVisibility(View.GONE);
} else {
if (b2 == 0) {
ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b00, iv_dianliang);
@@ -985,6 +951,11 @@
}
}
+ /**
+ * ������������������
+ *
+ * @param level
+ */
public void play(int level) {
Log.d("music", "preLevel:" + preLevel + "----level:" + level);
if (preLevel == level) {
@@ -996,9 +967,11 @@
}
VoiceBean voiceBean = voiceList.get(level);
if (voiceBean.isDefaultMusic()) {
- mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
- mp.start();
- mp.setLooping(true);
+ if (voiceBean.getRes() != null) {
+ mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
+ mp.start();
+ mp.setLooping(true);
+ }
} else {
mp = new MediaPlayer();
try {
--
Gitblit v1.8.0