From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index 0839b7d..31008e1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -14,7 +14,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="device"></param>
- /// <param name="deviceBindType">1:鏂伴;2:娓╁害浼犳劅鍣�;3:婀垮害浼犳劅鍣�;4:PM2.5浼犳劅鍣�;5:绌鸿皟鐩爣</param>
+ /// <param name="deviceBindType">1:鏂伴;2:娓╁害浼犳劅鍣�;3:婀垮害浼犳劅鍣�;4:PM2.5浼犳劅鍣�;5:绌鸿皟鐩爣,6:鍦版殩鐩爣銆愭殏鏃舵病鍋氾紝鍥犱负娌℃湁璇ヨ澶囷紝鍚庢湡澧炲姞銆�</param>
/// <param name="bindDev">缁戝畾鐩爣 </param>
public PaneTargetsBaseForm(CommonDevice device, CommonDevice bindDev, DeviceBind.BindInfo.BindType deviceBindType)
{
@@ -68,6 +68,7 @@
/// 3:婀垮害浼犳劅鍣�
/// 4:PM2.5浼犳劅鍣�
/// 5:绌鸿皟鐩爣
+ /// 6:鍦版殩鐩爣銆愭殏鏃舵病鍋氾紝鍥犱负娌℃湁璇ヨ澶囷紝鍚庢湡澧炲姞銆�
/// </summary>
DeviceBind.BindInfo.BindType curDeviceBindType = 0;
/// <summary>
@@ -131,6 +132,10 @@
/// </summary>
public Action<string> actionAcTarget = null;
/// <summary>
+ /// Fh缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ public Action<string> actionFhTarget = null;
+ /// <summary>
/// 鏄惁鑳藉埛鏂�
/// </summary>
private bool canFresh = false;
@@ -172,6 +177,9 @@
break;
case DeviceBind.BindInfo.BindType.AC:
titleText = Language.StringByID(R.MyInternationalizationString.AcTargets);
+ break;
+ case DeviceBind.BindInfo.BindType.Fh:
+ titleText = Language.StringByID(R.MyInternationalizationString.uFloorHeatingTarget);
break;
}
this.TopFrameLayout(this, titleText);
@@ -260,7 +268,7 @@
TextAlignment = TextAlignment.CenterLeft,
};
bottomTipPicFrameLayout.AddChidren(btnTipText);
- bottomTipPicFrameLayout.Width = btnTipPicFrameLayout.Width + Application.GetMinReal(2) + btnTipText.GetTextWidth();
+ bottomTipPicFrameLayout.Width = btnTipPicFrameLayout.Width + Application.GetMinReal(12) + btnTipText.GetTextWidth();
bottomTipPicFrameLayout.Gravity = Gravity.CenterHorizontal;
EventHandler<MouseEventArgs> eHandlerEmptyTargets = (sender, e) =>
@@ -389,7 +397,7 @@
}
}
- if (index == roomTempList.Count - 1 && index > 3)
+ if (index == roomTempList.Count - 1 && index > 2)
{
var btnRoomFrameLayoutEmpty = new FrameLayout
{
--
Gitblit v1.8.0