From e79b65b97a8ae1eae5ee172dea1b52d041006599 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:24:32 +0800
Subject: [PATCH] 2020-09-02-3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 1116 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1,024 insertions(+), 92 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 80c02c8..402b3a6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -2,7 +2,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Shared.Common;
-using Shared.Phone.UserView;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.DeviceBind;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.Device
@@ -21,7 +22,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 璁惧鐨勮澶囩被鍨�
/// </summary>
@@ -30,8 +31,38 @@
/// 璁惧鍏蜂綋绫诲瀷鐨勪俊鎭�
/// </summary>
private DeviceEnumInfo deviceEnumInfo = null;
-
- #endregion
+ /// <summary>
+ /// 涓ぎ绌鸿皟鐨勭増鏈帶浠�
+ /// </summary>
+ private NormalViewControl btnAirConditionerVersion = null;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾鐨勬俯搴︾洰鏍囧悕瀛�
+ /// </summary>
+ private string bindTemperatureName = string.Empty;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾鐨勬箍搴︾洰鏍囧悕瀛�
+ /// </summary>
+ private string bindHumidityName = string.Empty;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾琚粦鐩爣鏄俯搴�
+ /// </summary>
+ private CommonDevice bindTemperatureDev;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘缁戝畾琚粦鐩爣鏄箍搴�
+ /// </summary>
+ private CommonDevice bindHumidityDev;
+ /// <summary>
+ /// 绠�绾﹂潰鏉垮綋鍓峂ac
+ /// </summary>
+ private string deviceMacTemp = string.Empty;
+ // <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘涓缁戝畾鐨勬俯婀垮害鐩爣鍒楄〃
+ /// </summary>
+ private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘鐨勬帴杩戞劅搴旀暟鎹�
+ private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
+ #endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -42,8 +73,13 @@
public void ShowForm(string deviceMac)
{
this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
-
+ if (listNewDevice.Count == 0)
+ {
+ //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+ listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
+ }
this.listDeviceType.Clear();
+ deviceMacTemp = deviceMac;
foreach (var device in listNewDevice)
{
//鏀堕泦璁惧绫诲瀷
@@ -53,7 +89,7 @@
this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);
//璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceInfo));
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceSettion));
//鍒濆鍖栧彸涓婅鑿滃崟
this.InitTopRightMenu();
@@ -63,6 +99,20 @@
//閲嶆柊鑾峰彇纭欢淇℃伅
this.RefreshHardFirmwareInfo();
+
+ //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀�
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+ if (dev != null)
+ {
+ var key = new ZigBee.Device.Panel();
+ key.DeviceAddr = deviceMac;
+ key.CurrentGateWayId = dev.CurrentGateWayId;
+ InitBindInfo(key);
+ }
+ }
}
/// <summary>
@@ -73,21 +123,26 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1368);
//鍥剧墖
var btnPic = new DeviceInfoIconControl();
btnPic.Y = Application.GetRealHeight(92);
btnPic.Gravity = Gravity.CenterHorizontal;
- bodyFrameLayout.AddChidren(btnPic);
+ listBackControl.frameTable.AddChidren(btnPic);
btnPic.InitControl(listNewDevice[0]);
//璁惧澶囨敞
string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+ btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
btnNote.InitControl();
//鍒掔嚎
@@ -101,6 +156,11 @@
}
if (oldName != btnNote.Text)
{
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
//淇敼鍚嶅瓧
this.DeviceReName(btnNote.Text, false);
}
@@ -116,30 +176,54 @@
//鍒掔嚎
btnType.AddBottomLine();
- //鎵�灞炲尯鍩�
+ //瀹夎浣嶇疆
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
listview.AddChidren(rowBeloneArea);
- rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
//搴曠嚎
rowBeloneArea.AddBottomLine();
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowBeloneArea.CanClick = false;
+ }
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
+ //閫夋嫨鏈垎閰嶆椂,娓呯┖
+ if (roomKeys == string.Empty) { listCheck = new List<string>(); }
foreach (var device in this.listNewDevice)
{
- var room = Room.CurrentRoom.GetRoomByDevice(device);
+ if (device is OTADevice)
+ {
+ //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+ continue;
+ }
+ if (roomKeys == string.Empty)
+ {
+ //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ continue;
+ }
+ var room = HdlRoomLogic.Current.GetRoomByDevice(device);
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
{
//杩欓噷鏈夌偣鐗规畩,濡傛灉鍥炶矾娌℃湁璁剧疆鏈夊尯鍩熺殑鏃跺��,鎵嶈缃�
listCheck.Add(mainKeys);
- Room.CurrentRoom.ChangedRoom(device, roomKeys);
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ }
+ else if (this.deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
+ && device.Type == DeviceType.FreshAir)
+ {
+ //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欏尯鍩熻窡鐫�妯″潡涓�璧�
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
}
else if (listCheck.Contains(mainKeys) == true)
{
//濡傛灉杩欎釜鍥炶矾涔嬪墠閮借繕娌℃湁鍖哄煙,鍦ㄦ湰鐣岄潰杩樻病鏈夊叧闂箣鍓�,鍙互鏃犳潯浠堕殢渚垮彉鏇�
- Room.CurrentRoom.ChangedRoom(device, roomKeys);
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
}
}
//淇濆瓨璁惧鎴块棿绱㈠紩
@@ -150,7 +234,7 @@
this.AddAllMenuRow();
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
@@ -175,6 +259,19 @@
this.CloseForm();
}
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ for (int i = 0; i < listview.ChildrenCount; i++)
+ {
+ var myRow = listview.GetChildren(i) as FrameRowControl;
+ if (myRow != null)
+ {
+ myRow.UseClickStatu = false;
+ myRow.CanClick = false;
+ }
+ }
+ }
}
#endregion
@@ -186,11 +283,10 @@
/// </summary>
private void AddAllMenuRow()
{
- bool isHdlDevice = Common.LocalDevice.Current.IsHdlDevice(listNewDevice[0]);
if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鏅鸿兘闂ㄩ攣)
{
//鍙湁鏄渤涓滅殑璁惧鐨勬椂鍊�
- if (isHdlDevice == true)
+ if (deviceEnumInfo.IsHdlDevice == true)
{
//娣诲姞銆愮敤鎴风鐞嗐�戣
this.AddUserManageRow();
@@ -205,25 +301,65 @@
//娣诲姞銆愬鍐呮満璁剧疆銆戣(绌鸿皟涓撶敤)
this.AddIndoorUnitSettionRow();
}
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ //绠�绾﹀鍔熻兘闈㈡澘
+ this.AddIBindRow(deviceMacTemp);
+ this.AddProximitySensorsRow(deviceMacTemp);
+ this.AddFunctionSettionRow();
+ this.AddHumiditySourceRow(deviceMacTemp);
+ this.AddTemperatureSensorRow(deviceMacTemp);
+ this.DataCorrectionRow(deviceMacTemp);
+ }
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+ //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
+ this.AddSimplePanelSettionRow();
+ }
else
{
+ //娣诲姞銆愬伐浣滄ā寮忋�戣(pir浼犳劅鍣ㄤ笓鐢�)
+ this.AddPirSensorWorkModeRow();
//娣诲姞銆愮粦瀹氱洰鏍囥�戣(pir浼犳劅鍣ㄤ笓鐢�)
this.AddPirSensorBindRow();
//娣诲姞銆愭柟鍚戜笌闄愪綅銆戣(寮�鍚堝笜,鍗峰笜涓撶敤)
this.AddDirectionAndLimitRow();
//娣诲姞銆愭墜鎷夋帶鍒躲�戣(寮�鍚堝笜涓撶敤)
this.AddHandPullControlRow();
- //娣诲姞銆愭寜閿缃�戣(闈㈡澘涓撶敤)
- this.AddPanelSettionRow();
- //娣诲姞銆愬姛鑳借缃�戣
- this.AddFunctionSettionRow();
+ //娣诲姞銆愭寜閿缃�戣(鏂规偊涓撶敤) --杩欎釜鏈夊彲鑳藉拰闈㈡澘閲嶅彔
+ if (this.AddFangyuePanelSettionRow() == false)
+ {
+ //娣诲姞銆愭寜閿缃�戣(闈㈡澘涓撶敤)
+ this.AddPanelSettionRow();
+ }
+ //妫�娴嬭兘鍚︽樉绀哄姛鑳借缃殑鑿滃崟
+ if (this.CheckCanShowFunctionSettionRow() == true)
+ {
+ //娣诲姞銆愬姛鑳借缃�戣
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
+ {
+ //PM浼犳劅鍣�
+ this.AddFunctionSettionRowPM();
+ }
+ else
+ {
+ this.AddFunctionSettionRow();
+ }
+
+ }
+
//娣诲姞銆愬共鎺ョ偣璁剧疆銆戣
this.AddDryContactSettionRow();
}
+ //娣诲姞銆愬姛鑳界被鍨嬨�戣(绌烘皵寮�鍏充笓鐢�)
+ this.AddAirSwitchFunctionTypeRow();
//娣诲姞銆愰�氱敤淇℃伅銆戣
this.AddGeneralInformationRow();
- if (isHdlDevice == true)
+ //娣诲姞銆愮┖璋冩ā鍧楃増鏈�(绌鸿皟涓撶敤)銆戣
+ this.AddAirConditionerModelVersionRow();
+
+ if (deviceEnumInfo.IsHdlDevice == true)
{
//娣诲姞銆愬浐浠跺崌绾с�戣
this.AddFirmwareUpdateRow();
@@ -257,21 +393,19 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
Action action = null;
- if (!UserCenterResourse.Option.DoorUnLockByRemote)
+ Action actionNone = null;
+ action = () =>
{
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);
- }
- else
+ var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userManagement.Show();
+ };
+ actionNone = () =>
{
- action = async () =>
- {
- var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userManagement.Show();
- };
- HdlCheckLogic.Current.CheckSecondarySecurity(action);
- }
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
+ };
+ HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
}
else
{
@@ -279,10 +413,21 @@
var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
if (result == false)
{
- var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userManagement.Show();
+ Action action = null;
+ Action actionNone = null;
+ action = () =>
+ {
+ var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userManagement.Show();
+ };
+ actionNone = () =>
+ {
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
+ };
+ HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
+
}
else
{
@@ -321,6 +466,11 @@
if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword) == false)
{
btnswitch.IsSelected = true;
+ }
+ //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹呯殑璇�,璁╂墍鏈夎彍鍗曢兘涓嶈兘鐐瑰嚮
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ btnswitch.CanClick = false;
}
btnswitch.ButtonClickEvent += async (sender, e) =>
@@ -424,7 +574,7 @@
#region 鈻� 鎸夐敭璁剧疆(闈㈡澘)_____________________
/// <summary>
- /// 娣诲姞銆愭寜閿缃�戣
+ /// 娣诲姞銆愭寜閿缃�戣(闈㈡澘)
/// </summary>
private void AddPanelSettionRow()
{
@@ -447,6 +597,83 @@
var form = new DevicePanel.PanelButtonSettionForm();
form.AddForm(listNewDevice[0]);
};
+ }
+
+ #region 鈻� 绠�绾︾幆澧�(闈㈡澘)_____________________
+
+ /// <summary>
+ /// 娣诲姞銆愭寜閿缃�戣绠�绾︾幆澧�(闈㈡澘)
+ /// </summary>
+ private void AddSimplePanelSettionRow()
+ {
+ //鎸夐敭璁剧疆
+ string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
+ var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnFunction);
+ btnFunction.AddLeftCaption(caption, 600);
+ //鍚戝彸鍥炬爣
+ btnFunction.AddRightArrow();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ var form = new DevicePanel.PanelSettionWithSourceForm();
+ form.AddForm(listNewDevice[0]);
+ };
+ }
+
+ #endregion
+
+ #endregion
+
+ #region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
+
+ /// <summary>
+ /// 娣诲姞銆愭寜閿缃�戣(鏂规偊)
+ /// </summary>
+ private bool AddFangyuePanelSettionRow()
+ {
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ //鎸夐敭璁剧疆
+ string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
+ var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnFunction);
+ btnFunction.AddLeftCaption(caption, 600);
+ //鍚戝彸鍥炬爣
+ btnFunction.AddRightArrow();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+ {
+ //鏂规偊鎸夐敭闈㈡澘[鍗曞紑鍙屾帶/鍙屽紑鍥涙帶/鍥涘紑鍏帶]閰嶇疆
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
+ }
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃�&鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
+ var form = new DevicePanel.PanelSettionWithSourceForm();
+ form.AddForm(listNewDevice[0]);
+ }
+ else
+ {
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
+ }
+ };
+ return true;
+ }
+ return false;
}
#endregion
@@ -488,6 +715,36 @@
#endregion
+ #region 鈻� 宸ヤ綔妯″紡(pir浼犳劅鍣ㄤ笓鐢�)____________
+
+ /// <summary>
+ /// 娣诲姞銆愬伐浣滄ā寮忋�戣(pir浼犳劅鍣ㄤ笓鐢�)
+ /// </summary>
+ private void AddPirSensorWorkModeRow()
+ {
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
+ || deviceEnumInfo.IsHdlDevice == false)
+ {
+ return;
+ }
+ //宸ヤ綔妯″紡
+ string caption = Language.StringByID(R.MyInternationalizationString.uWorkMode);
+ var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnFunction);
+ btnFunction.AddLeftCaption(caption, 600);
+ //鍚戝彸鍥炬爣
+ btnFunction.AddRightArrow();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DevicePirSensor.PirSensorWorkModeMenuForm();
+ form.AddForm((IASZone)this.listNewDevice[0]);
+ };
+ }
+
+ #endregion;
+
#region 鈻� 缁戝畾鐩爣(pir浼犳劅鍣ㄤ笓鐢�)____________
/// <summary>
@@ -527,6 +784,31 @@
//鍙湁鍥炶矾鏁板ぇ浜�1鎵嶈兘鏈夎繖涓彍鍗�
if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
{
+ //鏂伴灏忔ā鍧楀彧鏈変竴涓洖璺紝浣嗚姹傛柊椋庡皬妯″潡鐨勬柊椋庢湁鍔熻兘璁剧疆
+ if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
+ {
+ return;
+ }
+ }
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ //鐜闈㈡澘娌℃湁鍔熻兘璁剧疆
+ return;
+ }
+
+ //2020.03.06鏂拌拷鍔狅細濡傛灉鍏ㄩ儴閮芥槸骞叉帴鐐圭殑璇�,涔熶笉鑳芥湁杩欎釜涓滆タ
+ int dryContactCount = 0;
+ for (int i = 0; i < listNewDevice.Count; i++)
+ {
+ if (listNewDevice[i].Type == DeviceType.OnOffSwitch)
+ {
+ dryContactCount++;
+ }
+ }
+ if (listNewDevice.Count == dryContactCount)
+ {
+ //杩欎釜璁惧鍏ㄦ槸骞叉帴鐐�
return;
}
@@ -541,8 +823,25 @@
btnFunction.AddBottomLine();
btnFunction.ButtonClickEvent += (sender, e) =>
{
+ //鏂规偊闈㈡澘
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+ {
+ var form = new DevicePanel.PanelFangyueFunctionSettionForm();
+ form.AddForm(listNewDevice[0], deviceEnumInfo);
+ }
+ //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ var form = new DeviceFunctionSettionForm();
+ if (listNewDevice.Count > 62)
+ {
+ form.AddForm(listNewDevice[62], true);
+ }
+ }
//娌充笢鐨勯潰鏉胯澶�
- if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
+ else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
{
var form = new DevicePanel.PanelFunctionSettionForm();
form.AddForm(listNewDevice[0]);
@@ -552,6 +851,27 @@
var form = new DeviceFunctionSettionForm();
form.AddForm(listNewDevice[0], false);
}
+ };
+ }
+
+ /// <summary>
+ /// 娣诲姞浼犳劅鍣ㄣ�愬姛鑳借缃�戣
+ /// </summary>
+ private void AddFunctionSettionRowPM()
+ {
+ //鍔熻兘璁剧疆
+ string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);
+ var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnFunction);
+ btnFunction.AddLeftCaption(caption, 600);
+ //鍚戝彸鍥炬爣
+ btnFunction.AddRightArrow();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(listNewDevice[0], false);
};
}
@@ -629,15 +949,29 @@
var btnSwitch = btnFunction.AddMostRightSwitchIcon();
//搴曠嚎
btnFunction.AddBottomLine();
- btnSwitch.ButtonClickEvent += async (sender, e) =>
+ btnSwitch.ButtonClickEvent += (sender, e) =>
{
//鍒囨崲妯″紡
- var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, !btnSwitch.IsSelected);
+ bool statu = !btnSwitch.IsSelected;
+ var result = HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
if (result == true)
{
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ btnSwitch.IsSelected = statu;
}
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+ return;
+ }
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+ return;
+ }
//娣诲姞灞炴�т笂鎶ョ洃鍚�
string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);
@@ -655,7 +989,10 @@
//鎵嬫媺鎺у埗
if (0 < (attriBute.AttriButeData & 0x04))
{
- btnSwitch.IsSelected = true;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnSwitch.IsSelected = true;
+ });
}
}
}
@@ -673,10 +1010,12 @@
/// </summary>
private void AddIndoorUnitSettionRow()
{
- if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway
+ || this.listNewDevice[0] is OTADevice)//杩藉姞锛氬崟绾彧鏈�200绔偣鐨勮瘽锛屼笉鏄剧ず杩欎釜鑿滃崟
{
return;
}
+
//瀹ゅ唴鏈鸿缃�
string caption = Language.StringByID(R.MyInternationalizationString.uIndoorUnitSettion);
var btnFunction = new FrameRowControl(listview.rowSpace / 2);
@@ -691,6 +1030,399 @@
var form = new DeviceAirConditioner.IndoorUnitListForm();
form.AddForm(listNewDevice[0].DeviceAddr);
};
+ }
+ #endregion
+
+ #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
+ /// <summary>
+ /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
+ /// </summary>
+ private void AddIBindRow(string deviceMac)
+ {
+ string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);
+ var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnBindTargets);
+ btnBindTargets.AddLeftCaption(bindTargets, 600);
+ //鍚戝彸鍥炬爣
+ btnBindTargets.AddRightArrow();
+ //搴曠嚎
+ btnBindTargets.AddBottomLine();
+ btnBindTargets.ButtonClickEvent += (sender, e) =>
+ {
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
+ if (dev != null)
+ {
+ var curControlDev = dev as Panel;
+ var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ simpleMutilfunctionTargetsPage.Show();
+ }
+ };
+ }
+
+ #region 鈻� 鎺ヨ繎鎰熷簲___________________________
+
+ /// <summary>
+ /// 鎺ヨ繎鎰熷簲琛�
+ /// </summary>
+ private void AddProximitySensorsRow(string deviceMac)
+ {
+ string proximity = Language.StringByID(R.MyInternationalizationString.ProximitySensors);
+ var proximitySensors = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(proximitySensors);
+ proximitySensors.AddLeftCaption(proximity, 400);
+
+ //鎺ヨ繎鎰熷簲
+ proximitySensors.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
+ //寮�鍏虫帶浠�
+ var btnSwitch = proximitySensors.AddMostRightSwitchIcon();
+ //搴曠嚎
+ proximitySensors.AddBottomLine();
+
+ btnSwitch.ButtonClickEvent +=async (sender, e) =>
+ {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ proximitySensorsInfo.enable = btnSwitch.IsSelected;
+
+ //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+ if (dev != null)
+ {
+ var key = new ZigBee.Device.Panel();
+ key.DeviceAddr = deviceMac;
+ key.CurrentGateWayId = dev.CurrentGateWayId;
+ SetProximitySensor(key);
+ }
+ };
+ if (proximitySensorsInfo.enable == true)
+ {
+ btnSwitch.IsSelected = true;
+ }
+ }
+ #endregion
+
+ #region 鈻� 鏁版嵁鐭_________________________
+ /// <summary>
+ /// 鏁版嵁鐭琛�
+ /// </summary>
+ private void DataCorrectionRow(string deviceMac)
+ {
+ //鏁版嵁鐭
+ var rowLight = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowLight);
+ rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.DataCorrection), 600);
+ //搴曠嚎
+ rowLight.AddBottomLine();
+ //鍙崇澶�
+ rowLight.AddRightArrow();
+ rowLight.ButtonClickEvent += (sender, e) =>
+ {
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var device = new CommonDevice();
+ if (dev != null)
+ {
+ device.CurrentGateWayId = dev.CurrentGateWayId;
+ }
+ device.DeviceAddr = deviceMac;
+ device.DeviceEpoint = 65;
+ var form = new Shared.Phone.UserCenter.DevicePanel.DataCorrectionForm();
+ form.AddForm(device);
+ };
+ }
+ #endregion
+
+ /// <summary>
+ /// 婀垮害鏉ユ簮琛�
+ /// </summary>
+ private void AddHumiditySourceRow(string deviceMac)
+ {
+ //婀垮害
+ var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowHumidity);
+ rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
+ //搴曠嚎
+ rowHumidity.AddBottomLine();
+ //鍙崇澶�
+ rowHumidity.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ if (!string.IsNullOrEmpty(bindHumidityName))
+ {
+ msg = bindHumidityName;
+ }
+ var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
+ rowHumidity.ButtonClickEvent += (sender, e) =>
+ {
+
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var device = new CommonDevice();
+ if (dev != null)
+ {
+ device.CurrentGateWayId = dev.CurrentGateWayId;
+ }
+ device.Type = DeviceType.OnOffSwitch;
+ device.DeviceAddr = deviceMac;
+ device.DeviceEpoint = 1;//鑳界粦瀹氭箍搴︾殑鍥炶矾
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (string.IsNullOrEmpty(bindName))
+ {
+ btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ }
+ else
+ {
+ btnHumidityStatu.Text = bindName;
+ }
+ });
+ };
+ };
+ }
+
+ /// <summary>
+ /// 娓╁害鏉ユ簮琛�
+ /// </summary>
+ private void AddTemperatureSensorRow(string deviceMac)
+ {
+ //娓╁害鏉ユ簮
+ var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowTemPerature);
+ rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
+ //搴曠嚎
+ rowTemPerature.AddBottomLine();
+ //鍙崇澶�
+ rowTemPerature.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ if (!string.IsNullOrEmpty(bindTemperatureName))
+ {
+ msg = bindTemperatureName;
+ }
+ var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
+ rowTemPerature.ButtonClickEvent += (sender, e) =>
+ {
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var device = new CommonDevice();
+ if (dev != null)
+ {
+ device.CurrentGateWayId = dev.CurrentGateWayId;
+ }
+ device.Type = DeviceType.OnOffSwitch;
+ device.DeviceAddr = deviceMac;
+ device.DeviceEpoint = 1;//鑳界粦瀹氭俯搴︾殑鍥炶矾
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (string.IsNullOrEmpty(bindName))
+ {
+ btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ }
+ else
+ {
+ btnTemperatureStatu.Text = bindName;
+ }
+ });
+ };
+ };
+ }
+
+ /// <summary>
+ ///鍒濆鍖栨暟鎹�
+ /// </summary>
+ void InitBindInfo(CommonDevice curControlDev)
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Start("");
+ });
+ //璇绘俯婀垮害鏁版嵁
+ curControlDev.DeviceEpoint = 1;
+ var result = await GetBindName(curControlDev);
+ if (!result)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
+
+ //2銆佽幏璁惧鎺ヨ繎鎰熷簲鍒濆鏁版嵁
+ //鎺ヨ繎鎰熷簲(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+ proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev);
+ if (proximitySensorsInfo == null)
+ {
+ proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return ;
+ }
+ }
+ catch (Exception ex)
+ {
+ var mess = ex.Message;
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //鍒濆鍖栧彸涓婅鑿滃崟
+ this.InitTopRightMenu();
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鑾峰彇缁戝畾鐨勬俯婀垮害鐩爣
+ /// </summary>
+ /// <param name="curControlDev"></param>
+ /// <returns></returns>
+ private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev)
+ {
+ bool result = false;
+ var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+ if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
+ {
+ bindList = panelBindListRes.getAllBindResponseData.BindList;
+ foreach (var bDev in bindList)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ if (device == null)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var bD = device as TemperatureSensor;
+ if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
+ {
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ }
+ else
+ {
+ bindTemperatureName = bDev.ESName;
+ }
+ bindTemperatureDev = device;
+ }
+ if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
+ {
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
+ bindHumidityDev = device;
+ }
+ }
+ if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
+ bindHumidityDev = device;
+ }
+ }
+ result = true;
+ }
+ return result;
+ }
+
+ #region 鈻� 璁剧疆鏁版嵁___________________________
+
+ /// <summary>
+ /// 璁剧疆闈㈡澘鎺ヨ繎鎰熷簲鏁版嵁
+ /// </summary>
+ private void SetProximitySensor(CommonDevice curControlDev)
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Start("");
+ });
+ //鎺ヨ繎鎰熷簲(鎻愪緵璁惧鐨勫悓浜嬭闅忎究涓�涓洖璺氨琛�)
+ var result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(curControlDev, proximitySensorsInfo.enable);
+ if (result == false)
+ {
+ return;
+ }
+ } catch (Exception ex)
+ {
+ var mess = ex.Message;
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+
+ #endregion
+ #endregion
+
+ #region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________
+
+ /// <summary>
+ /// 娣诲姞銆愬姛鑳界被鍨嬨�戣(绌烘皵寮�鍏充笓鐢�)
+ /// </summary>
+ private void AddAirSwitchFunctionTypeRow()
+ {
+ //2020.04.28鍙樻洿:鏈変釜鍒澶囧畠闄や簡缁х數鍣ㄥ洖璺紝浠�涔堥兘娌℃湁浜�,
+ //杩欎釜鏃跺�欎篃瑕佺幇瀹炲嚭鏉�
+ if (this.listNewDevice.Count != 1)
+ {
+ return;
+ }
+ if (this.listNewDevice[0].Type != DeviceType.OnOffOutput
+ && this.listNewDevice[0].Type != DeviceType.AirSwitch)
+ {
+ return;
+ }
+ //鑷畾涔夊姛鑳界被鍨嬫帶浠�
+ var rowFunction = new DeviceFunctionTypeRowControl(this.listNewDevice[0], listview.rowSpace / 2);
+ listview.AddChidren(rowFunction);
+ rowFunction.InitControl();
+ //搴曠嚎
+ rowFunction.AddBottomLine();
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowFunction.CanClick = false;
+ }
}
#endregion
@@ -715,6 +1447,38 @@
var form = new DeviceGeneralInformationForm();
form.AddForm(listNewDevice[0].DeviceAddr);
};
+ }
+
+ #endregion
+
+ #region 鈻� 绌鸿皟妯″潡鐗堟湰(绌鸿皟涓撶敤)_____________
+
+ /// <summary>
+ /// 娣诲姞銆愮┖璋冩ā鍧楃増鏈�戣(娌充笢鐨勪腑澶┖璋�)
+ /// </summary>
+ private void AddAirConditionerModelVersionRow()
+ {
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
+ {
+ //涓嶆槸涓ぎ绌鸿皟
+ return;
+ }
+ string caption = Language.StringByID(R.MyInternationalizationString.uAirConditionerModelVersion);
+ var rowVersion = new FrameRowControl(listview.rowSpace / 2);
+ rowVersion.UseClickStatu = false;
+ listview.AddChidren(rowVersion);
+ rowVersion.AddLeftCaption(caption, 600);
+ //鐗堟湰
+ this.btnAirConditionerVersion = rowVersion.AddMostRightView(string.Empty, 900);
+ if (this.listNewDevice[0] is AC)
+ {
+ this.btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;
+ }
+ //搴曠嚎
+ rowVersion.AddBottomLine();
+
+ //鑾峰彇涓ぎ绌鸿皟妯″潡鐨勭増鏈�
+ this.ReadAirConditionerVersion();
}
#endregion
@@ -749,17 +1513,32 @@
btnNewVersion.Visible = false;
btnNewVersion.X = Application.GetRealWidth(242);
btnNewVersion.Y = Application.GetRealHeight(23);
- rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
+ rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);
rowUpDate.ButtonClickEvent += (sender, e) =>
{
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
+ {
+ //杩欎釜鏄竴鑸澶囩殑鍗囩骇
+ var form = new DeviceFirmwareUpdateForm();
+ form.AddForm(listNewDevice[0].DeviceAddr);
+ }
+ else
+ {
+ //涓ぎ绌鸿皟鐨勫崌绾х殑璇濓紝鏄壒娈婄殑
+ var form = new DeviceAirConditioner.ACZbGatewayUpdateMenuForm();
+ form.AddForm(listNewDevice[0], btnNewVersion.Visible);
+ }
btnNewVersion.Visible = false;
- var form = new DeviceFirmwareInfoForm();
- form.AddForm(listNewDevice[0].DeviceAddr);
};
- //璁剧疆璁惧鐨勭増鏈俊鎭�
- this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
+ //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
+ if (Config.Instance.Home.IsVirtually == false
+ && Config.Instance.Home.IsShowTemplate == false)
+ {
+ //璁剧疆璁惧鐨勭増鏈俊鎭�
+ this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
+ }
}
/// <summary>
@@ -769,43 +1548,55 @@
/// <param name="oTADevice">ota璁惧</param>
private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
bool receiveImageInfo = false;
//璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
- HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) =>
+ string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
- receiveImageInfo = true;
+ if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
+ {
+ string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
+ if (checkKey == mainKey)
+ {
+ //宸茬粡鎺ユ敹寰楀埌
+ receiveImageInfo = true;
+ }
+ }
});
+ //鍙戦�佸懡浠�
+ HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
+
int count = 5;
while (receiveImageInfo == false && count > 0)
{
//绛夊緟璁惧闀滃儚鐨勫弽棣�
- await Task.Delay(300);
+ System.Threading.Thread.Sleep(300);
count--;
}
//绉婚櫎浜嬩欢
- HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
- var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+ var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString(),
oTADevice.ImgVersion);
if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (btnNewVersion != null)
{
btnNewVersion.Visible = true;
}
- });
+ }, ShowErrorMode.NO);
}
});
}
@@ -818,17 +1609,11 @@
/// 璁惧閲嶅懡鍚�
/// </summary>
/// <param name="i_deviceName">deviceName.</param>
- private async void DeviceReName(string i_deviceName, bool closeForm)
+ private void DeviceReName(string i_deviceName, bool closeForm)
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
//淇敼MAC鍚�
string deviceName = i_deviceName.Trim();
- var result = await Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
-
+ var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
if (result == false)
{
return;
@@ -855,6 +1640,11 @@
/// </summary>
private void InitTopRightMenu()
{
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -871,15 +1661,21 @@
/// </summary>
private void ShowTopRightMenu()
{
- int menuCount = 1;
- string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭ｄ釜鍥炶矾鍘诲畾浣�)
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
- if (canTest == true)
+
+ TopRightMenuControl frame = null;
+
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
- menuCount = 2;
+ frame = new TopRightMenuControl(3, 1);
}
- var frame = new TopRightMenuControl(menuCount);
+ else
+ {
+ frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
+ }
+
+ string deviceMenu = string.Empty;
if (canTest == true)
{
//瀹氫綅
@@ -895,6 +1691,11 @@
deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
{
+ //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return;
+ }
//纭鍒犻櫎璇ヨ澶囧強鍔熻兘锛�
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteDeviceMsg);
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
@@ -904,21 +1705,70 @@
});
});
+ //鍚屾
+ deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
+ {
+ frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
+ {
+ //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return;
+ }
+
+ //鍚屾鎸囧畾璁惧
+ this.SynchronizationDevice();
+ });
+ }
+
}
/// <summary>
/// 鍒犻櫎鎸囧畾璁惧
/// </summary>
- private async void DoDeleteDevice()
+ private void DoDeleteDevice()
{
- //鍒犻櫎璁惧
- bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(async () =>
{
- return;
- }
- //鍏抽棴鐣岄潰
- this.CloseForm();
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍒犻櫎璁惧
+ bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ });
+ });
+ }
+
+ /// <summary>
+ /// 鍚屾鎸囧畾璁惧
+ /// </summary>
+ private void SynchronizationDevice()
+ {
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍚屾璁惧
+ bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ });
}
#endregion
@@ -930,8 +1780,13 @@
public override void CloseFormBefore()
{
HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
- //绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋�
- HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
+
+ //璁惧鏂板叆缃�
+ if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
+ {
+ this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });
+ }
base.CloseFormBefore();
}
@@ -945,27 +1800,104 @@
/// </summary>
private void RefreshHardFirmwareInfo()
{
- if (listNewDevice[0].DriveCode > 0)
+ if (listNewDevice[0].DriveCode > 0 || Common.Config.Instance.Home.IsShowTemplate == true)
{
//铏氭嫙璁惧娌℃湁杩欑鎿嶄綔
return;
}
//閲嶆柊鑾峰彇纭欢淇℃伅
- HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0], (device, reportData) =>
- {
- for (int i = 1; i < listNewDevice.Count; i++)
- {
- //鍏ㄩ儴鍥炶矾鐨勪俊鎭兘鏄竴鑷寸殑
- HdlDeviceHardInfoLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, listNewDevice[i]);
- listNewDevice[i].ReSave();
- }
- });
+ HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+
+ /// <summary>
+ /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
+ /// </summary>
+ public override int FormActionAgainEvent()
+ {
+ //閲嶆柊鑾峰彇涓ぎ绌鸿皟妯″潡鐨勭増鏈�
+ this.ReadAirConditionerVersion();
+
+ return 0;
}
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
+ /// <summary>
+ /// 鑾峰彇涓ぎ绌鸿皟妯″潡鐨勭増鏈�
+ /// </summary>
+ private void ReadAirConditionerVersion()
+ {
+ if (this.btnAirConditionerVersion == null)
+ {
+ return;
+ }
+ //濡傛灉鏄櫄鎷熶綇瀹呮垨鑰呭睍绀烘ā鏉跨殑璇�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ return;
+ }
+
+ bool notVersion = true;
+ if (this.listNewDevice[0] is AC)
+ {
+ notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;
+ }
+ if (notVersion == true)
+ {
+ //鑾峰彇涓�
+ btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ }
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ //璇诲彇绌鸿皟妯″潡鐗堟湰
+ var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);
+ if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)
+ {
+ if (notVersion == true)
+ {
+ //鑾峰彇澶辫触
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
+ });
+ }
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ string strVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
+ if (this.listNewDevice[0] is AC)
+ {
+ ((AC)this.listNewDevice[0]).AcModelVersion = strVersion;
+ this.listNewDevice[0].ReSave();
+ }
+ btnAirConditionerVersion.Text = strVersion;
+ });
+ });
+ }
+
+ /// <summary>
+ /// 妫�娴嬭兘鍚︽樉绀哄姛鑳借缃殑鑿滃崟
+ /// </summary>
+ /// <returns></returns>
+ private bool CheckCanShowFunctionSettionRow()
+ {
+ //鏂规偊鏂伴闈㈡澘娌℃湁鍔熻兘璁剧疆
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FourButtonScene
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
+ {
+ return false;
+ }
+ return true;
+ }
+
#endregion
}
}
--
Gitblit v1.8.0