From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 06aa559..1246bf1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -186,12 +186,28 @@
                 {
                     var frameContr = new FrameLayout();
                     frameContr.Height = Application.GetRealHeight(470);
+                    frameContr.Gravity = Gravity.CenterHorizontal;
                     listView.AddChidrenFrame(frameContr);
+
                     //鍦烘櫙鍥剧墖
-                    var btnPic = new PicViewControl(878, 470, true);
-                    btnPic.Gravity = Gravity.CenterHorizontal;
-                    btnPic.UnSelectedImagePath = data.IconPath;
+                    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 = 17;
                     frameContr.AddChidren(btnPic);
+
+                    var btnName = new NormalViewControl(251, 282, true);
+                    btnName.X = ControlCommonResourse.XXLeft;
+                    btnName.Gravity = Gravity.CenterVertical;
+                    btnName.BackgroundColor = 0xff333333;
+                    btnName.Radius = 17;
+                    btnName.Text = data.Name;
+                    btnName.TextSize = 15;
+                    btnName.TextColor = UserCenterColor.Current.White;
+                    btnName.TextAlignment = TextAlignment.Center;
+                    frameContr.AddChidren(btnName);
                 }
             });
         }

--
Gitblit v1.8.0