~cjl/Android_HDL_SDK_TTL485.git

			@@ -3,56 +3,76 @@
			import android.content.Context;
			import android.content.Intent;
			import android.text.TextUtils;
			import android.util.Log;

			import com.google.gson.Gson;
			import com.google.gson.JsonSyntaxException;
			import com.google.gson.reflect.TypeToken;
			import com.hdl.sdk.ttl.Config.MCUConstants;
			import com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition.AirHVACBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLCommonSwitch.CommonSwitchBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLSecurity.SecurityBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLSensor.DryContactSensorBackEvent;
			import com.hdl.sdk.ttl.HDLAppliances.HDLSensor.SensorStateBackInfo;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.MCUConfigurationBean;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.MCUDataBean;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.AirHVACFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CommonSwitchCtrlBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CommonSwitchStateBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DiscoverNewDevicesEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.EventCode;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.MCUFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.SecurityAlarmFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.SecurityArmingFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.UpdateRemarkFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.Parser.DeviceParser;
			import com.hdl.sdk.ttl.Config.Configuration;
			import com.hdl.sdk.ttl.Config.MCUConstants;
			import com.hdl.sdk.ttl.HDLAppliances.Config.HDLApConfig;
			import com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition.AirCtrlBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition.AirHVACBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition.AirTechSysBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition.Parser.AirCtrlParser;
			import com.hdl.sdk.ttl.HDLAppliances.HDLAudio.HDLAudio;
			import com.hdl.sdk.ttl.HDLAppliances.HDLCommonSwitch.CommonSwitchBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLCurtain.CurtainCtrlBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLCurtain.Parser.CurtainCtrlParser;
			import com.hdl.sdk.ttl.HDLAppliances.HDLDoorMachine.DoorMachineBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLDoorMachine.DoorMachineFristBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLDoorMachine.DoorMachineWaringBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLFreshAir.FreshAirBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLFreshAir.FreshAirJinMaoBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLGeothermal.GeothermalBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLLight.ColourLightCtrlBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLLight.LightCtrlBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLLogic.LogicCtrlBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLLogic.LogicMode;
			import com.hdl.sdk.ttl.HDLAppliances.HDLLogic.SceneCtrlBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLSecurity.SecurityBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLSensor.DryContactSensorBackEvent;
			import com.hdl.sdk.ttl.HDLAppliances.HDLSensor.SensorStateBackInfo;
			import com.hdl.sdk.ttl.HDLAppliances.HDLWarning.WarningType;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.AppliancesInfo;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.DevicesData;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.ListRemarks;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.ListSceneRemarks;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.MCUConfigurationBean;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.MCUDataBean;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.RcuCurtain;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.RcuLight;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.ScenesData;
			import com.hdl.sdk.ttl.HDLDeviceManger.Bean.UdpDataBean;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.AirFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.AirHVACFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.AirTechSysFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.ColourLightFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CommonSwitchCtrlBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CommonSwitchStateBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CurtainDeviceStateEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.CurtainFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DeviceStateEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DiscoverNewDevicesEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DoorMachineFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.DoorMachineFeedFristBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.EventCode;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.FreshAirFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.FreshAirJinMaoFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.GeothermalFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.LightFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.LogicFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.MCUFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.SceneFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.SecurityAlarmFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.SecurityArmingFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.UpdateRemarkFeedBackEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.EventBusEvent.WarningInfoEvent;
			import com.hdl.sdk.ttl.HDLDeviceManger.Parser.DeviceParser;
			import com.hdl.sdk.ttl.Utils.HDLUtlis.HDLStringUtils;
			import com.hdl.sdk.ttl.Utils.HDLUtlis.HDLUtlis;
			import com.hdl.sdk.ttl.Utils.LogUtils.HDLLog;
			import com.hdl.sdk.ttl.Utils.SPUtils.SPUtils;
			//import com.hdl.sdk.ttl.Utils.TransformUtils.DataConverseUtils;

			import org.greenrobot.eventbus.EventBus;

			@@ -77,22 +97,19 @@

			public class HDLDeviceManager {
			public static List<String> rcuIpList = new ArrayList<>();//统计Rcu ip地址列表
			public static List<DevicesData> devicesDataList = new ArrayList<>();//统计搜索列表
			public static List<DevicesData> realDevicesDataList = new ArrayList<>();//统计搜索列表
			public static List<DevicesData> devicesDataList = new ArrayList<>();//统计设备搜索列表
			public static List<DevicesData> realDevicesDataList = new ArrayList<>();//统计设备搜索列表
			public static int totalDeviceSize = 0;
			public static List<ScenesData> scenesDataList = new ArrayList<>();//统计场景搜索列表
			private static Context viewContext;
			public static List<ListRemarks> listRemarks = new ArrayList<>();
			public static List<ListSceneRemarks> listSceneRemarks = new ArrayList<>();
			public static List<RcuLight> rcuLightList = new ArrayList<>();
			public static List<RcuCurtain> rcuCurtainList = new ArrayList<>();
			public static boolean isLogicCtrl = false;
			public static ConcurrentHashMap<String, Boolean> ctrlSuccessStateHashMap = new ConcurrentHashMap<>();//2019-8-2


			// public static byte[] air1Info = null;
			// public static byte[] air2Info = null;
			// public static byte[] air3Info = null;
			// public static byte[] air4Info = null;

			public static boolean isGetDeviceStateSuccess = false; //判断获取设备状态是否控制成功
			public static boolean isGetDeviceStateSuccess = false; //判断获取设备状态是否读取成功
			public static boolean isUpdateRemarkSuccess = false; //判断修改设备名是否成功
			public static boolean isMCUCtrlSuccess = false; //判断是否与MCU通信成功

			@@ -100,9 +117,12 @@
			// public static boolean isLightCtrlSuccess = false; //判断灯光是否控制成功
			// public static boolean isCurtainCtrlSuccess = false; //判断窗帘是否控制成功
			// public static boolean isACCtrlSuccess = false; //判断空调是否控制成功
			// public static boolean isSceneCtrlSuccess = false; //判断场景是否控制成功

			// public static boolean isSecurityCtrlSuccess = false; //判断安防模块是否通信成功

			public static boolean isGetBusLightState = false;
			public static boolean isGetSceneRemarkSuccess = false; //判断获取场景详情成功
			public static boolean isSceneCtrlSuccess = false; //判断场景是否控制成功

			/**
			* 初始化 SDK HDLDeviceManager初始化
			@@ -124,6 +144,14 @@
			}
			}

			public static boolean getIsGetBusLightState() {
			return isGetBusLightState;
			}

			public static void setIsGetBusLightState(boolean isGetBusLightState) {
			HDLDeviceManager.isGetBusLightState = isGetBusLightState;
			}

			/**
			* 释放关闭串口
			*/
			@@ -138,24 +166,60 @@
			* @param commandType 命令类型
			*/
			public static void handle(UdpDataBean getDatas, int commandType) {
			// Log.e("panlili", "commandType=" + Integer.toHexString(commandType) + " sourceSubnetID=" + getDatas.sourceSubnetID + " sourceDeviceID=" + getDatas.sourceDeviceID);
			switch (commandType) {
			case Configuration.DEVICES_SEARCH_BACK_COMMAND:
			if (HandleSearch.isGetRcuIp) {
			// handleRcuIp(getDatas);
			case Configuration.SEARCH_GATEWAY_BACK_COMMAND:
			break;
			case Configuration.DEVICES_SEARCH_FROM_GATEWAY_BACK_COMMAND://读取网关已配置功能
			handleSearchData(getDatas);
			break;
			case Configuration.DEVICES_READ_FROM_GATEWAY_BACK_COMMAND://依次读取设备信息
			if (isLogicCtrl) {
			isLogicCtrl = false;
			handleLogicAir(getDatas);
			} else {
			boolean isExit = false;
			for (DevicesData value : realDevicesDataList) {
			if (value.getSourceDeviceID() == getDatas.sourceDeviceID
			&& value.getSourceSubnetID() == getDatas.sourceSubnetID) {
			HDLLog.I("Device is Exit " + value.getRemark());
			isExit = true;
			break;
			}
			}
			if (!isExit) {
			handleSearchData(getDatas);
			}
			handleRemarkCurStateData(getDatas);
			}
			break;
			case Configuration.SCENE_SEARCH_FROM_GATEWAY_BACK_COMMAND:
			handleSearchSceneData(getDatas);
			break;
			case Configuration.SCENE_READ_FROM_GATEWAY_BACK_COMMAND:
			handleSceneCurStateData(getDatas);
			break;
			/*2020-07-20 新增新风设备/
			case Configuration.FRESH_AIR_STATE_BACK_COMMAND:
			handleFreshAirStateData(getDatas);
			break;
			case Configuration.FRESH_AIR_CTRL_BACK_COMMAND:
			handleFreshAirCtrlBackData(getDatas);
			break;
			/*2020-07-20 金茂新风设备/
			case Configuration.FRESH_AIR_JINMAO_STATE_BACK_COMMAND:
			handleFreshAirJINMAOStateData(getDatas);
			break;
			case Configuration.FRESH_AIR_JINMAO_CTRL_BACK_COMMAND:
			handleFreshAirJINMAOCtrlBackData(getDatas);
			break;
			/*2020-07-20 地热模块/
			case Configuration.GEOTHERMAL_MODULE_STATE_BACK_COMMAND:
			handleGeothermalStateData(getDatas);
			break;
			case Configuration.GEOTHERMAL_MODULE_CTRL_BACK_COMMAND:
			handleGeothermalCtrlData(getDatas);
			break;
			/*2023-08-22 门锁模块/
			case Configuration.DOOR_MACHINE_MODULE_STATE_BACK_COMMAND:
			handleDoorMachineStateData(getDatas);
			break;
			case Configuration.DOOR_MACHINE_MODULE_CTRL_FRIST_BACK_COMMAND:
			handleDoorMachineCtrlFristBackData(getDatas);
			break;
			case Configuration.DOOR_MACHINE_MODULE_CTRL_BACK_COMMAND:
			handleDoorMachineCtrlBackData(getDatas);
			break;
			case Configuration.DOOR_MACHINE_BROADCAST_STATE_BACK_COMMAND:
			handleDoorMachineBroadcastStateData(getDatas);
			break;
			/*2020-04-01 新增通用开关/
			case Configuration.COMMON_SWITCH_CTRL_BACK_COMMAND:
			@@ -168,44 +232,45 @@
			case Configuration.LIGHT_CTRL_BACK_COMMAND:
			case Configuration.CURTAIN_CTRL_BACK_COMMAND:
			case Configuration.AIR_CTRL_BACK_COMMAND:
			case Configuration.LOGIC_CTRL_BACK_COMMAND:
			handleCtrlData(getDatas);
			break;
			case Configuration.LOGIC_CTRL_BACK_COMMAND:
			handleLogicCtrlData(getDatas);//逻辑模块控制
			handleSceneCtrlData(getDatas);//场景控制
			break;
			case Configuration.LIGHT_RGB_CTRL_BACK_COMMAND:
			handleColourLightStateData(getDatas);
			break;
			case Configuration.AIR_HVAC_CTRL_BACK_COMMAND:
			handleHVACCtrlData(getDatas);
			handleTechSysCtrlData(getDatas);//2023-08-21
			break;
			case Configuration.SECURITY_ARMING_CTRL_BACK_COMMAND://20190729新增
			case Configuration.SECURITY_ALARM_CTRL_BACK_COMMAND://报警设置反馈
			handleSecurityCtrlData(getDatas);
			break;
			// 获取设备备注
			case Configuration.DEVICES_READ_BACK_COMMAND:
			if (isLogicCtrl) {
			isLogicCtrl = false;
			handleLogicAir(getDatas);
			} else {
			handleRemarkCurStateData(getDatas);
			}
			break;
			// 获取设备状态
			case Configuration.AIR_STATE_BACK_COMMAND:
			handleAirStateData(getDatas);
			break;
			case Configuration.SENSOR_STATE_BACK_COMMAND:
			handleSensorBroadcastStateData(getDatas);
			break;
			case Configuration.SENSOR_BROADCAST_STATE_BACK_COMMAND:
			handleSensorBroadcastStateData(getDatas);
			handleKNXTechSysStateData(getDatas);
			break;
			case Configuration.DRY_CONTACT_STATE_BACK_COMMAND:
			case Configuration.DRY_CONTACT_BROADCAST_STATE_COMMAND:
			handleDryContactBroadcastStateData(getDatas);
			break;

			case Configuration.LIGHT_STATE_BACK_COMMAND:
			handleLightStateData(getDatas);
			break;
			case Configuration.LIGHT_RGB_STATE_BACK_COMMAND:
			handleColourLightStateData(getDatas);//2023-08-22
			break;
			case Configuration.CURTAIN_STATE_BACK_COMMAND:
			handleCurtainStateData(getDatas);
			break;
			case Configuration.CURTAIN_STATE_BROADCAST_BACK_COMMAND:
			handleCurtainBroadcastStateData(getDatas);
			break;
			@@ -215,6 +280,7 @@
			case Configuration.AIR_HVAC_STATE_BACK_COMMAND:
			// handleRcuAirCastData(getDatas);
			handleHVACStateData(getDatas);//2019-06-27
			handleTechSysStateData(getDatas);//2023-08-21
			break;
			case Configuration.LOGIC_STATE_BACK_COMMAND:
			// handleRcuAirCastData(getDatas);
			@@ -243,8 +309,10 @@
			case Configuration.MANUAL_ADD_DEVICE_COMMAND:
			boolean isExit = false;
			for (DevicesData value : realDevicesDataList) {
			if (value.getSourceDeviceID() == getDatas.sourceDeviceID
			&& value.getSourceSubnetID() == getDatas.sourceSubnetID) {
			if (value.getSourceSubnetID() == getDatas.sourceSubnetID
			&& value.getSourceDeviceID() == getDatas.sourceDeviceID
			&& value.getDeviceSubnetID() == (getDatas.addBytes[6] & 0xFF)
			&& value.getDeviceDeviceID() == (getDatas.addBytes[7] & 0xFF)) {
			isExit = true;
			break;
			}
			@@ -320,25 +388,38 @@
			devicesData.setSourceSubnetID(getDatas.sourceSubnetID);
			devicesData.setSourceDeviceID(getDatas.sourceDeviceID);
			devicesData.setAddByte(getDatas.addBytes);
			byte[] remarkByte;
			if (getDatas.addBytes.length >= 22) {
			remarkByte = new byte[20];
			System.arraycopy(getDatas.addBytes, 2, remarkByte, 0, remarkByte.length);
			} else {
			remarkByte = new byte[getDatas.addBytes.length - 2];
			System.arraycopy(getDatas.addBytes, 2, remarkByte, 0, getDatas.addBytes.length - 2);
			}

			int size = (getDatas.addBytes[2] & 0xFF) * 256 + (getDatas.addBytes[3] & 0xFF);
			int index = (getDatas.addBytes[4] & 0xFF) * 256 + (getDatas.addBytes[5] & 0xFF);
			devicesData.setDeviceSize(size);
			totalDeviceSize = size;
			devicesData.setDeviceIndex(index);

			byte[] remarkByte = new byte[getDatas.addBytes.length];
			String remarkStr = HDLStringUtils.byte2String(remarkByte);
			HDLLog.I("remarkStr：" + remarkStr);
			devicesData.setRemark(remarkStr);

			boolean isExitData = DeviceParser.parse(getDatas.addBytes, devicesData, remarkStr);

			realDevicesDataList.add(devicesData);//记录所有的接收到设备，包括SDK不支持的设备种类。作用：作为发送第二次搜索命令时用到
			boolean isExist = false;
			for (DevicesData value : realDevicesDataList) {
			if (value.getSourceSubnetID() == getDatas.sourceSubnetID
			&& value.getSourceDeviceID() == getDatas.sourceDeviceID
			&& value.getDeviceSubnetID() == (getDatas.addBytes[6] & 0xFF)
			&& value.getDeviceDeviceID() == (getDatas.addBytes[7] & 0xFF)) {
			HDLLog.I("Device is isExist " + value.getRemark());
			isExist = true;
			break;
			}
			}
			if (!isExist) {
			realDevicesDataList.add(devicesData);//记录所有的接收到设备，包括SDK不支持的设备种类。作用：作为发送第二次搜索命令时用到
			HDLLog.I("---totalDeviceSize=" + totalDeviceSize + " realDevicesDataList=" + realDevicesDataList.size());
			}

			/******************辅助调试打印*****************/
			String addData = "";
			for (int i = 22, len = getDatas.addBytes.length; i < len; i++) {
			for (int i = 0, len = getDatas.addBytes.length; i < len; i++) {
			addData += " arr" + i + " = " + (getDatas.addBytes[i] & 0xFF) + ",";
			}
			HDLLog.I("所有设备列表第 " + realDevicesDataList.size() + " 个模块 "
			@@ -352,12 +433,12 @@


			// 判断是否符合要求的大类小类
			if (isExitData) {
			if (!isExist && isExitData) {
			devicesDataList.add(devicesData);//记录所有的接收到设备，不包括SDK不支持的设备种类
			/*2019-07-03 发现新设备，这里可以发送通知事件，并传递新的设备数据/
			EventBus.getDefault().post(new DiscoverNewDevicesEvent(devicesData));

			// 过滤掉背景音乐，背景音乐没有备注返回
			//过滤掉背景音乐，背景音乐没有备注返回
			if (devicesDataList.get(devicesDataList.size() - 1).getAppliancesInfoList().get(0).getBigType() != Configuration.AUDIO_BIG_TYPE) {
			for (int i = 0, len = devicesDataList.get(devicesDataList.size() - 1).getAppliancesInfoList().size(); i < len; i++) {
			ListRemarks listRemarksTemp = new ListRemarks();
			@@ -366,8 +447,6 @@
			listRemarks.add(listRemarksTemp);
			}
			}

			// HDLCommand.HDLgetDevRemarks(devicesDataList.get(devicesDataList.size()-1).getAppliancesInfoList());

			/******************辅助调试打印*****************/
			String deviceName = "";
			@@ -388,6 +467,33 @@
			}

			/**
			* 处理搜索场景数据
			*
			* @param getDatas
			*/
			private static void handleSearchSceneData(UdpDataBean getDatas) {
			int size = getDatas.addBytes[0] * 256 + getDatas.addBytes[1];

			/******************辅助调试打印*****************/
			for (int i = 0, len = size; i < len; i++) {
			ScenesData scenesData = new ScenesData();
			scenesData.setSourceSubnetID(getDatas.sourceSubnetID);
			scenesData.setSourceDeviceID(getDatas.sourceDeviceID);
			scenesData.setAddByte(getDatas.addBytes);
			scenesData.setIndex(i + 1);
			scenesDataList.add(scenesData);
			HDLLog.I("所有场景列表第 " + scenesDataList.size() + " 个模块 "
			+ " \n源子网号 = " + (getDatas.sourceSubnetID)
			+ " \n源设备号 = " + (getDatas.sourceDeviceID)
			+ " \n场景索引 = " + scenesData.getIndex()
			);
			}

			/******************辅助调试打印*****************/

			}

			/**
			* 处理灯光返回
			* 2020-1-18
			* 修复混合调光混合开关类模块问题
			@@ -397,8 +503,8 @@
			private static void handleLightCtrlData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -451,6 +557,40 @@

			}

			/**
			* 处理CCT OR RGB灯光返回
			* 2023-8-22
			*
			* @param getDatas
			*/
			private static void handleColourLightCtrlData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			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)) {
			AppliancesInfo lightInfo = infos.get(j);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[2] & 0xFF);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(getDatas.addBytes[2] & 0xFF);
			LightCtrlBackInfo info = new LightCtrlBackInfo();
			info.setParentRemarks(lightInfo.getParentRemarks());
			info.setAppliancesInfo(lightInfo);
			info.setRemarks(lightInfo.getRemarks());
			info.setChannelNum(getDatas.addBytes[0] & 0xFF);
			info.setBrightness(getDatas.addBytes[1] & 0xFF);
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new LightFeedBackEvent(info, true));
			break outter;
			}

			}
			}
			}
			}


			/**
			* 处理设备控制数据
			@@ -461,69 +601,15 @@
			switch (getDatas.command) {
			case Configuration.LIGHT_CTRL_BACK_COMMAND:
			handleLightCtrlData(getDatas);

			if (!HDLDeviceManager.isGetBusLightState) {
			isGetDeviceStateSuccess = true;
			}
			break;
			case Configuration.CURTAIN_CTRL_BACK_COMMAND:
			// if (TextUtils.isEmpty(HandleSearch.rcuIp)){
			//
			// }else{
			// AppliancesInfo curtainInfo = new AppliancesInfo();
			// for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			// if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			// && devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			// ) {
			// List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			// for (int j = 0, len2 = infos.size(); j < len2; j++) {
			// if (infos.get(j).getBigType() == Configuration.CURTAIN_BIG_TYPE
			// && infos.get(j).getChannelNum() == (getDatas.addBytes[1] & 0xFF)) {
			// for (int k = 0; k < rcuCurtainList.size(); k++) {
			// if (devicesDataList.get(i).getAppliancesInfoList().get(j).getChannelNum() == rcuCurtainList.get(k).getChanelNum()
			// && devicesDataList.get(i).getAppliancesInfoList().get(j).getLittleType() == rcuCurtainList.get(k).getLittleType()
			// ) {
			// int state;
			// switch (getDatas.addBytes[2] & 0xFF) {
			// case 0:
			// state = CurtainCtrlParser.curtainPause;
			// break;
			// case 1:
			// state = CurtainCtrlParser.curtainOn;
			// break;
			// case 2:
			// state = CurtainCtrlParser.curtainOff;
			// break;
			// default:
			// state = 0;
			// break;
			// }
			// rcuCurtainList.get(k).setCurState(state);
			// devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[2] & 0xFF);
			//// HDLLog.I("控制 rcuCurtainList回路号："+rcuCurtainList.get(k).getChanelNum()
			//// + " state = "+rcuCurtainList.get(k).getCurState()
			//// );
			// }
			// }
			//
			// curtainInfo = infos.get(j);
			// }
			//
			// }
			// }
			// }
			// CurtainCtrlBackInfo curtainCtrlBackInfo = new CurtainCtrlBackInfo();
			// curtainCtrlBackInfo.setRemarks(curtainInfo.getRemarks());
			// curtainCtrlBackInfo.setParentRemarks(curtainInfo.getParentRemarks());
			// curtainCtrlBackInfo.setAppliancesInfo(curtainInfo);
			// curtainCtrlBackInfo.setNum(getDatas.addBytes[1] & 0xFF);
			// curtainCtrlBackInfo.setState(getDatas.addBytes[2] & 0xFF);
			// isCurtainCtrlSuccess = true;
			// EventBus.getDefault().post(new CurtainFeedBackEvent(curtainCtrlBackInfo, true));
			// }


			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			inner:
			@@ -547,12 +633,13 @@
			curtainCtrlBackInfo.setRemarks(curtainInfo.getRemarks());
			curtainCtrlBackInfo.setParentRemarks(curtainInfo.getParentRemarks());
			curtainCtrlBackInfo.setAppliancesInfo(curtainInfo);
			// isCurtainCtrlSuccess = true;
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);

			if (curtainInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_GLYSTRO
			\|\| curtainInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_ROLLER) {
			\|\| curtainInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_ROLLER
			\|\| curtainInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_SHANGRILA) {
			if ((getDatas.addBytes[0] & 0xFF) >= 17) {
			int curState = getDatas.addBytes[1] & 0xFF;
			int curState = getDatas.addBytes[1] & 0xFF;//V1.0百分比
			if (curState == 1) {
			//这个判断很傻，窗帘关到百分比为0，会跳到1返回回来，只能强制改为0
			curState = 0;
			@@ -561,16 +648,23 @@
			curState = 100;
			}
			curtainCtrlBackInfo.setState(curState);

			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(curState);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(curState);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			curtainCtrlBackInfo.setNum((getDatas.addBytes[0] & 0xFF) - 16);
			EventBus.getDefault().post(new CurtainFeedBackEvent(curtainCtrlBackInfo, true));
			} else {
			if (getDatas.addBytes.length >= 3) {
			curtainCtrlBackInfo = new CurtainCtrlBackInfo(devicesDataList.get(i).getAppliancesInfoList().get(j));
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			curtainCtrlBackInfo.setNum(getDatas.addBytes[0] & 0xFF);
			EventBus.getDefault().post(new CurtainFeedBackEvent(curtainCtrlBackInfo, true));
			}
			}
			}
			if (curtainInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE) {
			} else if (curtainInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE) {
			if ((getDatas.addBytes[0] & 0xFF) < 17) {
			int state = getDatas.addBytes[1] & 0xFF;
			switch (getDatas.addBytes[1] & 0xFF) {//这里也应该改成0，1，2
			switch (state) {//这里也应该改成0，1，2
			case 0:
			state = CurtainCtrlParser.curtainPause;
			break;
			@@ -587,15 +681,11 @@
			curtainCtrlBackInfo.setState(state);
			curtainCtrlBackInfo.setNum(getDatas.addBytes[0] & 0xFF);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(state);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(state);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			EventBus.getDefault().post(new CurtainFeedBackEvent(curtainCtrlBackInfo, true));
			}
			}


			break outter;


			}
			}
			}
			@@ -604,8 +694,8 @@
			case Configuration.AIR_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -707,226 +797,83 @@
			}
			}
			}


			break;
			// case Configuration.AIR_HVAC_CTRL_BACK_COMMAND: //2019-8-6 屏蔽
			// outter:
			// for (int devIndex = 0, len = devicesDataList.size(); devIndex < len; devIndex++) {
			// if (devicesDataList.get(devIndex).getSourceSubnetID() == getDatas.sourceSubnetID
			// && devicesDataList.get(devIndex).getSourceDeviceID() == getDatas.sourceDeviceID
			// ) {
			// List<AppliancesInfo> infos = devicesDataList.get(devIndex).getAppliancesInfoList();
			// for (int appIndex = 0, len2 = infos.size(); appIndex < len2; appIndex++) {
			// if ((infos.get(appIndex).getDeviceType() == HDLApConfig.TYPE_AC_HVAC
			// \|\| infos.get(appIndex).getDeviceType() == HDLApConfig.TYPE_AC_COOLMASTER
			// \|\| infos.get(appIndex).getDeviceType() == HDLApConfig.TYPE_AC_INFRARED)
			// && infos.get(appIndex).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {
			//// String airbytes = "193b 附加数据：";
			//// for (int i = 0; i < getDatas.addBytes.length; i++) {
			//// airbytes += (getDatas.addBytes[i] & 0xff) + ",";
			//// }
			//// HDLLog.I( airbytes);
			// AppliancesInfo airInfo = infos.get(appIndex);
			// int indexI = devIndex;
			// int indexJ = appIndex;
			//
			// final byte[] oldAirInfo;
			//// HDLLog.I("KKKKKKDD"+(getDatas.addBytes[0] & 0xFF));
			// switch (getDatas.addBytes[0] & 0xFF) {
			// case 1:
			// oldAirInfo = air1Info;
			// break;
			// case 2:
			// oldAirInfo = air2Info;
			// break;
			// case 3:
			// oldAirInfo = air3Info;
			// break;
			// case 4:
			// oldAirInfo = air4Info;
			// break;
			// default:
			// oldAirInfo = new byte[1];
			// break;
			// }
			// byte[] newAirInfo = getDatas.addBytes;
			// byte[] curAirInfo = new byte[]{0};
			// boolean isModeChange = false;
			// if (oldAirInfo == null \|\| oldAirInfo.length == 0) {
			// return;
			// }
			// for (int oldAirInedx = 0; oldAirInedx < oldAirInfo.length; oldAirInedx++) {
			// if (oldAirInedx == 0) {
			// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// if (oldAirInfo[0] != newAirInfo[8]) {//2019-8-2 去掉相同开关状态判断,解决开状态下,调用开命令状态下,不停重发问题
			// oldAirInfo[0] = newAirInfo[8];
			// curAirInfo = new byte[]{AirCtrlParser.airSwich, newAirInfo[8]};
			// if (curAirInfo.length > 1) {
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(oldAirInfo);
			// airInfo.setArrCurState(oldAirInfo);
			// AirCtrlBackInfo airCtrlBackInfo = new AirCtrlBackInfo();
			// airCtrlBackInfo.setAppliancesInfo(airInfo);
			// airCtrlBackInfo.setCurState(curAirInfo);
			//// isACCtrlSuccess = true;
			//// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// EventBus.getDefault().post(new AirFeedBackEvent(airCtrlBackInfo, true));
			//
			// }
			//
			// }
			// } else if (oldAirInedx == 1) {
			//// int mode = ((newAirInfo[4] & 0xf0) >> 4);
			// int mode = newAirInfo[9] & 0xff;
			// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// if (oldAirInfo[1] != (byte) mode) {
			// isModeChange = true;
			// oldAirInfo[1] = (byte) mode;
			// curAirInfo = new byte[]{AirCtrlParser.airMode, (byte) mode};
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(oldAirInfo);
			// airInfo.setArrCurState(oldAirInfo);
			// AirCtrlBackInfo airCtrlBackInfo = new AirCtrlBackInfo();
			// airCtrlBackInfo.setAppliancesInfo(airInfo);
			// airCtrlBackInfo.setCurState(curAirInfo);
			//// isACCtrlSuccess = true;
			//// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// EventBus.getDefault().post(new AirFeedBackEvent(airCtrlBackInfo, true));
			//
			// }
			// } else if (oldAirInedx == 2) {
			// int mode = newAirInfo[9] & 0xff;
			// byte newAirTem = newAirInfo[11];
			// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			//
			// if (oldAirInfo[2] != newAirTem) {
			// oldAirInfo[2] = newAirTem;
			// switch (mode) {
			// case 0:
			// curAirInfo = new byte[]{AirCtrlParser.refTem, newAirTem};
			// break;
			// case 1:
			// curAirInfo = new byte[]{AirCtrlParser.heatTem, newAirTem};
			// break;
			// case 3:
			// curAirInfo = new byte[]{AirCtrlParser.autoTem, newAirTem};
			// break;
			// case 4:
			// curAirInfo = new byte[]{AirCtrlParser.dehumTem, newAirTem};
			// break;
			// }
			// if (curAirInfo.length > 1) {
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(oldAirInfo);
			// airInfo.setArrCurState(oldAirInfo);
			// AirCtrlBackInfo airCtrlBackInfo = new AirCtrlBackInfo();
			// airCtrlBackInfo.setAppliancesInfo(airInfo);
			// airCtrlBackInfo.setCurState(curAirInfo);
			//// isACCtrlSuccess = true;
			//// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// EventBus.getDefault().post(new AirFeedBackEvent(airCtrlBackInfo, true));
			//
			// }
			// }
			// } else if (oldAirInedx == 3) {
			//// int speed = (newAirInfo[4] & 0x0f);//获取低4位
			// int speed = newAirInfo[10];
			// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// if (oldAirInfo[3] != (byte) speed) {
			// oldAirInfo[3] = (byte) speed;
			// curAirInfo = new byte[]{AirCtrlParser.airSpeed, (byte) speed};
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(oldAirInfo);
			// airInfo.setArrCurState(oldAirInfo);
			// AirCtrlBackInfo airCtrlBackInfo = new AirCtrlBackInfo();
			// airCtrlBackInfo.setAppliancesInfo(airInfo);
			// airCtrlBackInfo.setCurState(curAirInfo);
			//// isACCtrlSuccess = true;
			//// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			// EventBus.getDefault().post(new AirFeedBackEvent(airCtrlBackInfo, true));
			//
			// }
			// }
			// }
			//
			// switch (getDatas.addBytes[0] & 0xFF) {
			// case 1:
			// air1Info = oldAirInfo;
			// break;
			// case 2:
			// air2Info = oldAirInfo;
			// break;
			// case 3:
			// air3Info = oldAirInfo;
			// break;
			// case 4:
			// air4Info = oldAirInfo;
			// break;
			// }
			//
			//
			//// if (curAirInfo.length > 1) {
			////// if (isModeChange) {
			////// isACCtrlSuccess = true;
			////// getAirInfo(hvacInfo);
			////// } else {f
			////// airInfo.setArrCurState(oldAirInfo);
			////// AirCtrlBackInfo airCtrlBackInfo = new AirCtrlBackInfo();
			////// airCtrlBackInfo.setAppliancesInfo(airInfo);
			////// airCtrlBackInfo.setCurState(curAirInfo);
			////// isACCtrlSuccess = true;
			////// EventBus.getDefault().post(new AirFeedBackEvent(airCtrlBackInfo, true));
			////// }
			////
			//// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(oldAirInfo);
			//// airInfo.setArrCurState(oldAirInfo);
			//// AirCtrlBackInfo airCtrlBackInfo = new AirCtrlBackInfo();
			//// airCtrlBackInfo.setAppliancesInfo(airInfo);
			//// airCtrlBackInfo.setCurState(curAirInfo);
			////// isACCtrlSuccess = true;
			//// setDeviceCtrlSuccessStateWithInfo(infos.get(appIndex), true);
			//// EventBus.getDefault().post(new AirFeedBackEvent(airCtrlBackInfo, true));
			////
			//// }
			//
			//
			// break outter;
			// }
			// }
			// }
			// }
			//
			// break;
			}
			}

			/**
			* 处理逻辑控制回调
			* 2024-1-19
			*
			* @param getDatas
			*/
			private static void handleLogicCtrlData(UdpDataBean getDatas) {
			switch (getDatas.command) {
			case Configuration.LOGIC_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if ((infos.get(j).getBigType() == Configuration.LOGIC_BIG_TYPE
			\|\| infos.get(j).getBigType() == Configuration.GLOBAL_LOGIC_BIG_TYPE)
			&& infos.get(j).getLogicMode().getAreaNum() == (getDatas.addBytes[0] & 0xFF)
			&& infos.get(j).getLogicMode().getAreaSceneNum() == (getDatas.addBytes[1] & 0xFF)
			) {
			AppliancesInfo sceneInfo = infos.get(j);
			LogicMode logicMode = new LogicMode();
			logicMode.setAreaNum(getDatas.addBytes[0] & 0xFF);
			logicMode.setAreaSceneNum(getDatas.addBytes[1] & 0xFF);
			sceneInfo.setLogicMode(logicMode);
			if (devicesDataList != null && devicesDataList.size() != 0) {
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if ((infos.get(j).getBigType() == Configuration.LOGIC_BIG_TYPE
			\|\| infos.get(j).getBigType() == Configuration.GLOBAL_LOGIC_BIG_TYPE)
			&& infos.get(j).getLogicMode().getAreaNum() == (getDatas.addBytes[0] & 0xFF)
			&& infos.get(j).getLogicMode().getAreaSceneNum() == (getDatas.addBytes[1] & 0xFF)) {
			AppliancesInfo sceneInfo = infos.get(j);
			LogicMode logicMode = new LogicMode();
			logicMode.setAreaNum(getDatas.addBytes[0] & 0xFF);
			logicMode.setAreaSceneNum(getDatas.addBytes[1] & 0xFF);
			sceneInfo.setLogicMode(logicMode);

			LogicCtrlBackInfo logicCtrlBackInfo = new LogicCtrlBackInfo();
			logicCtrlBackInfo.setAppliancesInfo(sceneInfo);
			logicCtrlBackInfo.setAreaNum(getDatas.addBytes[0] & 0xFF);
			logicCtrlBackInfo.setSceneNum(getDatas.addBytes[1] & 0xFF);
			LogicCtrlBackInfo logicCtrlBackInfo = new LogicCtrlBackInfo();
			logicCtrlBackInfo.setAppliancesInfo(sceneInfo);
			logicCtrlBackInfo.setAreaNum(getDatas.addBytes[0] & 0xFF);
			logicCtrlBackInfo.setSceneNum(getDatas.addBytes[1] & 0xFF);
			// isSceneCtrlSuccess = true;
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new LogicFeedBackEvent(logicCtrlBackInfo, true));
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new LogicFeedBackEvent(logicCtrlBackInfo, true));

			break outter;
			break outter;
			}
			}
			}
			}
			}
			break;
			}
			}

			/**
			* 处理场景控制回调
			* 2024-1-19
			*
			* @param getDatas
			*/
			private static void handleSceneCtrlData(UdpDataBean getDatas) {
			switch (getDatas.command) {
			case Configuration.LOGIC_CTRL_BACK_COMMAND:
			outter:
			if (scenesDataList != null && scenesDataList.size() != 0) {
			for (int i = 0, len = scenesDataList.size(); i < len; i++) {
			if (scenesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& scenesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			&& scenesDataList.get(i).getAreaCodeID() == (getDatas.addBytes[0] & 0xFF)
			&& scenesDataList.get(i).getSceneID() == (getDatas.addBytes[1] & 0xFF)) {

			SceneCtrlBackInfo sceneCtrlBackInfo = new SceneCtrlBackInfo();
			sceneCtrlBackInfo.setAreaCodeID(getDatas.addBytes[0] & 0xFF);
			sceneCtrlBackInfo.setSceneID(getDatas.addBytes[1] & 0xFF);
			sceneCtrlBackInfo.setLoopNum(getDatas.addBytes[2] & 0xFF);

			setSceneCtrlSuccess(true);
			EventBus.getDefault().post(new SceneFeedBackEvent(sceneCtrlBackInfo, true));

			break outter;
			}
			}
			}
			break;
			}
			}
			@@ -943,8 +890,8 @@
			case Configuration.SECURITY_ARMING_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -974,8 +921,8 @@
			case Configuration.SECURITY_ALARM_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {

			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			@@ -1022,8 +969,8 @@
			case Configuration.AIR_HVAC_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -1038,8 +985,6 @@
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new AirHVACFeedBackEvent(info, true));
			break outter;
			} else {
			HDLLog.E("控制HVAC状态反馈数据异常");
			}
			break outter;
			}
			@@ -1049,6 +994,44 @@
			break;
			}

			}


			/**
			* 处理科技系统控制回调
			* 2023-8-21
			*
			* @param getDatas
			*/
			private static void handleTechSysCtrlData(UdpDataBean getDatas) {
			switch (getDatas.command) {
			case Configuration.AIR_HVAC_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID) {
			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).getBigType() == Configuration.AIR_BIG_TYPE
			&& (infos.get(j).getDeviceType() == HDLApConfig.TYPE_AC_TECHSYS
			\|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_AC_KNXTECHSYS)
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {

			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			AppliancesInfo mTechSysAirInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			AirTechSysBackInfo info = new AirTechSysBackInfo(mTechSysAirInfo);
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new AirTechSysFeedBackEvent(info, true));
			break outter;
			}
			}
			}
			break outter;
			}
			}
			break;
			}
			}


			@@ -1078,8 +1061,8 @@
			private static void handleLogicAir(UdpDataBean getDatas) {
			AppliancesInfo newInfo1 = null;
			for (int devPos = 0, len = devicesDataList.size(); devPos < len; devPos++) {
			if (devicesDataList.get(devPos).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(devPos).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(devPos).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(devPos).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(devPos).getAppliancesInfoList();
			for (int appPos = 0, len2 = infos.size(); appPos < len2; appPos++) {
			@@ -1216,208 +1199,45 @@
			outter:
			for (int devPos = 0, len = devicesDataList.size(); devPos < len; devPos++) {
			if (devicesDataList.get(devPos).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(devPos).getSourceDeviceID() == getDatas.sourceDeviceID
			) {
			&& devicesDataList.get(devPos).getSourceDeviceID() == getDatas.sourceDeviceID) {
			List<AppliancesInfo> infos = devicesDataList.get(devPos).getAppliancesInfoList();
			for (int appPos = 0, len2 = infos.size(); appPos < len2; appPos++) {
			if ((infos.get(appPos).getBigType()) == (getDatas.addBytes[0] & 0xFF)
			&& ((infos.get(appPos).getLittleType()) == (getDatas.addBytes[1] & 0xFF))
			if ((infos.get(appPos).getDeviceSubnetID()) == (getDatas.addBytes[0] & 0xFF)
			&& (infos.get(appPos).getDeviceDeviceID()) == (getDatas.addBytes[1] & 0xFF)
			&& ((infos.get(appPos).getChannelNum()) == (getDatas.addBytes[2] & 0xFF))
			) {
			&& (infos.get(appPos).getBigType()) == (getDatas.addBytes[3] & 0xFF)
			&& ((infos.get(appPos).getLittleType()) == (getDatas.addBytes[4] & 0xFF))) {

			//2019-8-20
			//2023-11-30
			byte[] remarkByte;
			if (getDatas.addBytes.length >= 23) {
			if (getDatas.addBytes.length >= 26) {
			remarkByte = new byte[20];
			System.arraycopy(getDatas.addBytes, 3, remarkByte, 0, remarkByte.length);
			System.arraycopy(getDatas.addBytes, 6, remarkByte, 0, remarkByte.length);
			} else {
			remarkByte = new byte[getDatas.addBytes.length - 3];
			System.arraycopy(getDatas.addBytes, 3, remarkByte, 0, getDatas.addBytes.length - 3);
			System.arraycopy(getDatas.addBytes, 6, remarkByte, 0, getDatas.addBytes.length - 3);
			}

			String remarkStr = HDLStringUtils.byte2String(remarkByte);
			HDLLog.I("remarkStr回路：" + remarkStr);

			// byte[] remark = new byte[20];
			// //硬件的字节流协议提供有误，收到某硬件提供备注不足20长度，解决这问题的权宜之计
			// int length;
			// if (getDatas.addBytes.length < 20) {
			// length = getDatas.addBytes.length;
			// } else {
			// length = remark.length;
			// }
			// System.arraycopy(getDatas.addBytes, 3, remark, 0, length);

			// String remarkStr = HDLStringUtils.byte2String(remark);
			// HDLLog.I("remarkStr回路：" + remarkStr);
			HDLLog.I("remarkStr获取的备注名为：" + remarkStr);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setChannelNum(getDatas.addBytes[5] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setRemarks(remarkStr);

			switch (infos.get(appPos).getBigType()) {
			case Configuration.LOGIC_BIG_TYPE:
			case Configuration.GLOBAL_LOGIC_BIG_TYPE:
			LogicMode logicMode = new LogicMode();
			logicMode.setAreaNum(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			logicMode.setAreaSceneNum(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			String key = "K" + devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).getBigType()
			+ "-" + devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).getLittleType()
			+ "-" + devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).getDeviceSubnetID()
			+ "-" + devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).getDeviceDeviceID()
			+ "-" + devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).getChannelNum();
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setDeviceKey(key);

			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setLogicMode(logicMode);

			break;
			case Configuration.LIGTH_BIG_TYPE:
			switch (infos.get(appPos).getLittleType()) {
			case 0:
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			break;
			case 1:
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			break;
			case 9:
			RcuLight rcuLight = new RcuLight();
			rcuLight.setPhysicsChanelNum(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			rcuLight.setCurState(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			rcuLight.setLittleType(9);
			rcuLightList.add(rcuLight);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setPhysicsChannelNum(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			break;
			case 10:
			RcuLight rcu2Light = new RcuLight();
			rcu2Light.setPhysicsChanelNum(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			rcu2Light.setCurState(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			rcu2Light.setLittleType(10);
			rcuLightList.add(rcu2Light);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setPhysicsChannelNum(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(getDatas.addBytes[getDatas.addBytes.length - 2] & 0xFF);
			break;

			}
			break;
			case Configuration.CURTAIN_BIG_TYPE:
			int curtainState;
			switch (infos.get(appPos).getLittleType()) {
			case 0:
			curtainState = getDatas.addBytes[25] & 0xFF;
			if (curtainState == 1) {
			curtainState = 0;
			} else if (curtainState == 99) {
			curtainState = 100;
			}
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(curtainState);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(curtainState);
			break;
			case 1:
			curtainState = getDatas.addBytes[23] & 0xFF;
			if (curtainState == 1) {
			curtainState = 0;
			} else if (curtainState == 99) {
			curtainState = 100;
			}
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(curtainState);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(curtainState);
			break;
			case 2:
			// if (!TextUtils.isEmpty(HandleSearch.rcuIp)) {
			// RcuCurtain rcuCurtain = new RcuCurtain();
			// rcuCurtain.setChanelNum(getDatas.addBytes[2] & 0xFF);
			// rcuCurtain.setLittleType(2);
			// int state = -1;
			// switch (getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF) {
			// case 0:
			// state = CurtainCtrlParser.curtainPause;
			// break;
			// case 1:
			// state = CurtainCtrlParser.curtainOn;
			// break;
			// case 2:
			// state = CurtainCtrlParser.curtainOff;
			// break;
			// }
			// rcuCurtain.setCurState(state);
			// rcuCurtainList.add(rcuCurtain);
			// }

			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState(getDatas.addBytes[getDatas.addBytes.length - 1] & 0xFF);
			break;

			}
			break;

			case Configuration.AIR_BIG_TYPE:
			switch (infos.get(appPos).getLittleType()) {
			case 0:
			byte[] hvacBytes = new byte[getDatas.addBytes.length - 23];
			for (int i = 23; i < getDatas.addBytes.length; i++) {
			hvacBytes[i - 23] = getDatas.addBytes[i];
			}
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setArrCurState(hvacBytes);
			// switch (devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).getChannelNum()) {
			// case 1:
			// if (air1Info == null) {
			// air1Info = hvacBytes;
			// }
			// break;
			// case 2:
			// if (air2Info == null) {
			// air2Info = hvacBytes;
			// }
			// break;
			// case 3:
			// if (air3Info == null) {
			// air3Info = hvacBytes;
			// }
			// break;
			// case 4:
			// if (air4Info == null) {
			// air4Info = hvacBytes;
			// }
			// break;
			//
			// }
			break;
			case 3:
			byte[] newBytes = new byte[getDatas.addBytes.length - 24 + 1];
			for (int i = 24; i < getDatas.addBytes.length; i++) {
			newBytes[i - 24] = getDatas.addBytes[i];
			}
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setArrCurState(newBytes);
			break;
			}
			break;
			case Configuration.SENSOR_BIG_TYPE://2019-07-03 屏蔽
			// String aa = "传感器备注：";
			// for (int i = 0; i < getDatas.addBytes.length; i++) {
			// aa += (getDatas.addBytes[i] & 0xff) + ",";
			// }
			// HDLLog.I( aa);

			int curState;
			if (getDatas.addBytes.length >= 26) {//2019-11-7 特殊处理，修改回路号
			curState = (int) (getDatas.addBytes[24] & 0xff);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setChannelNum(getDatas.addBytes[25] & 0xff);

			} else {
			curState = (int) (getDatas.addBytes[getDatas.addBytes.length - 1] & 0xff);
			}
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(curState);
			devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState((int) curState);
			break;
			default:
			HDLLog.I("未找到此类型设备：" + infos.get(appPos).getBigType());
			break;
			}
			listRemarksOutter:
			for (int lRPos = 0, len3 = listRemarks.size(); lRPos < len3; lRPos++) {
			//找到E44B对应的设备回路，判断是否已经拿到了数据。
			if (listRemarks.get(lRPos).getAppliancesInfo().getDeviceSubnetID() == getDatas.sourceSubnetID
			&& listRemarks.get(lRPos).getAppliancesInfo().getDeviceDeviceID() == getDatas.sourceDeviceID
			&& listRemarks.get(lRPos).getAppliancesInfo().getBigType() == (getDatas.addBytes[0] & 0xFF)
			&& listRemarks.get(lRPos).getAppliancesInfo().getLittleType() == (getDatas.addBytes[1] & 0xFF)
			//找到F44B对应的设备回路，判断是否已经拿到了数据。
			if (listRemarks.get(lRPos).getAppliancesInfo().getDeviceSubnetID() == (getDatas.addBytes[0] & 0xFF)
			&& listRemarks.get(lRPos).getAppliancesInfo().getDeviceDeviceID() == (getDatas.addBytes[1] & 0xFF)
			&& listRemarks.get(lRPos).getAppliancesInfo().getChannelNum() == (getDatas.addBytes[2] & 0xFF)
			) {
			&& listRemarks.get(lRPos).getAppliancesInfo().getBigType() == (getDatas.addBytes[3] & 0xFF)
			&& listRemarks.get(lRPos).getAppliancesInfo().getLittleType() == (getDatas.addBytes[4] & 0xFF)) {


			//若没拿到数据，则拿数据；若已经拿到数据，需要判断listRemarks全部条目是否拿到备注。
			@@ -1460,6 +1280,70 @@
			}

			/**
			* 处理所有场景详情数据、设置当前场景状态
			*
			* @param getDatas
			*/
			private static void handleSceneCurStateData(UdpDataBean getDatas) {
			outter:
			for (int devPos = 0, len = scenesDataList.size(); devPos < len; devPos++) {
			if (scenesDataList.get(devPos).getSourceSubnetID() == getDatas.sourceSubnetID
			&& scenesDataList.get(devPos).getSourceDeviceID() == getDatas.sourceDeviceID
			&& scenesDataList.get(devPos).getIndex() == (getDatas.addBytes[0] * 256 + getDatas.addBytes[1])) {
			//2024-01-18
			byte[] remarkByte;
			String remarkStr = "";
			if (getDatas.addBytes.length >= 36) {
			remarkByte = new byte[32];
			System.arraycopy(getDatas.addBytes, 4, remarkByte, 0, remarkByte.length);
			remarkStr = HDLStringUtils.byte2String(remarkByte);
			}

			HDLLog.I("remarkStr获取的场景备注名为：" + remarkStr);
			scenesDataList.get(devPos).setAreaCodeID(getDatas.addBytes[2] & 0xFF);
			scenesDataList.get(devPos).setSceneID(getDatas.addBytes[3] & 0xFF);
			scenesDataList.get(devPos).setRemark(remarkStr);

			listRemarksOutter:
			for (int lRPos = 0, len3 = scenesDataList.size(); lRPos < len3; lRPos++) {
			//找到F44B对应的设备回路，判断是否已经拿到了数据。
			if (scenesDataList.get(lRPos).getAreaCodeID() == (getDatas.addBytes[2] & 0xFF)
			&& scenesDataList.get(lRPos).getSceneID() == (getDatas.addBytes[3] & 0xFF)) {

			//若没拿到数据，则拿数据；若已经拿到数据，需要判断listRemarks全部条目是否拿到备注。
			if (scenesDataList.get(lRPos).isCallBack()) {
			for (int lR2Pos = 0, len4 = scenesDataList.size(); lR2Pos < len4; lR2Pos++) {
			if (scenesDataList.get(lR2Pos).isCallBack()) {
			if (lR2Pos == (len4 - 1)) {
			HDLLog.I("收到备注命令，已存在此场景备注，过滤");
			break listRemarksOutter;
			}
			} else {
			HDLLog.I("不存在的场景备注，再次搜索备注。区号：" + scenesDataList.get(lRPos).getAreaCodeID()
			+ ",场景号：" + scenesDataList.get(lRPos).getSceneID());
			HandleSearch.getSceneDetails();
			break listRemarksOutter;
			}
			}
			} else {
			HDLLog.I("返回备注场景：区号：" + scenesDataList.get(lRPos).getAreaCodeID()
			+ ",场景号：" + scenesDataList.get(lRPos).getSceneID());
			scenesDataList.get(lRPos).setCallBack(true);
			HandleSearch.getSceneDetails();
			break listRemarksOutter;
			}

			}
			}

			break outter;

			}
			}
			}


			/**
			* 处理修改设备备注后的回调
			*
			* @param getDatas
			@@ -1480,8 +1364,8 @@
			private static void handleStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -1494,7 +1378,6 @@
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState((int) value);

			sensorInfo.setCurState(value);


			String unite = "";
			switch (sensorInfo.getDeviceType()) {
			@@ -1522,6 +1405,7 @@
			unite = "";
			break;
			case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
			case HDLApConfig.TYPE_SENSOR_PM_10:
			switch (getDatas.addBytes[4] & 0xff) {
			case 0:
			unite = "mg/m3";
			@@ -1649,8 +1533,6 @@
			unite = "未知单位";
			break;
			}


			// EventBus.getDefault().post(new DeviceStateEvent(sensorInfo, true));
			HDLLog.I("发送传感器通知更新");
			EventBus.getDefault().post(new SensorStateBackInfo(sensorInfo, true, unite));
			@@ -1667,16 +1549,16 @@
			}

			/**
			* 处理传感器广播数据
			* 2019-11-4 新修改
			* 处理传感器状态读取、广播数据
			* 2024-2-2 新支持
			*
			* @param getDatas
			*/
			private static void handleSensorBroadcastStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -1685,7 +1567,14 @@
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[2] & 0xFF)) {//2019-07-29
			isGetDeviceStateSuccess = true;
			AppliancesInfo sensorInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			float value = HDLUtlis.byte2Float(Arrays.copyOfRange(getDatas.addBytes, 5, 8));
			float value = 0;
			if ((getDatas.addBytes[3] & 0xFF) == 1 \|\| (getDatas.addBytes[3] & 0xFF) == 2) {//整型
			value = HDLUtlis.getInt(Arrays.copyOfRange(getDatas.addBytes, 5, 9));
			} else if ((getDatas.addBytes[3] & 0xFF) == 3) {//浮点型
			value = HDLUtlis.byteToFloat(getDatas.addBytes[5], getDatas.addBytes[6], getDatas.addBytes[7], getDatas.addBytes[8]);
			}

			Log.d("panlili", "HDLDeviceManager.java:handleSensorBroadcastStateData----->value= " + value);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(value);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState((int) value);

			@@ -1717,6 +1606,7 @@
			unite = "";
			break;
			case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
			case HDLApConfig.TYPE_SENSOR_PM_10:
			switch (getDatas.addBytes[4] & 0xff) {
			case 0:
			unite = "mg/m3";
			@@ -1860,198 +1750,150 @@

			}

			// /**
			// * 处理传感器广播数据
			// *
			// * @param getDatas
			// */
			// private static void handleSensorBroadcastStateData(UdpDataBean getDatas) {
			// outter:
			// for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			// if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			// && devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			// ) {
			// List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			// for (int j = 0, len2 = infos.size(); j < len2; j++) {
			// switch (devicesDataList.get(i).getAppliancesInfoList().get(j).getBigType()) {
			// case Configuration.SENSOR_BIG_TYPE://2019-07-03 屏蔽
			// isGetDeviceStateSuccess = true;
			// AppliancesInfo sensorInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			// float value = HDLUtlis.byte2Float(Arrays.copyOfRange(getDatas.addBytes, 5, 8));
			// devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(value);
			// devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState((int) value);
			//
			// sensorInfo.setCurState(value);
			//
			//
			// String unite = "";
			// switch (sensorInfo.getDeviceType()) {
			// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_TEMP:
			// if ((getDatas.addBytes[4] & 0xff) == 0) {
			// unite = "°C";
			// } else {
			// unite = "°F";
			// }
			//
			// break;
			// case HDLApConfig.TYPE_SENSOR_HUMIDITY:
			// unite = "%";
			// break;
			// case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
			// unite = "LUX";
			// break;
			// case HDLApConfig.TYPE_SENSOR_VOC:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
			// switch (getDatas.addBytes[4] & 0xff) {
			// case 0:
			// unite = "mg/m3";
			// break;
			// case 1:
			// unite = "ppm";
			// break;
			// case 2:
			// unite = "μm";
			// break;
			// default:
			// unite = "";
			// break;
			// }
			//
			// break;
			// case HDLApConfig.TYPE_SENSOR_C02:
			// switch (getDatas.addBytes[4] & 0xff) {
			// case 0:
			// unite = "mg/m3";
			// break;
			// case 1:
			// unite = "ppm";
			// break;
			// default:
			// unite = "";
			// break;
			// }
			// break;
			// case HDLApConfig.TYPE_SENSOR_LPG:
			// unite = "ppm";
			// break;
			// case HDLApConfig.TYPE_SENSOR_CO_H2:
			// unite = "ppm";
			// break;
			// case HDLApConfig.TYPE_SENSOR_CH4:
			// unite = "ppm";
			// break;
			// case HDLApConfig.TYPE_SENSOR_SMOG:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
			// unite = "m/s";
			// break;
			// case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
			// unite = "Pa";
			// break;
			// case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
			// unite = "Pa";
			// break;
			// case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
			// unite = "mm";
			// break;
			// case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
			// switch (getDatas.addBytes[4] & 0xff) {
			// case 0:
			// unite = "无雨";
			// break;
			// case 1:
			// unite = "小雨";
			// break;
			// case 2:
			// unite = "大雨";
			// break;
			// default:
			// unite = "";
			// break;
			// }
			// break;
			// case HDLApConfig.TYPE_SENSOR_WEIGHT:
			// unite = "KG";
			// break;
			// case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
			// unite = "mm";
			// break;
			// case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
			// unite = "m/s";
			// break;
			// case HDLApConfig.TYPE_SENSOR_SHAKE:
			// unite = "mm";
			// break;
			// case HDLApConfig.TYPE_SENSOR_VOLTAGE:
			// switch (getDatas.addBytes[4] & 0xff) {
			// case 0:
			// unite = "V";
			// break;
			// case 1:
			// unite = "μV";
			// break;
			// default:
			// unite = "";
			// break;
			// }
			// break;
			// case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
			// switch (getDatas.addBytes[4] & 0xff) {
			// case 0:
			// unite = "A";
			// break;
			// case 1:
			// unite = "μA";
			// break;
			// default:
			// unite = "";
			// break;
			// }
			// break;
			// case HDLApConfig.TYPE_SENSOR_POWER:
			// unite = "W";
			// break;
			// case HDLApConfig.TYPE_SENSOR_FLOODING:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET:
			// unite = "";
			// break;
			// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON:
			// unite = "";
			// break;
			// default:
			// unite = "未知单位";
			// break;
			// }
			//
			//
			//// EventBus.getDefault().post(new DeviceStateEvent(sensorInfo, true));
			// HDLLog.I("发送传感器通知更新");
			// EventBus.getDefault().post(new SensorStateBackInfo(sensorInfo, true, unite));
			// break;
			// default:
			// HDLLog.I("handle state 没有找到匹配类型");
			// break;
			// }
			//
			// }
			// break outter;
			// }
			// }
			// }
			/**
			* 处理KNX科技希桐状态读取、广播数据
			* 2024-5-28 新支持
			*
			* @param getDatas
			*/
			private static void handleKNXTechSysStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.AIR_BIG_TYPE
			&& infos.get(j).getLittleType() == 101
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[2] & 0xFF)) {

			AppliancesInfo info = devicesDataList.get(i).getAppliancesInfoList().get(j);
			info.setGetDeviceStateSuccess(true);
			float value = 0;
			//00014 2024年5月29日9:44:03:806: 14 64 C8 11 F7 35 3A FF FF 05 03 01 03 00 00 00 00 36 53 81
			if ((getDatas.addBytes[3] & 0xFF) == 1 \|\| (getDatas.addBytes[3] & 0xFF) == 2) {//整型
			value = HDLUtlis.getInt(Arrays.copyOfRange(getDatas.addBytes, 5, 9));
			} else if ((getDatas.addBytes[3] & 0xFF) == 3) {//浮点型
			// value = HDLUtlis.byteToFloat(getDatas.addBytes[8], getDatas.addBytes[7], getDatas.addBytes[6], getDatas.addBytes[5]);
			value = HDLUtlis.getInt(Arrays.copyOfRange(getDatas.addBytes, 5, 9));
			}
			Log.d("panlili", "HDLDeviceManager.java:handleKNXTechSysStateData----->value= " + value);

			AirTechSysBackInfo mAirTechSysBackInfo = new AirTechSysBackInfo(info);
			mAirTechSysBackInfo.setIndoorHumidity(value + "");//设置湿度

			EventBus.getDefault().post(new AirTechSysFeedBackEvent(mAirTechSysBackInfo, true));
			HDLLog.I("发送科技系统湿度通知更新");

			break outter;
			} else {
			HDLLog.I("handle state 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}

			/**
			* panlili
			* 处理门锁状态和报警广播数据
			*
			* @param getDatas
			*/
			private static void handleDoorMachineBroadcastStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE
			&& infos.get(j).getDeviceType() == HDLApConfig.TYPE_DOOR_MACHINE) {
			String type = "";
			/*开锁:
			0x*1：指纹开锁
			0x*2：密码开锁
			0x*3：感应卡开锁
			0x*4：机械钥匙开锁
			0x*5：远程授权开锁
			0x*6：临时密码开锁
			0x7-0xf：（预留）

			报警:
			0x1*：密码验证错误报警（密码连续3次次错误）
			0x2*：门未锁好报警（门锁未关好，当门锁好时上报解除报警）
			0x3*：劫持报警（输入防劫持密码或者防劫持指纹开锁时报警）
			0x4*：防撬报警（门锁被撬开时报警）
			0x5*：电量不足报警（电量不足时报警）
			0x6*：指纹验证错误报警（开门验证输入指纹连续错误次数达到门锁规定3次时报警）
			0x7*：卡片验证错误报警（开门验证输入卡片连续错误次数达到门锁规定3次报警）
			0x8*：门锁恢复出厂设置
			0x9-0xf：（预留）*/
			switch (getDatas.addBytes[2] & 0xFF) {
			case 1:
			type = "指纹开锁";
			break;
			case 2:
			type = "密码开锁";
			break;
			case 3:
			type = "感应卡开锁";
			break;
			case 4:
			type = "机械钥匙开锁";
			break;
			case 5:
			type = "远程授权开锁";
			break;
			case 6:
			type = "临时密码开锁";
			break;
			case 10:
			type = "密码验证错误报警";
			break;
			case 20:
			type = "门未锁好报警";
			break;
			case 30:
			type = "劫持报警";
			break;
			case 40:
			type = "防撬报警";
			break;
			case 50:
			type = "电量不足报警";
			break;
			case 60:
			type = "指纹验证错误报警";
			break;
			case 70:
			type = "卡片验证错误报警";
			break;
			case 80:
			type = "门锁恢复出厂设置";
			break;
			default:
			break;
			}
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[j] & 0xFF);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(getDatas.addBytes[j] & 0xFF);

			AppliancesInfo doorMachineInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			int state = getDatas.addBytes[2] & 0xFF;
			doorMachineInfo.setCurState(state);

			HDLLog.I("发送门锁状态和报警通知");
			EventBus.getDefault().post(new DoorMachineWaringBackInfo(doorMachineInfo, true, type));
			} else {
			HDLLog.I("handleDoorMachineBroadcastStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}


			/**
			@@ -2063,12 +1905,12 @@
			private static void handleLightStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.LIGTH_BIG_TYPE) { //2019-07-26因为查灯光状态是查询所以回路，所以要把所有回路灯光状态都推送一次
			if (infos.get(j).getBigType() == Configuration.LIGTH_BIG_TYPE && (infos.get(j).getDeviceType() != HDLApConfig.TYPE_LIGHT_CCT && infos.get(j).getDeviceType() != HDLApConfig.TYPE_LIGHT_RGB && infos.get(j).getDeviceType() != HDLApConfig.TYPE_LIGHT_DALI && infos.get(j).getDeviceType() != HDLApConfig.TYPE_LIGHT_DMX)) { //2019-07-26因为查灯光状态是查询所以回路，所以要把所有回路灯光状态都推送一次
			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[j + 1] & 0xFF);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(getDatas.addBytes[j + 1] & 0xFF);
			@@ -2076,6 +1918,37 @@
			// HDLLog.I("HDLlightState" + devicesDataList.get(i).getAppliancesInfoList().get(j).toString());
			} else {
			HDLLog.I("handleLightStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}

			/**
			* 处理CCT OR RGB灯光模块回调
			* 20230822新增
			*
			* @param getDatas
			*/
			private static void handleColourLightStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.LIGTH_BIG_TYPE && (infos.get(j).getDeviceType() == HDLApConfig.TYPE_LIGHT_CCT \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_LIGHT_RGB \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_LIGHT_DALI \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_LIGHT_DMX)) {
			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			AppliancesInfo appliancesInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			ColourLightCtrlBackInfo colourLightCtrlBackInfo = new ColourLightCtrlBackInfo(appliancesInfo);
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new ColourLightFeedBackEvent(colourLightCtrlBackInfo, true));

			} else {
			HDLLog.I("handleColourLightStateData 没有找到匹配类型");
			}
			}
			break outter;
			@@ -2092,8 +1965,8 @@
			private static void handleCurtainBroadcastStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2142,8 +2015,8 @@
			private static void handleCurtainStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2151,7 +2024,6 @@
			int state = 0;
			if (infos.get(j).getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE//窗帘模块
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {//2019-07-17

			switch (getDatas.addBytes[1] & 0xFF) {//这里也应该改成0，1，2
			case 0:
			state = CurtainCtrlParser.curtainPause;
			@@ -2174,38 +2046,59 @@
			EventBus.getDefault().post(new DeviceStateEvent(curtainInfo, true));

			break outter;
			} else if (infos.get(j).getDeviceType() == HDLApConfig.TYPE_CURTAIN_GLYSTRO \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_CURTAIN_ROLLER) {
			if ((getDatas.addBytes[0] & 0xFF) >= 17
			&& ((getDatas.addBytes[0] & 0xFF) - 16) == infos.get(j).getChannelNum()) {//窗帘号大于等于17 减 16 = 当前窗帘回路号
			state = getDatas.addBytes[1] & 0xFF;
			if (state == 1) {
			state = 0;//这个判断是将百分比为1，强制改为0.
			} else if (infos.get(j).getDeviceType() == HDLApConfig.TYPE_CURTAIN_GLYSTRO \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_CURTAIN_ROLLER
			\|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_CURTAIN_SHANGRILA) {

			if (getDatas.addBytes.length >= 3) {//新协议拓展字段
			if ((getDatas.addBytes[0] & 0xFF) >= 17
			&& ((getDatas.addBytes[0] & 0xFF) - 16) == infos.get(j).getChannelNum()) {//窗帘号大于等于17 减 16 = 当前窗帘回路号
			state = getDatas.addBytes[1] & 0xFF;
			if (state == 1) {
			state = 0;//这个判断是将百分比为1，强制改为0.
			}
			if (state == 99) {
			state = 100;//这个判断是将百分比为99，强制改为100.
			}
			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(state);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);

			AppliancesInfo curtainInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);

			CurtainCtrlBackInfo curtainCtrlBackInfo = new CurtainCtrlBackInfo();
			curtainCtrlBackInfo.setRemarks(curtainInfo.getRemarks());
			curtainCtrlBackInfo.setParentRemarks(curtainInfo.getParentRemarks());
			curtainCtrlBackInfo.setAppliancesInfo(curtainInfo);
			curtainInfo.setCurState(state);

			curtainCtrlBackInfo.setState(state);

			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(state);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			curtainCtrlBackInfo.setNum((getDatas.addBytes[0] & 0xFF) - 16);

			EventBus.getDefault().post(new CurtainDeviceStateEvent(curtainCtrlBackInfo, true));
			break outter;
			} else {
			if ((getDatas.addBytes[0] & 0xFF) == infos.get(j).getChannelNum()) {
			isGetDeviceStateSuccess = true;

			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			AppliancesInfo appliancesInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			CurtainCtrlBackInfo info = new CurtainCtrlBackInfo(appliancesInfo);
			EventBus.getDefault().post(new CurtainDeviceStateEvent(info, true));
			}
			}
			if (state == 99) {
			state = 100;//这个判断是将百分比为99，强制改为100.
			}
			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[1] & 0xFF);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(getDatas.addBytes[1] & 0xFF);
			AppliancesInfo curtainInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			curtainInfo.setCurState(state);
			EventBus.getDefault().post(new DeviceStateEvent(curtainInfo, true));
			break outter;
			} else {
			if ((getDatas.addBytes[0] & 0xFF) == infos.get(j).getChannelNum()) {
			switch (getDatas.addBytes[1] & 0xFF) {//这里也应该改成0，1，2
			case 0:
			state = CurtainCtrlParser.curtainPause;
			break;
			case 1:
			state = CurtainCtrlParser.curtainOn;
			break;
			case 2:
			state = CurtainCtrlParser.curtainOff;
			break;
			default:
			state = 0;
			break;
			} else {//兼容旧协议
			if ((getDatas.addBytes[0] & 0xFF) >= 17
			&& ((getDatas.addBytes[0] & 0xFF) - 16) == infos.get(j).getChannelNum()) {//窗帘号大于等于17 减 16 = 当前窗帘回路号
			state = getDatas.addBytes[1] & 0xFF;
			if (state == 1) {
			state = 0;//这个判断是将百分比为1，强制改为0.
			}
			if (state == 99) {
			state = 100;//这个判断是将百分比为99，强制改为100.
			}
			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[1] & 0xFF);
			@@ -2214,12 +2107,34 @@
			curtainInfo.setCurState(state);
			EventBus.getDefault().post(new DeviceStateEvent(curtainInfo, true));
			break outter;
			} else {
			if ((getDatas.addBytes[0] & 0xFF) == infos.get(j).getChannelNum()) {
			switch (getDatas.addBytes[1] & 0xFF) {//这里也应该改成0，1，2
			case 0:
			state = CurtainCtrlParser.curtainPause;
			break;
			case 1:
			state = CurtainCtrlParser.curtainOn;
			break;
			case 2:
			state = CurtainCtrlParser.curtainOff;
			break;
			default:
			state = 0;
			break;
			}
			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(getDatas.addBytes[1] & 0xFF);
			devicesDataList.get(i).getAppliancesInfoList().get(j).setIntCurState(getDatas.addBytes[1] & 0xFF);
			AppliancesInfo curtainInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			curtainInfo.setCurState(state);
			EventBus.getDefault().post(new DeviceStateEvent(curtainInfo, true));
			break outter;
			}
			}

			}

			}


			} else {
			HDLLog.I("handleCurtainStateData 没有找到匹配类型");
			@@ -2239,8 +2154,8 @@
			private static void handleAirStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2292,8 +2207,8 @@
			private static void handleLOGICStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2334,8 +2249,8 @@
			private static void handleSecurityStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2369,8 +2284,8 @@
			private static void handleHVACStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2393,6 +2308,38 @@


			/**
			* 读取科技系统状态反馈
			*
			* @param getDatas
			*/
			private static void handleTechSysStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.AIR_BIG_TYPE
			&& (infos.get(j).getDeviceType() == HDLApConfig.TYPE_AC_TECHSYS
			\|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_AC_KNXTECHSYS)
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {//2019-8-6

			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
			break outter;
			} else {
			HDLLog.I("handleTechSysStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}


			/**
			* 干接点广播状态反馈反馈
			* 20191105新增
			*
			@@ -2401,13 +2348,13 @@
			private static void handleDryContactBroadcastStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.SENSOR_BIG_TYPE
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[1] & 0xFF)) {//2019-07-29
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[1] & 0xFF)) {
			if (getDatas.addBytes.length >= 3) {
			isGetDeviceStateSuccess = true;
			int state = getDatas.addBytes[2] & 0xFF;
			@@ -2437,8 +2384,8 @@
			private static void handleCommonSwitchCtrlData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID) {

			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2474,8 +2421,8 @@
			private static void handleCommonSwitchStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID) {

			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2505,286 +2452,6 @@
			}
			}

			// /**
			// * 读取HVAC状态反馈
			// *
			// * @param getDatas
			// */
			// private static void handleHVACStateData(UdpDataBean getDatas) {
			// int count = getDatas.addBytes.length / 11;
			//
			// for (int airIndex = 0; airIndex < count; airIndex++) {
			// outter:
			// for (int indexI = 0, len = devicesDataList.size(); indexI < len; indexI++) {
			// if (devicesDataList.get(indexI).getSourceSubnetID() == getDatas.sourceSubnetID
			// && devicesDataList.get(indexI).getSourceDeviceID() == getDatas.sourceDeviceID
			// ) {
			// List<AppliancesInfo> infos = devicesDataList.get(indexI).getAppliancesInfoList();
			// for (int indexJ = 0, len2 = infos.size(); indexJ < len2; indexJ++) {
			// if (infos.get(indexJ).getBigType() == Configuration.AIR_BIG_TYPE
			// && infos.get(indexJ).getDeviceType() != HDLApConfig.TYPE_AC_PANEL
			// && infos.get(indexJ).getChannelNum() == (getDatas.addBytes[airIndex * 11] & 0xFF)) {
			// AppliancesInfo appliancesInfo = devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ);
			//
			// switch (getDatas.addBytes[airIndex * 11] & 0xff) {
			// case 1:
			// handleAirCastData(getDatas, air1Info, airIndex, appliancesInfo);
			// air1Info[0] = getDatas.addBytes[1 + 0 * 11];
			// air1Info[1] = (byte) ((getDatas.addBytes[3 + 0 * 11] & 0xf0) >> 4);
			// switch (air1Info[0] & 0xff) {
			// case 0:
			// air1Info[2] = getDatas.addBytes[2 + 0 * 11];
			// break;
			// case 1:
			// air1Info[2] = getDatas.addBytes[6 + 0 * 11];
			// break;
			// case 3:
			// air1Info[2] = getDatas.addBytes[8 + 0 * 11];
			// break;
			// case 4:
			// air1Info[2] = getDatas.addBytes[9 + 0 * 11];
			// break;
			//
			// }
			//
			// air1Info[3] = (byte) (getDatas.addBytes[3 + 0 * 11] & 0x0f);
			// air1Info[4] = getDatas.addBytes[5 + 0 * 11];
			// air1Info[5] = getDatas.addBytes[10 + 0 * 11];
			//// HDLLog.info( "209a air1Info = " + air1Info[0] + " " + air1Info[1] + " " + air1Info[2] + " " + air1Info[3] + " " + air1Info[4] + " " + air1Info[5]);
			//// String arrString = "209a 附加数据：";
			//// for (int i = 0; i < getDatas.addBytes.length; i++) {
			//// arrString += (getDatas.addBytes[i] & 0xff) + ",";
			//// }
			//// HDLLog.info( arrString);
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(air1Info);
			// break;
			// case 2:
			// handleAirCastData(getDatas, air2Info, airIndex, appliancesInfo);
			// air2Info[0] = getDatas.addBytes[1 + 1 * 11];
			// air2Info[1] = (byte) ((getDatas.addBytes[3 + 1 * 11] & 0xf0) >> 4);
			// switch (air2Info[0] & 0xff) {
			// case 0:
			// air2Info[2] = getDatas.addBytes[2 + 1 * 11];
			// break;
			// case 1:
			// air2Info[2] = getDatas.addBytes[6 + 1 * 11];
			// break;
			// case 3:
			// air2Info[2] = getDatas.addBytes[8 + 1 * 11];
			// break;
			// case 4:
			// air2Info[2] = getDatas.addBytes[9 + 1 * 11];
			// break;
			//
			// }
			// air2Info[3] = (byte) (getDatas.addBytes[3 + 1 * 11] & 0x0f);
			// air2Info[4] = getDatas.addBytes[5 + 1 * 11];
			// air2Info[5] = getDatas.addBytes[10 + 1 * 11];
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(air2Info);
			// break;
			// case 3:
			// handleAirCastData(getDatas, air3Info, airIndex, appliancesInfo);
			// air3Info[0] = getDatas.addBytes[1 + 2 * 11];
			// air3Info[1] = (byte) ((getDatas.addBytes[3 + 2 * 11] & 0xf0) >> 4);
			// switch (air3Info[0] & 0xff) {
			// case 0:
			// air3Info[2] = getDatas.addBytes[2 + 2 * 11];
			// break;
			// case 1:
			// air3Info[2] = getDatas.addBytes[6 + 2 * 11];
			// break;
			// case 3:
			// air3Info[2] = getDatas.addBytes[8 + 2 * 11];
			// break;
			// case 4:
			// air3Info[2] = getDatas.addBytes[9 + 2 * 11];
			// break;
			// }
			// air3Info[3] = (byte) (getDatas.addBytes[3 + 2 * 11] & 0x0f);
			// air3Info[4] = getDatas.addBytes[5 + 2 * 11];
			// air3Info[5] = getDatas.addBytes[10 + 2 * 11];
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(air3Info);
			// break;
			// case 4:
			// handleAirCastData(getDatas, air4Info, airIndex, appliancesInfo);
			// air4Info[0] = getDatas.addBytes[1 + 3 * 11];
			// air4Info[1] = (byte) ((getDatas.addBytes[3 + 3 * 11] & 0xf0) >> 4);
			// switch (air4Info[0] & 0xff) {
			// case 0:
			// air4Info[2] = getDatas.addBytes[2 + 3 * 11];
			// break;
			// case 1:
			// air4Info[2] = getDatas.addBytes[6 + 3 * 11];
			// break;
			// case 3:
			// air4Info[2] = getDatas.addBytes[8 + 3 * 11];
			// break;
			// case 4:
			// air4Info[2] = getDatas.addBytes[9 + 3 * 11];
			// break;
			// }
			// air4Info[3] = (byte) (getDatas.addBytes[3 + 3 * 11] & 0x0f);
			// air4Info[4] = getDatas.addBytes[5 + 3 * 11];
			// air4Info[5] = getDatas.addBytes[10 + 3 * 11];
			// devicesDataList.get(indexI).getAppliancesInfoList().get(indexJ).setArrCurState(air4Info);
			// break;
			//
			// }
			// }
			//
			// }
			// }
			// }
			//
			//
			// }
			//
			//
			// }
			//
			//
			// /**
			// * 处理家居空调广播消息
			// *
			// * @param getDatas
			// * @param airInfo
			// * @param airIndex
			// * @param oldInfo
			// */
			// private static void handleAirCastData(UdpDataBean getDatas, final byte[] airInfo, int airIndex, final AppliancesInfo oldInfo) {
			// if (airInfo[0] != getDatas.addBytes[1 + airIndex * 11]) {
			//
			//// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.airSwich, airInfo[0]});
			//// HDLLog.info( "0x209A in 空调开关改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 500);
			// }
			//
			//// HDLLog.info( "airIndex = " + airIndex + " 209a 模式值 = " + ((getDatas.addBytes[3 + airIndex * 11] & 0xf0) >> 4) + " 或 = " + ((getDatas.addBytes[7 + airIndex * 11] & 0xf0) >> 4));
			// if (airInfo[1] != (byte) ((getDatas.addBytes[3 + airIndex * 11] & 0xf0) >> 4)) {
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.airMode, airInfo[1]});
			//// HDLLog.info( "0x209A in 空调模式改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 1000);
			// }
			//
			//
			// switch (airInfo[1] & 0xff) {
			// case 0:
			// if (airInfo[2] != getDatas.addBytes[2 + airIndex * 11]) {
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.refTem, airInfo[2]});
			//// HDLLog.info( "0x209A in 空调温度改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 1500);
			// }
			//
			// break;
			// case 1:
			// if (airInfo[2] != getDatas.addBytes[6 + airIndex * 11]) {
			//// airInfo[2] = getDatas.addBytes[6 + airIndex * 11];
			//
			//// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.heatTem, airInfo[2]});
			//// HDLLog.info( "0x209A in 空调温度改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 1500);
			// }
			//
			// break;
			// case 3:
			// if (airInfo[2] != getDatas.addBytes[8 + airIndex * 11]) {
			//// airInfo[2] = getDatas.addBytes[8 + airIndex * 11];
			//
			//// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.autoTem, airInfo[2]});
			//// HDLLog.info( "0x209A in 空调温度改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 1500);
			// }
			//
			// break;
			// case 4:
			// if (airInfo[2] != getDatas.addBytes[9 + airIndex * 11]) {
			//// airInfo[2] = getDatas.addBytes[9 + airIndex * 11];
			//
			//// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.dehumTem, airInfo[2]});
			//// HDLLog.info( "0x209A in 空调温度改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 1500);
			// }
			//
			// break;
			// }
			//
			//// HDLLog.info( "airInfo[3] = " + (airInfo[3] & 0xff) + " 第3位低4位风速 = "+(getDatas.addBytes[3 + airIndex * 11] & 0x0f));
			//// HDLLog.info( "airInfo[3] = " + (airInfo[3] & 0xff) + " 第7位低4位风速 = "+(getDatas.addBytes[7 + airIndex * 11] & 0x0f));
			// if (airInfo[3] != (byte) (getDatas.addBytes[3 + airIndex * 11] & 0x0f)) {
			//// airInfo[3] = (byte) (getDatas.addBytes[3 + airIndex * 11] & 0x0f);
			//
			//// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			//
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			//
			// final AppliancesInfo newInfo = oldInfo;
			// newInfo.setArrCurState(new byte[]{AirCtrlParser.airSpeed, airInfo[3]});
			//// HDLLog.info( "空调风速改变" + " appliancesInfo subid = " + newInfo.getDeviceSubnetID()
			//// + " devID = " + newInfo.getDeviceDeviceID() + " 回路号：" + newInfo.getChannelNum() + " devType" + newInfo.getDeviceType());
			//// HDLLog.info( "发送空调改变风速data = " + Arrays.toString(newInfo.getArrCurState()));
			// EventBus.getDefault().post(new DeviceStateEvent(newInfo, true));
			// }
			// }, 2000);
			// }
			//
			// //室温、摆风没有返回。下个版本需要考虑
			// if (airInfo[4] != getDatas.addBytes[5 + airIndex * 11]) {
			//// airInfo[4] = getDatas.addBytes[5 + airIndex * 11];
			// }
			//
			// if (airInfo[5] != getDatas.addBytes[10 + airIndex * 11]) {
			//// airInfo[5] = getDatas.addBytes[10 + airIndex * 11];
			// }
			// }

			/**
			* 此方法基本没用到，逻辑模块的控制信息已经在handleCtrlData中处理过了
			* <p>
			@@ -2794,8 +2461,8 @@
			*/
			private static void handleLogicData(UdpDataBean getDatas) {
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {

			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			@@ -2854,8 +2521,8 @@
			private static void handleAudioData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			@@ -2992,7 +2659,6 @@
			*/
			public static void setDeviceCtrlSuccessStateWithInfo(AppliancesInfo info, Boolean success) {
			// if(info.getDeviceKey() == null) return;

			ctrlSuccessStateHashMap.put(info.getDeviceKey(), success);
			}

			@@ -3008,6 +2674,14 @@
			Boolean success = ctrlSuccessStateHashMap.get(info.getDeviceKey());
			if (success == null) success = false;
			return success;
			}

			public static boolean isSceneCtrlSuccess() {
			return isSceneCtrlSuccess;
			}

			public static void setSceneCtrlSuccess(boolean isSceneCtrlSuccess) {
			HDLDeviceManager.isSceneCtrlSuccess = isSceneCtrlSuccess;
			}

			/**
			@@ -3089,8 +2763,8 @@
			boolean bCanAdd = false;
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getSourceSubnetID() == mSubnetID
			&& devicesDataList.get(i).getSourceDeviceID() == mDeviceID
			if (devicesDataList.get(i).getDeviceSubnetID() == mSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == mDeviceID
			) {
			bExistSubnetID = true;
			DevicesData mDevicesData = devicesDataList.get(i);
			@@ -3153,4 +2827,316 @@
			}


			/**
			* 处理新风设备状态数据
			* 2020-07-20 新增
			*
			* @param getDatas
			*/
			private static void handleFreshAirStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			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

			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
			break outter;
			} else {
			HDLLog.I("handleFreshAirStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}

			/**
			* 处理新风控制成功状态数据
			* 2020-07-20 新增
			*
			* @param getDatas
			*/
			private static void handleFreshAirCtrlBackData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			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).setArrCurState(getDatas.addBytes);
			AppliancesInfo mFreshAirInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			FreshAirBackInfo info = new FreshAirBackInfo(mFreshAirInfo);
			// isFreshAirCtrlSuccess = true;
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new FreshAirFeedBackEvent(info, true));
			break outter;
			}

			}
			}
			}

			}

			/**
			* 处理金茂新风设备状态数据
			* 2020-07-20 新增
			*
			* @param getDatas
			*/
			private static void handleFreshAirJINMAOStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.FRESH_AIR_BIG_TYPE
			&& infos.get(j).getDeviceType() == HDLApConfig.TYPE_FRESH_AIR_JINMAO
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {//2019-07-17

			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
			break outter;
			} else {
			HDLLog.I("handleFreshAirStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}

			/**
			* 处理金茂新风控制成功状态数据
			* 2020-07-20 新增
			*
			* @param getDatas
			*/
			private static void handleFreshAirJINMAOCtrlBackData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.FRESH_AIR_BIG_TYPE
			&& infos.get(j).getDeviceType() == HDLApConfig.TYPE_FRESH_AIR_JINMAO
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {

			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			AppliancesInfo mFreshAirInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			FreshAirJinMaoBackInfo info = new FreshAirJinMaoBackInfo(mFreshAirInfo);
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new FreshAirJinMaoFeedBackEvent(info, true));
			break outter;
			}

			}
			}
			}


			}

			/**
			* 处理地热设备状态数据
			* 2020-07-20 新增
			*
			* @param getDatas
			*/
			private static void handleGeothermalStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.GEOTHERMAL_BIG_TYPE
			&& (infos.get(j).getDeviceType() == HDLApConfig.TYPE_GEOTHERMAL_MODULE \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_GEOTHERMAL_JINMAO)
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {//2019-07-17
			if (getDatas.addBytes.length >= 10) {
			byte[] getBytes = devicesDataList.get(i).getAppliancesInfoList().get(j).getArrCurState();
			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).setArrCurState(getBytes);
			isGetDeviceStateSuccess = true;
			EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
			} else {
			HDLLog.E("地热状态反馈数据异常");
			}

			break outter;
			} else {
			HDLLog.I("handleFreshAirStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}

			/**
			* 处理地热设备控制数据
			* 2020-07-20
			*
			* @param getDatas
			*/
			private static void handleGeothermalCtrlData(UdpDataBean getDatas) {
			switch (getDatas.command) {
			//2019-07-09 地热模块
			case Configuration.GEOTHERMAL_MODULE_CTRL_BACK_COMMAND:
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {

			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).getBigType() == Configuration.GEOTHERMAL_BIG_TYPE
			&& (infos.get(j).getDeviceType() == HDLApConfig.TYPE_GEOTHERMAL_MODULE \|\| infos.get(j).getDeviceType() == HDLApConfig.TYPE_GEOTHERMAL_JINMAO)
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {
			if (getDatas.addBytes.length >= 8) {
			byte[] getBytes = devicesDataList.get(i).getAppliancesInfoList().get(j).getArrCurState();
			if (getBytes == null \|\| getBytes.length < 10) {
			getBytes = new byte[10];
			}
			System.arraycopy(getDatas.addBytes, 0, getBytes, 0, 8);//控制地热状态反馈，只取前8位数据
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getBytes);
			AppliancesInfo mInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);

			GeothermalBackInfo info = new GeothermalBackInfo(mInfo, true);
			// isGeothermalCtrlSuccess = true;
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new GeothermalFeedBackEvent(info, EventCode.SUCCESS));
			} else {

			HDLLog.E("控制地热状态反馈数据异常");
			}
			break outter;
			}
			}
			}
			}
			}

			break;
			}
			}


			/**
			* 处理门锁设备状态数据
			* 2023-08-22 新增
			*
			* @param getDatas
			*/
			private static void handleDoorMachineStateData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE
			&& infos.get(j).getDeviceType() == HDLApConfig.TYPE_DOOR_MACHINE
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {

			isGetDeviceStateSuccess = true;
			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			EventBus.getDefault().post(new DeviceStateEvent(devicesDataList.get(i).getAppliancesInfoList().get(j), true));
			break outter;
			} else {
			HDLLog.I("handleDoorMachineStateData 没有找到匹配类型");
			}
			}
			break outter;
			}
			}
			}

			/**
			* 处理门锁远程开锁连接控制成功状态数据
			* 2023-08-22 新增
			*
			* @param getDatas
			*/
			private static void handleDoorMachineCtrlFristBackData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE
			&& infos.get(j).getDeviceType() == HDLApConfig.TYPE_DOOR_MACHINE
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {

			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			AppliancesInfo mDoorMachineInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			DoorMachineFristBackInfo info = new DoorMachineFristBackInfo(mDoorMachineInfo);
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new DoorMachineFeedFristBackEvent(info, true));
			break outter;
			}

			}
			}
			}
			}

			/**
			* 处理门锁远程开锁控制成功状态数据
			* 2023-08-22 新增
			*
			* @param getDatas
			*/
			private static void handleDoorMachineCtrlBackData(UdpDataBean getDatas) {
			outter:
			for (int i = 0, len = devicesDataList.size(); i < len; i++) {
			if (devicesDataList.get(i).getDeviceSubnetID() == getDatas.sourceSubnetID
			&& devicesDataList.get(i).getDeviceDeviceID() == getDatas.sourceDeviceID
			) {
			List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
			for (int j = 0, len2 = infos.size(); j < len2; j++) {
			if (infos.get(j).getBigType() == Configuration.DOOR_MACHINE_BIG_TYPE
			&& infos.get(j).getDeviceType() == HDLApConfig.TYPE_DOOR_MACHINE
			&& infos.get(j).getChannelNum() == (getDatas.addBytes[0] & 0xFF)) {

			devicesDataList.get(i).getAppliancesInfoList().get(j).setArrCurState(getDatas.addBytes);
			AppliancesInfo appliancesInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
			DoorMachineBackInfo doorMachineBackInfo = new DoorMachineBackInfo(appliancesInfo);
			setDeviceCtrlSuccessStateWithInfo(infos.get(j), true);
			EventBus.getDefault().post(new DoorMachineFeedBackEvent(doorMachineBackInfo, true));
			break outter;
			}

			}
			}
			}
			}

			}