~wjc/HomeApp.git

			@@ -66,6 +66,7 @@
			{
			//先清除吧
			this.RemoveAll();

			//初始化头部控件
			this.InitTopControl();
			//初始化中间控件
			@@ -74,6 +75,8 @@
			this.AddNormalDeviceReportEvent();
			//添加传感器状态上报事件
			this.AddSensorDeviceReportEvent();
			//开启传感器状态还原的线程
			this.StartRecoverSenorStatuThread();
			}

			/// <summary>
			@@ -88,8 +91,8 @@
			topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
			this.AddChidren(topFrameLayout);
			//标题分类
			var btnTitle = new NormalViewControl(300, 95, true);
			btnTitle.X = ControlCommonResourse.XXLeft;
			var btnTitle = new NormalViewControl(400, 95, true);
			btnTitle.X = HdlControlResourse.XXLeft;
			btnTitle.Gravity = Gravity.CenterVertical;
			btnTitle.TextID = R.MyInternationalizationString.Category;
			btnTitle.TextSize = 24;
			@@ -105,7 +108,7 @@
			topFrameLayout.AddChidren(btnTopRightAdd);
			btnTopRightAdd.ButtonClickEvent += (sender, e) =>
			{
			if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
			if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
			{
			//添加场景
			var form = new AddOrEditorSceneForm();
			@@ -116,7 +119,7 @@
			this.RefreshBodyView();
			};
			}
			else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
			else if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
			{
			//添加自动化
			Device.Logic.SkipView.SkipAddLogic(0);
			@@ -152,18 +155,21 @@
			btnFloorName.Y = Application.GetRealHeight(17);
			btnFloorName.TextAlignment = TextAlignment.CenterRight;
			btnFloorName.IsBold = true;
			btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
			btnFloorName.Text = Common.Config.Instance.Home.GetCurrentFloorName;
			frameSwitchBack.AddChidren(btnFloorName);
			btnFloorName.ButtonClickEvent += (sender, e) =>
			{
			var floors = new SelectFloorForm();
			floors.CurFloorId = Config.Instance.Home.CurrentFloorId;
			AddChidren(floors);
			floors.Init(580, 330, Direction.Right);
			floors.changeFloor = true;
			floors.FloorAction += (floorId) =>
			{
			btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
			Config.Instance.Home.CurrentFloorId = floorId;
			HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();
			//这个时候需要刷新主页
			UserPage.Instance.RefreshMainPageForm = true;
			//刷新bodyView
			this.RefreshBodyView();
			};
			@@ -188,29 +194,30 @@

			//场景,功能,自动化的切换控件
			var switchContr = new SceneFunctionSwitchControl();
			switchContr.Y = Application.GetRealHeight(40);
			switchContr.Width = Application.GetRealWidth(650);
			switchContr.Gravity = Gravity.CenterVertical;
			frameSwitchBack.AddChidren(switchContr);
			var listTitle = new List<string>();
			listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
			listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
			if (UserCenterResourse.UserInfo.AuthorityNo == 1 \|\| UserCenterResourse.UserInfo.AuthorityNo == 2)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 \|\| HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
			{
			//成员没有自动化
			listTitle.Add(Language.StringByID(R.MyInternationalizationString.Automation));
			}
			//设置初始值
			switchContr.SetDefultIndex(UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex);
			switchContr.SetDefultIndex(HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex);
			//选择事件
			switchContr.SelectTabEvent += (selectIndex) =>
			{
			UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = selectIndex;
			HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = selectIndex;
			if (selectIndex == 2)
			{
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			Common.Logic.LogicDviceList.AddRange(HdlDeviceCommonLogic.Current.listAllDevice.ToArray());
			}
			}
			//刷新bodyView
			@@ -231,7 +238,7 @@
			{
			bool floorVisible = true;
			//场景
			if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
			if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
			{
			//初始化房间菜单
			this.InitRoomMenuControl();
			@@ -239,7 +246,7 @@
			this.btnTopRightAdd.Visible = true;
			}
			//功能
			else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
			else if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
			{
			//初始化房间菜单
			this.InitRoomMenuControl();
			@@ -247,7 +254,7 @@
			this.btnTopRightAdd.Visible = false;
			}
			//自动化
			else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
			else if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
			{
			//自动化功能代码入口
			Device.Logic.SkipView.ShowAutotionView(functionSceneAutoBodyView);
			@@ -276,7 +283,7 @@
			private void InitRoomMenuControl()
			{
			//当前楼层的全部房间
			var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
			var lisrRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
			if (HdlRoomLogic.Current.NowCategoryRoom == null)
			{
			//设置第一个为初始房间
			@@ -293,7 +300,7 @@
			{
			HdlRoomLogic.Current.NowCategoryRoom = selectRoom;
			//场景
			if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
			if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
			{
			//在外面清空(特效的问题)
			this.functionSceneBodyView.RemoveAll();
			@@ -304,7 +311,7 @@
			});
			}
			//功能
			else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
			else if (HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
			{
			//在外面清空(特效的问题)
			this.functionSceneBodyView.RemoveAll();
			@@ -348,14 +355,14 @@

			//设备菜单的白色背景
			var functionBack1 = new FrameLayout();
			functionBack1.X = ControlCommonResourse.XXLeft;
			functionBack1.X = HdlControlResourse.XXLeft;
			functionBack1.Height = Application.GetRealHeight(160);
			functionBack1.Width = Application.GetRealWidth(1028);
			functionBack1.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
			functionSceneBodyView.AddChidren(functionBack1);
			functionBack1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
			var functionBack2 = new FrameLayout();
			functionBack2.X = ControlCommonResourse.XXLeft;
			functionBack2.X = HdlControlResourse.XXLeft;
			functionBack2.Y = functionBack1.Bottom - Application.GetRealHeight(50);
			functionBack2.Height = Application.GetRealHeight(279 - 160 + 50);
			functionBack2.Width = Application.GetRealWidth(1028);
			@@ -365,14 +372,14 @@

			//设备菜单的左右滑动的控件
			var HorizontalView = new HorizontalScrolViewLayout();
			HorizontalView.X = Application.GetRealWidth(CommonFormResouce.X_Left);
			HorizontalView.X = HdlControlResourse.XXLeft;
			HorizontalView.Height = Application.GetRealHeight(279);
			HorizontalView.Width = Application.GetRealWidth(1028);
			functionSceneBodyView.AddChidren(HorizontalView);

			//设备的背景容器
			var frameDeviceBack = new FrameLayout();
			frameDeviceBack.X = ControlCommonResourse.XXLeft;
			frameDeviceBack.X = HdlControlResourse.XXLeft;
			frameDeviceBack.Y = HorizontalView.Bottom + Application.GetRealHeight(35);
			frameDeviceBack.BackgroundColor = UserCenterColor.Current.White;
			frameDeviceBack.Width = bodyFrameLayout.Width;
			@@ -389,11 +396,11 @@
			frameDeviceBack.AddChidren(listDeviceView);

			//上一次选择的菜单
			MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
			MainPage.Controls.DeviceFunctionMenuControl oldSelectContr = null;
			DeviceRowInfo nowSelectDeviceInfo = null;
			foreach (int Textid in dicGroupDevice.Keys)
			foreach (string strText in dicGroupDevice.Keys)
			{
			var rowInfo = dicGroupDevice[Textid];
			var rowInfo = dicGroupDevice[strText];

			//设备类型的容器
			var devieFrame = new FrameLayout();
			@@ -401,13 +408,13 @@
			HorizontalView.AddChidren(devieFrame);

			//菜单图片控件
			var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();
			var deviceObjContr = new MainPage.Controls.DeviceFunctionMenuControl();
			devieFrame.AddChidren(deviceObjContr);
			deviceObjContr.InitControl(Language.StringByID(Textid), rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
			deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);
			deviceObjContr.ButtonClickEvent += (sender, e) =>
			{
			//选择的是同一个东西的话,不处理
			if (nowSelectDeviceInfo.TextId != rowInfo.TextId)
			if (nowSelectDeviceInfo.Text != rowInfo.Text)
			{
			//上一次的菜单取消,本次菜单选择
			oldSelectContr.SetSelectStatu(false);
			@@ -452,16 +459,17 @@
			{
			//先清空
			listView.RemoveAll();
			this.dicDeviceRowControl = new Dictionary<string, Controls.DeviceRowCommon>();

			var listDevice = new List<CommonDevice>();
			for (int i = 0; i < rowInfo.listDeviceKeys.Count; i++)
			{
			var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);
			var device = HdlDeviceCommonLogic.Current.GetDevice(rowInfo.listDeviceKeys[i]);

			//获取设备类型的
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			//新风面板下的回路不显示，（如新风、温/湿度传感器则不显示）
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			continue;
			}
			@@ -550,13 +558,13 @@
			listView.AddChidren(cardContr);
			cardContr.InitControl(device, HdlRoomLogic.Current.NowCategoryRoom);
			//控件记录到缓存中
			this.dicDeviceRowControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr;
			this.dicDeviceRowControl[HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device)] = cardContr;
			//加缓存,然后发命令
			listContr.Add(cardContr);
			//控件被移除的回调函数
			cardContr.RowNeedRemoveEvent += () =>
			{
			string myKeys = LocalDevice.Current.GetDeviceMainKeys(cardContr.device);
			string myKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(cardContr.device);
			rowInfo.listDeviceKeys.Remove(myKeys);
			this.dicDeviceRowControl.Remove(myKeys);

			@@ -574,15 +582,30 @@
			}
			HdlThreadLogic.Current.RunThread(() =>
			{
			for (int i = 0; i < listContr.Count; i++)
			while (listView.Parent != null)
			{
			if (listView.Parent == null)
			bool hadSend = false;
			for (int i = 0; i < listContr.Count; i++)
			{
			return;
			if (listView.Parent == null)
			{
			return;
			}
			//如果还没有接收到数据,则再次发送
			if (listContr[i].ReceiveResponeResultStatu() == false)
			{
			//发送获取状态的命令
			listContr[i].SendStatuComand();
			hadSend = true;
			System.Threading.Thread.Sleep(200);
			}
			}
			System.Threading.Thread.Sleep(200);
			//发送获取状态的命令
			listContr[i].SendStatuComand();
			if (hadSend == false)
			{
			//如果已经全部回路都接收了网关回复,则不再二次发送
			break;
			}
			System.Threading.Thread.Sleep(2000);
			}

			}, ShowErrorMode.NO);
			@@ -603,7 +626,7 @@
			VerticalListRefreshControl listview1 = null;
			//成员专用不能刷新的控件
			VerticalListControl listview2 = null;
			if (UserCenterResourse.UserInfo.AuthorityNo == 1 \|\| UserCenterResourse.UserInfo.AuthorityNo == 2)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 \|\| HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
			{
			//主人，管理员专用刷新控件
			listview1 = new VerticalListRefreshControl();
			@@ -628,14 +651,18 @@
			HdlThreadLogic.Current.RunThread(() =>
			{
			//从网关刷新场景列表
			bool result = HdlSceneLogic.Current.RefreshSceneUIList();
			bool result = HdlSceneLogic.Current.RefreshSceneUIList(false);
			HdlThreadLogic.Current.RunMain(() =>
			{
			listview1.EndHeaderRefreshing();
			if (result == true)
			//listview1.Parent为null代表它切换房间了
			if (result == true && listview1.Parent != null)
			{
			//刷新场景的时候,关闭左划菜单的未分配界面
			MainPage.LeftListRoomViewFrom.Instance?.CloseUnallocatedRoomForm();
			//在外面清空(特效的问题)
			this.functionSceneBodyView.RemoveAll();

			HdlThreadLogic.Current.RunMainInThread(() =>
			{
			//刷新场景分支控件
			@@ -775,13 +802,13 @@
			while (remainTime > 0 && this.Parent != null)
			{
			System.Threading.Thread.Sleep(1000);
			Application.RunOnMainThread(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			sceneContr.SetTimeText(this.GetTimeString(remainTime, hourText, minuText, secondText));
			});
			}, ShowErrorMode.NO);
			remainTime--;
			}
			Application.RunOnMainThread(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (listview.Parent != null)
			{
			@@ -789,7 +816,7 @@
			//开启Loading特效
			sceneContr.StartLoadingApreal();
			}
			});
			}, ShowErrorMode.NO);
			});
			}

			@@ -808,15 +835,24 @@
			HdlThreadLogic.Current.RunMain(() =>
			{
			//处理一般设备的上报数据
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
			string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
			if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
			{
			//刷新卡片信息
			var locadevice = LocalDevice.Current.GetDevice(mainKeys);
			var locadevice = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
			//已经接收到网关的反馈 2020.05.09:删除Ack主题
			this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();
			//刷新控件
			this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
			if (locadevice.Type != DeviceType.IASZone)
			{
			//传感器不需要属性上报(但是那个球型传感器居然会属性上报)
			this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
			}
			else if (report.DeviceStatusReport.CluterID == 1)
			{
			//这个是电量推送
			this.dicDeviceRowControl[mainKeys].RefreshBatteryStatu();
			}
			}
			}, ShowErrorMode.NO);
			});
			@@ -826,11 +862,11 @@
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
			string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
			if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
			{
			//刷新卡片状态
			bool bolOnline = LocalDevice.Current.CheckDeviceIsOnline(report);
			bool bolOnline = HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(report);
			this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(bolOnline);
			return;
			}
			@@ -854,7 +890,7 @@
			HdlThreadLogic.Current.RunMain(() =>
			{
			//处理传感器上报数据
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
			string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
			if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
			{
			//开启行闪烁特效
			@@ -867,13 +903,52 @@

			#endregion

			#region ■ 传感器状态还原_____________________

			/// <summary>
			/// 开启传感器状态还原的线程
			/// </summary>
			private void StartRecoverSenorStatuThread()
			{
			HdlThreadLogic.Current.RunThread(() =>
			{
			while (this.Parent != null)
			{
			try
			{
			var dicControl = this.dicDeviceRowControl;
			foreach (var contr in dicControl.Values)
			{
			//如果是传感器,则刷新状态
			if (contr.device.Type == DeviceType.IASZone && contr.Parent != null
			&& ((IASZone)contr.device).iASInfo == null)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//设备状态必须刷新
			string statuText = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(contr.device);
			contr.SetDeviceStatuText(statuText);
			//传感器切换为灰色状态
			contr.SwitchRowStatuAppeal(false);
			}, ShowErrorMode.NO);
			}
			}
			System.Threading.Thread.Sleep(8000);
			}
			catch { System.Threading.Thread.Sleep(3000); }
			}
			});
			}

			#endregion

			#region ■ 整合设备___________________________

			/// <summary>
			/// 获取分组后的设备
			/// </summary>
			/// <returns></returns>
			private Dictionary<int, DeviceRowInfo> GetAllGroupDevice(Common.Room room)
			private Dictionary<string, DeviceRowInfo> GetAllGroupDevice(Common.Room room)
			{
			//全部的设备
			var listDeviceTemp = HdlRoomLogic.Current.GetRoomListDevice(room);
			@@ -881,7 +956,7 @@
			foreach (var device in listDeviceTemp)
			{
			//判断该设备能否显示在分类
			if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
			if (HdlDeviceCommonLogic.Current.CanShowInHomeHomeMainPage(device) == false)
			{
			continue;
			}
			@@ -889,24 +964,24 @@
			}

			//根据设备所属类型排序
			listDevice = LocalDevice.Current.SortDeviceByBelongType(listDevice);
			var dic = new Dictionary<int, DeviceRowInfo>();
			listDevice = HdlDeviceCommonLogic.Current.SortDeviceByBelongType(listDevice);
			var dic = new Dictionary<string, DeviceRowInfo>();
			foreach (var device in listDevice)
			{
			var typeInfo = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
			var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
			//按所属ID分组
			if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
			if (dic.ContainsKey(typeInfo.BeloneText) == false)
			{
			dic[typeInfo.BeloneTextId] = new DeviceRowInfo();
			dic[typeInfo.BeloneText] = new DeviceRowInfo();
			string path1 = string.Empty;
			string path2 = string.Empty;
			//获取图片
			LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
			dic[typeInfo.BeloneTextId].IconPath = path1;
			dic[typeInfo.BeloneTextId].IconPathSelected = path2;
			dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
			HdlDeviceCommonLogic.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
			dic[typeInfo.BeloneText].IconPath = path1;
			dic[typeInfo.BeloneText].IconPathSelected = path2;
			dic[typeInfo.BeloneText].Text = typeInfo.BeloneText;
			}
			dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
			dic[typeInfo.BeloneText].listDeviceKeys.Add(HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device));
			}
			return dic;
			}
			@@ -972,9 +1047,9 @@
			private class DeviceRowInfo
			{
			/// <summary>
			/// 文本ID,目前用来做主键
			/// 文本,目前用来做主键
			/// </summary>
			public int TextId = 0;
			public string Text = string.Empty;
			/// <summary>
			/// 图标
			/// </summary>