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

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

 Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs

@@ -28,7 +28,7 @@
        }
        #endregion

        #region  变量申明 
        #region  变量申明
        /// <summary>
        /// 控制设备
        /// </summary>
@@ -40,7 +40,7 @@
        /// <summary>
        /// 显示被绑定设备或场景的view
        /// </summary>
        VerticalFrameRefreshControl midVerticalScrolViewLayout;
        VerticalRefreshLayout midVerticalScrolViewLayout;
        /// <summary>
        /// 显示房间的view
        /// </summary>
@@ -133,7 +133,7 @@

        #endregion

        #region UI设计 
        #region UI设计
        /// <summary>
        /// 目标页显示
        /// </summary>
@@ -142,7 +142,7 @@
            TitleUI();
            //标题栏下的UI
            MidFrameLayoutContent();
            //初始化设备数据 
            //初始化设备数据
            InitData();
        }

@@ -200,7 +200,7 @@
            btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);

            //设备栏
            midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
            midVerticalScrolViewLayout = new VerticalRefreshLayout()
            {
                Y = btnMidTopLayout.Bottom,
                Height = Application.GetRealHeight(1145),
@@ -742,7 +742,7 @@
                        ChooseFloorAction += (floorId, btnMethodText) =>
                        {
                            btnFloorText.Text = dicFloorList[floorId];
                            //获取楼层中房间列表 
                            //获取楼层中房间列表
                            supportRoomList = BindInfo.GetFloorRoomList();
                            //获取本地未分配的支持当前类型的绑定设备列表
                            undistruibuteDevList = BindInfo.GetUndistributeDeviceList(undistruibuteDevList, curDeviceBindType);
@@ -768,7 +768,7 @@
                        {
                            foreach (var dev in targetList)
                            {
                                //获取本地设备列表 
                                //获取本地设备列表
                                var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
                                var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
                                if (tempDev != null)
@@ -1450,7 +1450,7 @@
            {
                return;
            }
            //获取本地设备列表 
            //获取本地设备列表
            var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
            var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
            if (tempDev != null)