From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13  wjc2021-02-06

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs
old mode 100755
new mode 100644
index 7216c7c..a5863ad
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs
@@ -1,23 +1,23 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
     /// <summary>
-    /// 鍋氭垚涓�涓樉绀哄浘鐗囩殑鏅�氭帶浠�(姣旂巼閲囧彇骞冲潎鍊�)鉁�
+    /// 鍋氭垚涓�涓樉绀哄浘鐗囩殑鏅�氭帶浠垛湬
     /// </summary>
     public class PicViewControl : ButtonBase
     {
         /// <summary>
-        /// 鍋氭垚涓�涓樉绀哄浘鐗囩殑鏅�氭帶浠�(姣旂巼閲囧彇骞冲潎鍊�)
+        /// 鍋氭垚涓�涓樉绀哄浘鐗囩殑鏅�氭帶浠�
         /// </summary>
         /// <param name="i_Width">瀹藉害</param>
         /// <param name="i_Height">楂樺害</param>
         /// <param name="real">鏄惁璁$畻鐪熷疄鍊�</param>
         public PicViewControl(int i_Width, int i_Height, bool real = true)
         {
-            this.InitAvgSize(i_Width, i_Height, real);
+            this.InitPictrueSize(i_Width, i_Height, real);
         }
-    }
-}
+    }
+}

--
Gitblit v1.8.0