From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 93 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index 422cf86..535b174 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -29,9 +29,9 @@
/// </summary>
private FrameCaptionInputControl btnDeviceName = null;
/// <summary>
- /// 璁惧Mac鍦板潃
+ /// 璁惧鐨勬煇涓�鍥炶矾
/// </summary>
- private string deviceMac = string.Empty;
+ private CommonDevice deviceObj = null;
/// <summary>
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
/// </summary>
@@ -40,6 +40,10 @@
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍔熻兘
/// </summary>
private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
+ /// <summary>
+ /// 淇℃伅缂栬緫鎺т欢
+ /// </summary>
+ private InformationEditorControl tableContr = null;
#endregion
@@ -48,10 +52,10 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_deviceMac">璁惧Mac鍦板潃</param>
- public void ShowForm(string i_deviceMac)
+ /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
+ public void ShowForm(CommonDevice i_device)
{
- this.deviceMac = i_deviceMac;
+ this.deviceObj = i_device;
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp));
@@ -72,15 +76,11 @@
this.ClearBodyFrame();
//鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
+ this.tableContr = new InformationEditorControl();
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
-
+
//鍒濆鍖栬澶囧洖璺浘鏍�
this.InitDeviceEpointIcon();
-
- //鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
- tableContr = null;
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -94,7 +94,7 @@
this.ShowProgressBar();
foreach (var epoint in dicDeviceSaveName.Keys)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);
+ var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
if (device == null || dicDeviceSaveName[epoint] == string.Empty)
{
//涓嶈兘鍏佽绌虹櫧鍚嶅瓧
@@ -116,7 +116,7 @@
}
foreach (var epoint in dicDeviceFuncType.Keys)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);
+ var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
if (device == null)
{
continue;
@@ -203,6 +203,8 @@
//娣诲姞鍔熻兘绫诲瀷琛�
this.AddFunctionTypeRow();
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl(bodyFrameLayout, this.listview);
}
#endregion
@@ -214,6 +216,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -234,11 +241,11 @@
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
- if (canTest == true)
- {
- menuCount = 2;
- }
- var frame = new TopRightMenuControl(this, menuCount);
+ //if (canTest == true)
+ //{
+ // menuCount = 2;
+ //}
+ var frame = new TopRightMenuControl(menuCount, 1);
if (canTest == true)
{
//瀹氫綅
@@ -251,10 +258,10 @@
}
//鍒犻櫎
- deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
- frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
- {
- });
+ //deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
+ //frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
+ //{
+ //});
}
#endregion
@@ -320,7 +327,7 @@
//鏍囬:閫夋嫨鍔熻兘绫诲瀷
var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
- var form = new BottomDialogSelectForm();
+ var form = new BottomItemSelectForm();
form.AddForm(title, listText, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
@@ -354,7 +361,8 @@
/// </summary>
private void InitDeviceEpointIcon()
{
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ bool hadDevice = false;
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
var listSort = new List<CommonDevice>();
foreach (var device in listDevice)
{
@@ -363,6 +371,11 @@
|| device.Type == DeviceType.ColorDimmableLight)
{
listSort.Add(device);
+ if (device.DeviceEpoint == deviceObj.DeviceEpoint)
+ {
+ //鑳藉鍖归厤寰楀埌杩欎釜鍥炶矾
+ hadDevice = true;
+ }
}
}
//鎺掑簭
@@ -374,6 +387,11 @@
}
return -1;
});
+ if (hadDevice == false)
+ {
+ //濡傛灉鍖归厤涓嶅埌杩欎釜鍥炶矾,鍒欓粯璁ょ涓�涓�
+ this.deviceObj = listSort[0];
+ }
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(150);
@@ -408,9 +426,8 @@
/// </summary>
/// <param name="frame">鎵╁ぇ鐐瑰嚮鍖哄煙鐨勫鍣�</param>
/// <param name="device">璁惧瀵硅薄</param>
- /// <param name="isFirst">鏄惁鏄涓�涓�</param>
/// <returns></returns>
- private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device, bool isFirst)
+ private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)
{
//涓嶄娇鐢ㄧ偣鍑荤壒鏁�
frame.UseClickStatu = false;
@@ -418,7 +435,7 @@
var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
btnIcon.Name = "btn" + device.DeviceEpoint;
btnIcon.Gravity = Gravity.Center;
- btnIcon.Radius = (uint)Application.GetMinRealAverage(6);
+ btnIcon.RadiusEx = 16;
btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
@@ -429,7 +446,7 @@
this.DeviceEpointSelectEvent(btnIcon, null);
};
- if (isFirst == true)
+ if (device.DeviceEpoint == deviceObj.DeviceEpoint)
{
//鍒濆鍖栬彍鍗曡
this.DeviceEpointSelectEvent(btnIcon, null);
@@ -455,7 +472,7 @@
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame1, listDevice[0], true);
+ this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
var frame2 = new FrameLayoutControl();
@@ -465,7 +482,7 @@
frame2.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame2, listDevice[1], false);
+ this.InitDeviceIcon(frame2, listDevice[1]);
}
#endregion
@@ -487,7 +504,7 @@
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame1, listDevice[0], true);
+ this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
var frame2 = new FrameLayoutControl();
@@ -497,7 +514,7 @@
frame2.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame2, listDevice[1], false);
+ this.InitDeviceIcon(frame2, listDevice[1]);
//鎸夐敭3
var frame3 = new FrameLayoutControl();
@@ -507,7 +524,7 @@
frame3.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame3, listDevice[2], false);
+ this.InitDeviceIcon(frame3, listDevice[2]);
}
#endregion
@@ -529,7 +546,7 @@
frame1.Y = Application.GetMinRealAverage(63);
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame1, listDevice[0], true);
+ this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
var frame2 = new FrameLayoutControl();
@@ -539,7 +556,7 @@
frame2.Y = Application.GetMinRealAverage(63);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame2, listDevice[1], false);
+ this.InitDeviceIcon(frame2, listDevice[1]);
//鎸夐敭3
var frame3 = new FrameLayoutControl();
@@ -549,7 +566,7 @@
frame3.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame3, listDevice[2], false);
+ this.InitDeviceIcon(frame3, listDevice[2]);
//鎸夐敭4
var frame4 = new FrameLayoutControl();
@@ -559,7 +576,7 @@
frame4.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame4);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame4, listDevice[3], false);
+ this.InitDeviceIcon(frame4, listDevice[3]);
}
#endregion
@@ -594,7 +611,7 @@
nowContr.TextColor = UserCenterColor.Current.TextColor1;
nowSelectControl = nowContr;
- nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceMac, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
+ nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
//閲嶆柊鍒濆鍖栬彍鍗曡
this.InitMenuRow();
--
Gitblit v1.8.0