From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index efbac27..d942395 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -29,13 +29,17 @@
/// </summary>
private FrameCaptionInputControl btnDeviceName = null;
/// <summary>
- /// 璁惧鐨勬煇涓�鍥炶矾
+ /// 璁惧Mac鍦板潃
/// </summary>
- private CommonDevice deviceObj = null;
+ private string deviceMac = string.Empty;
/// <summary>
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
/// </summary>
private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
+ /// <summary>
+ /// 璁惧鍏蜂綋绫诲瀷鐨勪俊鎭�
+ /// </summary>
+ private DeviceEnumInfo deviceEnumInfo = null;
#endregion
@@ -44,10 +48,13 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
- public void ShowForm(CommonDevice i_device)
+ /// <param name="i_deviceMac">璁惧Mac鍦板潃</param>
+ public void ShowForm(string i_deviceMac)
{
- this.deviceObj = i_device;
+ this.deviceMac = i_deviceMac;
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
+ this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
@@ -90,7 +97,7 @@
this.ShowProgressBar();
foreach (var epoint in dicDeviceSaveName.Keys)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
+ var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);
if (device == null || dicDeviceSaveName[epoint] == string.Empty)
{
//涓嶈兘鍏佽绌虹櫧鍚嶅瓧
@@ -208,7 +215,7 @@
{
menuCount = 2;
}
- var frame = new TopRightMenuControl(menuCount);
+ var frame = new TopRightMenuControl(this, menuCount);
if (canTest == true)
{
//瀹氫綅
@@ -295,8 +302,7 @@
/// </summary>
private void InitDeviceEpointIcon()
{
- bool hadDevice = false;
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
var listOffSwitch = new List<CommonDevice>();
foreach (var device in listDevice)
{
@@ -304,11 +310,6 @@
{
//鍙骞叉帴鐐�
listOffSwitch.Add(device);
- if (device.DeviceEpoint == deviceObj.DeviceEpoint)
- {
- //鑳藉鍖归厤寰楀埌杩欎釜鍥炶矾
- hadDevice = true;
- }
}
}
//鎺掑簭
@@ -320,11 +321,6 @@
}
return -1;
});
- if (hadDevice == false)
- {
- //濡傛灉鍖归厤涓嶅埌杩欎釜鍥炶矾,鍒欓粯璁ょ涓�涓�
- this.deviceObj = listOffSwitch[0];
- }
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(150);
@@ -361,7 +357,7 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="isFirst">鏄惁鏄涓�涓�</param>
/// <returns></returns>
- private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)
+ private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device,bool isFirst)
{
//涓嶄娇鐢ㄧ偣鍑荤壒鏁�
frame.UseClickStatu = false;
@@ -380,7 +376,7 @@
this.DeviceEpointSelectEvent(btnIcon, null);
};
- if (device.DeviceEpoint == deviceObj.DeviceEpoint)
+ if (isFirst == true)
{
//鍒濆鍖栬彍鍗曡
this.DeviceEpointSelectEvent(btnIcon, null);
@@ -406,7 +402,7 @@
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame1, listDevice[0]);
+ this.InitDeviceIcon(frame1, listDevice[0], true);
//鎸夐敭2
var frame2 = new FrameLayoutControl();
@@ -416,7 +412,7 @@
frame2.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame2, listDevice[1]);
+ this.InitDeviceIcon(frame2, listDevice[1], false);
}
#endregion
@@ -438,7 +434,7 @@
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame1, listDevice[0]);
+ this.InitDeviceIcon(frame1, listDevice[0], true);
//鎸夐敭2
var frame2 = new FrameLayoutControl();
@@ -448,7 +444,7 @@
frame2.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame2, listDevice[1]);
+ this.InitDeviceIcon(frame2, listDevice[1], false);
//鎸夐敭3
var frame3 = new FrameLayoutControl();
@@ -458,7 +454,7 @@
frame3.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame3, listDevice[2]);
+ this.InitDeviceIcon(frame3, listDevice[2], false);
}
#endregion
@@ -480,7 +476,7 @@
frame1.Y = Application.GetMinRealAverage(63);
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame1, listDevice[0]);
+ this.InitDeviceIcon(frame1, listDevice[0], true);
//鎸夐敭2
var frame2 = new FrameLayoutControl();
@@ -490,7 +486,7 @@
frame2.Y = Application.GetMinRealAverage(63);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame2, listDevice[1]);
+ this.InitDeviceIcon(frame2, listDevice[1], false);
//鎸夐敭3
var frame3 = new FrameLayoutControl();
@@ -500,7 +496,7 @@
frame3.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame3, listDevice[2]);
+ this.InitDeviceIcon(frame3, listDevice[2], false);
//鎸夐敭4
var frame4 = new FrameLayoutControl();
@@ -510,7 +506,7 @@
frame4.Y = Application.GetMinRealAverage(245);
frameBack.AddChidren(frame4);
//鍒濆鍖栬澶囧浘鏍�
- this.InitDeviceIcon(frame4, listDevice[3]);
+ this.InitDeviceIcon(frame4, listDevice[3], false);
}
#endregion
@@ -541,7 +537,7 @@
nowContr.BorderColor = 0xfffb744a;
nowSelectControl = nowContr;
- nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
+ nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceMac, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
//閲嶆柊鍒濆鍖栬彍鍗曡
this.InitMenuRow();
--
Gitblit v1.8.0