Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs

@@ -26,7 +26,7 @@
        }
        #endregion

        #region  变量申明 
        #region  变量申明
        /// <summary>
        /// 当前新风面板【控制设备】
        /// </summary>
@@ -106,7 +106,7 @@

        #endregion

        #region UI设计 
        #region UI设计
        /// <summary>
        /// 目标页显示
        /// </summary>
@@ -144,13 +144,13 @@
            BindDownFrameLayout();
            //标题栏下的UI
            MidFrameLayoutContent();
            //初始化设备数据 
            //初始化设备数据
            InitData();
        }

        /// <summary>
        /// 添加楼层UI
        /// </summary> 
        /// </summary>
        void BindDownFrameLayout()
        {
            var btnAddFrameLayout = new FrameLayout
@@ -658,7 +658,7 @@
                    curControlDev.currentSelectFloorId = curFloorId;
                    btnFloorText.Text = dicFloorList[floorId];

                    //获取楼层中房间列表 
                    //获取楼层中房间列表
                    supportRoomList = GetFloorRoomList();
                    if (!btnMethodText.IsSelected)
                    {
@@ -727,7 +727,7 @@
                    //获取所有房间中匹配的能绑的目标
                    currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();

                    //获取面板中存在的绑定目标 
                    //获取面板中存在的绑定目标
                    var panelBindListRes = await this.curControlDev.GetDeviceBindAsync();
                    if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
                    {
@@ -865,7 +865,7 @@
                        {
                            foreach (var dev in targetList)
                            {
                                //获取本地设备列表 
                                //获取本地设备列表
                                var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
                                var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
                                if (tempDev != null)
@@ -1303,7 +1303,7 @@
            {
                return;
            }
            //获取本地设备列表 
            //获取本地设备列表
            var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
            var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
            if (tempDev != null)
@@ -1489,11 +1489,11 @@
            {
                var device = LocalDevice.Current.GetDevice(de);
                if (device != null)
                {
                    //电池设备不支持绑定
                    if (device.ZigbeeType != 1)
                    {
                        continue;
                {

                    //电池设备不支持绑定

                    if (device.ZigbeeType != 1)

                    {

                        continue;

                    }
                    if (device.Type == DeviceType.TemperatureSensor)
                    {
@@ -1530,11 +1530,11 @@
            {
                var device = LocalDevice.Current.GetDevice(de);
                if (device != null)
                {
                    //电池设备不支持绑定
                    if (device.ZigbeeType != 1)
                    {
                        continue;
                {

                    //电池设备不支持绑定

                    if (device.ZigbeeType != 1)

                    {

                        continue;

                    }
                    if (device.Type == DeviceType.TemperatureSensor)
                    {