From 4eb9bd2cd9921386de8caec224cdb7405196472d Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 15 May 2018 13:01:59 +0800
Subject: [PATCH] debugging
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 620 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 467 insertions(+), 153 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 6f1b46a..24d4a23 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -1,5 +1,7 @@
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;
@@ -7,9 +9,11 @@
import android.content.Intent;
import android.content.res.AssetManager;
import android.media.MediaPlayer;
+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;
import android.util.Log;
@@ -18,6 +22,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
import com.clj.fastble.conn.BleCharacterCallback;
import com.clj.fastble.exception.BleException;
import com.lzy.okgo.cache.CacheMode;
@@ -25,12 +31,14 @@
import com.moral.andbrickslib.utils.NumberUtils;
import com.moral.andbrickslib.utils.StringUtils;
import com.moral.andbrickslib.utils.TimeUtil;
+import com.moral.andbrickslib.utils.dialog.MaterialDialogUtils;
import com.moral.andbrickslib.utils.log.XLog;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.activity.BLESearchActivity;
import com.moral.yunfushao.activity.ChartActivity;
+import com.moral.yunfushao.activity.VoiceSetActivity;
import com.moral.yunfushao.base.BaseFragment;
import com.moral.yunfushao.ble.BLECommon;
import com.moral.yunfushao.ble.BluetoothService;
@@ -38,16 +46,19 @@
import com.moral.yunfushao.common.AppConfig;
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
+import com.moral.yunfushao.imageload.ImageLoader;
import com.moral.yunfushao.model.EventMessage;
import com.moral.yunfushao.model.RecData;
import com.moral.yunfushao.model.UpLoadParam;
import com.moral.yunfushao.model.VoiceBean;
import com.moral.yunfushao.ui.PanelView;
+import com.moral.yunfushao.utils.DebugUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
@@ -70,16 +81,30 @@
private LinearLayout ll_status;
private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status;
private PanelView pv;
- private ImageView iv_his, iv_status, iv_search;
+ private ImageView iv_his, iv_status, iv_search, iv_bottom_status, iv_dianliang;
private BluetoothService mBluetoothService;
private ArrayList<String> realResult = new ArrayList<>();
+ private ArrayList<String> realHourResult = new ArrayList<>();
+ 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;
- Handler handler = new Handler();
+ private Timer heartTimer, resTimer, chonglianTimer;
+
+ private Handler handler = new Handler();
+
+ private Runnable runnable = new Runnable(){
+ @Override
+ public void run() {
+ checkTime();
+ checkTimeCount++;
+ handler.postDelayed(this, 5000);
+ }
+ };
+
+ private int checkTimeCount = 0;
/**
* ������
@@ -89,9 +114,14 @@
@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;
+ }
pv.setStatusStr("���������");
//������������
mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
+ ((MainActivity) getActivity()).resetBLECallBack();
if (mBluetoothService != null) {
BluetoothGatt gatt = mBluetoothService.getGatt();
if (gatt != null) {
@@ -130,11 +160,20 @@
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);
parseHisData(result);
+ parseHoutData(result);
+
+ if(result.equals(BLECommon.BLE_REC_TIME) || checkTimeCount > 5) {
+ handler.removeCallbacks(runnable);
+ }
+ if (result.startsWith("7A")) {
+ mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_SEND_7A, null);
+ }
+ DebugUtils.sendData("data", result);
}
});
}
@@ -153,12 +192,8 @@
/**
* ������������������
*/
- handler.postDelayed(new Runnable() {
- @Override
- public void run() {
- checkTime();
- }
- }, 2000);
+ handler.postDelayed(runnable, 5000);
+
/**
* ������������������������
*/
@@ -172,10 +207,13 @@
heart();
}
} else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
+ showStatus(-1);
pv.setStatusStr("���������");
pv.setPercent(0);
tv_ljjl.setText("0");
tv_shishi.setText("0");
+ chonglian();
+ stop();
} else if (msg.getType() == AppConfig.CHANGE_SETTING) {
if (timer != null) {
timer.cancel();
@@ -184,6 +222,8 @@
submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
doTask();
+ } else if (msg.getType() == AppConfig.SET_MAIN_CALL) {
+ ((MainActivity) getActivity()).resetBLECallBack();
}
}
@@ -191,22 +231,35 @@
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EventBus.getDefault().register(this);
- VoiceBean voiceBean = new VoiceBean();
- voiceBean.setId(0);
- voiceBean.setRes(R.raw.music);
- voiceBean.setName("music");
- voiceList.add(voiceBean);
- voiceBean = new VoiceBean();
- voiceBean.setId(1);
- voiceBean.setRes(R.raw.music1);
- voiceBean.setName("music1");
- voiceList.add(voiceBean);
+ ArrayList<VoiceBean> temp = (ArrayList<VoiceBean>) FastJsonTools.getArrayJson(MainApp.theApp.sharedPreferencesUtil.getVideoList(), VoiceBean.class);
+ if (temp != null) {
+ voiceList.clear();
+ voiceList.addAll(temp);
+ } else {
+ voiceList.clear();
+ VoiceBean voiceBean = new VoiceBean();
+ voiceBean.setId(0);
+ voiceBean.setRes(VoiceSetActivity.voideUrl1);
+ voiceBean.setName("������������");
+ voiceList.add(voiceBean);
+ voiceBean = new VoiceBean();
+ voiceBean.setId(1);
+ voiceBean.setRes(VoiceSetActivity.voideUrl2);
+ voiceBean.setName("������������");
+ voiceList.add(voiceBean);
+ voiceBean = new VoiceBean();
+ voiceBean.setId(2);
+ voiceBean.setRes(VoiceSetActivity.voideUrl3);
+ voiceBean.setName("������������");
+ voiceList.add(voiceBean);
+ }
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
+ FragmentMonitor.this.mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
}
@Override
@@ -220,6 +273,10 @@
if (timer != null) {
timer.cancel();
timer = null;
+ }
+ if (chonglianTimer != null) {
+ chonglianTimer.cancel();
+ chonglianTimer = null;
}
stop();
}
@@ -241,13 +298,16 @@
iv_status = findView(R.id.iv_status);
ll_status = findView(R.id.ll_status);
iv_search = findView(R.id.iv_search);
+ iv_bottom_status = findView(R.id.iv_bottom_status);
+ iv_dianliang = findView(R.id.iv_dianliang);
+ showStatus(-1);
}
@Override
protected void initListener() {
pv.setOnClickListener(this);
iv_his.setOnClickListener(this);
-// iv_search.setOnClickListener(this);
+ iv_search.setOnClickListener(this);
}
int submitTime;
@@ -258,6 +318,39 @@
submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
doTask();
+ }
+
+ private MaterialDialog clearDialog;
+
+ private void showClear() {
+ clearDialog = MaterialDialogUtils.showCallBaclDialog(getActivity(), "������������", "���������������������������������?", new MaterialDialog.SingleButtonCallback() {
+ @Override
+ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+ if (MainApp.theApp.bleManager == null) {
+ return;
+ }
+ if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
+ return;
+ }
+ if (mBluetoothService == null) {
+ return;
+ }
+ if (mBluetoothService.getWirteCharacteristic() == null) {
+ return;
+ }
+ if (mBluetoothService.getWirteCharacteristic().getService() == null) {
+ return;
+ }
+ mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_CLEAR, null);
+ clearDialog.dismiss();
+ }
+ }, new MaterialDialog.SingleButtonCallback() {
+ @Override
+ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+ clearDialog.dismiss();
+ }
+ });
+ clearDialog.show();
}
@Override
@@ -276,13 +369,7 @@
startActivity(intent);
break;
case R.id.iv_search:
-// if(mBluetoothService==null){
-// return;
-// }
-// if(mBluetoothService.getWirteCharacteristic()==null){
-// return;
-// }
-// mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),BLECommon.BLE_SEARCH,null);
+ showClear();
break;
}
@@ -311,53 +398,76 @@
/**
* ���������������������3������
*/
- Handler heartHandler = new Handler(){
+ @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 (mBluetoothService == null) {
+ if (FragmentMonitor.this.mBluetoothService == null) {
return;
}
- if (mBluetoothService.getWirteCharacteristic() == null) {
+ if (FragmentMonitor.this.mBluetoothService.getWirteCharacteristic() == null) {
return;
}
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
+ 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() {
- heartTimer = new Timer();
- heartTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- Message message = new Message();
- message.what = 1;
- heartHandler.sendMessage(message);
- }
- }, 0, 1000 * 60*3);
+ 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 * 10);
+ }
}
- private long timeComplete = 0;
-
- private void checkResComplete(final String result) {
- resTimer = new Timer();
- resTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- if (!TextUtils.isEmpty(result) && result.startsWith("3A")) {
- timeComplete = 0;
- } else {
- timeComplete++;
+ 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);
}
- if (timeComplete >= 120) {
- submitResData();
- }
- }
- }, 0, 1000);
+ }, 0, 1000 * 8);
+ }
}
private void submitData() {
@@ -375,10 +485,10 @@
up.setLon(MainApp.mLon);
up.setData(submitTempResult);
params.put("data", FastJsonTools.toJson(up));
+// Log.d("haijiang","###################" + FastJsonTools.toJson(up));
HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
@Override
public void onSuccess(String res, String msg) {
- XLog.d("@@@@@@@@@@@@@@@@@@@@@@@@@@" + msg);
submitTempResult.clear();
}
@@ -394,60 +504,57 @@
});
}
- 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) {
-
- }
- });
-
-
- }
-
/**
* ������������������������������
*
- * @param safe
+ * @param level
*/
- private void showStatus(boolean safe) {
- if (safe) {
+ private void showStatus(int level) {
+ if (level == 0) {
+ tv_tishi.setText("������������������");
+ tv_tishi.setBackgroundResource(R.mipmap.bt_green);
+ iv_bottom_status.setImageResource(R.mipmap.icon_good);
+ tv_desc.setText("���������������������������\n���������������������������������������������");
iv_status.setImageResource(R.mipmap.icon_safe);
tv_status.setText("������");
tv_status.setTextColor(getResources().getColor(R.color.green_txt));
ll_status.setBackgroundResource(R.mipmap.bg_conner_green);
- } else {
+ } else if (level == 1) {
+ tv_tishi.setText("������������������");
+ tv_tishi.setBackgroundResource(R.mipmap.bt_blue);
+ iv_bottom_status.setImageResource(R.mipmap.icon_qingwei);
+ tv_desc.setText("���������������������������\n���������������������������������������");
+ iv_status.setImageResource(R.mipmap.icon_head_qingwei);
+ tv_status.setText("������");
+ tv_status.setTextColor(getResources().getColor(R.color.blue_txt));
+ ll_status.setBackgroundResource(R.mipmap.bg_corner_blue);
+ } else if (level == 2) {
+ tv_tishi.setText("������������������");
+ tv_tishi.setBackgroundResource(R.mipmap.bt_zise);
+ iv_bottom_status.setImageResource(R.mipmap.icon_zhongdu);
+ tv_desc.setText("���������������������������\n������������������������������������������");
+ iv_status.setImageResource(R.mipmap.icon_head_zhongfu);
+ 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������������������������������������������");
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) {
+ tv_tishi.setText("������������������");
+ tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
+ iv_bottom_status.setImageResource(R.mipmap.icon_offline);
+ tv_desc.setText("���������������������\n������������������������");
+ iv_status.setImageResource(R.mipmap.icon_head_offline);
+ tv_status.setText("������");
+ tv_status.setTextColor(getResources().getColor(R.color.gray_txt));
+ ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
}
}
@@ -456,6 +563,8 @@
*
* @param result
*/
+ private int preLevel = -1;
+
private void parseCurrentData(String result) {
if (result.startsWith("5A")) {
realResult.clear();
@@ -467,16 +576,16 @@
for (String s : realResult) {
nowResult += s;
}
- Log.d("haijiang", "������������===nowResult=" + nowResult);
/**
* 20������������5A������ 5B������
*/
if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) {
-
int shunshiValue = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16);
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);
- float level = (float) (shunshiValue / 10 * 0.01);
- XLog.d("���������" + shunshiValue + "|���������" + leijiValue);
+// float level = (float) (shunshiValue / 10 * 0.01);
+ 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 shishiValue = NumberUtils.getBigDecimalValue((shunshiValue) / 100.0, 3);
tv_shishi.setText(shishiValue + "");
@@ -487,38 +596,102 @@
RecData data = new RecData();
data.setValue(shishiValue);
data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
- submitResult.add(data);
+ data.setType(0);
- if (shishiValue<0.25) {
- pv.setPercent((float) (shishiValue / 2.0));
- tv_tishi.setText("������������������");
- tv_desc.setText("���������������������������\n���������������������������������������������");
- showStatus(true);
- stop();
- } else if (shishiValue >= 0.25 && shishiValue < 0.8) {
- pv.setPercent((float) (shishiValue / 2.0));
- tv_tishi.setText("������������������");
- tv_desc.setText("���������������������������\n���������������������������������������������������");
- showStatus(true);
- play();
- } else if (shishiValue >=0.8 && shishiValue < 2) {
- showStatus(false);
- tv_tishi.setText("������������������");
- tv_desc.setText("���������������������������\n���������������������������������������������������");
- if(shishiValue>1.8){
- pv.setPercent(0.9f);
- }else{
- pv.setPercent((float) (shishiValue / 2.0));
+
+ /**
+ * ������������
+ */
+ if (b1 == 1) {
+ ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
+ } else if (b1 == 2) {
+ ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
+ } else {
+ if (b2 == 0) {
+ ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b00, iv_dianliang);
+ } else if (b2 == 1) {
+ ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b01, iv_dianliang);
+ } else if (b2 == 2) {
+ ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b02, iv_dianliang);
+ } else if (b2 == 3) {
+ ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b03, iv_dianliang);
+ } else if (b2 == 4) {
+ ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b04, iv_dianliang);
}
- play();
- } else if (shishiValue >= 2) {
- showStatus(false);
- tv_tishi.setText("������������������");
- tv_desc.setText("���������������������������\n���������������������������������������������������");
- pv.setPercent(1.0f);
- play();
}
+
+ if (shishiValue < 0.16) {
+ data.setIs_warn(0);
+ 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)));
+ showStatus(1);
+ play(0);
+ } else if (shishiValue >= 0.8 && shishiValue < 2) {
+ data.setIs_warn(1);
+ showStatus(2);
+ pv.setPercent((float) (0.5 + shishiValue * (0.25 / 2)));
+ play(1);
+ } else if (shishiValue >= 2) {
+ data.setIs_warn(1);
+ showStatus(3);
+ if ((0.75 + shishiValue / 30) < 1.0) {
+ pv.setPercent((float) (0.75 + shishiValue / 30));
+ } else {
+ pv.setPercent(1.0f);
+ }
+ play(2);
+ }
+ submitResult.add(data);
realResult.clear();
+ }
+ }
+
+ /**
+ * ������������������
+ *
+ * @param result
+ */
+ private AlertDialog testDialog;
+
+ private void parseHoutData(String result) {
+ if (result.startsWith("7A")) {
+ realHourResult.clear();
+ realHourResult.add(result);
+ } else {
+ realHourResult.add(result);
+ }
+ String nowResult = "";
+ for (String s : realHourResult) {
+ nowResult += s;
+ }
+ if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 8 && nowResult.startsWith("7A") && nowResult.endsWith("7B")) {
+
+ if(DebugUtils.debug_mode) {
+ //-----------------------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));
+
+ //sendHourDataRec();
+
+ RecData data = new RecData();
+ data.setType(1);
+ data.setIs_warn(0);
+ data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
+ data.setValue(hourValue / 100.0);
+ ArrayList<RecData> temp = new ArrayList<>();
+ temp.add(data);
+ submitHourData(temp);
}
}
@@ -526,24 +699,45 @@
* ���������������������������������
*/
private void parseHisData(String result) {
- if (!TextUtils.isEmpty(result) && result.length() == 16 && result.startsWith("3A") && result.endsWith("3B")) {
- if (submitHisResult.size() == 0) {
- //���������������������
- checkResComplete(result);
+ if (result.startsWith("3A")) {
+ realHisResult.clear();
+ realHisResult.add(result);
+ } else {
+ realHisResult.add(result);
+ }
+ String nowResult = "";
+ for (String s : realHisResult) {
+ nowResult += s;
+ }
+ if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 16 && nowResult.startsWith("3A") && nowResult.endsWith("3B")) {
+ Log.d("hourdata", "=====nowResult=====" + nowResult);
+
+ if(DebugUtils.debug_mode) {
+ //-----------------------Test------------------------------------------//
+ String aaa = MainApp.theApp.sharedPreferencesUtil.getTest() + "\n" + nowResult;
+ MainApp.theApp.sharedPreferencesUtil.saveTest(aaa);
+ //-----------------------Test------------------------------------------//
}
- String year = "20" + Integer.parseInt(result.substring(2, 4), 16);
- String month = Integer.parseInt(result.substring(4, 6), 16) + "";
- String day = Integer.parseInt(result.substring(6, 8), 16) + "";
- String hour = Integer.parseInt(result.substring(8, 10), 16) + "";
- int resValue = Integer.parseInt(result.substring(10, 12), 16) * 256 + Integer.parseInt(result.substring(12, 14), 16);
+
+ 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) + "";
+ String hour = Integer.parseInt(nowResult.substring(8, 10), 16) + "";
+ int resValue = Integer.parseInt(nowResult.substring(10, 12), 16) * 256 + Integer.parseInt(nowResult.substring(12, 14), 16);
RecData data = new RecData();
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);
}
}
@@ -566,7 +760,24 @@
blesb.append(toHex(Integer.toHexString((now.get(Calendar.HOUR_OF_DAY)))));
blesb.append(toHex(Integer.toHexString((now.get(Calendar.MINUTE)))));
blesb.append("4B");
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), blesb.toString(), null);
+
+ boolean result = mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), blesb.toString(), new BleCharacterCallback() {
+ @Override
+ public void onSuccess(BluetoothGattCharacteristic characteristic) {
+ String val = StringUtils.byteArrayToHexStr(characteristic.getValue());
+ DebugUtils.sendData("time", val);
+ }
+
+ @Override
+ public void onFailure(BleException exception) {
+ }
+
+ @Override
+ public void onInitiatedResult(boolean result) {
+ //DebugUtils.sendData("time", String.valueOf(result));
+ }
+ });
+ DebugUtils.sendData("time", String.valueOf(result));
}
private String toHex(String s) {
@@ -577,20 +788,123 @@
}
}
- public void play(){
- if(mp!=null){
+ public void play(int level) {
+ Log.d("music", "preLevel:" + preLevel + "----level:" + level);
+ if (preLevel == level) {
+ return;
+ }
+ preLevel = level;
+ if (mp != null) {
stop();
}
- int index = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getVideo();
- mp = MediaPlayer.create(getActivity(), voiceList.get(index).getRes());
- mp.start();
+ VoiceBean voiceBean = voiceList.get(level);
+ 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();
+ }
+ }
}
- public void stop(){
- if(mp!=null&&mp.isPlaying()){
+
+ public void stop() {
+ if (mp != null && mp.isPlaying()) {
mp.stop();
mp.release();
mp = null;
}
}
+
+ private void submitHourData(ArrayList<RecData> hourdatas) {
+ //���������������������������
+ HashMap<String, String> params = new HashMap<>();
+ UpLoadParam up = new UpLoadParam();
+ up.setUserid(MainApp.userId);
+ up.setAddress(MainApp.address);
+ up.setLat(MainApp.mLat);
+ up.setLon(MainApp.mLon);
+ up.setData(hourdatas);
+ 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);
+// 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
+ public void showLoadingDialog() {
+
+ }
+
+ @Override
+ public void onFail(int errno, String s) {
+
+ }
+ });
+ }
+
+ /**
+ * ������������������
+ */
+ private void sendHourDataRec() {
+ 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_HOUR_REC, null);
+ }
}
--
Gitblit v1.8.0