From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs
index 7216c7c..4e4a5e3 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs
@@ -5,19 +5,19 @@
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