合并门锁，完成住宅管理

黄学彪

2019-10-12 c6b35c3138b944830b5336bf610f918154dd47c7

 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs

old mode 100644
new mode 100755
@@ -98,7 +98,7 @@
            ///设备状态条件
            var btndevice = new Button {
                //Text = "设备状态条件",
                TextID = MyInternationalizationString.devicestate,
                TextID = MyInternationalizationString.device,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth (60),
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -145,7 +145,7 @@
                //Text = "安防条件",
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(60),
                TextID = MyInternationalizationString.securityconditions,
                TextID = MyInternationalizationString.security,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
            };
            securityrowlayout.AddChidren(btnsecurity);