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/AppliancesListActivity.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AppliancesListActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AppliancesListActivity.java
index 538e49b..a955401 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AppliancesListActivity.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AppliancesListActivity.java
@@ -32,14 +32,16 @@
public class AppliancesListActivity extends BaseActivity {
private RecyclerView mRecyclerView;
-// private List<String> listString = new ArrayList<>();
+ // private List<String> listString = new ArrayList<>();
private List<AppliancesInfo> appliancesInfos = new ArrayList<>();
private String remarkStr;
private HDLAppliancesListAdapter mAppliancesAdapter;
- /**Topbar*/
+ /**
+ * Topbar
+ */
private RelativeLayout topBarBack;
private TextView topBarTitle;
@@ -50,7 +52,7 @@
initToolbar();
appliancesInfos = (List<AppliancesInfo>) getIntent().getSerializableExtra("Appliances");
initRecyclerView();
- topBarTitle.setText(appliancesInfos.get(0).getDeviceName());
+ topBarTitle.setText(appliancesInfos.get(0).getParentRemarks());
}
/**
@@ -129,7 +131,11 @@
switch (mBigType) {
case Configuration.LIGTH_BIG_TYPE:
//鐏厜妯″潡
- intent.setClass(AppliancesListActivity.this, CtrlLightActivity.class);
+ if (appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_LIGHT_CCT || appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_LIGHT_RGB || appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_LIGHT_DALI || appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_LIGHT_DMX) {
+ intent.setClass(AppliancesListActivity.this, CtrlColourLightActivity.class);
+ } else {
+ intent.setClass(AppliancesListActivity.this, CtrlLightActivity.class);
+ }
break;
case Configuration.CURTAIN_BIG_TYPE:
//绐楀笜妯″潡
@@ -137,9 +143,11 @@
break;
case Configuration.AIR_BIG_TYPE:
//绌鸿皟妯″潡
- if(appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_AC_HVAC){
+ if (appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_AC_HVAC) {
intent.setClass(AppliancesListActivity.this, CtrlAirHVACActivity.class);
- }else {
+ } else if (appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_AC_TECHSYS) {
+ intent.setClass(AppliancesListActivity.this, CtrlAirTechSysActivity.class);
+ } else {
intent.setClass(AppliancesListActivity.this, CtrlAirActivity.class);
}
break;
@@ -163,9 +171,24 @@
//澶х被鏄�氱敤寮�鍏冲垯璺宠浆鍒癈trlCommonSwitchActivity
intent.setClass(AppliancesListActivity.this, CtrlCommonSwitchActivity.class);
break;
+ case Configuration.FRESH_AIR_BIG_TYPE://2020-07-20 鏂板鏂伴
+ //鏂伴妯″潡
+ if (appliancesInfos.get(position).getDeviceType() == HDLApConfig.TYPE_FRESH_AIR_JINMAO) {
+ //閲戣寕瀹氬埗鏂伴璁惧
+ intent.setClass(AppliancesListActivity.this, FreshAirJinMaoActivity.class);
+ } else {
+ intent.setClass(AppliancesListActivity.this, FreshAirActivity.class);
+ }
+ break;
+ case Configuration.GEOTHERMAL_BIG_TYPE://2020-07-20 鏂板鍦扮儹
+ //澶х被鏄湴鐑垯璺宠浆鍒癎eothermalActivity
+ intent.setClass(AppliancesListActivity.this, GeothermalActivity.class);
+ break;
+ case Configuration.DOOR_MACHINE_BIG_TYPE://2023-08-22 鏂板闂ㄩ攣
+ intent.setClass(AppliancesListActivity.this, DoorMachineActivity.class);
+ break;
default:
intent.setClass(AppliancesListActivity.this, CtrlActivity.class);
-
break;
}
--
Gitblit v1.8.0