From 17d97f58265510ceda0b38959a90424ee07b6910 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 11:42:07 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 872 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 568 insertions(+), 304 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 7df91fd..86ef576 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -1,6 +1,7 @@
package com.moral.yunfushao.fragment;
-import android.annotation.SuppressLint;
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattService;
@@ -11,12 +12,12 @@
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;
import android.view.View;
+import android.view.animation.OvershootInterpolator;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -32,17 +33,18 @@
import com.moral.andbrickslib.utils.TimeUtil;
import com.moral.andbrickslib.utils.dialog.MaterialDialogUtils;
import com.moral.andbrickslib.utils.log.XLog;
+import com.moral.yunfushao.BuildConfig;
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;
import com.moral.yunfushao.common.API;
import com.moral.yunfushao.common.AppConfig;
+import com.moral.yunfushao.common.VersionConstants;
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.imageload.ImageLoader;
@@ -51,6 +53,9 @@
import com.moral.yunfushao.model.UpLoadParam;
import com.moral.yunfushao.model.VoiceBean;
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;
@@ -69,28 +74,122 @@
*/
public class FragmentMonitor extends BaseFragment {
+ private String TGA = getClass().getSimpleName();
/**
* ������������
*/
private ArrayList<VoiceBean> voiceList = new ArrayList<>();
AssetManager am;
MediaPlayer mp;
-
- private LinearLayout ll_status;
- private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status;
+ private boolean isVirating = false;
+ private LinearLayout ll_status, lv_ljjl;
+ private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status, tv_dianliang2, tvLijiTitle, tvShishiTitle;
private PanelView pv;
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 int type = 1;
//������������
private ArrayList<RecData> submitResult = new ArrayList<>();
- private ArrayList<RecData> submitHisResult = new ArrayList<>();
+
+ private StringBuilder stringResult = new StringBuilder();
+ private String deviceName = "";//���������������������������
+
//������������������������
private ArrayList<RecData> submitTempResult = new ArrayList<>();
- private Timer heartTimer, resTimer, chonglianTimer;
- Handler handler = new Handler();
+
+ //������������
+ private int HEARTTIMES = 2;
+
+ //������������������
+ private boolean isMySelfPage = false;
+
+ //handler������������
+ private Handler handler = new Handler();
+
+ private Runnable heartRunnable = new Runnable() {
+ @Override
+ public void run() {
+ 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_HEART, null);
+ heart();
+ }
+ };
+
+
+ private Runnable reconnectRunnable = new Runnable() {
+ @Override
+ public void run() {
+ System.out.println("chenqi ������������");
+ //������
+ if (mBluetoothService == null) {
+ return;
+ }
+ String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
+ if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
+ if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
+ return;
+ }
+ mBluetoothService.scanAndConnect5(mac);
+ }
+ }
+ };
+
+
+ private void doHandleData(String result) {
+ if (StringUtils.isEmpty(result)) {
+ return;
+ }
+ if (result.startsWith("3A")) {
+ if (result.length() >= 16) {
+ DebugUtils.sendData("data", result);
+
+ parseHisData(result.substring(0, 16));
+ result = result.substring(16);
+ doHandleData(result);
+ } else {
+ stringResult.append(result);
+ }
+ }
+
+ if (result.startsWith("5A")) {
+ if (result.length() >= 40) {
+ DebugUtils.sendData("data", result);
+ parseCurrentData(result.substring(0, 40));
+ result = result.substring(40);
+ doHandleData(result);
+ } else {
+ stringResult.append(result);
+ }
+ }
+
+ if (result.startsWith("7A")) {
+ if (result.length() >= 76) {
+ DebugUtils.sendData("data", result);
+ parseHoutData(result.substring(0, 76));
+ result = result.substring(76);
+ doHandleData(result);
+ } else {
+ stringResult.append(result);
+ }
+ }
+ }
/**
* ������
@@ -99,14 +198,11 @@
*/
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void eventComing(EventMessage msg) {
+ mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
- if (chonglianTimer != null) {
- chonglianTimer.cancel();
- chonglianTimer = null;
- }
+ resetHandler();
pv.setStatusStr("���������");
//������������
- mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
((MainActivity) getActivity()).resetBLECallBack();
if (mBluetoothService != null) {
BluetoothGatt gatt = mBluetoothService.getGatt();
@@ -117,12 +213,11 @@
mBluetoothService.setService(service);
break;
}
- }
- //������������
+
+ }//������������
for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
int charaProp = characteristic.getProperties();
if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
-
}
if ((charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0 || (charaProp & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) > 0) {
mBluetoothService.setWirteCharacteristic(characteristic);
@@ -140,20 +235,18 @@
mBluetoothService.getCharacteristic().getService().getUuid().toString(),
mBluetoothService.getCharacteristic().getUuid().toString(),
new BleCharacterCallback() {
-
@Override
public void onSuccess(final BluetoothGattCharacteristic characteristic) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
-// Log.d("haijiang", "������������====" + StringUtils.byteArrayToHexStr(characteristic.getValue()));
String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
- //������������
- parseCurrentData(result);
- parseHisData(result);
- parseHoutData(result);
+ stringResult.append(result);
+ doHandleData(result);
+ stringResult = new StringBuilder();
}
});
+ HEARTTIMES = 30;
}
@Override
@@ -163,39 +256,20 @@
@Override
public void onInitiatedResult(boolean result) {
-
}
-
});
- /**
- * ������������������
- */
- handler.postDelayed(new Runnable() {
- @Override
- public void run() {
- checkTime();
- }
- }, 2000);
- /**
- * ������������������������
- */
- if (mBluetoothService == null) {
- return;
- }
- if (mBluetoothService.getWirteCharacteristic() == null) {
- return;
- }
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HEART, null);
+ //������handler
+ resetHandler();
+ //������������
heart();
}
} else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
+ preLevel = -1;
showStatus(-1);
- pv.setStatusStr("���������");
- pv.setPercent(0);
- tv_ljjl.setText("0");
- tv_shishi.setText("0");
- chonglian();
+ reconnect();
stop();
+ isVirating = false;
+ AudioUtils.virateCancle(getActivity());
} else if (msg.getType() == AppConfig.CHANGE_SETTING) {
if (timer != null) {
timer.cancel();
@@ -204,8 +278,34 @@
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();
+ } else if (msg.getType() == AppConfig.SET_VOICE) {
+ 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(AppConfig.voideUrl1);
+ voiceBean.setName("������������");
+ voiceList.add(voiceBean);
+ voiceBean = new VoiceBean();
+ voiceBean.setId(1);
+ voiceBean.setRes(AppConfig.voideUrl2);
+ voiceBean.setName("������������");
+ voiceList.add(voiceBean);
+ voiceBean = new VoiceBean();
+ voiceBean.setId(2);
+ voiceBean.setRes(AppConfig.voideUrl3);
+ voiceBean.setName("������������");
+ voiceList.add(voiceBean);
+ }
+ } else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
+ showStatus(-1);
+ stopReconnect();
}
}
@@ -221,17 +321,17 @@
voiceList.clear();
VoiceBean voiceBean = new VoiceBean();
voiceBean.setId(0);
- voiceBean.setRes(VoiceSetActivity.voideUrl1);
+ voiceBean.setRes(AppConfig.voideUrl1);
voiceBean.setName("������������");
voiceList.add(voiceBean);
voiceBean = new VoiceBean();
voiceBean.setId(1);
- voiceBean.setRes(VoiceSetActivity.voideUrl2);
+ voiceBean.setRes(AppConfig.voideUrl2);
voiceBean.setName("������������");
voiceList.add(voiceBean);
voiceBean = new VoiceBean();
voiceBean.setId(2);
- voiceBean.setRes(VoiceSetActivity.voideUrl3);
+ voiceBean.setRes(AppConfig.voideUrl3);
voiceBean.setName("������������");
voiceList.add(voiceBean);
}
@@ -241,26 +341,38 @@
@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;
+ reconnect();
+ textShowMac();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ //������������������������
+ T.show("onPause");
+ isMySelfPage = false;
+ stopReconnect();
}
@Override
public void onDestroy() {
super.onDestroy();
EventBus.getDefault().unregister(this);
- if (heartTimer != null) {
- heartTimer.cancel();
- heartTimer = null;
- }
if (timer != null) {
timer.cancel();
timer = null;
}
- if (chonglianTimer != null) {
- chonglianTimer.cancel();
- chonglianTimer = null;
- }
+ handler.removeCallbacksAndMessages(null);
stop();
+ isVirating = false;
+ AudioUtils.virateCancle(getActivity());
}
@Override
@@ -282,7 +394,30 @@
iv_search = findView(R.id.iv_search);
iv_bottom_status = findView(R.id.iv_bottom_status);
iv_dianliang = findView(R.id.iv_dianliang);
+ tv_dianliang2 = findView(R.id.tv_dianliang2);
+ tvShishiTitle = findView(R.id.tv_shishi_title);
+ tvLijiTitle = findView(R.id.tv_ljjl_title);
+ lv_ljjl = findView(R.id.lv_ljjl);
+ iv_dianliang.bringToFront();
+ tv_dianliang2.bringToFront();//���������������������
+ iv_dianliang.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
+ }
+ }
+ });
+ tv_dianliang2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ FlipAnimatorXViewShow(tv_dianliang2, iv_dianliang, 200);
+ }
+ }
+ });
showStatus(-1);
+
}
@Override
@@ -303,7 +438,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 +449,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 +486,7 @@
startActivity(intent);
break;
case R.id.iv_search:
- showClear();
+ showClear();
break;
}
@@ -376,100 +512,33 @@
}, 0, submitTime * 1000);
}
- /**
- * ���������������������3������
- */
- @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 (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_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() {
- 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);
+ handler.postDelayed(heartRunnable, 1000 * HEARTTIMES);
+ }
+
+ /**
+ * ������������
+ */
+ private void reconnect() {
+ if (isMySelfPage) {
+ stopReconnect();
+ //���������������������
+ handler.postDelayed(reconnectRunnable, 0);
}
}
- 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);
- }
- }, 0, 1000 * 8);
- }
+ /**
+ * ������������
+ */
+ private void stopReconnect() {
+ handler.removeCallbacks(reconnectRunnable);
+ if (mBluetoothService != null)
+ mBluetoothService.closeConnect();
}
- 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);
- }
+ private void resetHandler() {
+ handler.removeCallbacks(reconnectRunnable);
+ handler.removeCallbacks(heartRunnable);
}
private void submitData() {
@@ -487,11 +556,9 @@
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();
}
@@ -507,50 +574,31 @@
});
}
- 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 level
*/
private void showStatus(int level) {
+ int yanzhang = R.mipmap.icon_yanzhong;
+ int danger = R.mipmap.icon_danger;
+ iv_dianliang.setVisibility(View.VISIBLE);
+ if (type == 1) {
+ //������
+ yanzhang = R.mipmap.icon_yanzhong;
+ danger = R.mipmap.icon_danger;
+ tvLijiTitle.setText("������������(uSv)");
+ tvShishiTitle.setText("������������(uSv/h)");
+ iv_dianliang.setEnabled(false);
+ } else if (type == 2) {
+ //������
+ yanzhang = R.mipmap.dianliyanyang;
+ danger = R.mipmap.dianlidanger;
+ tvLijiTitle.setText("������������");
+ tvShishiTitle.setText("������������");
+ iv_dianliang.setEnabled(true);
+ }
+
if (level == 0) {
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_green);
@@ -573,21 +621,22 @@
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������������������������������������������");
- iv_status.setImageResource(R.mipmap.icon_danger);
- tv_status.setText("������");
+ iv_bottom_status.setImageResource(yanzhang);
+ tv_desc.setText("���������������������������\n������������������������������������������");
+ iv_status.setImageResource(danger);
+ tv_status.setText("������");
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);
@@ -596,6 +645,42 @@
tv_status.setText("������");
tv_status.setTextColor(getResources().getColor(R.color.gray_txt));
ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
+ pv.setStatusStr("���������");
+ pv.setPercent(0);
+ tv_ljjl.setText("0");
+ tv_shishi.setText("0");
+ showPower(2, 0);
+ } else if (level == -2) {
+ tv_tishi.setText("���������������������");
+ tv_tishi.setBackgroundResource(R.mipmap.bt_green);
+ tv_desc.setText("������������������������");
+ iv_status.setVisibility(View.GONE);
+ tv_status.setText("���������");
+ ll_status.setBackgroundResource(R.mipmap.bg_corner_gray);
+ pv.setPercent(0);
+ pv.setStatusStr("���������");
+ tv_ljjl.setText("0");
+ tv_shishi.setText("0");
+ }
+ }
+
+ private void textShowMac() {
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ final TextView tv_text_mac = findView(R.id.tv_text_mac);
+ tv_desc.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ tv_text_mac.setText("Mac: " + MainApp.theApp.sharedPreferencesUtil.getBLE());
+ FlipAnimatorXViewShow(tv_desc, tv_text_mac, 100L);
+ }
+ });
+
+ tv_text_mac.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ FlipAnimatorXViewShow(tv_text_mac, tv_desc, 100L);
+ }
+ });
}
}
@@ -604,142 +689,202 @@
*
* @param result
*/
- private void parseCurrentData(String result) {
- if (result.startsWith("5A")) {
- realResult.clear();
- realResult.add(result);
- } else {
- realResult.add(result);
- }
- String nowResult = "";
- for (String s : realResult) {
- nowResult += s;
- }
-// Log.d("haijiang", "������������===nowResult=" + nowResult);
- /**
- * 20������������5A������ 5B������
- */
+ private int preLevel = -1;
+
+ /**
+ * data : 5A160000FA1C0400004100E7000700000071005B
+ * format : 20������������5A������ 5B������
+ * 5A������������������
+ *
+ * @param nowResult
+ */
+ //todo ������������������
+ private void parseCurrentData(String nowResult) {
+ System.out.println("chenqi nowResult parseCurrentData");
+ type = 1;
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 real = 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);
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) + "");
- double shishiValue = NumberUtils.getBigDecimalValue((shunshiValue) / 100.0, 3);
- tv_shishi.setText(shishiValue + "");
+ tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
+ double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
+ tv_shishi.setText(realValue + "");
/**
* ���������������������
*/
RecData data = new RecData();
- data.setValue(shishiValue);
+ data.setValue(realValue);
data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
data.setType(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);
- }
- }
-
- if (shishiValue < 0.16) {
+ if (realValue < 0.16) {
data.setIs_warn(0);
- pv.setPercent((float) (shishiValue * (0.25 / 0.16)));
+ pv.setPercent((float) (realValue * (0.25 / 0.16)));
showStatus(0);
stop();
- } else if (shishiValue >= 0.16 && shishiValue < 0.8) {
+ if (isVirating) {
+ isVirating = false;
+ AudioUtils.virateCancle(getActivity());
+ }
+ preLevel = -1;
+ } else if (realValue >= 0.16 && realValue < 0.8) {
data.setIs_warn(1);
- pv.setPercent((float) (0.25 + shishiValue * (0.25 / 0.8)));
+ pv.setPercent((float) (0.25 + realValue * (0.25 / 0.8)));
showStatus(1);
play(0);
- } else if (shishiValue >= 0.8 && shishiValue < 2) {
+ if (!isVirating) {
+ isVirating = true;
+ AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+ }
+ } else if (realValue >= 0.8 && realValue < 2) {
data.setIs_warn(1);
showStatus(2);
- pv.setPercent((float) (0.5 + shishiValue * (0.25 / 2)));
+ pv.setPercent((float) (0.5 + realValue * (0.25 / 2)));
play(1);
- } else if (shishiValue >= 2) {
+ if (!isVirating) {
+ isVirating = true;
+ AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+ }
+ } else if (realValue >= 2) {
data.setIs_warn(1);
showStatus(3);
- if ((0.75 + shishiValue / 30) < 1.0) {
- pv.setPercent((float) (0.75 + shishiValue / 30));
+ if ((0.75 + realValue / 30) < 1.0) {
+ pv.setPercent((float) (0.75 + realValue / 30));
} else {
pv.setPercent(1.0f);
}
play(2);
+ if (!isVirating) {
+ isVirating = true;
+ AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+ }
}
+ /**
+ * ������������
+ */
+ showPower(b1, b2);
submitResult.add(data);
- realResult.clear();
+// realResult.clear();
}
}
+
/**
- * ������������������
- *
- * @param result
+ * 7A������������������
+ * 7A0024010002D8B04CE90E6300000003000003EE0000000000000EC6000000000017347B0D0A
+ * ������������������
*/
- private void parseHoutData(String result) {
- if (result.startsWith("7A")) {
- realHourResult.clear();
- realHourResult.add(result);
- } else {
- realHourResult.add(result);
+ private void parseHoutData(String nowResult) {
+ if (TextUtils.isEmpty(nowResult)) {
+ return;
}
- String nowResult = "";
- for (String s : realHourResult) {
- nowResult += s;
- }
- if (!TextUtils.isEmpty(nowResult)&& nowResult.length() == 8&&nowResult.startsWith("7A") && nowResult.endsWith("7B")) {
- 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();
+ type = 2;
+ String[] strings = StringUtils.splitString(nowResult, 2);
+ if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {
+ String realString = StringUtils.subStrings(strings, 21, 23);
+ int electric_field = Integer.parseInt(realString, 16);
+ int b1 = Integer.parseInt(strings[24].trim(), 16);
+ int b2 = Integer.parseInt(strings[25].trim(), 16);
+ int baojing = Integer.parseInt(strings[29].trim(), 16);
+
+ double elec = Integer.parseInt(StringUtils.subStrings(strings, 13, 15), 16);
+
+ double electricFieldValue = (electric_field) / 100.0;
+ double elecValue = (elec) / 100.0;
+
+ String power = StringUtils.subStrings(strings, 26, 27);
+
+ double textPower = Integer.parseInt(power, 16) / 1000.0;
+
+ tv_shishi.setText(electricFieldValue + "(V/m)");
+
+ tv_dianliang2.setText(textPower + "V");
+
+ tv_ljjl.setText(elecValue + "(��T)");
+
+ /**
+ * ���������������������
+ */
RecData data = new RecData();
- data.setType(1);
- data.setIs_warn(0);
+ data.setValue(electricFieldValue);
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);
+ data.setType(0);
+
+
+ showStatus(Integer.parseInt(strings[21], 16));
+
+ if (baojing == 0) {
+ pv.setPercent((float) (0.125));
+ showStatus(0);
+ stop();
+ if (isVirating) {
+ isVirating = false;
+ AudioUtils.virateCancle(getActivity());
+ }
+ preLevel = -1;
+ } else if (baojing == 1) {
+ data.setIs_warn(1);
+ pv.setPercent((float) (0.375));
+ showStatus(1);
+ play(0);
+ if (!isVirating) {
+ isVirating = true;
+ AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+ }
+ } else if (baojing == 2) {
+ data.setIs_warn(1);
+ showStatus(2);
+ pv.setPercent((float) (0.625));
+ play(1);
+ if (!isVirating) {
+ isVirating = true;
+ AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+ }
+ } else if (baojing == 3) {
+ 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;
+ AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+ }
+ }
+ /**
+ * ������������
+ */
+ showPower(b1, b2);
+ submitResult.add(data);
}
}
/**
* ���������������������������������
*/
- private void parseHisData(String result) {
- if (result.startsWith("3A")) {
- realHisResult.clear();
- realHisResult.add(result);
- } else {
- realHisResult.add(result);
- }
- String nowResult = "";
- for (String s : realHisResult) {
- nowResult += s;
- }
+ private void parseHisData(String nowResult) {
if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 16 && nowResult.startsWith("3A") && nowResult.endsWith("3B")) {
- if (submitHisResult.size() == 0) {
- //���������������������
- checkResComplete(result);
+ 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(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 +894,39 @@
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);
+ test(nowResult, time.toString());
+ submitHourData(temp);
+ }
+ }
+
+ /**
+ * ������������
+ */
+ private void showPower(int b1, int b2) {
+ if (b1 == 1) {
+ ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
+ showStatus(-2);
+ } 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);
+ }
}
}
@@ -775,7 +949,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) {
@@ -786,20 +977,34 @@
}
}
+ /**
+ * ������������������
+ *
+ * @param level
+ */
public void play(int level) {
+ Log.d("music", "preLevel:" + preLevel + "----level:" + level);
+ if (preLevel == level) {
+ return;
+ }
+ preLevel = level;
if (mp != null) {
stop();
}
VoiceBean voiceBean = voiceList.get(level);
if (voiceBean.isDefaultMusic()) {
- mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
- mp.start();
+ if (voiceBean.getRes() != null) {
+ 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 +1034,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 +1085,7 @@
/**
* ������������������
*/
- private void sendHourDataRec(){
+ private void sendHourDataRec() {
if (MainApp.theApp.bleManager == null) {
return;
}
@@ -869,5 +1104,34 @@
FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HOUR_REC, null);
}
+ public static void FlipAnimatorXViewShow(final View oldView, final View newView, final long time) {
+ ObjectAnimator animator1 = ObjectAnimator.ofFloat(oldView, "rotationX", 0, 90);
+ final ObjectAnimator animator2 = ObjectAnimator.ofFloat(newView, "rotationX", -90, 0);
+ animator2.setInterpolator(new OvershootInterpolator(2.0f));
+ animator1.addListener(new Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ oldView.setVisibility(View.GONE);
+ animator2.setDuration(time).start();
+ newView.setVisibility(View.VISIBLE);
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+
+ }
+ });
+ animator1.setDuration(time).start();
+ }
}
--
Gitblit v1.8.0