From 566ddb2ea03e2514de50f2ca861a2674f6e840ac Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期一, 27 十一月 2023 13:32:27 +0800
Subject: [PATCH] 新增科技系统、门锁、新风和地暖支持
---
app/src/main/java/com/hdl/sdk/ttl_sdk/activity/SensorActivity.java | 83 ++++++++++++-----------------------------
1 files changed, 25 insertions(+), 58 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 a894570..7be74e8 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
@@ -2,6 +2,8 @@
import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.RelativeLayout;
@@ -14,6 +16,7 @@
import com.hdl.sdk.ttl_sdk.R;
import com.hdl.sdk.ttl_sdk.base.BaseActivity;
import com.hdl.sdk.ttl_sdk.utlis.HDLLog;
+import com.hdl.sdk.ttl_sdk.utlis.HDLUtlis;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -24,7 +27,6 @@
*/
private RelativeLayout topBarBack;
private TextView topBarTitle;
- private Button sensorbtn;
private TextView sensorText;
private AppliancesInfo appliancesInfo;
@@ -46,10 +48,10 @@
initToolbar();
initcurState();
initView();
- initOnClick();
displayStateView();
- //浠庣綉缁滀笂鏌ヨ鍒锋柊涓�娆¤澶囩姸鎬侊紝寰呰皟璇�
- HDLCommand.getDryContactSensorStateFromNetwork(appliancesInfo);
+
+ Log.d("panlili", "SensorActivity.java:appliancesInfo-----> " + appliancesInfo.toString());
+ //浼犳劅鍣ㄦ棤鐘舵�佽幏鍙栵紝鍙兘瑙﹀彂浜嬩欢涓婃姤
}
/**
@@ -70,61 +72,24 @@
private void initcurState() {
appliancesInfo = (AppliancesInfo) getIntent().getSerializableExtra("hdl");
String titleStr = appliancesInfo.getRemarks();
- topBarTitle.setText(titleStr);
+ if (TextUtils.isEmpty(titleStr) || titleStr.equals(HDLUtlis.REMAEK_NULL)) {
+ if (TextUtils.isEmpty(appliancesInfo.getDeviceName())) {
+ titleStr = "澶囨敞涓虹┖";
+ } else {
+ titleStr = appliancesInfo.getDeviceName();
+ }
+ }
+ topBarTitle.setText(titleStr + appliancesInfo.getDeviceType());
}
private void initView() {
- sensorbtn = findViewById(R.id.sensorbtn);
sensorText = findViewById(R.id.sensorText);
-
-
- }
-
- private void initOnClick() {
-
- sensorbtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- //浠庣綉缁滀笂鏌ヨ鍒锋柊涓�娆¤澶囩姸鎬侊紝寰呰皟璇�
- HDLCommand.getDryContactSensorStateFromNetwork(appliancesInfo);
- }
- });
}
private void displayStateView() {
switch (appliancesInfo.getDeviceType()) {
-// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT://2019-07-03 灞忚斀
-// case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR:
-// case HDLApConfig.TYPE_SENSOR_TEMP:
-// case HDLApConfig.TYPE_SENSOR_HUMIDITY:
-// case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
-// case HDLApConfig.TYPE_SENSOR_VOC:
-// case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
-// case HDLApConfig.TYPE_SENSOR_C02:
-// case HDLApConfig.TYPE_SENSOR_LPG:
-// case HDLApConfig.TYPE_SENSOR_CO_H2:
-// case HDLApConfig.TYPE_SENSOR_CH4:
-// case HDLApConfig.TYPE_SENSOR_SMOG:
-// case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
-// case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
-// case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
-// case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
-// case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
-// case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
-// case HDLApConfig.TYPE_SENSOR_WEIGHT:
-// case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
-// case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
-// case HDLApConfig.TYPE_SENSOR_SHAKE:
-// case HDLApConfig.TYPE_SENSOR_VOLTAGE:
-// case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
-// case HDLApConfig.TYPE_SENSOR_POWER:
-// case HDLApConfig.TYPE_SENSOR_FLOODING:
-// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET:
-// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON:
-
-
case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: //绾㈠鎰熷簲浼犳劅鍣�
case HDLApConfig.TYPE_SENSOR_CO_H2: //鐓ゆ皵浼犳劅鍣�
case HDLApConfig.TYPE_SENSOR_SMOG: //鐑熼浘浼犳劅鍣�
@@ -142,7 +107,7 @@
/**
* 浼犳劅鍣ㄧ姸鎬佸洖璋� Event
- * 骞茶妭鐐圭姸鎬佷富鍔ㄥ箍鎾� 鍜� 琚姩鏌ヨ鐘舵�佸弽棣�
+ * 骞茶妭鐐圭姸鎬佷富鍔ㄥ箍鎾�--->15D0
*
* @param event
*/
@@ -153,21 +118,23 @@
&& event.getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
) {
- //浼犳劅鍣� 骞叉帴鐐� 銆傚彧鏈夊紑鍏崇姸鎬�
if (!event.isSuccess()) {
- showToast("鑾峰彇浼犳劅鍣ㄧ姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ showToast("浼犳劅鍣ㄧ姸鎬佷笂鎶ュけ璐ワ紝璇烽噸鏂板啀璇�");
return;
}
String mData = "";
- if (appliancesInfo.getDeviceType() == HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR) {
- mData = event.getState() == 0 ? "鏃犲姩闈�" : "鏈夊姩闈�";
+ if (appliancesInfo.getDeviceType() == HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR) {//绾㈠鎰熷簲浼犳劅鍣�
+ mData = event.getState() == 0 ? "鏃犱汉" : "鏈変汉";
+ } else if (appliancesInfo.getDeviceType() == HDLApConfig.TYPE_SENSOR_FLOODING) {//姘存蹈浼犳劅鍣�
+ mData = event.getState() == 0 ? "姝ｅ父" : "婕忔按";
+ } else if (appliancesInfo.getDeviceType() == HDLApConfig.TYPE_SENSOR_DOOR_MAGNET) {//闂ㄧ浼犳劅鍣�
+ mData = event.getState() == 0 ? "闂悎" : "鎵撳紑";
} else {
- mData = event.getState() == 0 ? "闂悎" : "鏂紑";
+ mData = event.getState() == 0 ? "姝ｅ父" : "鎶ヨ";
}
- sensorText.setText("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + mData);
-// showToast("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + mData);
- HDLLog.Log("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + mData);
+ sensorText.setText("浼犳劅鍣ㄧ姸鎬侊細" + mData);
+ HDLLog.Log("浼犳劅鍣ㄧ姸鎬侊細" + mData);
}
}
--
Gitblit v1.8.0