From b02e8275a21dc06bf54b66273485d44e007a2616 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 20 七月 2020 14:50:17 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 72 +++++++----------------------------
1 files changed, 15 insertions(+), 57 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 87fda05..a91f411 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -14,6 +14,7 @@
public class DeviceMacInfoEditorForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
+
/// <summary>
/// 璁惧瀵硅薄
/// </summary>
@@ -101,13 +102,13 @@
{
//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
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);
- }
+ if (dev != null)
+ {
+ var key = new ZigBee.Device.Panel();
+ key.DeviceAddr = deviceMac;
+ key.CurrentGateWayId = dev.CurrentGateWayId;
+ InitBindInfo(key);
+ }
}
}
@@ -296,7 +297,7 @@
}
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
{
- //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
+ //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
this.AddSimplePanelSettionRow();
}
else
@@ -1163,7 +1164,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
@@ -1175,7 +1176,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
@@ -1211,9 +1212,9 @@
foreach (var bDev in bindList)
{
var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
- if (device == null)
- {
- continue;
+ if (device == null)
+ {
+ continue;
}
if (device.Type == DeviceType.TemperatureSensor)
{
@@ -1546,24 +1547,7 @@
//鍒犻櫎鎸囧畾璁惧
this.DoDeleteDevice();
});
- });
-
- //鍚屾
- 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();
- });
- }
+ });
//鍚屾
deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
@@ -1596,32 +1580,6 @@
//鍒犻櫎璁惧
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)
--
Gitblit v1.8.0