备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

 ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs

@@ -214,7 +214,6 @@
                    }

                    string oldFloorId = Config.Instance.Home.CurrentFloorId;

                    CommonPage.Instance.CloseLeftMenu();

                    HdlRoomLogic.Current.CurrentRoom = room;



                    HdlThreadLogic.Current.RunThread(() =>

                    {

@@ -234,7 +233,7 @@
                                }

                            }

                            //如果只是切换当前楼层的其他房间,则只滑动主页的滑动控件

                            this.LoadFormMethodByName("HomeMainPageForm", "SetRoomPageViewSelect", room);

                            HomeMainPageForm.Instance?.SetRoomPageViewSelect(room);

                        });

                    });

                };

@@ -272,14 +271,14 @@
            picBackGroud.Gravity = Gravity.CenterHorizontal;

            picBackGroud.Radius = (uint)this.GetPictrueRealSize(29);

            picBackGroud.BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor3;

            frameBack.AddChidren(picBackGroud, ChidrenBindMode.BindEventOnly);

            frameBack.AddChidren(picBackGroud, ChidrenBindMode.BindEvent);



            //未分配图标

            var btnIcon = new PicViewControl(92, 72);

            btnIcon.X = this.GetPictrueRealSize(129);

            btnIcon.Y = this.GetPictrueRealSize(141);

            btnIcon.UnSelectedImagePath = "Room/NoNameRoom.png";

            frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

            frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);



            //未分配

            var btnName = new NormalViewControl(141, 84, true);

@@ -288,7 +287,7 @@
            btnName.IsBold = true;

            btnName.TextColor = UserCenterColor.Current.White;

            btnName.TextID = R.MyInternationalizationString.Unallocated;

            frameBack.AddChidren(btnName, ChidrenBindMode.BindEventOnly);

            frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);

            frameBack.ButtonClickEvent += (sender, e) =>

            {

                if (this.CanClick == false)