From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 48 ++++++++----------------------------------------
1 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index 52239f1..ead44e9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -72,7 +72,7 @@
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
- this.gatewayId = HdlGatewayResourse.NowSelectGatewayId;
+ this.gatewayId = GatewayResourse.NowSelectGatewayId;
HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);
//鍒濆鍖栦腑閮ㄦ帶浠�
@@ -163,7 +163,7 @@
return;
}
//鏍规嵁璁惧Type鍒涘缓瀵瑰簲鐨勮澶囧璞�
- var device = HdlDeviceCommonLogic.Current.NewDeviceObjectByDeviceId((DeviceType)jobject.Value<int>("Device_ID"), jobject.Value<int>("Epoint"));
+ var device = Common.LocalDevice.Current.NewDeviceObjectByDeviceId((DeviceType)jobject.Value<int>("Device_ID"), jobject.Value<int>("Epoint"));
if (device == null)
{
return;
@@ -171,14 +171,14 @@
device.DeviceInfo = info;
//缁欐柊璁惧璁剧疆涓婚敭灞炴��
- HdlDeviceCommonLogic.Current.SetNewDeviceMainKeys(device, jobject);
+ Common.LocalDevice.Current.SetNewDeviceMainKeys(device, jobject);
device.CurrentGateWayId = this.realGateway.GwId;
//灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
- HdlDeviceCommonLogic.Current.SetDeviceInfoToMain(device, device);
+ Common.LocalDevice.Current.SetDeviceInfoToMain(device, device);
//娣诲姞璁惧鐨勭紦瀛�
device.IsOnline = 1;
- HdlDeviceCommonLogic.Current.AddDeviceToMemory(ref device);
+ Common.LocalDevice.Current.AddDeviceToMemory(ref device);
//鍒锋柊瓒呮椂鏃堕棿
this.waitDeviceTimeOut = 20;
@@ -236,17 +236,14 @@
device.ReSave();
//璁剧疆璁惧鍔熻兘绫诲瀷 (涓嶈兘鍦ㄦ帴鏀跺洖璺殑鍦版柟鍐欏叆,涓嶇劧缃戝叧鍙兘浼氳秴璐熻嵎)
- HdlDeviceCommonLogic.Current.RefreshDeviceFunctionType(device, device, true);
+ Common.LocalDevice.Current.RefreshDeviceFunctionType(device, device, true);
System.Threading.Thread.Sleep(200);
//鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
- if (HdlDeviceAttributeLogic.Current.ReadDeviceAllFixedAttribute(device) == true)
+ if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
{
System.Threading.Thread.Sleep(200);
}
}
-
- //璇诲彇璁惧鐨勫叾浠栦俊鎭�
- this.ReadDeviceOtherInfo(listDevice);
//鐩墠灏卞紕涓�涓�
HdlThreadLogic.Current.RunMain(() =>
@@ -272,7 +269,7 @@
if (this.targetFormId != string.Empty)
{
//鍐嶅叧闂澶囧叆缃戞寚瀵肩晫闈�
- HdlFormLogic.Current.CloseFormByFormName(this.targetFormId);
+ this.CloseFormByFormName(this.targetFormId);
}
//娣诲姞璁惧
@@ -545,35 +542,6 @@
});
}
base.CloseFormBefore();
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 璇诲彇璁惧鐨勫叾浠栦俊鎭�
- /// </summary>
- /// <param name="listDevice"></param>
- private void ReadDeviceOtherInfo(List<CommonDevice> listDevice)
- {
- var myTypeInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
- if (myTypeInfo.BeloneType == DeviceBeloneType.A绐楀笜 && listDevice[0] is Rollershade)
- {
- HdlThreadLogic.Current.RunThread(async () =>
- {
- for (int i = 1; i <= 3; i++)
- {
- //閲嶇疆绐楀笜
- var result = await HdlDeviceCurtainLogic.Current.RestoreCurtain((Rollershade)listDevice[0], i != 3 ? ShowErrorMode.NO : ShowErrorMode.YES);
- if (result == true)
- {
- return;
- }
- await System.Threading.Tasks.Task.Delay(1000);
- }
- });
- }
}
#endregion
--
Gitblit v1.8.0