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 | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 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 a2d2ef6..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;
/**
* ������������
@@ -270,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();
@@ -363,10 +358,6 @@
super.onDestroy();
System.out.println("chenqi onDestroy");
EventBus.getDefault().unregister(this);
- if (timer != null) {
- timer.cancel();
- timer = null;
- }
handler.removeCallbacksAndMessages(null);
stop();
isVirating = false;
@@ -424,7 +415,7 @@
iv_search.setOnClickListener(this);
}
- int submitTime;
+ int submitTime = 0;
int isupLoad;
@Override
@@ -493,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() {
@@ -771,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")) {
--
Gitblit v1.8.0