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 | 350 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 180 insertions(+), 170 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 fd7ea84..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;
@@ -35,6 +33,7 @@
import com.moral.andbrickslib.utils.TimeUtil;
import com.moral.andbrickslib.utils.dialog.MaterialDialogUtils;
import com.moral.andbrickslib.utils.log.XLog;
+import com.moral.yunfushao.BuildConfig;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
@@ -45,6 +44,7 @@
import com.moral.yunfushao.ble.BluetoothService;
import com.moral.yunfushao.common.API;
import com.moral.yunfushao.common.AppConfig;
+import com.moral.yunfushao.common.VersionConstants;
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.imageload.ImageLoader;
@@ -73,6 +73,7 @@
*/
public class FragmentMonitor extends BaseFragment {
+ private String TGA = getClass().getSimpleName();
/**
* ������������
*/
@@ -90,40 +91,69 @@
private ArrayList<RecData> submitResult = new ArrayList<>();
private StringBuilder stringResult = new StringBuilder();
+ private String deviceName = "";//���������������������������
//������������������������
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;
-
- result = result.substring(14);
- doHandleData(result);
- }
-
if (result.startsWith("3A")) {
if (result.length() >= 16) {
DebugUtils.sendData("data", result);
@@ -151,7 +181,6 @@
if (result.length() >= 76) {
DebugUtils.sendData("data", result);
parseHoutData(result.substring(0, 76));
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_SEND_7A, null);
result = result.substring(76);
doHandleData(result);
} else {
@@ -168,10 +197,7 @@
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void eventComing(EventMessage msg) {
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
- if (chonglianTimer != null) {
- chonglianTimer.cancel();
- chonglianTimer = null;
- }
+ resetHandler();
pv.setStatusStr("���������");
//������������
mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
@@ -190,7 +216,6 @@
for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
int charaProp = characteristic.getProperties();
if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
-
}
if ((charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0 || (charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) > 0) {
mBluetoothService.setWirteCharacteristic(characteristic);
@@ -216,47 +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);
- pv.setStatusStr("���������");
- pv.setPercent(0);
- tv_ljjl.setText("0");
- tv_shishi.setText("0");
- chonglian();
+ handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
stop();
isVirating = false;
AudioUtils.virateCancle(getActivity());
@@ -294,7 +302,8 @@
voiceBean.setName("������������");
voiceList.add(voiceBean);
}
-
+ } else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
+ showStatus(-1);
}
}
@@ -334,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());
@@ -382,14 +390,17 @@
iv_dianliang.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
+ }
}
});
tv_dianliang2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- FlipAnimatorXViewShow(tv_dianliang2, iv_dianliang, 200);
-
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ FlipAnimatorXViewShow(tv_dianliang2, iv_dianliang, 200);
+ }
}
});
showStatus(-1);
@@ -487,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() {
@@ -603,18 +553,21 @@
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.dianliyanyang;
- danger = R.mipmap.dianlidanger;
- lv_ljjl.setVisibility(View.VISIBLE);
- tvShishiTitle.setText("������������(uSv/h)");
- } else if (type == 2) {
- //������
yanzhang = R.mipmap.icon_yanzhong;
danger = R.mipmap.icon_danger;
- tvShishiTitle.setText("������������(V/m)");
- lv_ljjl.setVisibility(View.GONE);
+ tvLijiTitle.setText("������������(uSv)");
+ tvShishiTitle.setText("������������(uSv/h)");
+ iv_dianliang.setEnabled(false);
+ } else if (type == 2) {
+ //������
+ yanzhang = R.mipmap.dianliyanyang;
+ danger = R.mipmap.dianlidanger;
+ tvLijiTitle.setText("������������");
+ tvShishiTitle.setText("������������");
+ iv_dianliang.setEnabled(true);
}
if (level == 0) {
@@ -654,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);
@@ -662,6 +616,42 @@
tv_status.setText("������");
tv_status.setTextColor(getResources().getColor(R.color.gray_txt));
ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
+ pv.setStatusStr("���������");
+ pv.setPercent(0);
+ tv_ljjl.setText("0");
+ tv_shishi.setText("0");
+ showPower(2, 0);
+ } else if (level == -2) {
+ tv_tishi.setText("���������������������");
+ tv_tishi.setBackgroundResource(R.mipmap.bt_green);
+ tv_desc.setText("������������������������");
+ iv_status.setVisibility(View.GONE);
+ tv_status.setText("���������");
+ ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
+ pv.setPercent(0);
+ 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);
+ }
+ });
}
}
@@ -672,7 +662,6 @@
*/
private int preLevel = -1;
-
/**
* data : 5A160000FA1C0400004100E7000700000071005B
* format : 20������������5A������ 5B������
@@ -682,6 +671,7 @@
*/
//todo ������������������
private void parseCurrentData(String nowResult) {
+ System.out.println("chenqi nowResult parseCurrentData");
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);
@@ -701,10 +691,6 @@
data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
data.setType(0);
- /**
- * ������������
- */
- showPower(b1, b2);
if (realValue < 0.16) {
data.setIs_warn(0);
@@ -748,11 +734,15 @@
AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
}
}
-
+ /**
+ * ������������
+ */
+ showPower(b1, b2);
submitResult.add(data);
// realResult.clear();
}
}
+
/**
* 7A������������������
@@ -767,33 +757,39 @@
String[] strings = StringUtils.splitString(nowResult, 2);
if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {
String realString = StringUtils.subStrings(strings, 21, 23);
- int real = Integer.parseInt(realString, 16);
- int b1 = Integer.parseInt(strings[24], 16);
- int b2 = Integer.parseInt(strings[25], 16);
- double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
+ int electric_field = Integer.parseInt(realString, 16);
+ 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;
+
String power = StringUtils.subStrings(strings, 26, 27);
+
double textPower = Integer.parseInt(power, 16) / 1000.0;
+
+ tv_shishi.setText(electricFieldValue + "(V/m)");
+
tv_dianliang2.setText(textPower + "V");
- tv_shishi.setText(realValue + "");
+
+ tv_ljjl.setText(elecValue + "(��T)");
/**
* ���������������������
*/
RecData data = new RecData();
- data.setValue(realValue);
+ data.setValue(electricFieldValue);
data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
data.setType(0);
- /**
- * ������������
- */
- showPower(b1, b2);
showStatus(Integer.parseInt(strings[21], 16));
- if (realValue < 0.16) {
- data.setIs_warn(0);
- pv.setPercent((float) (realValue * (0.25 / 0.16)));
+ if (baojing == 0) {
+ pv.setPercent((float) (0.125));
showStatus(0);
stop();
if (isVirating) {
@@ -801,40 +797,48 @@
AudioUtils.virateCancle(getActivity());
}
preLevel = -1;
- } else if (realValue >= 0.16 && realValue < 0.8) {
+ } else if (baojing == 1) {
data.setIs_warn(1);
- pv.setPercent((float) (0.25 + realValue * (0.25 / 0.8)));
+ pv.setPercent((float) (0.375));
showStatus(1);
play(0);
if (!isVirating) {
isVirating = true;
AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
}
- } else if (realValue >= 0.8 && realValue < 2) {
+ } else if (baojing == 2) {
data.setIs_warn(1);
showStatus(2);
- pv.setPercent((float) (0.5 + realValue * (0.25 / 2)));
+ pv.setPercent((float) (0.625));
play(1);
if (!isVirating) {
isVirating = true;
AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
}
- } else if (realValue >= 2) {
+ } else if (baojing == 3) {
data.setIs_warn(1);
showStatus(3);
- if ((0.75 + realValue / 30) < 1.0) {
- pv.setPercent((float) (0.75 + realValue / 30));
- } else {
- pv.setPercent(1.0f);
+ 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);
}
}
+ /**
+ * ������������
+ */
+ showPower(b1, b2);
submitResult.add(data);
-// realResult.clear();
}
}
@@ -868,7 +872,6 @@
ArrayList<RecData> temp = new ArrayList<>();
temp.add(data);
- Log.d("hourdata", "=====hourdata=====" + FastJsonTools.toJson(temp));
test(nowResult, time.toString());
submitHourData(temp);
}
@@ -880,6 +883,7 @@
private void showPower(int b1, int b2) {
if (b1 == 1) {
ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
+ showStatus(-2);
} else if (b1 == 2) {
ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
} else {
@@ -944,6 +948,11 @@
}
}
+ /**
+ * ������������������
+ *
+ * @param level
+ */
public void play(int level) {
Log.d("music", "preLevel:" + preLevel + "----level:" + level);
if (preLevel == level) {
@@ -955,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 {
@@ -1065,7 +1076,6 @@
}
public static void FlipAnimatorXViewShow(final View oldView, final View newView, final long time) {
-
ObjectAnimator animator1 = ObjectAnimator.ofFloat(oldView, "rotationX", 0, 90);
final ObjectAnimator animator2 = ObjectAnimator.ofFloat(newView, "rotationX", -90, 0);
animator2.setInterpolator(new OvershootInterpolator(2.0f));
--
Gitblit v1.8.0