一个新版本

黄学彪

2019-12-09 163777d8a2cb7cfa469f54a7042528870ebc10a3

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

@@ -16,14 +16,8 @@
        /// <param name="common">Common.</param>
        public void Changed(CommonDevice common)
        {
            //if (common.Type != ZigBee.Device.DeviceType.OnOffSwitch)
            //{
            //    return;
            //}

            Shared.Application.RunOnMainThread(() =>
            {
                //var dev = common as Panel;
            });
        }

@@ -157,7 +151,7 @@
            {
                Width = Application.GetRealWidth(907),
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(120) / 2,
                Radius = (uint)Application.GetRealHeight(127) / 2,
                TextID = R.MyInternationalizationString.ChooseKeyMode,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
@@ -179,12 +173,8 @@
                    roomList.Add(room);
                }
            }
            //当前按键所有显示房间的所有设备处理
            var aa = GetALlDispalyRoomDeviceList();
            //首次拿到所有房间中按键的目标并存储
            //if (IsInitEntry)
            //{
            //首次拿到所有房间中按键的目标并存储
            GetALlDispalyRoomDeviceList();
            if (currentKeyAllRoomDeviceList.Count != 0)
            {
                if (currentKey.bindList != null && currentKey.bindList.Count != 0)
@@ -203,7 +193,7 @@
                    }
                }
            }
            if (oldTargetList != null)
            if (oldTargetList.Count != 0)
            {
                foreach (var de in oldTargetList.Keys)
                {
@@ -212,7 +202,10 @@
                }
            }

            //}
            if (roomList.Count == 0)
            {
                return;
            }
            Shared.Common.Room curRoom = roomList[0];
            int index = 0;
            RefreshRoomList(curRoom, btnChooseKeyMode, ref index);
@@ -522,6 +515,10 @@
            int curIndex = 0;
            foreach (var device in curTypeDeviceList)
            {
                if (device.CommonDevice != null && device.CommonDevice.IsOnline == 0)
                {
                    continue;
                }
                #region 绑定表UI显（无数据处理）
                var rowLayout = new FrameLayout()
                {
@@ -576,7 +573,7 @@
                };
                rowLayout.AddChidren(line2);

                if (curIndex == curRoom.SceneUIList.Count - 1)
                if (curIndex == curRoom.DeviceUIList.Count - 1)
                {
                    line2.Visible = false;
                }
@@ -594,9 +591,16 @@
                    }
                    else
                    {
                        targetList.Add(device.CommonDevice);
                        btnChoose.IsSelected = true;
                        btnChoose.Visible = true;
                        if (targetList.Count > 9)
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        }
                        else
                        {
                            targetList.Add(device.CommonDevice);
                            btnChoose.IsSelected = true;
                            btnChoose.Visible = true;
                        }
                    }
                };
                rowLayout.MouseUpEventHandler += hander;