请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -15,7 +15,7 @@
    /// </summary>
    public class MutilfunctionPanelMethod
    {
        #region  变量申明
        #region  变量申明 
        /// <summary>
        /// 开关的个数 [每次进入到多功能绑定界面，都要被重新取值]
        /// </summary>
@@ -48,6 +48,21 @@
            var tempList = new List<BindListAllInfo>();
            int count1 = 0;
            int count2 = 0;

            switch (curBindType)
            {
                case 1:
                    curSwitchCount = 0;
                    break;
                case 2:
                    curSocketCount = 0;
                    break;
                case 3:
                    curLightFromRelayCount = 0;
                    curLightCount = 0;
                    break;
            }

            foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
            {
                var bList = bindTargetsFromMutilfunctionPanelList[key];
@@ -540,7 +555,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)
        {
@@ -636,7 +651,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)