合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

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

@@ -29,7 +29,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -111,6 +111,7 @@
                TextID = MyInternationalizationString.device,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
               TextSize=15,
            };
            devicerow.AddChidren(btndevice);

@@ -176,6 +177,7 @@
                TextID = MyInternationalizationString.scene,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            sceneRowLayout.AddChidren (scene);

@@ -237,6 +239,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.securitymode,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            securityrow.AddChidren(btnsecurity);

@@ -280,7 +283,7 @@
                Width = Application.GetRealWidth(400),
                TextID = MyInternationalizationString.Alreadyautomated,
                //Text = "已有自动化",
                TextSize = 16,
                TextSize = 15,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(40),
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -346,6 +349,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.delayed,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            delayedRowLayout.AddChidren(delayed);