From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
old mode 100755
new mode 100644
index 6af7fad..913be70
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -476,7 +476,16 @@
var listDevice = new List<CommonDevice>();
for (int i = 0; i < rowInfo.listDeviceKeys.Count; i++)
{
- var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);
+ var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);
+
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ //鏂伴闈㈡澘涓嬬殑鍥炶矾涓嶆樉绀猴紝锛堝鏂伴銆佹俯/婀垮害浼犳劅鍣ㄥ垯涓嶆樉绀猴級
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ continue;
+ }
+
if (device != null)
{
listDevice.Add(device);
@@ -511,6 +520,11 @@
}
//绌鸿皟
else if (device.Type == DeviceType.Thermostat)
+ {
+ cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);
+ }
+ // 鏂伴
+ else if (device.Type == DeviceType.FreshAir)
{
cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);
}
@@ -611,21 +625,43 @@
}
var dicSceneContr = new Dictionary<int, SceneCategoryView>();
- var listview = new VerticalListControl();
- functionSceneBodyView.AddChidren(listview);
+ //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
+ VerticalListRefreshControl listview1 = null;
+ //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
+ VerticalListControl listview2 = null;
+ //if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ //{
+ // listview1 = new VerticalListRefreshControl();
+ // functionSceneBodyView.AddChidren(listview1);
+ //}
+ //else
+ {
+ listview2 = new VerticalListControl();
+ functionSceneBodyView.AddChidren(listview2);
+ }
+
foreach (var scene in listScene)
{
//鍦烘櫙鍗＄墖鎺т欢
var sceneView = new SceneCategoryView();
- listview.AddChidren(sceneView);
+ listview1?.AddChidren(sceneView);
+ listview2?.AddChidren(sceneView);
sceneView.InitControl(scene, room);
dicSceneContr[scene.Id] = sceneView;
}
HdlThreadLogic.Current.RunThread(() =>
{
- //鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
- this.GetAllDelayScene(dicSceneContr, listview);
+ if (listview1 != null)
+ {
+ //鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
+ this.GetAllDelayScene(dicSceneContr, listview1);
+ }
+ else
+ {
+ //鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
+ this.GetAllDelayScene(dicSceneContr, listview2);
+ }
}, ShowErrorMode.NO);
}
@@ -633,7 +669,7 @@
/// 鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
/// </summary>
/// <param name="dicSceneContr"></param>
- private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, VerticalListControl listview)
+ private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, ViewGroup listview)
{
//璇诲彇鍏ㄩ儴鐨勫欢鏃舵椂闂�
var result = await Scene.CatDelaySceneAsync();
--
Gitblit v1.8.0