From ce4ea39afd14301dd1df0501a657fa6de97d576a Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 27 Nov 2018 17:11:35 +0800
Subject: [PATCH] [*]修改主页指针跳转动画
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 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 6c4ee08..3e0cf72 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -199,6 +199,7 @@
mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
resetHandler();
+ textShowMac();//
pv.setStatusStr("���������");
//������������
((MainActivity) getActivity()).resetBLECallBack();
@@ -469,14 +470,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);
@@ -523,6 +523,7 @@
handler.postDelayed(reconnectRunnable, 0);
}
}
+
/**
* ������������
*/
@@ -583,14 +584,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) {
@@ -630,7 +631,7 @@
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);
+// iv_dianliang.setVisibility(View.GONE);
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
iv_bottom_status.setImageResource(R.mipmap.icon_offline);
@@ -701,7 +702,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 + "");
@@ -800,14 +800,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));
@@ -838,19 +835,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