~wxr/HDL_APP_Project.git

			@@ -61,12 +61,7 @@

			};
			middFLayout.AddChidren(addDevice);
			if (Pir.currPir.FunctioList.Count < 10)
			{
			//10个遥控器就会隐藏添加图标
			// middFLayout.AddChidren(addDevice);
			addDevice.Visible = true;
			}

			#endregion

			#region 界面点击事件
			@@ -101,7 +96,7 @@
			//进来不允许左滑
			MainPage.BasePageView.ScrollEnabled = false;
			View.Buttons buttons = new View.Buttons();
			buttons.AddFrameLayout(this, (if_value, view) =>
			buttons.AddFrameLayout(this, (if_value, view) =>
			{
			//关闭允许左滑
			MainPage.BasePageView.ScrollEnabled = true;
			@@ -111,8 +106,8 @@
			PirMethod method = new PirMethod();
			method.AddControl(this, (control) =>
			{
			//成功后移除;
			view.RemoveFromParent();
			//成功后移除;
			view.RemoveFromParent();
			AddButton addButton = new AddButton();
			MainPage.BasePageView.AddChidren(addButton);
			addButton.Show(control);
			@@ -131,8 +126,8 @@
			GetDeviceTypeList(true, () =>
			{
			DeviceTypeViewClick(if_value);
			//获取成功之后移除
			view.RemoveFromParent();
			//获取成功之后移除
			view.RemoveFromParent();

			});
			}
			@@ -141,7 +136,6 @@
			DeviceTypeViewClick(if_value);
			view.RemoveFromParent();
			}

			}
			}, 7);
			};
			@@ -155,6 +149,12 @@
			/// <param name="vv">上下滑控件</param>
			private void UIView(VerticalRefreshLayout vv)
			{
			if (Pir.currPir.FunctioList.Count < 10)
			{
			//10个遥控器就会隐藏添加图标
			// middFLayout.AddChidren(addDevice);
			addDevice.Visible = true;
			}
			vv.RemoveAll();
			#region 红外宝图标版本号名称状态
			FrameLayout fLayout = new FrameLayout
			@@ -197,7 +197,7 @@
			//遥控器名称
			controlView.nameBtn.Text = control.name;
			//遥控器存放区域
			controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
			controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
			//标记遥控器
			controlView.delBtn.Tag = control;
			//删除点击事件
			@@ -236,7 +236,7 @@
			{
			//回调更新名字/区域
			controlView.nameBtn.Text = device.name;
			controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device);
			controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(device);

			});
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			@@ -257,7 +257,6 @@
			/// <param name="if_value">控件索引值</param>
			private void DeviceTypeViewClick(int if_value)
			{

			var strings = View.Buttons.GetTypeString(if_value).Split('-');
			var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
			if (jobDeviceType == null)
			@@ -273,7 +272,6 @@
			});

			});

			}
			/// <summary>
			/// 读取红外设备类型列表
			@@ -284,7 +282,6 @@
			{
			PirSend.GetDeviceTypesList(this, (responsePackNew) =>
			{

			if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
			{
			//清空之前数据