From 071a8328823a2861f93ce556a4da3e4119cab1a3 Mon Sep 17 00:00:00 2001 From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com> Date: 星期四, 19 九月 2024 16:24:28 +0800 Subject: [PATCH] 完成金茂定制功能 --- app/src/main/java/com/hdl/sdk/ttl_sdk/activity/SensorActivity.java | 444 ++++++++++++++----------------------------------------- 1 files changed, 115 insertions(+), 329 deletions(-) diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/SensorActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/SensorActivity.java index 7be74e8..2ff34b2 100644 --- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/SensorActivity.java +++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/SensorActivity.java @@ -5,12 +5,12 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; -import android.widget.Button; import android.widget.RelativeLayout; import android.widget.TextView; import com.hdl.sdk.ttl.HDLAppliances.Config.HDLApConfig; import com.hdl.sdk.ttl.HDLAppliances.HDLSensor.DryContactSensorBackEvent; +import com.hdl.sdk.ttl.HDLAppliances.HDLSensor.SensorStateBackInfo; import com.hdl.sdk.ttl.HDLDeviceManger.Bean.AppliancesInfo; import com.hdl.sdk.ttl.HDLDeviceManger.Core.HDLCommand; import com.hdl.sdk.ttl_sdk.R; @@ -28,7 +28,9 @@ private RelativeLayout topBarBack; private TextView topBarTitle; private TextView sensorText; + private TextView sensorStatusText; private AppliancesInfo appliancesInfo; + private String showMessage; /** @@ -51,7 +53,9 @@ displayStateView(); Log.d("panlili", "SensorActivity.java:appliancesInfo-----> " + appliancesInfo.toString()); - //浼犳劅鍣ㄦ棤鐘舵�佽幏鍙栵紝鍙兘瑙﹀彂浜嬩欢涓婃姤 + //瀹夐槻浼犳劅鍣ㄦ棤鐘舵�佽幏鍙栵紝鍙兘瑙﹀彂浜嬩欢涓婃姤 + //鐜浼犳劅鍣ㄨ幏鍙栫姸鎬� + HDLCommand.getSensorStateFromNetwork(appliancesInfo); } /** @@ -85,17 +89,26 @@ private void initView() { sensorText = findViewById(R.id.sensorText); + sensorStatusText = findViewById(R.id.sensorStatusText); } private void displayStateView() { switch (appliancesInfo.getDeviceType()) { case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: //绾㈠鎰熷簲浼犳劅鍣� - case HDLApConfig.TYPE_SENSOR_CO_H2: //鐓ゆ皵浼犳劅鍣� + case HDLApConfig.TYPE_SENSOR_LPG: //鐓ゆ皵浼犳劅鍣� 娑插寲鐭虫补姘� + case HDLApConfig.TYPE_SENSOR_CO_H2: //鐓ゆ皵浼犳劅鍣� 浜哄伐鐓ゆ皵锛圕O锛孒2锛� + case HDLApConfig.TYPE_SENSOR_CH4: //鐓ゆ皵浼犳劅鍣� 澶╃劧姘旓紙CH4) case HDLApConfig.TYPE_SENSOR_SMOG: //鐑熼浘浼犳劅鍣� case HDLApConfig.TYPE_SENSOR_FLOODING: //姘存蹈浼犳劅鍣� case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET: //闂ㄧ浼犳劅鍣� case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON://绱ф�ユ寜閽� + case HDLApConfig.TYPE_SENSOR_TEMP://娓╁害 + case HDLApConfig.TYPE_SENSOR_HUMIDITY://婀垮害 + case HDLApConfig.TYPE_SENSOR_VOC://VOC + case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5://PM2.5 + case HDLApConfig.TYPE_SENSOR_C02://C02 + case HDLApConfig.TYPE_SENSOR_PM_10://PM10 break; default: finish();//璁惧绫诲瀷涓嶅缁撴潫椤甸潰 @@ -133,337 +146,110 @@ mData = event.getState() == 0 ? "姝e父" : "鎶ヨ"; } + sensorText.setVisibility(View.VISIBLE); + sensorStatusText.setVisibility(View.GONE); sensorText.setText("浼犳劅鍣ㄧ姸鎬侊細" + mData); HDLLog.Log("浼犳劅鍣ㄧ姸鎬侊細" + mData); } } -// /** -// * 浼犳劅鍣ㄧ姸鎬佸洖璋� Event -// * -// * @param event -// */ -// @Subscribe(threadMode = ThreadMode.MAIN) -// public void onSensorStateBackInfoMain(SensorStateBackInfo event) { -// if (event.getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID() -// && event.getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID() -// && event.getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum() -// ) { -// //杩欎釜杩斿洖鐨勪俊鎭槸褰撳墠鐘舵�佺殑 -// switch (event.getAppliancesInfo().getDeviceType()) { -// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT://2019-07-03 灞忚斀 -// //浼犳劅鍣� 骞叉帴鐐� 銆傚彧鏈夊紑鍏崇姸鎬� -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float dryContactValue = (float) event.getAppliancesInfo().getCurState(); -// String dryContactUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit); -// HDLLog.Log("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: -// //浼犳劅鍣� 绉诲姩鎺㈡祴 銆傜伒鏁忓害 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︾姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float mdValue = (float) event.getAppliancesInfo().getCurState(); -// String mdValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit); -// HDLLog.Log("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_TEMP: -// //浼犳劅鍣� 娓╁害 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float tempValue = (float) event.getAppliancesInfo().getCurState(); -// String tempValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit); -// HDLLog.Log("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_HUMIDITY: -// //浼犳劅鍣� 婀垮害 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float humidityValue = (float) event.getAppliancesInfo().getCurState(); -// String humidityValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit); -// HDLLog.Log("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_ILLUMINACE: -// //浼犳劅鍣� 鐓у害 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---鐓у害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float illuminaceValue = (float) event.getAppliancesInfo().getCurState(); -// String illuminaceValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit); -// HDLLog.Log("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_VOC: -// //浼犳劅鍣� 褰撳墠绌烘皵璐ㄩ噺绛夌骇 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float vocValue = (float) event.getAppliancesInfo().getCurState(); -// String vocValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit); -// HDLLog.Log("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5: -// //浼犳劅鍣� pm2.5 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float pm2_5Value = (float) event.getAppliancesInfo().getCurState(); -// String pm2_5ValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit); -// HDLLog.Log("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_C02: -// //浼犳劅鍣� 浜屾哀鍖栫⒊ -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float co2Value = (float) event.getAppliancesInfo().getCurState(); -// String co2ValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit); -// HDLLog.Log("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_LPG: -// //浼犳劅鍣� 娑插寲鐭虫补姘� -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---娑插寲鐭虫补姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float lpgValue = (float) event.getAppliancesInfo().getCurState(); -// String lpgValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit); -// HDLLog.Log("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_CO_H2: -// //浼犳劅鍣� 浜哄伐鐓ゆ皵 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---浜哄伐鐓ゆ皵鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float coh2Value = (float) event.getAppliancesInfo().getCurState(); -// String coh2ValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit); -// HDLLog.Log("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_CH4: -// //浼犳劅鍣� 澶╃劧姘� -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---澶╃劧姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float ch4Value = (float) event.getAppliancesInfo().getCurState(); -// String ch4ValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit); -// HDLLog.Log("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_SMOG: -// //浼犳劅鍣� 鐑熼浘 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---鐑熼浘鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float smogValue = (float) event.getAppliancesInfo().getCurState(); -// String smogValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit); -// HDLLog.Log("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_WIND_SPEED: -// //浼犳劅鍣� 椋庨�� -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---椋庨�熺姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float windSpeedValue = (float) event.getAppliancesInfo().getCurState(); -// String windSpeedValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit); -// HDLLog.Log("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE: -// //浼犳劅鍣� 椋庡帇 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---椋庡帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float windPressureValue = (float) event.getAppliancesInfo().getCurState(); -// String windPressureValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit); -// HDLLog.Log("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW: -// //浼犳劅鍣� 娑蹭綋娴侀噺 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娴侀噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float liquidFlowValue = (float) event.getAppliancesInfo().getCurState(); -// String liquidFlowValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit); -// HDLLog.Log("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE: -// //浼犳劅鍣� 娑蹭綋鍘嬪姏 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---娑蹭綋鍘嬪姏鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float liquidPressureValue = (float) event.getAppliancesInfo().getCurState(); -// String liquidPressureValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit); -// HDLLog.Log("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH: -// //浼犳劅鍣� 娑蹭綋娣卞害 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娣卞害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float liquidDepthValue = (float) event.getAppliancesInfo().getCurState(); -// String liquidDepthValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit); -// HDLLog.Log("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_RAIN_FALL: -// //浼犳劅鍣� 闆ㄩ噺 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---闆ㄩ噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float rainFallValue = (float) event.getAppliancesInfo().getCurState(); -// String rainFallValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit); -// HDLLog.Log("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_WEIGHT: -// //浼犳劅鍣� 閲嶉噺 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float weightValue = (float) event.getAppliancesInfo().getCurState(); -// String weightValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit); -// HDLLog.Log("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH: -// //浼犳劅鍣� 閲嶉噺 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float height_lengthValue = (float) event.getAppliancesInfo().getCurState(); -// String height_lengthValueUnit = ((SensorStateBackInfo) event).getUnite(); -// showToast("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit); -// HDLLog.Log("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit); -// break; -// case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED: -// //浼犳劅鍣� 鐗╀綋閫熷害 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---鐗╀綋閫熷害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float objectSpeedValue = (float) event.getAppliancesInfo().getCurState(); -// String objectSpeedUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite); -// HDLLog.Log("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_SHAKE: -// //浼犳劅鍣� 闇囧姩 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---闇囧姩鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float shakeValue = (float) event.getAppliancesInfo().getCurState(); -// String shakeValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite); -// HDLLog.Log("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_VOLTAGE: -// //浼犳劅鍣� 鐢靛帇 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---鐢靛帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float voltageValue = (float) event.getAppliancesInfo().getCurState(); -// String voltageValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite); -// HDLLog.Log("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_ELECTRICITY: -// //浼犳劅鍣� 鐢垫祦 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---鐢垫祦鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float electricityValue = (float) event.getAppliancesInfo().getCurState(); -// String electricityValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite); -// HDLLog.Log("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_POWER: -// //浼犳劅鍣� 鍔熺巼 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---鍔熺巼鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float powerValue = (float) event.getAppliancesInfo().getCurState(); -// String powerValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite); -// HDLLog.Log("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_FLOODING: -// //浼犳劅鍣� 姘存蹈 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---姘存蹈鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float floodingValue = (float) event.getAppliancesInfo().getCurState(); -// String floodingValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---姘存蹈锛�" + floodingValue + floodingValueUnite); -// HDLLog.Log("浼犳劅鍣�---姘存蹈锛�" + floodingValue + floodingValueUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET: -// //浼犳劅鍣� 闂ㄧ绐楃 -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---闂ㄧ绐楃鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float doorMagnetValue = (float) event.getAppliancesInfo().getCurState(); -// String doorMagnetValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---闂ㄧ绐楃锛�" + doorMagnetValue + doorMagnetValueUnite); -// HDLLog.Log("浼犳劅鍣�---闂ㄧ绐楃锛�" + doorMagnetValue + doorMagnetValueUnite); -// break; -// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON: -// //浼犳劅鍣� 绱ф�ユ寜閽� -// if (!event.isSuccess()) { -// showToast("鑾峰彇浼犳劅鍣�---绱ф�ユ寜閽姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�"); -// return; -// } -// float emergencyButtonValue = (float) event.getAppliancesInfo().getCurState(); -// String emergencyButtonUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣� -// showToast("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite); -// HDLLog.Log("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite); -// break; -// -// -// } -// } -// } + /** + * 浼犳劅鍣ㄧ姸鎬佸洖璋� Event + * + * @param event + */ + @Subscribe(threadMode = ThreadMode.MAIN) + public void onSensorStateBackInfoMain(SensorStateBackInfo event) { + if (event.getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID() + && event.getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID() + && event.getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum() + ) { + showMessage = ""; + sensorText.setVisibility(View.GONE); + sensorStatusText.setVisibility(View.VISIBLE); + //杩欎釜杩斿洖鐨勪俊鎭槸褰撳墠鐘舵�佺殑 + switch (event.getAppliancesInfo().getDeviceType()) { + case HDLApConfig.TYPE_SENSOR_TEMP: + //浼犳劅鍣� 娓╁害 + if (!event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float tempValue = (float) event.getAppliancesInfo().getCurState(); + String tempValueUnit = ((SensorStateBackInfo) event).getUnite(); + showMessage = tempValue + tempValueUnit; + sensorStatusText.setText("浼犳劅鍣�---娓╁害锛�" + showMessage); + showToast("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit); + HDLLog.Log("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit); + break; + case HDLApConfig.TYPE_SENSOR_HUMIDITY: + //浼犳劅鍣� 婀垮害 + if (!event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float humidityValue = (float) event.getAppliancesInfo().getCurState(); + String humidityValueUnit = ((SensorStateBackInfo) event).getUnite(); + showMessage = humidityValue + humidityValueUnit; + sensorStatusText.setText("浼犳劅鍣�---婀垮害锛�" + showMessage); + showToast("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit); + HDLLog.Log("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit); + break; + case HDLApConfig.TYPE_SENSOR_VOC: + //浼犳劅鍣� 褰撳墠绌烘皵璐ㄩ噺绛夌骇 + if (!event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float vocValue = (float) event.getAppliancesInfo().getCurState(); + String vocValueUnit = ((SensorStateBackInfo) event).getUnite(); + showMessage = vocValue + vocValueUnit; + sensorStatusText.setText("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + showMessage); + showToast("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit); + HDLLog.Log("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit); + break; + case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5: + //浼犳劅鍣� pm2.5 + if (!event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float pm2_5Value = (float) event.getAppliancesInfo().getCurState(); + String pm2_5ValueUnit = ((SensorStateBackInfo) event).getUnite(); + showMessage = pm2_5Value + pm2_5ValueUnit; + sensorStatusText.setText("浼犳劅鍣�---pm2.5锛�" + showMessage); + showToast("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit); + HDLLog.Log("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit); + break; + case HDLApConfig.TYPE_SENSOR_C02: + //浼犳劅鍣� 浜屾哀鍖栫⒊ + if (!event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float co2Value = (float) event.getAppliancesInfo().getCurState(); + String co2ValueUnit = ((SensorStateBackInfo) event).getUnite(); + showMessage = co2Value + co2ValueUnit; + sensorStatusText.setText("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + showMessage); + showToast("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit); + HDLLog.Log("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit); + break; + case HDLApConfig.TYPE_SENSOR_PM_10: + //浼犳劅鍣� pm10 + if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---pm10鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float pm10Value = (float) event.getAppliancesInfo().getCurState(); + String pm10ValueUnit = ((SensorStateBackInfo) event).getUnite(); + showMessage = pm10Value + pm10ValueUnit; + sensorStatusText.setText("浼犳劅鍣�---pm10锛�" + showMessage); + showToast("浼犳劅鍣�---pm10锛�" + pm10Value + pm10ValueUnit); + HDLLog.Log("浼犳劅鍣�---pm10锛�" + pm10Value + pm10ValueUnit); + break; + } + } + } } \ No newline at end of file -- Gitblit v1.8.0