合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs

@@ -198,16 +198,33 @@
                    //场景图片

                    var frameContr = new FrameLayoutControl();

                    frameContr.UseClickStatu = false;

                    frameContr.Width = Application.GetRealWidth(878);

                    frameContr.Height = Application.GetRealHeight(440);

                    frameContr.Gravity = Gravity.CenterHorizontal;

                    frameContr.BackgroundImagePath = data.IconPath;

                    frameContr.Height = Application.GetRealHeight(470);

                    listView.AddChidrenFrame(frameContr);



                    //场景图片

                    var btnPic = new ImageView();

                    btnPic.X = Application.GetRealWidth(179);

                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = (uint)Application.GetRealHeight(17);

                    frameContr.AddChidren(btnPic, ChidrenBindMode.BindEventOnly);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.RadiusEx = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

                    btnName.TextAlignment = TextAlignment.Center;

                    frameContr.AddChidren(btnName);



                    var btnSelect = new IconViewControl(58);

                    btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";

                    btnSelect.SelectedImagePath = "Item/ItemSelected.png";

                    btnSelect.X = Application.GetRealWidth(786);

                    btnSelect.X = Application.GetRealWidth(887);

                    btnSelect.Y = Application.GetRealHeight(35);

                    frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);

                    if (dicSelectScene.ContainsKey(data.Id) == true)

@@ -236,6 +253,8 @@
                        }

                    };

                }

                //调整一下高度

                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(185));

            });

        }



@@ -262,13 +281,13 @@
                }

                else

                {

                    var frameBack = new FrameLayoutControl(false);

                    var frameBack = new FrameLayout();

                    frameBack.X = ControlCommonResourse.XXLeft;

                    frameBack.Y = Application.GetRealHeight(178);

                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.RadiusEx = 20;

                    frameBack.Radius = (uint)Application.GetRealHeight(58);

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);

@@ -365,6 +384,9 @@
                    }

                };

            }



            //列表自己有个23的Y轴坐标

            listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(300 - 23));

        }



        #endregion