From 0e7dd8919ae2811063057f18a4db4156c771448a Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 07 Dec 2018 16:54:04 +0800
Subject: [PATCH] [*]添加了微信登陆
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 80 ++++++++++++++--------------------------
1 files changed, 28 insertions(+), 52 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 86ef576..32ddba2 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -55,7 +55,6 @@
import com.moral.yunfushao.ui.PanelView;
import com.moral.yunfushao.utils.AudioUtils;
import com.moral.yunfushao.utils.DebugUtils;
-import com.moral.yunfushao.utils.T;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -65,8 +64,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
/**
* ������������
@@ -136,7 +133,6 @@
private Runnable reconnectRunnable = new Runnable() {
@Override
public void run() {
- System.out.println("chenqi ������������");
//������
if (mBluetoothService == null) {
return;
@@ -201,6 +197,7 @@
mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
resetHandler();
+ textShowMac();//
pv.setStatusStr("���������");
//������������
((MainActivity) getActivity()).resetBLECallBack();
@@ -259,7 +256,7 @@
}
});
//������handler
- resetHandler();
+ HEARTTIMES = 2;
//������������
heart();
}
@@ -271,10 +268,7 @@
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();
@@ -348,15 +342,13 @@
public void onResume() {
super.onResume();
isMySelfPage = true;
- reconnect();
textShowMac();
}
@Override
public void onPause() {
super.onPause();
- //������������������������
- T.show("onPause");
+ System.out.println("chenqi onPause");
isMySelfPage = false;
stopReconnect();
}
@@ -364,11 +356,8 @@
@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;
@@ -417,7 +406,6 @@
}
});
showStatus(-1);
-
}
@Override
@@ -427,7 +415,7 @@
iv_search.setOnClickListener(this);
}
- int submitTime;
+ int submitTime = 0;
int isupLoad;
@Override
@@ -472,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);
@@ -497,19 +484,22 @@
}
- 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() {
@@ -532,8 +522,6 @@
*/
private void stopReconnect() {
handler.removeCallbacks(reconnectRunnable);
- if (mBluetoothService != null)
- mBluetoothService.closeConnect();
}
private void resetHandler() {
@@ -589,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) {
@@ -636,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);
@@ -707,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 + "");
@@ -779,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")) {
@@ -806,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));
@@ -844,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