Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -20,94 +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;
        //}

        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);
            if (delResult != null && delResult.removeBindResultResponseData != null)
            {
                if (delResult.removeBindResultResponseData.Result == 0)
                {
                    return 0;
                }
                else
                {
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                }
            }
            else
            {
                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
            }
            return -1;
        }

        /// <summary>
        /// 检测该设备能否显示
        /// </summary>
@@ -231,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)
            {
                //第一个楼层
@@ -464,11 +376,7 @@
                    }
                }
            }

            return dicCheck;
        }



    }
}