From bd46c57c77c276014db3192a4e2cc96e23c93202 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 二月 2020 13:08:47 +0800
Subject: [PATCH] 先上传个版本吧
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 155 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 128 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 5e47e00..7fb6fe1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -43,6 +43,8 @@
/// </summary>
public void ShowForm()
{
+ this.ScrollEnabled = false;
+
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.DeviceManagement));
@@ -132,21 +134,10 @@
frame.AddChidren(listView);
listView.BeginHeaderRefreshingAction += () =>
{
- //涓嬫媺鍒锋柊
HdlThreadLogic.Current.RunThread(() =>
{
- //鑾峰彇鍏ㄩ儴璁惧
- bool result = LocalDevice.Current.SetDeviceToMemmoryByGateway(GatewayResourse.NowSelectGateway);
- HdlThreadLogic.Current.RunMain(() =>
- {
- //闅愯棌涓嬫媺鍒锋柊鐗规晥
- listView.EndHeaderRefreshing();
- if (result == true)
- {
- //閲嶆柊鍒锋柊鐣岄潰
- this.InitMiddleFrame(false);
- }
- });
+ //涓嬫媺鍒锋柊
+ this.ListViewBeginHeaderRefreshing();
});
};
}
@@ -163,6 +154,8 @@
//鑾峰彇璁惧鍒楄〃
string gwID = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(gwID);
+ var listSpecialOta = Common.LocalDevice.Current.GetSpecialOtaDevice(gwID);
+ listDevice.AddRange(listSpecialOta);
this.dicRowInfo.Clear();
@@ -175,6 +168,10 @@
//鏍规嵁MAC鍚堝苟璁惧鍒楄〃
this.MargeAllDeviceByMac(listDevice);
+ if (this.Parent == null)
+ {
+ return;
+ }
HdlThreadLogic.Current.RunMain(() =>
{
var listOta = new List<OTADevice>();
@@ -234,7 +231,7 @@
//妫�娴嬭澶囨槸鍚︽嫢鏈夊畾浣嶇殑鍔熻兘
var listdevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
- if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)
+ if (listdevice.Count > 0 && Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)
{
//瀹氫綅
var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowMenu.Height, false);
@@ -396,14 +393,54 @@
//pir浼犳劅鍣�
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)
{
- var form = new DevicePirSensor.PirSensorBindTargetSettionForm();
- form.AddForm((IASZone)device);
+ if (device is IASZone)
+ {
+ var form = new DevicePirSensor.PirSensorBindTargetSettionForm();
+ form.AddForm((IASZone)device);
+ }
+ else
+ {
+ //pir浼犳劅鍣�,浠栦滑鍙堟悶浜嗕釜缁х數鍣ㄥ湪閲岄潰
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
}
//涓ぎ绌鸿皟
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.AirConditioner_ZbGateway)
{
var form = new DeviceAirConditioner.IndoorUnitSettionForm();
form.AddForm((AC)device);
+ }
+ //鐜闈㈡澘
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
+ //鏂规偊闈㈡澘
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+ {
+ //骞叉帴鐐�
+ if (device.Type == DeviceType.OnOffSwitch)
+ {
+ //鏂规偊闈㈡澘鐨勬寜閿厤缃�
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(device);
+ }
+ //缁х數鍣�
+ else if (device.Type == DeviceType.OnOffOutput)
+ {
+ //鏂规偊闈㈡澘鐨勫姛鑳介厤缃�
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(device);
+ }
+ else
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
}
//闈㈡澘璁惧
else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
@@ -437,12 +474,6 @@
var form = new DeviceFunctionSettionForm();
form.AddForm(device, true);
}
- }
- //娓╂箍搴�
- else if (device.Type == DeviceType.TemperatureSensor)
- {
- var form = new DeviceFunctionSettionForm();
- form.AddForm(device, true);
}
else
{
@@ -515,6 +546,60 @@
}
});
}
+ }
+
+ #endregion
+
+ #region 鈻� 涓嬫媺鍒锋柊___________________________
+
+ /// <summary>
+ /// 婊戝姩鎺т欢涓嬫媺鍒锋柊
+ /// </summary>
+ private async void ListViewBeginHeaderRefreshing()
+ {
+ //濡傛灉鏄湪绾跨殑
+ if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(GatewayResourse.NowSelectGateway) == true)
+ {
+ //妫�娴嬪箍鎾埌鐨勮繖涓綉鍏虫槸鍚︽嫢鏈変綇瀹匢D
+ ZbGateway realWay = null;
+ if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, GatewayResourse.NowSelectGateway) == true)
+ {
+ //閲嶆柊璁剧疆浣忓畢ID(杩欎釜搴旇鏄笉缁忚繃APP,鐩存帴鎶婄綉鍏虫仮澶嶄簡鍑哄巶璁剧疆)
+ if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.getGatewayBaseInfo.HomeId) == true)
+ {
+ //鏄剧ず杩涘害鏉�
+ ProgressBar.Show();
+ int result2 = await HdlGatewayLogic.Current.ReBindNewGateway(realWay);
+ //鍏抽棴杩涘害鏉�
+ ProgressBar.Close();
+ if (result2 == -1)
+ {
+ return;
+ }
+ }
+ }
+ }
+ if (this.Parent == null)
+ {
+ return;
+ }
+
+ //鑾峰彇鍏ㄩ儴璁惧
+ int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(GatewayResourse.NowSelectGateway);
+ if (this.Parent == null)
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //闅愯棌涓嬫媺鍒锋柊鐗规晥
+ listView.EndHeaderRefreshing();
+ if (result != -1)
+ {
+ //閲嶆柊鍒锋柊鐣岄潰
+ this.InitMiddleFrame(false);
+ }
+ });
}
#endregion
@@ -616,7 +701,16 @@
{
//杩欓噷涓昏鍙槸鑾峰彇鍦ㄧ嚎鐘舵��
var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
- var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatu, ShowErrorMode.NO);
+ int statu = 0;
+ var list = LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
+ if (statu != -1)
+ {
+ for (int i = 0; i < list.Count; i++)
+ {
+ //璁剧疆璁惧鍦ㄧ嚎鐘舵��
+ this.ReceiveDeviceStatu(list[i]);
+ }
+ }
});
}
@@ -778,8 +872,14 @@
var localDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr);
if (localDevice.Count == 0)
{
- //鍏ョ綉涔嬪悗锛屽張鎶婂畠鍒犱簡
- return;
+ //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+ var ota = Common.LocalDevice.Current.GetOTADevice(deviceAddr);
+ if (ota == null)
+ {
+ //鍏ョ綉涔嬪悗锛屽張鎶婂畠鍒犱簡
+ return;
+ }
+ localDevice.Add(ota);
}
var rowNewInfo = new DeviceObjRowInfo();
rowNewInfo.DeviceMac = deviceAddr;
@@ -839,8 +939,9 @@
if (this.nowActionDeviceMac != null)
{
var rowInfo = this.dicRowInfo[nowActionDeviceMac];
- //妫�娴嬭繖涓澶囨槸鍚﹁鍒犻櫎
- if (Common.LocalDevice.Current.GetDevicesByMac(nowActionDeviceMac).Count == 0)
+ //妫�娴嬭繖涓澶囨槸鍚﹁鍒犻櫎 2020.01.13鍙樻洿:杩藉姞Ota璁惧鐨勫垽鏂�
+ if (Common.LocalDevice.Current.GetDevicesByMac(nowActionDeviceMac).Count == 0
+ && Common.LocalDevice.Current.GetOTADevice(nowActionDeviceMac) == null)
{
//绉婚櫎鎺т欢
rowInfo.dicDetailRow = null;
--
Gitblit v1.8.0