From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 242 +++++++++++++++++++++---------------------------
1 files changed, 106 insertions(+), 136 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..c4c4445 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;
@@ -75,6 +73,7 @@
*/
public class FragmentMonitor extends BaseFragment {
+ private String TGA = getClass().getSimpleName();
/**
* ������������
*/
@@ -96,39 +95,65 @@
//������������������������
private ArrayList<RecData> submitTempResult = new ArrayList<>();
- private Timer heartTimer, resTimer, chonglianTimer;
+ //������������
+ private int HEARTTIMES = 2;
+ //������������
+ private int RECONNECTTIMES = 8000;
+ //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);
+ Log.d(TGA, "������������");
+ heart();
+ }
+ };
+ private Runnable reconnectRunnable = new Runnable() {
+ @Override
+ public void run() {
+ //������
+ 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(TGA, "������������");
+ FragmentMonitor.this.mBluetoothService.scanAndConnect5(mac);
+ }
+ reconnect();
}
};
- private int checkTimeCount = 0;
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,12 +196,8 @@
*/
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void eventComing(EventMessage msg) {
- System.out.println("chenqi msge -> " + msg.getType());
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
- if (chonglianTimer != null) {
- chonglianTimer.cancel();
- chonglianTimer = null;
- }
+ resetHandler();
pv.setStatusStr("���������");
//������������
mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
@@ -203,7 +224,6 @@
mBluetoothService.setCharacteristic(characteristic);
}
}
-
}
/**
@@ -221,43 +241,30 @@
String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
stringResult.append(result);
doHandleData(result);
-
stringResult = new StringBuilder();
}
});
+ HEARTTIMES = 30;
}
@Override
public void onFailure(final BleException exception) {
-
}
@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.postDelayed(runnable, 5000);
heart();
}
} else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
preLevel = -1;
showStatus(-1);
- chonglian();
+ handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
stop();
isVirating = false;
AudioUtils.virateCancle(getActivity());
@@ -336,21 +343,20 @@
}
@Override
+ public void onResume() {
+ super.onResume();
+ textShowMac();
+ }
+
+ @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());
@@ -492,79 +498,18 @@
}, 0, submitTime * 1000);
}
- /**
- * ���������������������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);
- }
+ handler.postDelayed(heartRunnable, 1000 * HEARTTIMES);
}
- 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 reconnect() {
+ handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
+ }
+
+ private void resetHandler() {
+ handler.removeCallbacks(reconnectRunnable);
+ handler.removeCallbacks(heartRunnable);
+ HEARTTIMES = 2;
}
private void submitData() {
@@ -608,6 +553,7 @@
private void showStatus(int level) {
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;
@@ -661,6 +607,7 @@
tv_status.setTextColor(getResources().getColor(R.color.red_txt));
ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
} else if (level == -1) {
+ iv_dianliang.setVisibility(View.GONE);
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
iv_bottom_status.setImageResource(R.mipmap.icon_offline);
@@ -682,9 +629,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 = (TextView) 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);
+ }
+ });
}
}
@@ -776,13 +743,13 @@
}
}
+
/**
* 7A������������������
* 7A0024010002D8B04CE90E6300000003000003EE0000000000000EC6000000000017347B0D0A
* ������������������
*/
private void parseHoutData(String nowResult) {
- System.out.println("chenqi elec parseHoutData" + nowResult);
if (TextUtils.isEmpty(nowResult)) {
return;
}
@@ -791,13 +758,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;
@@ -869,13 +834,11 @@
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();
}
}
@@ -985,6 +948,11 @@
}
}
+ /**
+ * ������������������
+ *
+ * @param level
+ */
public void play(int level) {
Log.d("music", "preLevel:" + preLevel + "----level:" + level);
if (preLevel == level) {
@@ -996,9 +964,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