From 800cf637391b4b237149907ef3b3323966d971da Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Thu, 10 May 2018 19:04:38 +0800
Subject: [PATCH] 提交
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 180 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 90 insertions(+), 90 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 7713628..2cc5443 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -1,10 +1,12 @@
package com.moral.yunfushao.fragment;
import android.annotation.SuppressLint;
+import android.app.AlertDialog;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattService;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.AssetManager;
import android.media.MediaPlayer;
@@ -86,7 +88,7 @@
private ArrayList<String> realHisResult = new ArrayList<>();
//������������
private ArrayList<RecData> submitResult = new ArrayList<>();
- private ArrayList<RecData> submitHisResult = new ArrayList<>();
+
//������������������������
private ArrayList<RecData> submitTempResult = new ArrayList<>();
private Timer heartTimer, resTimer, chonglianTimer;
@@ -146,7 +148,7 @@
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
-// Log.d("haijiang", "������������====" + StringUtils.byteArrayToHexStr(characteristic.getValue()));
+ Log.d("haijiang123", "������������====" + StringUtils.byteArrayToHexStr(characteristic.getValue()));
String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
//������������
parseCurrentData(result);
@@ -175,7 +177,7 @@
public void run() {
checkTime();
}
- }, 2000);
+ }, 500);
/**
* ������������������������
*/
@@ -204,7 +206,7 @@
submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
doTask();
- }else if(msg.getType()==AppConfig.SET_MAIN_CALL){
+ } else if (msg.getType() == AppConfig.SET_MAIN_CALL) {
((MainActivity) getActivity()).resetBLECallBack();
}
}
@@ -303,7 +305,8 @@
}
private MaterialDialog clearDialog;
- private void showClear(){
+
+ private void showClear() {
clearDialog = MaterialDialogUtils.showCallBaclDialog(getActivity(), "������������", "���������������������������������?", new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
@@ -313,16 +316,16 @@
if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
return;
}
- if(mBluetoothService==null){
+ if (mBluetoothService == null) {
return;
}
- if(mBluetoothService.getWirteCharacteristic()==null){
+ if (mBluetoothService.getWirteCharacteristic() == null) {
return;
}
- if(mBluetoothService.getWirteCharacteristic().getService()==null){
+ if (mBluetoothService.getWirteCharacteristic().getService() == null) {
return;
}
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),BLECommon.BLE_CLEAR,null);
+ mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_CLEAR, null);
clearDialog.dismiss();
}
}, new MaterialDialog.SingleButtonCallback() {
@@ -350,7 +353,7 @@
startActivity(intent);
break;
case R.id.iv_search:
- showClear();
+ showClear();
break;
}
@@ -433,7 +436,7 @@
message.what = 1;
heartHandler.sendMessage(message);
}
- }, 0, 1000 * 10);
+ }, 0, 1000 * 60);
}
}
@@ -448,27 +451,6 @@
heartHandler.sendMessage(message);
}
}, 0, 1000 * 8);
- }
- }
-
- private long timeComplete = 0;
-
- private void checkResComplete(final String result) {
- if (resTimer == null) {
- resTimer = new Timer();
- resTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- if (!TextUtils.isEmpty(result) && result.startsWith("3A")) {
- timeComplete = 0;
- } else {
- timeComplete++;
- }
- if (timeComplete >= 120) {
- submitResData();
- }
- }
- }, 0, 1000);
}
}
@@ -491,7 +473,6 @@
HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
@Override
public void onSuccess(String res, String msg) {
- XLog.d("@@@@@@@@@@@@@@@@@@@@@@@@@@" + msg);
submitTempResult.clear();
}
@@ -505,44 +486,6 @@
}
});
- }
-
- private void submitResData() {
- //���������������������������
- HashMap<String, String> params = new HashMap<>();
- if (submitHisResult.size() == 0) {
- return;
- }
- UpLoadParam up = new UpLoadParam();
- up.setUserid(MainApp.userId);
- up.setAddress(MainApp.address);
- up.setLat(MainApp.mLat);
- up.setLon(MainApp.mLon);
- up.setData(submitHisResult);
- params.put("data", FastJsonTools.toJson(up));
- HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
- @Override
- public void onSuccess(String res, String msg) {
- XLog.d("������������������������" + msg);
- submitHisResult.clear();
- if (resTimer != null) {
- resTimer.cancel();
- resTimer = null;
- }
- }
-
- @Override
- public void showLoadingDialog() {
-
- }
-
- @Override
- public void onFail(int errno, String s) {
-
- }
- });
-
-
}
/**
@@ -573,18 +516,18 @@
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_zise);
iv_bottom_status.setImageResource(R.mipmap.icon_zhongdu);
- tv_desc.setText("���������������������������\n������������������������������������������");
+ tv_desc.setText("���������������������������\n������������������������������������������");
iv_status.setImageResource(R.mipmap.icon_head_zhongfu);
- tv_status.setText("������");
+ tv_status.setText("������");
tv_status.setTextColor(getResources().getColor(R.color.zi_txt));
ll_status.setBackgroundResource(R.mipmap.bg_corner_zise);
} else if (level == 3) {
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_red);
iv_bottom_status.setImageResource(R.mipmap.icon_yanzhong);
- tv_desc.setText("���������������������������\n������������������������������������������");
+ tv_desc.setText("���������������������������\n������������������������������������������");
iv_status.setImageResource(R.mipmap.icon_danger);
- tv_status.setText("������");
+ tv_status.setText("������");
tv_status.setTextColor(getResources().getColor(R.color.red_txt));
ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
} else if (level == -1) {
@@ -604,6 +547,8 @@
*
* @param result
*/
+ private int preLevel = -1;
+
private void parseCurrentData(String result) {
if (result.startsWith("5A")) {
realResult.clear();
@@ -615,7 +560,6 @@
for (String s : realResult) {
nowResult += s;
}
-// Log.d("haijiang", "������������===nowResult=" + nowResult);
/**
* 20������������5A������ 5B������
*/
@@ -626,7 +570,7 @@
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.001, 3) + "");
+ tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
double shishiValue = NumberUtils.getBigDecimalValue((shunshiValue) / 100.0, 3);
tv_shishi.setText(shishiValue + "");
@@ -665,6 +609,7 @@
pv.setPercent((float) (shishiValue * (0.25 / 0.16)));
showStatus(0);
stop();
+ preLevel = -1;
} else if (shishiValue >= 0.16 && shishiValue < 0.8) {
data.setIs_warn(1);
pv.setPercent((float) (0.25 + shishiValue * (0.25 / 0.8)));
@@ -695,6 +640,8 @@
*
* @param result
*/
+ private AlertDialog testDialog;
+
private void parseHoutData(String result) {
if (result.startsWith("7A")) {
realHourResult.clear();
@@ -706,9 +653,16 @@
for (String s : realHourResult) {
nowResult += s;
}
- if (!TextUtils.isEmpty(nowResult)&& nowResult.length() == 8&&nowResult.startsWith("7A") && nowResult.endsWith("7B")) {
+ if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 8 && nowResult.startsWith("7A") && nowResult.endsWith("7B")) {
+
+ //-----------------------Test------------------------------------------//
+// String aaa = MainApp.theApp.sharedPreferencesUtil.getTest()+"\n"+nowResult+" ���������������"+TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss");
+// MainApp.theApp.sharedPreferencesUtil.saveTest(aaa);
+ //-----------------------Test------------------------------------------//
+
+ test(nowResult, TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
int hourValue = Integer.parseInt(nowResult.substring(2, 4), 16) * 256 + Integer.parseInt(nowResult.substring(4, 6), 16);
- Log.d("haijiang", "������������������������="+ nowResult+"���������"+nowResult.substring(2, 4)+"|"+Integer.parseInt(nowResult.substring(2, 4), 16) * 256+"���������"+nowResult.substring(4, 6)+"|"+Integer.parseInt(nowResult.substring(4, 6), 16) +"���������"+(hourValue/100.0));
+// Log.d("haijiang", "������������������������="+ nowResult+"���������"+nowResult.substring(2, 4)+"|"+Integer.parseInt(nowResult.substring(2, 4), 16) * 256+"���������"+nowResult.substring(4, 6)+"|"+Integer.parseInt(nowResult.substring(4, 6), 16) +"���������"+(hourValue/100.0));
sendHourDataRec();
RecData data = new RecData();
data.setType(1);
@@ -736,10 +690,13 @@
nowResult += s;
}
if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 16 && nowResult.startsWith("3A") && nowResult.endsWith("3B")) {
- if (submitHisResult.size() == 0) {
- //���������������������
- checkResComplete(result);
- }
+ Log.d("hourdata", "=====nowResult=====" + nowResult);
+
+ //-----------------------Test------------------------------------------//
+// String aaa = MainApp.theApp.sharedPreferencesUtil.getTest()+"\n"+nowResult;
+// MainApp.theApp.sharedPreferencesUtil.saveTest(aaa);
+ //-----------------------Test------------------------------------------//
+
String year = "20" + Integer.parseInt(nowResult.substring(2, 4), 16);
String month = Integer.parseInt(nowResult.substring(4, 6), 16) + "";
String day = Integer.parseInt(nowResult.substring(6, 8), 16) + "";
@@ -749,10 +706,16 @@
StringBuilder time = new StringBuilder();
//yyyy-MM-dd HH:mm:ss
time.append(year).append("-").append(month).append("-").append(day).append(" ").append(hour).append(":00:00");
- Log.d("haijiang", "=====time=====" + time.toString());
data.setTime(time.toString());
data.setValue(NumberUtils.getBigDecimalValue((resValue) / 100.0, 3));
- submitHisResult.add(data);
+ data.setType(1);
+ data.setIs_warn(0);
+
+ ArrayList<RecData> temp = new ArrayList<>();
+ temp.add(data);
+ Log.d("hourdata", "=====hourdata=====" + FastJsonTools.toJson(temp));
+ test(nowResult, time.toString());
+ submitHourData(temp);
}
}
@@ -787,6 +750,11 @@
}
public void play(int level) {
+ Log.d("music", "preLevel:" + preLevel + "----level:" + level);
+ if (preLevel == level) {
+ return;
+ }
+ preLevel = level;
if (mp != null) {
stop();
}
@@ -794,12 +762,14 @@
if (voiceBean.isDefaultMusic()) {
mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
mp.start();
+ mp.setLooping(true);
} else {
mp = new MediaPlayer();
try {
mp.setDataSource(voiceBean.getSetMusic());
mp.prepare();
mp.start();
+ mp.setLooping(true);
} catch (IOException e) {
e.printStackTrace();
}
@@ -829,10 +799,40 @@
@Override
public void onSuccess(String res, String msg) {
XLog.d("������������������������������" + msg);
- if (resTimer != null) {
- resTimer.cancel();
- resTimer = null;
- }
+// if (resTimer != null) {
+// resTimer.cancel();
+// resTimer = null;
+// }
+ }
+
+ @Override
+ public void showLoadingDialog() {
+
+ }
+
+ @Override
+ public void onFail(int errno, String s) {
+
+ }
+ });
+ }
+
+ /**
+ * ������������������
+ *
+ * @param data
+ * @param time
+ */
+ private void test(String data, String time) {
+ //���������������������������
+ HashMap<String, String> params = new HashMap<>();
+ params.put("data", data);
+ params.put("time", time);
+ params.put("user_id", MainApp.userId);
+ HttpUtils.doPost(API.ORIGINALUPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
+ @Override
+ public void onSuccess(String res, String msg) {
+ Log.d("hourdata","������������");
}
@Override
@@ -850,7 +850,7 @@
/**
* ������������������
*/
- private void sendHourDataRec(){
+ private void sendHourDataRec() {
if (MainApp.theApp.bleManager == null) {
return;
}
--
Gitblit v1.8.0