2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

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

@@ -246,7 +246,7 @@

            var btnAddFrameLayout = new FrameLayout()
            {
                X = Application.GetRealWidth(888),
                X = Application.GetRealWidth(772 - 58),
                Width = Application.GetRealWidth(192),
            };
            this.titleFrameLayout.AddChidren(btnAddFrameLayout);
@@ -254,8 +254,8 @@
            var btnBindAdd = new Button
            {
                X = Application.GetRealWidth(62),
                Height = Application.GetRealHeight(72),
                Width = Application.GetRealWidth(72),
                Height = Application.GetMinReal(72),
                Width = Application.GetMinReal(72),
                UnSelectedImagePath = "BindPic/BindAdd.png",
            };
            btnAddFrameLayout.AddChidren(btnBindAdd);
@@ -352,6 +352,7 @@
            InitListInfo();

        }

        /// <summary>
        /// 中部布局
        /// </summary>
@@ -359,6 +360,7 @@
        {
            midVerticalRefreshLayout = new VerticalFrameRefreshControl(29)
            {
                Height = this.midFrameLayout.Height + 1,
            };
            this.midFrameLayout.AddChidren(midVerticalRefreshLayout);
            midVerticalRefreshLayout.BeginHeaderRefreshingAction += () =>
@@ -489,6 +491,10 @@
                            {
                                btnFloorRoomNameText = myName;
                            }
                            else
                            {
                                btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
                            }
                        }
                    }
                    else
@@ -511,11 +517,25 @@
                                    var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
                                    if (string.IsNullOrEmpty(tempDevFloorName))
                                    {
                                        btnFloorRoomNameText = tempDevRoomName;
                                        if (string.IsNullOrEmpty(tempDevRoomName))
                                        {
                                            btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
                                        }
                                        else
                                        {
                                            btnFloorRoomNameText = tempDevRoomName;
                                        }
                                    }
                                    else
                                    {
                                        btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
                                        if (string.IsNullOrEmpty(tempDevRoomName))
                                        {
                                            btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
                                        }
                                        else
                                        {
                                            btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
                                        }
                                    }
                                }



@@ -639,10 +659,10 @@
                             else
                             {
                                 var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
                                 if (temp.setWritableValueResponData?.Status != 0)
                                 if (temp != null && temp.setWritableValueResponData?.Status != 0)
                                 {
                                     var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
                                     if (temp1.setWritableValueResponData?.Status != 0)
                                     if (temp1 != null && temp1.setWritableValueResponData?.Status != 0)
                                     {
                                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                                     }
@@ -698,8 +718,8 @@

            var sidelipFrameLayout = new FrameLayout()
            {
                Height = Application.GetRealHeight(628),
                Width = Application.GetRealWidth(415),
                Height = Application.GetMinReal(628),
                Width = Application.GetMinReal(415),
                Y = Application.GetRealHeight(115 + 45),
                X = Application.GetRealWidth(605),
                BackgroundImagePath = "DoorLock/SideslipPic.png",
@@ -738,8 +758,10 @@
                }
            }

            int count = 0;
            foreach (var value in typeModeList)
            {
                count++;
                #region  rowView
                var rowView = new FrameLayout()
                {