From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 5122424..5736446 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -7,7 +7,7 @@
 {
     public class FunctionSetting : DoorLockCommonLayout, ZigBee.Common.IStatus
     {
-        #region 鈼� 鏋勯�犲嚱鏁癬_________________________
+        #region  鏋勯�犲嚱鏁� 
         /// <summary>
         /// 鏋勯�犲嚱鏁�
         /// </summary>
@@ -22,7 +22,7 @@
         }
         #endregion
 
-        #region 鈼� 鍙橀噺鐢虫槑__________________________
+        #region  鍙橀噺鐢虫槑 
         public ZigBee.Device.DoorLock doorLock = null;
         /// <summary>
         /// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
@@ -53,7 +53,7 @@
         FrameLayout bottomFrameLayout;
         #endregion
 
-        #region 鈼� UI鏄剧ず __________________________ 
+        #region  UI鏄剧ず  
         /// <summary>
         /// UI鏄剧ず 
         /// </summary>
@@ -74,18 +74,15 @@
         }
         #endregion
 
-        #region 鈼� 涓儴鏄剧ず __________________________ 
+        #region  涓儴鏄剧ず  
         public void MidFrameLayoutContent()
         {
-            var MidTopFrameLayout = new FrameLayout()
-            {
-                X = Application.GetRealWidth(449),
-                Y = Application.GetRealHeight(58),
-                Width = Application.GetRealWidth(184),
-                Height = Application.GetRealHeight(184),
-                BackgroundImagePath = "DoorLock/DoorlockPicture.png",
-            };
-            this.midFrameLayout.AddChidren(MidTopFrameLayout);
+            //鍥剧墖
+            var btnPic = new DeviceInfoIconControl();
+            btnPic.Y = Application.GetRealHeight(92);
+            btnPic.Gravity = Gravity.CenterHorizontal;
+            this.midFrameLayout.AddChidren(btnPic);
+            btnPic.InitControl(doorLock);
 
             var btnDeviceText = new Button()
             {
@@ -102,7 +99,7 @@
         }
         #endregion
 
-        #region 鈼� 搴曢儴鏄剧ず __________________________  
+        #region  搴曢儴鏄剧ず 
         public void BottomFrameLayout()
         {
             #region  UI 
@@ -133,13 +130,13 @@
                 Y = Application.GetRealHeight(170),
             };
             bottomFrameLayout.AddChidren(listview);
-            #endregion 
+            #endregion
 
             FunctionDetail(doorLock);
         }
         #endregion
 
-        #region 鈼� 鍔熻兘鏄剧ず __________________________ 
+        #region  鍔熻兘鏄剧ず  
         void FunctionDetail(ZigBee.Device.DoorLock doorLock)
         {
             listview.RemoveAll();
@@ -234,7 +231,7 @@
         }
         #endregion
 
-        #region 娣诲姞鍏ㄩ儴鑿滃崟
+        #region  娣诲姞鍏ㄩ儴鑿滃崟 
         /// <summary>
         /// 娣诲姞鍏ㄩ儴鑿滃崟
         /// </summary>
@@ -407,7 +404,7 @@
 
         #endregion
 
-        #region 鈼� 璁惧閲嶅懡鍚峗_________________________
+        #region  璁惧閲嶅懡鍚� 
         /// <summary>
         /// 璁惧閲嶅懡鍚�
         /// </summary>
@@ -448,30 +445,28 @@
         }
         #endregion
 
-        #region 鈼� 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout__________________________
+        #region  琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout 
         /// <summary>
         /// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
         /// </summary> 
         void FinishInitControl(FrameLayout bodyFrameLayout, VerticalListControl listview)
         {
-            var btnFinish = new BottomClickButton();
-            btnFinish.Y = Application.GetRealHeight(1054);
             if (listview.ChildrenCount > 0)
             {
                 var realHeight = listview.GetChildren(0).Height * listview.ChildrenCount;
 
-                if (bodyFrameLayout.Height - btnFinish.Y + realHeight > listview.Height)
+                if (bodyFrameLayout.Height - Application.GetRealHeight(1054) + realHeight > listview.Height)
                 {
                     //淇冧娇琚尅浣忕殑鑿滃崟鑳藉鍚戜笂婊戝姩
                     var frameTemp = new FrameLayout();
-                    frameTemp.Height = bodyFrameLayout.Height - btnFinish.Y + Application.GetRealHeight(115);
+                    frameTemp.Height = bodyFrameLayout.Height - Application.GetRealHeight(1054) + Application.GetRealHeight(115);
                     listview.AddChidren(frameTemp);
                 }
             }
         }
         #endregion
 
-        #region 鈼� 鎺ュ彛瀹炵幇__________________________
+        #region  鎺ュ彛瀹炵幇 
         /// <summary>
         /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
         /// </summary>

--
Gitblit v1.8.0