全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -179,12 +179,8 @@
                    roomList.Add(room);
                }
            }
            //当前按键所有显示房间的所有设备处理
            var aa = GetALlDispalyRoomDeviceList();
            //首次拿到所有房间中按键的目标并存储
            //if (IsInitEntry)
            //{
            //首次拿到所有房间中按键的目标并存储
            GetALlDispalyRoomDeviceList();
            if (currentKeyAllRoomDeviceList.Count != 0)
            {
                if (currentKey.bindList != null && currentKey.bindList.Count != 0)
@@ -203,7 +199,7 @@
                    }
                }
            }
            if (oldTargetList != null)
            if (oldTargetList.Count != 0)
            {
                foreach (var de in oldTargetList.Keys)
                {
@@ -212,7 +208,10 @@
                }
            }

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