From dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 28 四月 2020 15:03:43 +0800
Subject: [PATCH] 合并新代码，提供逻辑需要的门锁接口
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
old mode 100755
new mode 100644
index 3a52b0e..ea3f30e
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -87,12 +87,12 @@
//鍒濆鍖栨甯�
this.tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);
-
- //鍒濆鍖栬澶囧洖璺浘鏍�
- this.InitDeviceEpointIcon(listBackControl);
-
- //淇濆瓨
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);
+
+ //鍒濆鍖栬澶囧洖璺浘鏍�
+ this.InitDeviceEpointIcon(listBackControl);
+
+ //淇濆瓨
var btnFinish = new BottomClickButton();
btnFinish.TextID = R.MyInternationalizationString.uSave;
bodyFrameLayout.AddChidren(btnFinish);
@@ -149,6 +149,10 @@
else if (device.DfunctionType == DeviceFunctionType.A鐏厜)
{
device.IconPath = "Device/Light.png";
+ }
+ else
+ {
+ device.IconPath = "Device/RelayEpoint.png";
}
device.ReSave();
}
@@ -312,8 +316,8 @@
{
strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
nowSelectNo = 2;
- }
-
+ }
+
var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
btnFunction.UseClickStatu = false;
listview.AddChidren(btnFunction);
@@ -338,10 +342,19 @@
var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
var form = new BottomItemSelectForm();
+ form.CancelCallEvent = true;//鍏佽鍙栨秷
form.AddForm(title, listText, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
- btnFunction.Text = listText[selectNo];
+ if (selectNo == -1)
+ {
+ //鍙栨秷閫夋嫨
+ btnFunction.Text = string.Empty;
+ }
+ else
+ {
+ btnFunction.Text = listText[selectNo];
+ }
nowSelectNo = selectNo;
//璁板綍璧峰綋鍓嶉�夋嫨鐨勫姛鑳界被鍨�
if (selectNo == 0)
@@ -352,14 +365,32 @@
{
dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A鐏厜;
}
- else
+ else if (selectNo == 2)
{
dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A鎻掑骇;
+ }
+ else
+ {
+ dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A鏈畾涔�;
}
};
};
}
}
+
+ //濡傛灉鏄柊椋�
+ if (nowSelectDevice.Type == DeviceType.FreshAir)
+ {
+ //鍔熻兘绫诲瀷
+ string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
+ string strType = Language.StringByID(R.MyInternationalizationString.FreshAir);
+ var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
+ btnFunction.UseClickStatu = false;
+ listview.AddChidren(btnFunction);
+ btnFunction.InitControl();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ }
}
#endregion
@@ -397,7 +428,7 @@
else
{
//涓嶉渶瑕佹粦鍔ㄦ帶浠�
- frameBorder.AddChidren(frameBack);
+ frameBorder.AddChidren(frameBack);
}
int index = 0;
@@ -412,7 +443,17 @@
if (listIcon.Count == 1)
{
- frame.Gravity = Gravity.CenterVertical;
+ frame.Gravity = Gravity.CenterVertical;
+
+ //濡傛灉鏄柊椋�
+ if (deviceObj.Type == DeviceType.FreshAir)
+ {
+ frame.RemoveFromParent();
+ frameBack.BackgroundImagePath = "FreshAir/FreshAirRealDevicePic.png";
+ frameBack.Width = Application.GetMinRealAverage(878);
+ frameBack.Height = Application.GetMinRealAverage(354);
+ frameBack.Gravity = Gravity.Center;
+ }
}
else
{
@@ -425,15 +466,15 @@
//璁＄畻鐪熷疄楂樺害
int realHeight = this.GetPictrueRealSize(58 + 58);//涓婁笅闂磋窛
realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//鍦嗗湀楂樺害
- realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//鍦嗗湀闂磋窛
+ realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//鍦嗗湀闂磋窛
if (realHeight > frameBack.Height)
{
//鍙樻洿楂樺害
frameBack.Height = realHeight;
}
}
- }
-
+ }
+
/// <summary>
/// 鍒濆鍖栦竴琛岃澶囧浘鏍�
/// </summary>
@@ -474,6 +515,8 @@
//鍒濆鍖栬彍鍗曡
this.DeviceEpointSelectEvent(btnTemp, null);
}
+
+
}
/// <summary>
--
Gitblit v1.8.0