From 4203968ed148a7e56ab460c8d6edb744cb1645e4 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 07 Dec 2018 17:16:54 +0800
Subject: [PATCH] [*]优化微信登陆用户信息
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 133 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 64 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 c4c4445..32ddba2 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -64,8 +64,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
/**
* ������������
@@ -98,11 +96,12 @@
//������������
private int HEARTTIMES = 2;
- //������������
- private int RECONNECTTIMES = 8000;
+
+ //������������������
+ private boolean isMySelfPage = false;
+
//handler������������
private Handler handler = new Handler();
-
private Runnable heartRunnable = new Runnable() {
@Override
@@ -126,15 +125,16 @@
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) {
+ if (mBluetoothService == null) {
return;
}
String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
@@ -142,10 +142,8 @@
if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
return;
}
- Log.d(TGA, "������������");
- FragmentMonitor.this.mBluetoothService.scanAndConnect5(mac);
+ mBluetoothService.scanAndConnect5(mac);
}
- reconnect();
}
};
@@ -196,11 +194,12 @@
*/
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void eventComing(EventMessage msg) {
+ mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
resetHandler();
+ textShowMac();//
pv.setStatusStr("���������");
//������������
- mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
((MainActivity) getActivity()).resetBLECallBack();
if (mBluetoothService != null) {
BluetoothGatt gatt = mBluetoothService.getGatt();
@@ -211,8 +210,8 @@
mBluetoothService.setService(service);
break;
}
- }
- //������������
+
+ }//������������
for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
int charaProp = characteristic.getProperties();
if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
@@ -249,31 +248,27 @@
@Override
public void onFailure(final BleException exception) {
+
}
@Override
public void onInitiatedResult(boolean result) {
}
});
- /**
- * ������������������
- */
-// handler.postDelayed(runnable, 5000);
+ //������handler
+ HEARTTIMES = 2;
+ //������������
heart();
}
} else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
preLevel = -1;
showStatus(-1);
- handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
+ 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();
@@ -304,6 +299,7 @@
}
} else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
showStatus(-1);
+ stopReconnect();
}
}
@@ -339,23 +335,29 @@
@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();
+ System.out.println("chenqi onPause");
+ isMySelfPage = false;
+ stopReconnect();
}
@Override
public void onDestroy() {
super.onDestroy();
+ System.out.println("chenqi onDestroy");
EventBus.getDefault().unregister(this);
- if (timer != null) {
- timer.cancel();
- timer = null;
- }
handler.removeCallbacksAndMessages(null);
stop();
isVirating = false;
@@ -413,7 +415,7 @@
iv_search.setOnClickListener(this);
}
- int submitTime;
+ int submitTime = 0;
int isupLoad;
@Override
@@ -458,14 +460,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);
@@ -483,33 +484,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);
}
+ /**
+ * ������������
+ */
private void reconnect() {
- handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
+ if (isMySelfPage) {
+ stopReconnect();
+ //���������������������
+ handler.postDelayed(reconnectRunnable, 0);
+ }
+ }
+
+ /**
+ * ������������
+ */
+ private void stopReconnect() {
+ handler.removeCallbacks(reconnectRunnable);
}
private void resetHandler() {
handler.removeCallbacks(reconnectRunnable);
handler.removeCallbacks(heartRunnable);
- HEARTTIMES = 2;
}
private void submitData() {
@@ -560,14 +577,14 @@
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) {
@@ -607,7 +624,6 @@
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);
@@ -637,7 +653,7 @@
private void textShowMac() {
if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
- final TextView tv_text_mac = (TextView) findView(R.id.tv_text_mac);
+ final TextView tv_text_mac = findView(R.id.tv_text_mac);
tv_desc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -678,7 +694,6 @@
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 + "");
@@ -750,9 +765,11 @@
* ������������������
*/
private void parseHoutData(String nowResult) {
+ System.out.println("chenqi parseHoutData first" + nowResult);
if (TextUtils.isEmpty(nowResult)) {
return;
}
+ System.out.println("chenqi parseHoutData begin" + nowResult);
type = 2;
String[] strings = StringUtils.splitString(nowResult, 2);
if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {
@@ -777,14 +794,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));
@@ -815,19 +829,10 @@
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);
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;
--
Gitblit v1.8.0