From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25

---
 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 8293b3d..0d30915 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -181,16 +181,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 = 8;
+                    frameContr.AddChidren(btnPic);
+
+                    var btnName = new NormalViewControl(251, 282, true);
+                    btnName.X = ControlCommonResourse.XXLeft;
+                    btnName.Y = Application.GetRealHeight(58);
+                    btnName.BackgroundColor = 0xff333333;
+                    btnName.Radius = 8;
+                    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)
@@ -219,6 +236,8 @@
                         }
                     };
                 }
+                //璋冩暣涓�涓嬮珮搴�
+                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(185));
             });
         }
 
@@ -245,13 +264,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 = 20;
                     frameDeviceTable.AddChidren(frameBack);
 
                     var listView = new VerticalListControl(23);
@@ -300,6 +319,8 @@
         private void AddDeviceRow(List<CommonDevice> listDevice, VerticalListControl listView)
         {
             listView.RemoveAll();
+            //杩樺師楂樺害
+            listView.RecoverHeight();
 
             foreach (var device in listDevice)
             {
@@ -348,6 +369,8 @@
                     }
                 };
             }
+            //鍒楄〃鑷繁鏈変釜23鐨刌杞村潗鏍�
+            listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(300 - 23));
         }
 
         #endregion

--
Gitblit v1.8.0