From 52f8575a2fa0590c28b5d784399c51a8af2f790a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 二月 2020 15:26:04 +0800
Subject: [PATCH] 2020-2-28 1.增加小类是3的音乐播放器支持
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java | 296 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 157 insertions(+), 139 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
index ba76b9f..65bd63b 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
@@ -2,6 +2,7 @@
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button;
@@ -22,6 +23,7 @@
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.DeviceStateEvent;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.LightFeedBackEvent;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.LogicFeedBackEvent;
+import com.hdl.sdk.hdl_core.Util.TransformUtil.HDLUtlis;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -62,7 +64,7 @@
initView();
initClickOnEvent();
- HDLCommand.getDeviceState(appliancesInfo);
+
}
@@ -125,8 +127,9 @@
sensorText.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
- int curLightState = (int) appliancesInfo.getCurState();
+ if (appliancesInfo.getCurStateObject() != null) {
+
+ int curLightState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurStateObject());
lightText.setText("褰撳墠鐏厜浜害锛�" + curLightState);
lightBtn.setText("褰撳墠鐏厜浜害锛�" + curLightState);
@@ -162,9 +165,9 @@
curtainBtn4.setVisibility(View.GONE);
curtainBtn5.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
+ if (appliancesInfo.getCurStateObject() != null) {
String stringCurtainState = "";
- int curCurtainState = (int) appliancesInfo.getCurState();
+ int curCurtainState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurStateObject());
Log.i("djl", "curCurtainState = " + curCurtainState);
switch (curCurtainState) {
case CurtainCtrlParser.TYPE_STATE_PAUSE:
@@ -196,8 +199,8 @@
curText1.setVisibility(View.GONE);
curtainBtn.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
- curText2.setText("褰撳墠绐楀笜鐘舵�侊細" + appliancesInfo.getCurState());
+ if (appliancesInfo.getCurStateObject() != null) {
+ curText2.setText("褰撳墠绐楀笜鐘舵�侊細" + HDLUtlis.getIntegerByObject(appliancesInfo.getCurStateObject()));
} else {
curText2.setText("鏈幏鍙栧埌绐楀笜妯″潡鐘舵��");
}
@@ -409,8 +412,8 @@
lightText.setVisibility(View.GONE);
logicBtn.setVisibility(View.GONE);
logicText.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
- float value = (float) appliancesInfo.getCurState();
+ if (appliancesInfo.getCurStateObject() != null) {
+ float value = (float) appliancesInfo.getCurStateObject();
sensorBtn.setText("浼犳劅鍣ㄦ暟鍊硷細" + value);
}
break;
@@ -628,26 +631,38 @@
airBtnTemp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ String tempStr = airTempEd.getText().toString();
+ if (TextUtils.isEmpty(tempStr)) {
+ showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
+ return;
+ }
+ int tempInt = Integer.parseInt(tempStr);
+
+// if (tempInt < 16 || tempInt > 30) {
+// showToast("娓╁害璁剧疆鑼冨洿涓猴細16~30鎽勬皬搴�(鈩�)");
+// return;
+// }
+
switch (airModeState) {
case 0:
//褰撳墠绌鸿皟妯″紡涓哄埗鍐�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, Integer.parseInt(airTempEd.getText().toString()));//鍒跺喎娓╁害
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, tempInt);//鍒跺喎娓╁害
break;
case 1:
//褰撳墠绌鸿皟妯″紡涓哄埗鐑�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, Integer.parseInt(airTempEd.getText().toString()));//鍒剁儹娓╁害
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, tempInt);//鍒剁儹娓╁害
break;
case 2:
//褰撳墠绌鸿皟妯″紡涓洪�氶
- ToastUtil("閫氶妯″紡涓嶈兘鎺у埗娓╁害");
+ showToast("閫氶妯″紡涓嶈兘鎺у埗娓╁害");
break;
case 3:
//褰撳墠绌鸿皟妯″紡涓鸿嚜鍔�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.autoTem, Integer.parseInt(airTempEd.getText().toString()));//鑷姩娓╁害 鑼冨洿0-84
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.autoTem, tempInt);//鑷姩娓╁害
break;
case 4:
//褰撳墠绌鸿皟妯″紡涓烘娊婀�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.dehumTem, Integer.parseInt(airTempEd.getText().toString()));//鎶芥箍娓╁害 鑼冨洿0-84
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.dehumTem, tempInt);//鎶芥箍娓╁害
break;
default:
break;
@@ -688,10 +703,13 @@
if (event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getLightCtrlBackInfo().getChannelNum() == appliancesInfo.getChannelNum()
+ && event.getLightCtrlBackInfo().getPhysicsChannelNum() == appliancesInfo.getPhysicsChannelNum()
+
+ && event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceType() == appliancesInfo.getDeviceType()
) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
- ToastUtil("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
lightBtn.setText("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -704,7 +722,7 @@
String remarks = event.getLightCtrlBackInfo().getRemarks();//鑾峰彇杩斿洖鐨勭伅鍏夊娉ㄣ�傚鏋滄瘡涓伅鍏夊洖璺娉ㄩ兘鍞竴锛屽彲浠ョ洿鎺ラ�氳繃澶囨敞鍒ゆ柇
String parentRemarks = event.getLightCtrlBackInfo().getParentRemarks();//鑾峰彇缁х數鍣ㄦ垨璋冨厜鐏娉ㄣ�傝繖閲屽彲浠ョ煡閬撴槸鍝釜璁惧杩斿洖鐨�
int num = event.getLightCtrlBackInfo().getChannelNum();//鑾峰彇鍥炶矾鍙枫�傝繖閲屽彲浠ヨ幏鍙栧埌杩欎釜缁х數鍣ㄦ垨璋冨厜鐏殑鍥炶矾鍙�
- ToastUtil(parentRemarks + " 鐨� " + remarks + " 鍥炶矾鍙凤細" + num + " 杩斿洖" + " 浜害涓猴細" + brightness);
+ showToast(parentRemarks + " 鐨� " + remarks + " 鍥炶矾鍙凤細" + num + " 杩斿洖" + " 浜害涓猴細" + brightness);
}
}
@@ -718,7 +736,7 @@
) {
if (!event.isSuccess()) {
- ToastUtil("绐楀笜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("绐楀笜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -730,7 +748,7 @@
String remarks = event.getCurtainCtrlBackInfo().getRemarks();
String parentRemarks = event.getCurtainCtrlBackInfo().getParentRemarks();
int num = event.getCurtainCtrlBackInfo().getNum();
-// ToastUtil(parentRemarks+" 鐨� "+remarks+" 鍥炶矾鍙凤細"+num+" 杩斿洖"+" 鐘舵�佷负锛�"+curState);
+// showToast(parentRemarks+" 鐨� "+remarks+" 鍥炶矾鍙凤細"+num+" 杩斿洖"+" 鐘舵�佷负锛�"+curState);
Log.i("djl", parentRemarks + " 鐨� " + remarks + " 鍥炶矾鍙凤細" + num + " 杩斿洖" + " 鐘舵�佷负锛�" + curState);
if (event.getCurtainCtrlBackInfo().getAppliancesInfo().getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE) {
//鍒ゆ柇鏄惁涓虹獥甯樻ā鍧�
@@ -769,7 +787,7 @@
) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
- ToastUtil("绌鸿皟鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("绌鸿皟鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -780,13 +798,13 @@
case AirCtrlParser.airOff:
airSwitchState = 0;
airText.setText("绌鸿皟鍏�");
- ToastUtil("绌鸿皟鍏�");
+ showToast("绌鸿皟鍏�");
Log.i("djl", "绌鸿皟鍏�");
break;
case AirCtrlParser.airOn:
airSwitchState = 1;
airText.setText("绌鸿皟寮�");
- ToastUtil("绌鸿皟寮�");
+ showToast("绌鸿皟寮�");
Log.i("djl", "绌鸿皟寮�");
break;
default:
@@ -800,25 +818,25 @@
case AirCtrlParser.airSpeedAuto:
airSpeedState = 0;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
break;
case AirCtrlParser.airSpeedHigh:
airSpeedState = 1;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
break;
case AirCtrlParser.airSpeedMid:
airSpeedState = 2;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
break;
case AirCtrlParser.airSpeedLow:
airSpeedState = 3;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
break;
default:
@@ -830,31 +848,31 @@
case AirCtrlParser.airModeRefTem:
airModeState = 0;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
break;
case AirCtrlParser.airModeHeatTem:
airModeState = 1;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
break;
case AirCtrlParser.airModeVen:
airModeState = 2;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
break;
case AirCtrlParser.airModeAuto:
airModeState = 3;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
break;
case AirCtrlParser.airModeDehum:
airModeState = 4;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
break;
default:
@@ -865,37 +883,37 @@
case AirCtrlParser.refTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
break;
case AirCtrlParser.heatTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
break;
case AirCtrlParser.autoTem:
airTempState = -1;
airText.setText("绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
break;
case AirCtrlParser.dehumTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
break;
case AirCtrlParser.upTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
+ showToast("绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
break;
case AirCtrlParser.downTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
+ showToast("绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
break;
@@ -911,10 +929,10 @@
&& event.getLogicCtrlBackInfo().getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
) {
if (!event.isSuccess()) {
- ToastUtil("鍦烘櫙鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("鍦烘櫙鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
- ToastUtil("鍦烘櫙鎺у埗鎴愬姛");
+ showToast("鍦烘櫙鎺у埗鎴愬姛");
}
}
@@ -930,12 +948,12 @@
case HDLApConfig.TYPE_LIGHT_RELAY:
case HDLApConfig.TYPE_LIGHT_MIX_DIMMER:
case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
- if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
+ if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum() && appliancesInfo.getPhysicsChannelNum() == event.getAppliancesInfo().getPhysicsChannelNum()) {
if (!event.isSuccess()) {
- ToastUtil("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- lightBtn.setText("浜害 = " + event.getAppliancesInfo().getCurState());
+ lightBtn.setText("浜害 = " + HDLUtlis.getIntegerByObject(event.getAppliancesInfo().getCurStateObject()));
}
break;
case HDLApConfig.TYPE_CURTAIN_GLYSTRO:
@@ -943,12 +961,12 @@
case HDLApConfig.TYPE_CURTAIN_MODULE:
if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
if (!event.isSuccess()) {
- ToastUtil("鑾峰彇绐楀笜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇绐楀笜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
//绐楀笜妯″潡锛歝urState:0=鍋滄,1=鎵撳紑,2=鍏抽棴銆�
//寮�鍚堝笜鐢垫満锛屽嵎甯樼數鏈猴細curState:1-100寮�鍚堝害銆�
- int curState = (int) event.getAppliancesInfo().getCurState();
+ int curState = HDLUtlis.getIntegerByObject(event.getAppliancesInfo().getCurStateObject());
if (event.getAppliancesInfo().getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE) {//鍒ゆ柇鏄惁涓虹獥甯樻ā鍧�,鍚﹀垯涓哄紑鍚堝笜鎴栧嵎甯樼數鏈�
switch (curState) {
case CurtainCtrlParser.curtainOff:
@@ -973,7 +991,7 @@
case HDLApConfig.TYPE_AC_PANEL:
if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
if (!event.isSuccess()) {
- ToastUtil("鑾峰彇绌鸿皟鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇绌鸿皟鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
@@ -984,13 +1002,13 @@
case AirCtrlParser.airOff:
airSwitchState = 0;
airText.setText("绌鸿皟鍏�");
- ToastUtil("绌鸿皟鍏�");
+ showToast("绌鸿皟鍏�");
Log.i("djl", "绌鸿皟鍏�");
break;
case AirCtrlParser.airOn:
airSwitchState = 1;
airText.setText("绌鸿皟寮�");
- ToastUtil("绌鸿皟寮�");
+ showToast("绌鸿皟寮�");
Log.i("djl", "绌鸿皟寮�");
break;
default:
@@ -1004,25 +1022,25 @@
case AirCtrlParser.airSpeedAuto:
airSpeedState = 0;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedAuto鑷姩椋庨��");
break;
case AirCtrlParser.airSpeedHigh:
airSpeedState = 1;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedHigh椋庨�熼珮");
break;
case AirCtrlParser.airSpeedMid:
airSpeedState = 2;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedMid椋庨�熶腑");
break;
case AirCtrlParser.airSpeedLow:
airSpeedState = 3;
airText.setText("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
- ToastUtil("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
+ showToast("绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
Log.i("djl", "绌鸿皟椋庨�燂紝椋庨�熸ā寮忎负锛歛irSpeedLow椋庨�熶綆");
break;
default:
@@ -1034,31 +1052,31 @@
case AirCtrlParser.airModeRefTem:
airModeState = 0;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鍐�");
break;
case AirCtrlParser.airModeHeatTem:
airModeState = 1;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氬埗鐑�");
break;
case AirCtrlParser.airModeVen:
airModeState = 2;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氶�氶");
break;
case AirCtrlParser.airModeAuto:
airModeState = 3;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氳嚜鍔�");
break;
case AirCtrlParser.airModeDehum:
airModeState = 4;
airText.setText("绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
- ToastUtil("绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
+ showToast("绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
Log.i("djl", "绌鸿皟妯″紡锛屾ā寮忎负锛氭娊婀�");
break;
default:
@@ -1068,37 +1086,37 @@
case AirCtrlParser.refTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鍒跺喎锛屾俯搴︿负锛�" + (curState[1] & 0xFF));
break;
case AirCtrlParser.heatTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鍒剁儹锛屽埗鐑俯搴︿负" + (curState[1] & 0xFF));
break;
case AirCtrlParser.autoTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鑷姩锛岃嚜鍔ㄦ俯搴︿负" + (curState[1] & 0xFF));
break;
case AirCtrlParser.dehumTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
+ showToast("绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟鎶芥箍锛屾娊婀挎俯搴︿负" + (curState[1] & 0xFF));
break;
case AirCtrlParser.upTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
+ showToast("绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟璋冩俯锛屼笂鍗囨俯搴︼細" + (curState[1] & 0xFF));
break;
case AirCtrlParser.downTem:
airTempState = curState[1] & 0xFF;
airText.setText("绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
- ToastUtil("绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
+ showToast("绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
Log.i("djl", "绌鸿皟璋冩俯锛屼笅闄嶆俯搴︼細" + (curState[1] & 0xFF));
break;
}
@@ -1107,276 +1125,276 @@
case HDLApConfig.TYPE_SENSOR_DRY_CONTACT:
//浼犳劅鍣� 骞叉帴鐐� 銆傚彧鏈夊紑鍏崇姸鎬�
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float dryContactValue = (float) event.getAppliancesInfo().getCurState();
+ float dryContactValue = (float) event.getAppliancesInfo().getCurStateObject();
String dryContactUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
+ showToast("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
Log.i("djl", "浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
break;
case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR:
//浼犳劅鍣� 绉诲姩鎺㈡祴 銆傜伒鏁忓害
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︾姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︾姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float mdValue = (float) event.getAppliancesInfo().getCurState();
+ float mdValue = (float) event.getAppliancesInfo().getCurStateObject();
String mdValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
+ showToast("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
Log.i("djl", "浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_TEMP:
//浼犳劅鍣� 娓╁害
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float tempValue = (float) event.getAppliancesInfo().getCurState();
+ float tempValue = (float) event.getAppliancesInfo().getCurStateObject();
String tempValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
+ showToast("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
Log.i("djl", "浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_HUMIDITY:
//浼犳劅鍣� 婀垮害
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float humidityValue = (float) event.getAppliancesInfo().getCurState();
+ float humidityValue = (float) event.getAppliancesInfo().getCurStateObject();
String humidityValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
+ showToast("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
Log.i("djl", "浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
//浼犳劅鍣� 鐓у害
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---鐓у害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---鐓у害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float illuminaceValue = (float) event.getAppliancesInfo().getCurState();
+ float illuminaceValue = (float) event.getAppliancesInfo().getCurStateObject();
String illuminaceValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
+ showToast("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
Log.i("djl", "浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_VOC:
//浼犳劅鍣� 褰撳墠绌烘皵璐ㄩ噺绛夌骇
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float vocValue = (float) event.getAppliancesInfo().getCurState();
+ float vocValue = (float) event.getAppliancesInfo().getCurStateObject();
String vocValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
+ showToast("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
Log.i("djl", "浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
//浼犳劅鍣� pm2.5
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float pm2_5Value = (float) event.getAppliancesInfo().getCurState();
+ float pm2_5Value = (float) event.getAppliancesInfo().getCurStateObject();
String pm2_5ValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
+ showToast("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
Log.i("djl", "浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_C02:
//浼犳劅鍣� 浜屾哀鍖栫⒊
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float co2Value = (float) event.getAppliancesInfo().getCurState();
+ float co2Value = (float) event.getAppliancesInfo().getCurStateObject();
String co2ValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
+ showToast("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
Log.i("djl", "浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_LPG:
//浼犳劅鍣� 娑插寲鐭虫补姘�
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---娑插寲鐭虫补姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---娑插寲鐭虫补姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float lpgValue = (float) event.getAppliancesInfo().getCurState();
+ float lpgValue = (float) event.getAppliancesInfo().getCurStateObject();
String lpgValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
+ showToast("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
Log.i("djl", "浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_CO_H2:
//浼犳劅鍣� 浜哄伐鐓ゆ皵
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---浜哄伐鐓ゆ皵鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---浜哄伐鐓ゆ皵鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float coh2Value = (float) event.getAppliancesInfo().getCurState();
+ float coh2Value = (float) event.getAppliancesInfo().getCurStateObject();
String coh2ValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
+ showToast("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
Log.i("djl", "浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_CH4:
//浼犳劅鍣� 澶╃劧姘�
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---澶╃劧姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---澶╃劧姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float ch4Value = (float) event.getAppliancesInfo().getCurState();
+ float ch4Value = (float) event.getAppliancesInfo().getCurStateObject();
String ch4ValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
+ showToast("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
Log.i("djl", "浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_SMOG:
//浼犳劅鍣� 鐑熼浘
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---鐑熼浘鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---鐑熼浘鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float smogValue = (float) event.getAppliancesInfo().getCurState();
+ float smogValue = (float) event.getAppliancesInfo().getCurStateObject();
String smogValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
+ showToast("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
Log.i("djl", "浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
//浼犳劅鍣� 椋庨��
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---椋庨�熺姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---椋庨�熺姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float windSpeedValue = (float) event.getAppliancesInfo().getCurState();
+ float windSpeedValue = (float) event.getAppliancesInfo().getCurStateObject();
String windSpeedValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
+ showToast("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
Log.i("djl", "浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
//浼犳劅鍣� 椋庡帇
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---椋庡帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---椋庡帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float windPressureValue = (float) event.getAppliancesInfo().getCurState();
+ float windPressureValue = (float) event.getAppliancesInfo().getCurStateObject();
String windPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
+ showToast("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
Log.i("djl", "浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
//浼犳劅鍣� 娑蹭綋娴侀噺
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---娑蹭綋娴侀噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娴侀噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float liquidFlowValue = (float) event.getAppliancesInfo().getCurState();
+ float liquidFlowValue = (float) event.getAppliancesInfo().getCurStateObject();
String liquidFlowValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
+ showToast("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
Log.i("djl", "浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
//浼犳劅鍣� 娑蹭綋鍘嬪姏
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---娑蹭綋鍘嬪姏鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---娑蹭綋鍘嬪姏鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float liquidPressureValue = (float) event.getAppliancesInfo().getCurState();
+ float liquidPressureValue = (float) event.getAppliancesInfo().getCurStateObject();
String liquidPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
+ showToast("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
Log.i("djl", "浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
//浼犳劅鍣� 娑蹭綋娣卞害
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---娑蹭綋娣卞害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娣卞害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float liquidDepthValue = (float) event.getAppliancesInfo().getCurState();
+ float liquidDepthValue = (float) event.getAppliancesInfo().getCurStateObject();
String liquidDepthValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
+ showToast("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
Log.i("djl", "浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
//浼犳劅鍣� 闆ㄩ噺
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---闆ㄩ噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---闆ㄩ噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float rainFallValue = (float) event.getAppliancesInfo().getCurState();
+ float rainFallValue = (float) event.getAppliancesInfo().getCurStateObject();
String rainFallValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
+ showToast("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
Log.i("djl", "浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_WEIGHT:
//浼犳劅鍣� 閲嶉噺
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float weightValue = (float) event.getAppliancesInfo().getCurState();
+ float weightValue = (float) event.getAppliancesInfo().getCurStateObject();
String weightValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
+ showToast("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
Log.i("djl", "浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
//浼犳劅鍣� 閲嶉噺
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float height_lengthValue = (float) event.getAppliancesInfo().getCurState();
+ float height_lengthValue = (float) event.getAppliancesInfo().getCurStateObject();
String height_lengthValueUnit = ((SensorStateBackInfo) event).getUnite();
- ToastUtil("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
+ showToast("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
Log.i("djl", "浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
break;
case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
//浼犳劅鍣� 鐗╀綋閫熷害
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---鐗╀綋閫熷害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---鐗╀綋閫熷害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float objectSpeedValue = (float) event.getAppliancesInfo().getCurState();
+ float objectSpeedValue = (float) event.getAppliancesInfo().getCurStateObject();
String objectSpeedUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
- ToastUtil("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
+ showToast("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
Log.i("djl", "浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
break;
case HDLApConfig.TYPE_SENSOR_SHAKE:
//浼犳劅鍣� 闇囧姩
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---闇囧姩鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---闇囧姩鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float shakeValue = (float) event.getAppliancesInfo().getCurState();
+ float shakeValue = (float) event.getAppliancesInfo().getCurStateObject();
String shakeValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
- ToastUtil("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
+ showToast("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
Log.i("djl", "浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
break;
case HDLApConfig.TYPE_SENSOR_VOLTAGE:
//浼犳劅鍣� 鐢靛帇
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---鐢靛帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---鐢靛帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float voltageValue = (float) event.getAppliancesInfo().getCurState();
+ float voltageValue = (float) event.getAppliancesInfo().getCurStateObject();
String voltageValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
- ToastUtil("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
+ showToast("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
Log.i("djl", "浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
break;
case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
//浼犳劅鍣� 鐢垫祦
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---鐢垫祦鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---鐢垫祦鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float electricityValue = (float) event.getAppliancesInfo().getCurState();
+ float electricityValue = (float) event.getAppliancesInfo().getCurStateObject();
String electricityValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
- ToastUtil("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
+ showToast("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
Log.i("djl", "浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
break;
case HDLApConfig.TYPE_SENSOR_POWER:
//浼犳劅鍣� 鍔熺巼
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---鍔熺巼鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---鍔熺巼鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float powerValue = (float) event.getAppliancesInfo().getCurState();
+ float powerValue = (float) event.getAppliancesInfo().getCurStateObject();
String powerValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
- ToastUtil("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
+ showToast("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
Log.i("djl", "浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
break;
@@ -1386,8 +1404,8 @@
}
- public void ToastUtil(String text) {
- Toast.makeText(CtrlActivity.this, text, Toast.LENGTH_SHORT).show();
- }
+ public void showToast(String text) {
+ Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+ }
}
--
Gitblit v1.8.0