~wjc/HomeApp.git

			@@ -36,7 +36,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(176),
			Width = Application.GetRealWidth(400),
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.selection,
			@@ -529,7 +529,6 @@
			deviceedit.MouseUpEventHandler += (sender, e) =>
			{


			if (deviceinof.Type != DeviceType.DoorLock)
			{
			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			@@ -542,7 +541,7 @@
			UserView.HomePage.Instance.AddChidren(memberList);
			UserView.HomePage.Instance.PageIndex += 1;
			MemberList.edit = true;
			memberList.Show(deviceinof);
			memberList.Show(deviceinof, conditions);
			}

			};
			@@ -719,19 +718,39 @@
			break;
			case DeviceType.DoorLock:
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
			for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
			{
			if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
			{
			if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
			{
			devicestatus.Text = conditions["Account"];
			devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
			break;

			}
			}

			}
			}
			break;
			case DeviceType.TemperatureSensor:
			// conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
			var dev = deviceinof as TemperatureSensor;
			if (conditions["Cluster_ID"]=="1026") {
			dev.SensorDiv = 1;
			} else {
			dev.SensorDiv = 2;
			}
			if (conditions["Cluster_ID"] == "1026")
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
			devicestatus.Text = ">" + conditions["AttriButeData1"] + "℃";
			}
			else
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
			devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
			}
			break;

			@@ -1166,13 +1185,6 @@
			///编辑点击事件
			deviceedit.MouseUpEventHandler += (sender, e) =>
			{
			//var deviceStatePage = new DeviceStatePage();
			//UserView.HomePage.Instance.AddChidren(deviceStatePage);
			//UserView.HomePage.Instance.PageIndex += 1;
			//deviceStatePage.IsDeviceEditor = true;
			//deviceStatePage.Show(deviceinof);

			//ActionModifyDeviceStateView(deviceinof);
			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			this.AddChidren(flMain);
			LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);
			@@ -1895,10 +1907,6 @@
			btnsave.MouseUpEventHandler += async (sender, e) =>
			{
			var name = logicTextBox.Text.Trim();
			//if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
			//{
			// AddChidren(btnsave);
			//}
			if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
			{
			new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
			@@ -1934,11 +1942,7 @@
			CommonPage.Loading.Hide();
			UserView.HomePage.Instance.RemoveViewByTag("Logic");
			Category.Category.instance?.RefreshBodyView();
			//UserView.HomePage.Instance.RemoveAt("Logic1");
			//Category.Category category = new Category.Category();
			//UserView.HomePage.Instance.AddChidren(category);
			//UserView.HomePage.Instance.PageIndex += 1;
			//category.Show(2);

			};