合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

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

@@ -32,22 +32,48 @@
            gwCurScenesList = gwScenesList;
        }

        #region ◆ 变量申明__________________________
        #region  变量申明
        /// <summary>
        /// 当前按键
        /// </summary>
        ZigBee.Device.Panel currentKey;
        //显示被绑定设备或场景的view
        /// <summary>
        /// 显示被绑定设备或场景的view
        /// </summary>
        VerticalScrolViewLayout midVerticalScrolViewLayout;
        /// <summary>
        /// 显示房间的view
        /// </summary>
        HorizontalScrolViewLayout btnHorizontalScrolViewLayout;
        /// <summary>
        /// 按键配置的目标列表
        /// </summary>
        List<CommonDevice> targetList = new List<CommonDevice>();//临时目标列表
        List<Room> roomList = new List<Room>();//本地房间列表
        List<CommonDevice> targetList = new List<CommonDevice>();
        /// <summary>
        /// 本地房间列表
        /// </summary>
        List<Room> roomList = new List<Room>();
        /// <summary>
        /// 当绑定表变化后的回调
        /// </summary>
        public Action<List<BindListResponseObj>> action;
        /// <summary>
        /// 保存完成按钮
        /// </summary>
        Button btnFinifh;
        /// <summary>
        /// 楼层文本
        /// </summary>
        Button btnFloorText;
        Dictionary<string, string> dicFloor;//楼层列表
        /// <summary>
        /// 楼层列表
        /// </summary>
        Dictionary<string, string> dicFloor;
        List<SceneUI> currentKeyAllRoomSceneList = new List<SceneUI>();
        public List<ScenesListInfo> gwCurScenesList = new List<ScenesListInfo>();//网关中的场景列表
        /// <summary>
        /// 网关中的场景列表
        /// </summary>
        public List<ScenesListInfo> gwCurScenesList = new List<ScenesListInfo>();
        #endregion

        /// <summary>
@@ -108,6 +134,9 @@
            MidFrameLayoutContent(btnFloorText);
        }

        /// <summary>
        /// 中部布局
        /// </summary>
        async void MidFrameLayoutContent(Button btnFloorText)
        {
            #region UI
@@ -551,7 +580,10 @@
            RefreshSceneList(curRoom);
        }

        //按键绑定场景表显示
        /// <summary>
        /// 按键绑定场景表显示
        /// </summary>
        /// <param name="curRoom"></param>
        void RefreshSceneList(Shared.Common.Room curRoom)
        {
            midVerticalScrolViewLayout.RemoveAll();
@@ -721,7 +753,9 @@
            }
        }

        // 侧边导航栏
        /// <summary>
        /// 楼层选择的侧边导航栏
        /// </summary>
        void SideslipFramelayout()
        {
            var dialog = new Dialog
@@ -876,7 +910,10 @@
            }
        }

        //当前按键所有显示房间的所有场景处理
        /// <summary>
        /// 当前按键所有显示房间的所有场景处理
        /// </summary>
        /// <returns></returns>
        List<SceneUI> GetALlDispalyRoomSceneList()
        {
            currentKeyAllRoomSceneList.Clear();
@@ -901,7 +938,11 @@
            }
            return currentKeyAllRoomSceneList;
        }
        //获取网关中存在的本地场景列表
        /// <summary>
        /// 获取网关中存在的本地场景列表
        /// </summary>
        /// <param name="curRoom"></param>
        /// <returns></returns>
        List<SceneUI> GetMatchSceneUIList(Shared.Common.Room curRoom)
        {
            var tempSceneUIList = new List<SceneUI>();