~wjc/HomeApp.git

			@@ -41,9 +41,9 @@
			/// </summary>
			private Dictionary<string, CommonDevice> dicSelectDevice = new Dictionary<string, CommonDevice>();
			/// <summary>
			/// 当前选择的分支 1：场景 2：功能
			/// 当前选择的分支 0：场景 1：功能
			/// </summary>
			private int nowSwitchIndex = 1;
			private int nowSwitchIndex = 0;
			/// <summary>
			/// 当前选择的设备索引
			/// </summary>
			@@ -126,7 +126,7 @@
			tabControl.SelectTabEvent += (tabIndex) =>
			{
			this.nowSwitchIndex = tabIndex;
			if (tabIndex == 1)
			if (tabIndex == 0)
			{
			//显示场景列表
			this.frameSceneTable.Visible = true;
			@@ -139,7 +139,11 @@
			this.frameDeviceTable.Visible = true;
			}
			};
			tabControl.InitControl();
			//开始初始化场景功能切换控件
			var listTitle = new List<string>();
			listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
			listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
			tabControl.InitControl(listTitle);
			}

			#endregion
			@@ -155,12 +159,15 @@
			this.frameSceneTable.RemoveAll();

			var listScene = new List<Common.SceneUI>();
			for (int i = 0; i < lookRoom.SceneUIList.Count; i++)
			for (int i = 0; i < lookRoom.ListSceneId.Count; i++)
			{
			if (HdlShardLogic.Current.IsFileExists(lookRoom.SceneUIList[i].FileName) == true)
			var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{lookRoom.ListSceneId[i]}.json");
			if (byteData == null)
			{
			listScene.Add(lookRoom.SceneUIList[i]);
			continue;
			}
			var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
			listScene.Add(sceneUi);
			}
			if (listScene.Count == 0)
			{
			@@ -171,45 +178,24 @@

			HdlThreadLogic.Current.RunMainInThread(() =>
			{
			var listView = new VerticalFrameControl(29);
			var listView = new VerticalFrameControl(3);
			listView.Y = Application.GetRealHeight(53);
			listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
			frameSceneTable.AddChidren(listView);

			foreach (var data in listScene)
			{
			//场景图片
			var frameContr = new FrameLayoutControl();
			frameContr.UseClickStatu = false;
			frameContr.Height = Application.GetRealHeight(470);
			listView.AddChidrenFrame(frameContr);

			//场景图片
			var btnPic = new ImageView();
			btnPic.X = Application.GetRealWidth(179);
			btnPic.Width = Application.GetRealWidth(844);
			btnPic.Height = Application.GetRealHeight(420);
			btnPic.ImagePath = data.IconPath;
			btnPic.Radius = 17;
			frameContr.AddChidren(btnPic);

			var btnName = new NormalViewControl(251, 282, true);
			btnName.X = ControlCommonResourse.XXLeft;
			btnName.Gravity = Gravity.CenterVertical;
			btnName.BackgroundColor = 0xff333333;
			btnName.Radius = 17;
			btnName.Text = data.Name;
			btnName.TextSize = 15;
			btnName.TextColor = UserCenterColor.Current.White;
			btnName.TextAlignment = TextAlignment.Center;
			frameContr.AddChidren(btnName);
			//场景控件
			var frameContr = new ScenePictrueControl();
			listView.AddChidren(frameContr);
			frameContr.InitControl(data);

			var btnSelect = new IconViewControl(58);
			btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";
			btnSelect.SelectedImagePath = "Item/ItemSelected.png";
			btnSelect.X = Application.GetRealWidth(887);
			btnSelect.Y = Application.GetRealHeight(35);
			frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);
			frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEvent);
			if (dicSelectScene.ContainsKey(data.Id) == true)
			{
			btnSelect.IsSelected = true;
			@@ -264,13 +250,13 @@
			}
			else
			{
			var frameBack = new FrameLayoutControl(false);
			var frameBack = new FrameLayout();
			frameBack.X = ControlCommonResourse.XXLeft;
			frameBack.Y = Application.GetRealHeight(178);
			frameBack.BackgroundColor = UserCenterColor.Current.White;
			frameBack.Width = bodyFrameLayout.Width;
			frameBack.Height = Application.GetRealHeight(1650);
			frameBack.RadiusEx = 20;
			frameBack.Radius = (uint)Application.GetRealHeight(58);
			frameDeviceTable.AddChidren(frameBack);

			var listView = new VerticalListControl(23);
			@@ -388,44 +374,10 @@
			var dic = new Dictionary<int, List<CommonDevice>>();
			foreach (var device in listDevice)
			{
			var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			if (device.Type == DeviceType.IASZone)
			var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
			if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
			{
			//这个强制为传感器
			typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId1200;
			typeInfo.ConcreteType = Common.DeviceConcreteType.Sensor;
			}
			if (device.Type == DeviceType.OnOffOutput)
			{
			//继电器的时候,需要特殊处理
			if (device.DfunctionType == DeviceFunctionType.A开关)
			{
			typeInfo.BeloneTextId = R.MyInternationalizationString.uSwitch;
			}
			else if (device.DfunctionType == DeviceFunctionType.A插座)
			{
			typeInfo.BeloneTextId = R.MyInternationalizationString.uSocket1;
			}
			else if (device.DfunctionType == DeviceFunctionType.A灯光)
			{
			typeInfo.BeloneTextId = R.MyInternationalizationString.uLight;
			}
			else
			{
			//继电器
			typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId2300;
			}
			if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
			{
			dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
			}
			}
			else
			{
			if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
			{
			dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
			}
			dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
			}
			dic[typeInfo.BeloneTextId].Add(device);
			}
			@@ -485,8 +437,9 @@
			{
			//获取这个房间里面的分享设备
			var listDevice = new List<CommonDevice>();
			foreach (var deviceFile in this.lookRoom.DeviceUIFilePathList)
			foreach (var deviceKeys in this.lookRoom.ListDevice)
			{
			string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
			if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)
			{
			var strArry = deviceFile.Split('_');