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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -15,7 +15,7 @@
    /// </summary>
    public class MutilfunctionPanelMethod
    {
        #region  变量申明 
        #region  变量申明
        /// <summary>
        /// 开关的个数 [每次进入到多功能绑定界面，都要被重新取值]
        /// </summary>
@@ -53,6 +53,14 @@
                var bList = bindTargetsFromMutilfunctionPanelList[key];
                foreach (var bDev in bList)
                {
                    if (curBindType == 0)
                    {
                        if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
                        {
                            tempList.Add(bDev);
                        }
                    }

                    var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                    if (device == null)
                    {
@@ -60,12 +68,6 @@
                    }
                    switch (curBindType)
                    {
                        case 0:
                            if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
                            {
                                tempList.Add(bDev);
                            }
                            break;
                        case 1:
                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
                            {
@@ -225,6 +227,14 @@
                var bList = bindTargetsFromMutilfunctionPanelList[key];
                foreach (var bDev in bList)
                {
                    if (curBindType == 0)
                    {
                        if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
                        {
                            tempList.Remove(bDev.KeyEpoint);
                        }
                    }

                    var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                    if (device == null)
                    {
@@ -232,12 +242,6 @@
                    }
                    switch (curBindType)
                    {
                        case 0:
                            if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
                            {
                                tempList.Remove(bDev.KeyEpoint);
                            }
                            break;
                        case 1:
                        case 2:
                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
@@ -536,7 +540,7 @@
        /// <param name="currentPanelSupportBindDeviceList"></param>
        /// <param name="supportRoomList"></param>
        /// <param name="curDeviceBindType">当前设备绑定类型 1:开关  2:插座  3:灯光  4:遮阳 5:空调 6:新风</param>
        /// <param name="curBindTypeList">当前类型的绑定表</param> 
        /// <param name="curBindTypeList">当前类型的绑定表</param>
        /// <returns></returns>
        public static List<CommonDevice> GetAllRoomSupportDeviceList(List<CommonDevice> currentPanelSupportBindDeviceList, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType)
        {
@@ -632,7 +636,7 @@
        /// </summary>
        /// <param name="currentPanelSupportBindSceneList"></param>
        /// <param name="supportRoomList"></param>
        /// <param name="curBindTypeList">当前类型的绑定表</param> 
        /// <param name="curBindTypeList">当前类型的绑定表</param>
        /// <param name="curDeviceBindType">当前设备绑定类型 0:场景</param>
        /// <returns></returns>
        public static List<SceneUI> GetAllRoomSupportSceneList(List<SceneUI> currentPanelSupportBindSceneList, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType = 0)