From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index df2d07c..1b5ddfc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+锘� using System;
using System.Collections.Generic;
using Shared;
using Shared.Common;
@@ -14,7 +14,7 @@
{
Tag = "Logic";
}
- public void Show()
+ public void Show()
{
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -31,7 +31,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,
@@ -129,8 +129,8 @@
timeiconBtn.MouseUpEventHandler += timeclick;
timerow.MouseUpEventHandler += timeclick;
- #endregion
-
+ #endregion
+
#region ----璁惧鐘舵�佹潯浠�----
var deviceframelayout = new FrameLayout
{
@@ -183,11 +183,6 @@
EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
{
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
var deviceStateCondition = new DeviceStateCondition();
UserView.HomePage.Instance.AddChidren(deviceStateCondition);
UserView.HomePage.Instance.PageIndex += 1;
--
Gitblit v1.8.0