2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs

@@ -20,52 +20,6 @@
        /// </summary>
        public static List<CommonDevice> oldTargetList = new List<CommonDevice>();

        public static async System.Threading.Tasks.Task<int> RemoveTargets(BindObj.BindListResponseObj bindDevice, Panel currentKey)
        {
            var delDevice = new BindObj.DelDeviceBindData();
            delDevice.DeviceAddr = currentKey.DeviceAddr;
            delDevice.Epoint = currentKey.DeviceEpoint;

            if (bindDevice.BindType == 0 || bindDevice.BindType == 1)
            {
                var removeDevice = new BindObj.RemoveBindListObj();
                removeDevice.BindCluster = bindDevice.BindCluster;
                removeDevice.BindType = 0;
                removeDevice.BindMacAddr = bindDevice.BindMacAddr;
                removeDevice.BindEpoint = bindDevice.BindEpoint;
                delDevice.RemoveBindList.Add(removeDevice);
            }
            else if (bindDevice.BindType == 2)
            {
                var removeDevice = new BindObj.RemoveBindListObj();
                removeDevice.BindCluster = bindDevice.BindCluster;
                removeDevice.BindType = 1;
                removeDevice.BindScenesId = bindDevice.BindScenesId;
                delDevice.RemoveBindList.Add(removeDevice);
            }
            var delResult = await currentKey.DelDeviceBindAsync(delDevice);
            foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
            {
                switch (re.Result)
                {
                    case 0:
                        return 0;
                        break;
                    case 4:

                        if (delResult.removeBindResultResponseData != null)
                        {
                            if (delResult.removeBindResultResponseData.Result == 0)
                            {
                                return 0;
                            }
                        }
                        break;
                }
            }
            return -1;
        }

        /// <summary>
        /// 检测该设备能否显示
        /// </summary>
@@ -189,7 +143,7 @@
        /// <returns></returns>
        public static string GetCurrentSelectFloorId()
        {
            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();//
            foreach (var floorId in dicFloor.Keys)
            {
                //第一个楼层
@@ -422,11 +376,7 @@
                    }
                }
            }

            return dicCheck;
        }



    }
}