From 425b2352c57a377b1594097a69aabcc87207b683 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 02 八月 2019 14:11:32 +0800
Subject: [PATCH] 2019-8-2 14:10:43 1.修改地热演示页面；
---
app/src/main/res/layout/activity_ctrl.xml | 4
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java | 219 ++++++++++++++------------
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java | 107 +++++++------
app/src/main/res/values/strings.xml | 1
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 4
app/src/main/res/layout/activity_main.xml | 6
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java | 5
hdl_core/build.gradle | 2
README.md | 2
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java | 79 +++++----
10 files changed, 231 insertions(+), 198 deletions(-)
diff --git a/README.md b/README.md
index fc98032..2ec9626 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
HDL XW Android SDK Copyright (c) 2019 HDL Inc.
-鎻愪緵鍚戝線SDK椤圭洰
+鎻愪緵澹板繀鍙疭DK椤圭洰
##Version 1.0.2
1.鏂板鍦扮儹妯″潡鍜屾柊椋庣郴缁熸帶鍒跺拰璇诲彇鐘舵�佹帴鍙ｏ紱
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..4a09520 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;
@@ -62,7 +63,7 @@
initView();
initClickOnEvent();
- HDLCommand.getDeviceState(appliancesInfo);
+
}
@@ -628,26 +629,38 @@
airBtnTemp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ String tempStr = airTempEd.getText().toString();
+ if (TextUtils.isEmpty(tempStr) || 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;
@@ -691,7 +704,7 @@
) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
- ToastUtil("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
lightBtn.setText("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -704,7 +717,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 +731,7 @@
) {
if (!event.isSuccess()) {
- ToastUtil("绐楀笜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("绐楀笜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -730,7 +743,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 +782,7 @@
) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
- ToastUtil("绌鸿皟鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("绌鸿皟鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -780,13 +793,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 +813,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 +843,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 +878,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 +924,10 @@
&& event.getLogicCtrlBackInfo().getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
) {
if (!event.isSuccess()) {
- ToastUtil("鍦烘櫙鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("鍦烘櫙鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
- ToastUtil("鍦烘櫙鎺у埗鎴愬姛");
+ showToast("鍦烘櫙鎺у埗鎴愬姛");
}
}
@@ -932,7 +945,7 @@
case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
if (!event.isSuccess()) {
- ToastUtil("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
lightBtn.setText("浜害 = " + event.getAppliancesInfo().getCurState());
@@ -943,7 +956,7 @@
case HDLApConfig.TYPE_CURTAIN_MODULE:
if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
if (!event.isSuccess()) {
- ToastUtil("鑾峰彇绐楀笜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇绐楀笜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
//绐楀笜妯″潡锛歝urState:0=鍋滄,1=鎵撳紑,2=鍏抽棴銆�
@@ -973,7 +986,7 @@
case HDLApConfig.TYPE_AC_PANEL:
if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
if (!event.isSuccess()) {
- ToastUtil("鑾峰彇绌鸿皟鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇绌鸿皟鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
@@ -984,13 +997,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 +1017,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 +1047,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 +1081,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 +1120,276 @@
case HDLApConfig.TYPE_SENSOR_DRY_CONTACT:
//浼犳劅鍣� 骞叉帴鐐� 銆傚彧鏈夊紑鍏崇姸鎬�
if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) {
- ToastUtil("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
float dryContactValue = (float) event.getAppliancesInfo().getCurState();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
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();
String powerValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
- ToastUtil("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
+ showToast("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
Log.i("djl", "浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
break;
@@ -1386,8 +1399,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();
+ }
}
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
index 740955b..f3a4b01 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
@@ -309,41 +309,43 @@
showToast("鍦扮儹妯″潡,杩斿洖鏁版嵁涓虹┖");
return;
}
-
- String message = "";
GeothermalBackInfo mGeothermalBackInfo = event.getGeothermalBackInfo();
+ showGeothermalBackInfo(mGeothermalBackInfo);
- switch (ctrlId) { //ctrlId 褰撳墠鎺у埗绫诲瀷,鍙弽棣堟帶鍒剁殑鐘舵��
- case GeothermalParser.gSwich:
- message = getSwichStateString(mGeothermalBackInfo.getIsOn());
- break;
- case GeothermalParser.gMode:
- message = getModeStateString(mGeothermalBackInfo.getgMode());
- break;
- case GeothermalParser.gNormalTemp:
-// gTempState = mGeothermalBackInfo.getgNormalTemp();
- message = "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
- break;
+// String message = "";
+// GeothermalBackInfo mGeothermalBackInfo = event.getGeothermalBackInfo();
-
- case GeothermalParser.gDayTemp:
- message = "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
- break;
- case GeothermalParser.gNightTemp:
- message = "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
- break;
- case GeothermalParser.gLeaveTemp:
- message = "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
- break;
- default:
- break;
-
- }
-
-
- mTextView.setText(message);
- showToast(message);
- HDLLog.I(message);
+// switch (ctrlId) { //ctrlId 褰撳墠鎺у埗绫诲瀷,鍙弽棣堟帶鍒剁殑鐘舵��
+// case GeothermalParser.gSwich:
+// message = getSwichStateString(mGeothermalBackInfo.getIsOn());
+// break;
+// case GeothermalParser.gMode:
+// message = getModeStateString(mGeothermalBackInfo.getgMode());
+// break;
+// case GeothermalParser.gNormalTemp:
+//// gTempState = mGeothermalBackInfo.getgNormalTemp();
+// message = "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
+// break;
+//
+//
+// case GeothermalParser.gDayTemp:
+// message = "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
+// break;
+// case GeothermalParser.gNightTemp:
+// message = "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
+// break;
+// case GeothermalParser.gLeaveTemp:
+// message = "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
+// break;
+// default:
+// break;
+//
+// }
+//
+//
+// mTextView.setText(message);
+// showToast(message);
+// HDLLog.I(message);
}
}
@@ -369,26 +371,35 @@
return;
}
- if(mGeothermalBackInfo.getIsOn() == GeothermalParser.gSwichOn) {
- message = getSwichStateString(mGeothermalBackInfo.getIsOn());
-
- message += "\n" + getModeStateString(mGeothermalBackInfo.getgMode());
- message += "\n" + "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
- message += "\n" + "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
- message += "\n" + "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
- message += "\n" + "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
- }else {
- message = getSwichStateString(mGeothermalBackInfo.getIsOn());
- }
-
-
- mTextView.setText(message);
- showToast(message);
- HDLLog.I(message);
+ showGeothermalBackInfo(mGeothermalBackInfo);
}
break;
}
}
}
+
+ /**
+ * showGeothermalBackInfo
+ * @param mGeothermalBackInfo
+ */
+ private void showGeothermalBackInfo(GeothermalBackInfo mGeothermalBackInfo){
+ String message = "";
+ if(mGeothermalBackInfo.getIsOn() == GeothermalParser.gSwichOn) {
+ message = getSwichStateString(mGeothermalBackInfo.getIsOn());
+
+ message += "\n" + getModeStateString(mGeothermalBackInfo.getgMode());
+ message += "\n" + "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
+ message += "\n" + "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
+ message += "\n" + "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
+ message += "\n" + "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
+ }else {
+ message = getSwichStateString(mGeothermalBackInfo.getIsOn());
+ }
+
+
+ mTextView.setText(message);
+ showToast(message);
+ HDLLog.I(message);
+ }
}
diff --git a/app/src/main/res/layout/activity_ctrl.xml b/app/src/main/res/layout/activity_ctrl.xml
index 5ab6449..24e9581 100644
--- a/app/src/main/res/layout/activity_ctrl.xml
+++ b/app/src/main/res/layout/activity_ctrl.xml
@@ -118,7 +118,9 @@
<EditText
android:id="@+id/airet_tempet"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:inputType="number"
+ />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a66db05..79e7906 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
android:id="@+id/version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="hdl_lib_v1.5.9.20190710_beta"
+ android:text="@string/app_version"
/>
<LinearLayout
android:layout_width="wrap_content"
@@ -31,7 +31,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:focusable="true"
+ android:focusableInTouchMode="true">
<EditText
android:id="@+id/edt"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ced02d7..9000487 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
<resources>
<string name="app_name">HDL_SDK</string>
+ <string name="app_version">hdl_lib_v1.0.2.2.20190723_beta</string>
</resources>
diff --git a/hdl_core/build.gradle b/hdl_core/build.gradle
index fb4b6ab..0fdf4e1 100644
--- a/hdl_core/build.gradle
+++ b/hdl_core/build.gradle
@@ -6,7 +6,7 @@
defaultConfig {
minSdkVersion 17
targetSdkVersion 28
- versionCode 1
+ versionCode 2
versionName "1.0.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
index 6324e04..63bf0e3 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -581,8 +581,6 @@
*/
public static List<DeviceStateBean> getAllDevicesState() {
List<DeviceStateBean> deviceStateBeanList = new ArrayList<>();
-
-
for (int i = 0; i < HDLDeviceManager.devicesDataList.size(); i++) {
List<AppliancesInfo> appliancesInfos = HDLDeviceManager.devicesDataList.get(i).getAppliancesInfoList();
for (int j = 0; j < appliancesInfos.size(); j++) {
@@ -966,7 +964,7 @@
}
}
- }, 1, 200);
+ }, 1, 500); //2019-07-23 鍙戜竴娆¤ˉ鍙�3娆★紝闂撮殧500ms
}
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
index 721b46f..8fb85bf 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
@@ -90,7 +90,6 @@
public static boolean isGeothermalCtrlSuccess = false; //鍒ゆ柇鍦扮儹妯″潡鏄惁鎺у埗鎴愬姛
-
/**
* 鍒濆鍖朣DK
*
@@ -1009,7 +1008,9 @@
) {
List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
for (int j = 0, len2 = infos.size(); j < len2; j++) {
- if (infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {
+ if (infos.get(j).getBigType() == Configuration.FRESH_AIR_BIG_TYPE
+ && infos.get(j).getDeviceType() == HDLApConfig.TYPE_FRESH_AIR
+ && infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {
devicesDataList.get(i).getAppliancesInfoList().get(j).setFeedbackState(getDatas.addBytes);
AppliancesInfo mFreshAirInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
@@ -1029,12 +1030,13 @@
/**
* 澶勭悊鍦扮儹璁惧鎺у埗鏁版嵁
- * 20190710
+ * 20190710
+ *
* @param getDatas
*/
private static void handleGeothermalCtrlData(UdpDataBean getDatas) {
switch (getDatas.command) {
- //2019-07-09 鍦扮儹妯″潡
+ //2019-07-09 鍦扮儹妯″潡
case Configuration.GEOTHERMAL_MODULE_CTRL_BACK_COMMAND:
outter:
for (int i = 0, len = devicesDataList.size(); i < len; i++) {
@@ -1044,8 +1046,10 @@
List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
for (int j = 0, len2 = infos.size(); j < len2; j++) {
- if(getDatas.addBytes.length > 0) {
- if (infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {
+ if (getDatas.addBytes.length > 0) {
+ if (infos.get(j).getBigType() == Configuration.GEOTHERMAL_BIG_TYPE
+ && infos.get(j).getDeviceType() == HDLApConfig.TYPE_GEOTHERMAL_MODULE
+ && infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {
if (getDatas.addBytes.length >= 8) {
byte[] getBytes = devicesDataList.get(i).getAppliancesInfoList().get(j).getFeedbackState();
if (getBytes == null || getBytes.length < 10) {
@@ -1942,7 +1946,7 @@
) {
List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
for (int j = 0, len2 = infos.size(); j < len2; j++) {
- HDLLog.info("HDL big:锛�"+devicesDataList.get(i).getAppliancesInfoList().get(j).getBigType());
+ HDLLog.info("HDL big:锛�" + devicesDataList.get(i).getAppliancesInfoList().get(j).getBigType());
switch (devicesDataList.get(i).getAppliancesInfoList().get(j).getBigType()) {
case Configuration.LIGTH_BIG_TYPE:
isGetDeviceStateSuccess = true;
@@ -2194,7 +2198,7 @@
HDLLog.info("handle state 娌℃湁鎵惧埌鍖归厤绫诲瀷");
break;
}
-// break outter;
+
}
break outter;
}
@@ -2204,6 +2208,7 @@
/**
* 澶勭悊鏂伴璁惧鐘舵�佹暟鎹�
* 20190710鏂板
+ *
* @param getDatas
*/
private static void handleFreshAirStateData(UdpDataBean getDatas) {
@@ -2214,18 +2219,17 @@
) {
List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
for (int j = 0, len2 = infos.size(); j < len2; j++) {
- switch (devicesDataList.get(i).getAppliancesInfoList().get(j).getDeviceType()) {
- case HDLApConfig.TYPE_FRESH_AIR:
- isGetDeviceStateSuccess = true;
- devicesDataList.get(i).getAppliancesInfoList().get(j).setFeedbackState(getDatas.addBytes);
- EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
+ if (infos.get(j).getBigType() == Configuration.FRESH_AIR_BIG_TYPE
+ && infos.get(j).getDeviceType() == HDLApConfig.TYPE_FRESH_AIR
+ && infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {//2019-07-17
- break;
- default:
- HDLLog.info("handleFreshAirStateData 娌℃湁鎵惧埌鍖归厤绫诲瀷");
- break;
+ isGetDeviceStateSuccess = true;
+ devicesDataList.get(i).getAppliancesInfoList().get(j).setFeedbackState(getDatas.addBytes);
+ EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
+ break outter;
+ }else {
+ HDLLog.info("handleFreshAirStateData 娌℃湁鎵惧埌鍖归厤绫诲瀷");
}
-
}
break outter;
}
@@ -2236,6 +2240,7 @@
/**
* 澶勭悊鍦扮儹璁惧鐘舵�佹暟鎹�
* 20190710鏂板
+ *
* @param getDatas
*/
private static void handleGeothermalStateData(UdpDataBean getDatas) {
@@ -2246,34 +2251,34 @@
) {
List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
for (int j = 0, len2 = infos.size(); j < len2; j++) {
- switch (devicesDataList.get(i).getAppliancesInfoList().get(j).getDeviceType()) {
- case HDLApConfig.TYPE_GEOTHERMAL_MODULE:
-
- if(getDatas.addBytes.length >= 10) {
- byte[] getBytes = devicesDataList.get(i).getAppliancesInfoList().get(j).getFeedbackState();
- if (getBytes == null || getBytes.length < 10) {
- getBytes = new byte[10];
- }
- System.arraycopy(getDatas.addBytes, 0, getBytes, 0, 10);//20190710鏌ヨ鍦扮儹鐘舵�佸弽棣堬紝鍙彇鍓�10浣嶆暟鎹�
- devicesDataList.get(i).getAppliancesInfoList().get(j).setFeedbackState(getBytes);
- isGetDeviceStateSuccess = true;
- EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
- }else {
- HDLLog.E("鍦扮儹鐘舵�佸弽棣堟暟鎹紓甯�");
+ if (infos.get(j).getBigType() == Configuration.GEOTHERMAL_BIG_TYPE
+ && infos.get(j).getDeviceType() == HDLApConfig.TYPE_GEOTHERMAL_MODULE
+ && infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {//2019-07-17
+ if (getDatas.addBytes.length >= 10) {
+ byte[] getBytes = devicesDataList.get(i).getAppliancesInfoList().get(j).getFeedbackState();
+ if (getBytes == null || getBytes.length < 10) {
+ getBytes = new byte[10];
}
+ System.arraycopy(getDatas.addBytes, 0, getBytes, 0, 10);//20190710鏌ヨ鍦扮儹鐘舵�佸弽棣堬紝鍙彇鍓�10浣嶆暟鎹�
+ devicesDataList.get(i).getAppliancesInfoList().get(j).setFeedbackState(getBytes);
+ isGetDeviceStateSuccess = true;
+ EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
+ } else {
+ HDLLog.E("鍦扮儹鐘舵�佸弽棣堟暟鎹紓甯�");
+ }
- break;
- default:
- HDLLog.info("handleGeothermalStateData 娌℃湁鎵惧埌鍖归厤绫诲瀷");
- break;
+ break outter;
+ }else {
+ HDLLog.info("handleFreshAirStateData 娌℃湁鎵惧埌鍖归厤绫诲瀷");
}
-
}
break outter;
}
}
}
+
+
/**
* 姝ゆ柟娉曞熀鏈病鐢ㄥ埌锛岄�昏緫妯″潡鐨勬帶鍒朵俊鎭凡缁忓湪handleCtrlData涓鐞嗚繃浜�
* <p>
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java
index 3f26a0e..e7babfd 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java
@@ -7,6 +7,7 @@
import com.hdl.sdk.hdl_core.HDLDeviceManger.Bean.UdpDataBean;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.ThirdPartyBgmInfoEvent;
import com.hdl.sdk.hdl_core.Util.LogUtil.HDLLog;
+import com.hdl.sdk.hdl_core.Util.TransformUtil.StringUtil;
import org.greenrobot.eventbus.EventBus;
@@ -39,7 +40,7 @@
* @param sendDatas
*/
public static void sendData(final Crc sendDatas) {
-// HDLLog.info("HDLsendData锛� "+ StringUtil.ByteArrToHex(sendDatas.GetSendBytes(),0, sendDatas.GetSendBytes().length));
+ HDLLog.info("HDLsendData锛� "+ StringUtil.ByteArrToHex(sendDatas.GetSendBytes(),0, sendDatas.GetSendBytes().length));
// sendTestCMD(sendDatas.GetSendBytes(), HDLTest.SEND_TEST_PORT);
new Thread(new Runnable() {
@@ -337,7 +338,7 @@
return;
}
-// HDLLog.info("HDL ReceiveBytes锛� "+ StringUtil.ByteArrToHex(receiveBytes,0, receiveBytes.length));
+ HDLLog.info("HDL ReceiveBytes锛� "+ StringUtil.ByteArrToHex(receiveBytes,0, receiveBytes.length));
//鏍￠獙鏄惁涓篐DL 鏁版嵁
byte[] hdlDataVerify = new byte[10];
--
Gitblit v1.8.0