2019-11-18-1

WJC

2019-11-18 d8713d720fe7bc6d5dec99fa238397829b715aff

2019-11-18-1

修改文字大小

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,21 +1,34 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.28D65668-1785-4D5D-8282-1EAD504036BE" />
<Properties StartupConfiguration="{7D463846-A275-4A2E-930F-B5EA7200CEAA}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1991" Column="50" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" />
      <File FileName="Shared/Common/ZigbeeColor.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="490" Column="43" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Ios" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True">
                      <Node name="LockLogicCommunalPage.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -1861,6 +1861,7 @@
                TextID = MyInternationalizationString.logictemplate,
                Gravity = Gravity.CenterVertical,
                TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
                TextSize=15,
            };
            bjFrameLayout.AddChidren(recommendtextBtn);

@@ -1931,6 +1932,7 @@
                            Y = Application.GetRealHeight(246 - 23 - 80),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                            TextSize = 14,
                        };
                        frameLayout.AddChidren(logicnameBtn);

@@ -2040,6 +2042,7 @@
                    Y = Application.GetRealHeight(30),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextSize = 14,
                };
                logicRowlayout.AddChidren(logicnameBtn);


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

@@ -28,7 +28,7 @@
            this.AddChidren(topRowLayout);

            var titleName = new Button {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -108,6 +108,7 @@
                Text = Language.StringByID(MyInternationalizationString.timecondition),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize=15,
            };
            timerow.AddChidren(btntime);

@@ -169,6 +170,7 @@
                TextID = MyInternationalizationString.device,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            devicerow.AddChidren(btndevice);

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

@@ -292,6 +295,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.location,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            locationrow.AddChidren(btnlocation);

@@ -332,6 +336,7 @@
                X = Application.GetRealWidth(60),
                TextID = MyInternationalizationString.automation,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            existencerowlayout.AddChidren(btnexistence);

@@ -410,6 +415,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -437,6 +443,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -471,6 +478,7 @@
                TextID = MyInternationalizationString.logicathomegarrison,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            athomedefenceRowLayout.AddChidren(btnathomedefence);

@@ -504,6 +512,7 @@
                TextID = MyInternationalizationString.logicremovehomegarrison,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
            var leavehomedefenceSelected = new SelectedButton();
@@ -535,6 +544,7 @@
                TextID = MyInternationalizationString.withdrawal,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            withdrawalRowLayout.AddChidren(btnwithdrawal);
            var withdrawalSelected = new SelectedButton();
@@ -750,6 +760,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            typeRow.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -777,6 +788,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            typeRow.AddChidren(Btncomplete);
@@ -808,6 +820,7 @@
                TextID = MyInternationalizationString.athome,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,


            };
@@ -840,6 +853,7 @@
                TextID = MyInternationalizationString.leavehome,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            leavehomeRowLayout.AddChidren(btnleavehome);
            var leavehomeSelected = new SelectedButton();
@@ -1033,6 +1047,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1060,6 +1075,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -1093,6 +1109,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                //Text="立即执行",
                TextSize = 14,
            };
            timerow.AddChidren(Btntimepoint);

@@ -1126,6 +1143,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                //Text = "时间范围",
                TextSize = 14,
            };
            time1row.AddChidren(Btntime);


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

@@ -39,7 +39,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -88,6 +88,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -134,7 +135,7 @@
            };
            this.AddChidren(saveframeLayout);

          var  btnsave = new Button
            var btnsave = new Button
            {
                X = Application.GetRealWidth(85),
                Height = Application.GetRealHeight(130),
@@ -143,6 +144,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveframeLayout.AddChidren(btnsave);

@@ -200,6 +202,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -241,6 +244,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -414,6 +418,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                sceneRow.AddChidren(scenename);


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

@@ -22,7 +22,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -78,6 +78,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Text = Common.Logic.CurrentLogic.LogicCustomPushText,
                TextSize = 14,
            };
            middle.AddChidren(textBox);

@@ -91,7 +92,8 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.confrim,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
            };
                 TextSize = 16,
             };
            middle.AddChidren(btnsave);

                     

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

@@ -31,7 +31,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -96,6 +96,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            middle.AddChidren(btnsave);

@@ -135,6 +136,7 @@
                Text = Language.StringByID(MyInternationalizationString.executeonce),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            onceRow.AddChidren(onceTextBtn);

@@ -181,6 +183,7 @@
                TextID = MyInternationalizationString.everyday,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            everydayRow.AddChidren(everydayTxetBtn);

@@ -225,6 +228,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.weekly,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            weekRow.AddChidren(weekTextBtn);

@@ -274,6 +278,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.monthly,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            monthlyRow.AddChidren(monthlyTextBtn);

@@ -323,6 +328,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.everyyear,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            yearRow.AddChidren(yearTextBtn);


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

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -117,6 +117,8 @@
                Y = blancolor.Bottom + Application.GetRealHeight(50),
                TextID =MyInternationalizationString.createtimetext,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            middle.AddChidren(titleText);


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

@@ -40,7 +40,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -189,6 +190,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -230,6 +232,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -634,6 +637,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -768,6 +772,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -796,6 +801,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -856,6 +862,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -886,6 +893,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -981,6 +989,7 @@
                            Height = Application.GetRealHeight(180),
                            //SelectedBackgroundColor = 0xfffe5e00,
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1011,6 +1020,7 @@
                            Width = Application.GetRealWidth(300),
                            Height = Application.GetRealHeight(180),
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1107,6 +1117,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1137,6 +1148,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1408,6 +1420,7 @@
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
                            TextSize = 14,
                            //SelectedBackgroundColor = 0xfffe5e00,
                        };
                        buttonRow.AddChidren(button);
@@ -1459,6 +1472,7 @@
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(80),
                            Y = timetype.Bottom + Application.GetRealHeight(70),
                            TextSize = 14,
                        };
                        devicefra.AddChidren(Btntemperaturevalue);


 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);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs

@@ -27,7 +27,7 @@

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

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


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -27,7 +27,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -137,6 +137,7 @@
                    Width = Application.GetRealWidth(600),
                    Height = Application.GetRealHeight(130),
                    Tag = Send.LockList[i],
                    TextSize = 14,
                };
                userRow.AddChidren(usernameBtn);

@@ -203,6 +204,7 @@
            {
                Height = Application.GetRealHeight(140),
                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,

            };
            lockcolorfra1.AddChidren(lockRow);
            var Btncancel = new Button
@@ -213,6 +215,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            lockRow.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -241,6 +244,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            lockRow.AddChidren(Btncomplete);
@@ -277,6 +281,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                    Text = userIdmode.ModeName,
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);
                //(0按键/3卡/15指纹)

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -39,7 +39,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -89,6 +89,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -191,6 +192,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -232,6 +234,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -610,6 +613,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -721,6 +725,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -749,6 +754,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -833,6 +839,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -863,6 +870,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -893,6 +901,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1043,6 +1052,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1099,6 +1109,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1130,6 +1141,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1337,6 +1349,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1394,6 +1407,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1571,6 +1585,7 @@
                                TextID = MyInternationalizationString.open,
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            openrowlayout.AddChidren(btnopen);

@@ -1601,6 +1616,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            closerowlayout.AddChidren(btnclose);

@@ -1631,6 +1647,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            takebackrowlayout.AddChidren(btntakeback);

@@ -1790,6 +1807,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1877,6 +1895,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs

@@ -37,7 +37,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -86,6 +86,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -141,6 +142,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveframeLayout.AddChidren(btnsave);

@@ -196,6 +198,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -237,6 +240,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -412,6 +416,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                sceneRow.AddChidren(scenename);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -109,6 +109,7 @@
                TextID = MyInternationalizationString.automationname,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Y = Application.GetRealHeight(35),
                TextSize = 15,
            };
            logicnamefl.AddChidren(text);

@@ -120,7 +121,7 @@
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 13,
                TextSize = 14,
                Text = Common.Logic.CurrentLogic.LogicName,
                //TextID=MyInternationalizationString.automation1,
            };
@@ -163,7 +164,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            });

@@ -229,11 +230,12 @@
                    var addtextbtn = new Button
                    {
                        Height = Application.GetRealHeight(58),
                        Width = Application.GetRealWidth(300),
                        Width = Application.GetRealWidth(500),
                        Y = Application.GetRealHeight(45 + 30),
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.selectunlockingmode,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);

@@ -300,6 +302,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btndevice);

@@ -345,6 +348,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(400),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(devicestatus);

@@ -456,7 +460,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            };
            targetRowLayout.AddChidren(btntargettitle);
@@ -526,6 +530,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.lockaddaction,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);
                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -596,6 +601,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -621,6 +627,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(450),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(devicestatus);

@@ -911,6 +918,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = sceneinof.Name,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -1001,6 +1009,7 @@
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextID = MyInternationalizationString.pushswitch,
                TextSize = 14,
            };
            pushswitchRowlayout.AddChidren(btnswitchtxet);

@@ -1053,6 +1062,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            custompushRowLayout.AddChidren(btncustompush);

@@ -1098,6 +1108,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += async (sender, e) =>

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs

@@ -27,7 +27,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -164,6 +164,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Gravity = Gravity.CenterVertical,
                    TextSize = 15,
                };
                logicRowlayout.AddChidren(logicnameBtn);


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

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

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -97,6 +97,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            middle.AddChidren(saveBtn);


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

@@ -30,7 +30,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -115,6 +115,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Tag = intvalue,
                    TextSize = 14,
                };
                timeRow.AddChidren(timeBtn);

@@ -196,6 +197,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>

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

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -112,6 +112,7 @@
                TextID = MyInternationalizationString.automationname,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Y = Application.GetRealHeight(35),
                TextSize = 15,
            };
            logicnamefl.AddChidren(text);

@@ -123,7 +124,7 @@
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 13,
                TextSize = 14,
                Text = Common.Logic.CurrentLogic.LogicName,
                //TextID=MyInternationalizationString.automation1,
            };
@@ -166,7 +167,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            });

@@ -277,6 +278,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addconditions,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);

@@ -343,6 +345,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Gravity = Gravity.CenterVertical,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timevalue);

@@ -354,6 +357,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    X = conditionsRowLayout.Width - Application.GetRealWidth(400),
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timeTxet);

@@ -454,6 +458,7 @@
                                    Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2,
                                    //TextColor = 0xff121212,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timevalue);
                                var timeTxet = new Button
@@ -464,6 +469,7 @@
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    X = conditionsRowLayout.Width - Application.GetRealWidth(400),
                                    TextID = MyInternationalizationString.timeframe,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timeTxet);

@@ -501,6 +507,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btndevice);

@@ -555,6 +562,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(400),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(devicestatus);

@@ -773,6 +781,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    Text = logicinof.LogicName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                    //TextColor = 0xff121212,
                                };
                                conditionsRowLayout.AddChidren(btnlogic);
@@ -803,6 +812,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(500),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(logicstatus);

@@ -827,6 +837,7 @@
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    //TextColor = 0xff121212,
                                    TextID = MyInternationalizationString.security,
                                    TextSize = 14,
                                };
                                //conditionsRowLayout.AddChidren(btnsecurity);

@@ -859,6 +870,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    TextAlignment = TextAlignment.CenterLeft,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(securitystatus);

@@ -886,15 +898,16 @@
                            break;
                        case 7:
                            {
                                
                                conditionIcon.UnSelectedImagePath = "ZigeeLogic/position.png";
                                var btnlocation = new Button
                                {
                                    Width = Application.GetRealWidth(700),
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Gravity = Gravity.CenterVertical,
                                    //Text = "地理位置",
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    //TextColor = 0xff121212,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextID = MyInternationalizationString.geographicalposition,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btnlocation);

@@ -922,6 +935,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(500),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(locationstatus);
                                foreach (var radius in Common.Logic.CurrentLogic.Accounts)
@@ -1005,7 +1019,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            };
            targetRowLayout.AddChidren(btntargettitle);
@@ -1075,6 +1089,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addfunction,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);
                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -1145,6 +1160,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -1170,6 +1186,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(450),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(devicestatus);

@@ -1459,6 +1476,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = sceneinof.Name,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -1497,6 +1515,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    Text = logicinof.LogicName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                    //TextColor = 0xff121212,
                                };
                                actionsrowLayout.AddChidren(btnlogic);
@@ -1528,6 +1547,7 @@
                                    X = Application.GetRealWidth(1080 - 330),
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextAlignment = TextAlignment.CenterRight,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(logicstatus);

@@ -1551,6 +1571,7 @@
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    //TextColor = 0xff121212,
                                    TextID = MyInternationalizationString.security,
                                    TextSize = 14,
                                };
                                //actionsrowLayout.AddChidren(btnsecurity);

@@ -1579,6 +1600,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    TextAlignment = TextAlignment.CenterLeft,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(securitystatus);

@@ -1626,6 +1648,7 @@
                                    Width = Application.GetRealWidth(500),
                                    TextAlignment = TextAlignment.CenterLeft,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(delaytimeBtn);
                                if (Minutes != 0)
@@ -1733,6 +1756,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(settxet);
            var btnweektext = new Button
@@ -1745,6 +1769,7 @@
                TextID = MyInternationalizationString.everyday,
                Y = Application.GetRealHeight(35),
                X = settxet.Right,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(btnweektext);

@@ -1805,6 +1830,7 @@
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextID = MyInternationalizationString.pushswitch,
                TextSize = 14,
            };
            pushswitchRowlayout.AddChidren(btnswitchtxet);

@@ -1857,6 +1883,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            custompushRowLayout.AddChidren(btncustompush);

@@ -1902,6 +1929,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize=16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += async (sender, e) =>
@@ -2251,6 +2279,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -2278,6 +2307,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -2313,6 +2343,7 @@
                TextID = MyInternationalizationString.Allconditions,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,

            };
            androw.AddChidren(andbtn);
@@ -2348,6 +2379,7 @@
                TextID = MyInternationalizationString.anycondition,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            orrow.AddChidren(orbtn);


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

@@ -40,7 +40,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -192,6 +193,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -233,6 +235,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -611,6 +614,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -724,6 +728,8 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,

            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -752,6 +758,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -836,6 +843,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -866,6 +874,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -896,6 +905,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1046,6 +1056,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1102,6 +1113,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1133,6 +1145,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1340,6 +1353,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1397,6 +1411,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1573,6 +1588,7 @@
                                TextID = MyInternationalizationString.open,
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            openrowlayout.AddChidren(btnopen);

@@ -1603,6 +1619,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            closerowlayout.AddChidren(btnclose);

@@ -1633,6 +1650,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            takebackrowlayout.AddChidren(btntakeback);

@@ -1792,6 +1810,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1879,6 +1898,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);


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

@@ -34,7 +34,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -132,6 +132,7 @@
                    Text = user.UserName,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextSize = 14,
                };
                userRow.AddChidren(userBtn);

@@ -189,6 +190,7 @@
                        Width = Application.GetRealWidth(200),
                        X = Application.GetRealWidth(80),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextSize = 14,
                    };
                    lockRow.AddChidren(Btncancel);
                    Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -217,6 +219,7 @@
                        Width = Application.GetRealWidth(200),
                        TextAlignment = TextAlignment.CenterRight,
                        X = Btntitle.Right + Application.GetRealWidth(100),
                        TextSize = 14,

                    };
                    lockRow.AddChidren(Btncomplete);
@@ -251,6 +254,7 @@
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text= userifon.ModeName,
                            TextSize = 14,
                        };
                        doorlockRow.AddChidren(doorlockBtn);
                        //(1按键/3卡/15指纹)

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

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -130,6 +130,8 @@
                Text = Language.StringByID(MyInternationalizationString.logicathomegarrison),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            athomedefenceRowLayout.AddChidren(btnathomedefence);
            var athomedefenceSelected = new SelectedButton(789);
@@ -174,6 +176,7 @@
                Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
@@ -223,6 +226,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID = MyInternationalizationString.withdrawal,
                TextSize = 15,

            };
            withdrawalRowLayout.AddChidren(btnwithdrawal);
@@ -267,6 +271,7 @@
                TextID = MyInternationalizationString.urgentwithdrawal,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);


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

@@ -1036,12 +1036,10 @@

        }


        /// <summary>
        /// 门锁列表
        /// </summary>
        public static List<MembershipIfon> LockList = new List<MembershipIfon>();

        /// <summary>
        /// 当前门锁
        /// </summary>

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

@@ -39,7 +39,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -89,6 +89,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -190,6 +191,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -231,6 +233,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -606,6 +609,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -719,6 +723,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -747,6 +752,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -831,6 +837,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -861,6 +868,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -891,6 +899,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1041,6 +1050,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1097,6 +1107,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1128,6 +1139,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1335,6 +1347,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1392,6 +1405,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1569,6 +1583,7 @@
                                TextID = MyInternationalizationString.open,
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            openrowlayout.AddChidren(btnopen);

@@ -1599,6 +1614,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            closerowlayout.AddChidren(btnclose);

@@ -1629,6 +1645,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            takebackrowlayout.AddChidren(btntakeback);

@@ -1788,6 +1805,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1875,6 +1893,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);


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

@@ -40,7 +40,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                Y = Application.GetRealHeight(92),
                // TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -187,6 +188,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -228,6 +230,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -634,6 +637,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -753,6 +757,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -781,6 +786,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -806,254 +812,6 @@
            }
            switch (common.Type)
            {
                ///灯光
                case DeviceType.OnOffOutput:
                    {
                        dictionary(deviceConditionsInfo, "Cluster_ID", "6");
                        dictionary(deviceConditionsInfo, "AttriButeId", "0");
                        dictionary(deviceConditionsInfo, "Range", "1");
                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        #region  灯光View



                        var openframelayout = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
                            Y = timetype.Bottom + Application.GetRealHeight(20),
                        };
                        devicefra.AddChidren(openframelayout);

                        var openrowlayout = new RowLayout
                        {
                            Y = Application.GetRealHeight(30),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(130),
                            X = Application.GetRealWidth(80),
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(openrowlayout);

                        var btnopen = new Button
                        {
                            Width = Application.GetRealWidth(600),
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                        };
                        openrowlayout.AddChidren(btnopen);

                        var openBtnSelected = new SelectedButton();
                        openrowlayout.AddChidren(openBtnSelected);


                        var closeframelayout = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
                            Y = openframelayout.Bottom,
                        };
                        devicefra.AddChidren(closeframelayout);
                        var closerowlayout = new RowLayout
                        {
                            Y = Application.GetRealHeight(30),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(130),
                            X = Application.GetRealWidth(80),
                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                        };
                        closeframelayout.AddChidren(closerowlayout);

                        var btnclose = new Button
                        {
                            //Text = "关",
                            TextID = MyInternationalizationString.close,
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                        };
                        closerowlayout.AddChidren(btnclose);

                        var closeBtnSelected = new SelectedButton();
                        closerowlayout.AddChidren(closeBtnSelected);
                        #endregion

                        ///点击确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                            SelectedDeviceStatuscondition = "OnOffOutput";
                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");//默认值


                        };
                        openrowlayout.MouseUpEventHandler += openclick;
                        btnopen.MouseUpEventHandler += openclick;
                        openBtnSelected.MouseUpEventHandler += openclick;
                        openframelayout.MouseUpEventHandler += openclick;
                        ///点击取消事件
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;
                            SelectedDeviceStatuscondition = "OnOffOutput";
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//默认值

                        };
                        closerowlayout.MouseUpEventHandler += closeclick;
                        btnclose.MouseUpEventHandler += closeclick;
                        closeBtnSelected.MouseUpEventHandler += closeclick;
                        closeframelayout.MouseUpEventHandler += closeclick;
                        if (edit && devices != null)
                        {
                            if (devices["AttriButeId"] == "0")
                            {
                                if (devices["AttriButeData1"] == "1")
                                {
                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                    openBtnSelected.Visible = true;
                                    closeBtnSelected.Visible = false;
                                }
                                else
                                {
                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                    openBtnSelected.Visible = false;
                                    closeBtnSelected.Visible = true;

                                }
                            }
                        }
                    }
                    break;
                case DeviceType.WindowCoveringDevice:
                    {

                        dictionary(deviceConditionsInfo, "Cluster_ID", "258");
                        dictionary(deviceConditionsInfo, "AttriButeId", "8");
                        dictionary(deviceConditionsInfo, "Range", "0");
                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        #region 窗帘View
                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
                        devicefra.Height = Application.GetRealHeight(720);
                        var windowCoveringfra = new FrameLayout
                        {
                            Y = Application.GetRealHeight(180),
                            Height = Application.GetRealHeight(180 * 2 + 30),
                        };
                        devicefra.AddChidren(windowCoveringfra);

                        var openrowlayout = new RowLayout
                        {
                            Height = Application.GetRealHeight(180),
                        };
                        windowCoveringfra.AddChidren(openrowlayout);

                        var btnopen = new Button
                        {
                            //Text = "开",
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(50),
                            Width = Application.GetRealWidth(300),
                            Height = Application.GetRealHeight(180),
                            //SelectedBackgroundColor = 0xfffe5e00,
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                        };
                        openrowlayout.AddChidren(btnopen);

                        var openBtnSelected = new Button
                        {
                            X = Application.GetRealWidth(1000 - 150),
                            Width = Application.GetMinRealAverage(110),
                            Height = Application.GetMinRealAverage(110),
                            UnSelectedImagePath = "Item/YesSelected.png",
                            Visible = false,
                            Gravity = Gravity.CenterVertical
                        };
                        openrowlayout.AddChidren(openBtnSelected);

                        var closerowlayout = new RowLayout
                        {
                            Y = openrowlayout.Bottom,
                            Height = Application.GetRealHeight(180),
                        };
                        windowCoveringfra.AddChidren(closerowlayout);

                        var btnclose = new Button
                        {
                            //Text = "关",
                            TextID = MyInternationalizationString.close,
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(50),
                            Width = Application.GetRealWidth(300),
                            Height = Application.GetRealHeight(180),
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                        };
                        closerowlayout.AddChidren(btnclose);

                        var closeBtnSelected = new Button
                        {
                            X = Application.GetRealWidth(1000 - 150),
                            Width = Application.GetMinRealAverage(110),
                            Height = Application.GetMinRealAverage(110),
                            UnSelectedImagePath = "Item/YesSelected.png",
                            Visible = false,
                            Gravity = Gravity.CenterVertical
                        };
                        closerowlayout.AddChidren(closeBtnSelected);
                        #endregion

                        ///点击确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            dictionary(deviceConditionsInfo, "AttriButeData1", "95");//默认值

                        };
                        openrowlayout.MouseUpEventHandler += openclick;
                        btnopen.MouseUpEventHandler += openclick;
                        openBtnSelected.MouseUpEventHandler += openclick;
                        ///点击取消事件
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;
                            dictionary(deviceConditionsInfo, "AttriButeData1", "5");//默认值

                        };
                        closerowlayout.MouseUpEventHandler += closeclick;
                        btnclose.MouseUpEventHandler += closeclick;
                        closeBtnSelected.MouseUpEventHandler += closeclick;

                        if (edit && devices != null)
                        {
                            if (devices["AttriButeId"] == "8")
                            {
                                if (int.Parse(devices["AttriButeData1"]) > 5)
                                {
                                    openBtnSelected.Visible = true;
                                    closeBtnSelected.Visible = false;
                                }
                                else
                                {
                                    openBtnSelected.Visible = false;
                                    closeBtnSelected.Visible = true;
                                }
                            }
                        }
                    }
                    break;
                case DeviceType.IASZone:
                    {

@@ -1092,6 +850,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1122,6 +881,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1357,75 +1117,6 @@

                        }

                    }
                    break;
                case DeviceType.OnOffSwitch:
                    {

                        dictionary(deviceConditionsInfo, "Cluster_ID", "1282");
                        dictionary(deviceConditionsInfo, "AttriButeId", "1283");
                        dictionary(deviceConditionsInfo, "Range", "0");//按键特殊
                        dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
                        devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                        var OnOffOutputfra = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
                            Y = timetype.Bottom + Application.GetRealHeight(20),
                        };
                        devicefra.AddChidren(OnOffOutputfra);

                        var buttonRow = new RowLayout
                        {
                            Y = Application.GetRealHeight(30),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(130),
                            X = Application.GetRealWidth(80),
                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                        };
                        OnOffOutputfra.AddChidren(buttonRow);

                        var button = new Button
                        {
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
                            //SelectedBackgroundColor = 0xfffe5e00,
                        };
                        buttonRow.AddChidren(button);

                        var buttonSelected = new SelectedButton();
                        buttonRow.AddChidren(buttonSelected);
                        EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
                        {
                            buttonSelected.Visible = true;
                            SelectedDeviceStatuscondition = "OnOffSwitch";
                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;

                        };
                        buttonRow.MouseUpEventHandler += buttonclick;
                        button.MouseUpEventHandler += buttonclick;
                        buttonSelected.MouseUpEventHandler += buttonclick;
                        OnOffOutputfra.MouseUpEventHandler += buttonclick;

                        if (edit && devices != null)
                        {
                            buttonSelected.Visible = true;
                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                        }

                    }
                    break;
                case DeviceType.DoorLock:
                    {
                        flMain.RemoveFromParent();
                        var memberList = new MemberList();
                        UserView.HomePage.Instance.AddChidren(memberList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        memberList.Show(common);
                    }
                    break;


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

@@ -28,7 +28,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -113,6 +113,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Tag = intvalue,
                    TextSize = 15,
                };
                timeRow.AddChidren(timeBtn);

@@ -194,6 +195,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>

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

@@ -36,7 +36,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -131,6 +131,7 @@
                TextID = MyInternationalizationString.automationname,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Y = Application.GetRealHeight(35),
                TextSize = 15,
            };
            logicnamefl.AddChidren(text);

@@ -142,7 +143,7 @@
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 13,
                TextSize = 14,
                Text = Common.Logic.CurrentLogic.LogicName,
                //TextID=MyInternationalizationString.automation1,
            };
@@ -185,7 +186,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            });

@@ -301,6 +302,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addconditions,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);

@@ -374,6 +376,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btndevice);

@@ -416,6 +419,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(400),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(devicestatus);

@@ -532,7 +536,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            };
            targetRowLayout.AddChidren(btntargettitle);
@@ -602,6 +606,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addfunction,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);
                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -672,6 +677,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -697,6 +703,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(450),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(devicestatus);

@@ -1033,6 +1040,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(settxet);
            var btnweektext = new Button
@@ -1045,6 +1053,7 @@
                TextID = MyInternationalizationString.everyday,
                Y = Application.GetRealHeight(35),
                X = settxet.Right,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(btnweektext);

@@ -1105,6 +1114,7 @@
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextID = MyInternationalizationString.pushswitch,
                TextSize = 14,
            };
            pushswitchRowlayout.AddChidren(btnswitchtxet);

@@ -1157,6 +1167,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            custompushRowLayout.AddChidren(btncustompush);

@@ -1559,6 +1570,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1586,6 +1598,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -1621,6 +1634,7 @@
                TextID = MyInternationalizationString.Allconditions,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,

            };
            androw.AddChidren(andbtn);
@@ -1656,6 +1670,7 @@
                TextID = MyInternationalizationString.anycondition,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            orrow.AddChidren(orbtn);


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

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -98,6 +98,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            fra.AddChidren(btnsave);
            #endregion
@@ -129,7 +130,8 @@
                Text = Language.StringByID(MyInternationalizationString.type),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnTypeTextTitle);
            
@@ -142,6 +144,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID = MyInternationalizationString.timeframe,
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnimmediateexecution);

@@ -183,7 +186,8 @@
                Text = Language.StringByID(MyInternationalizationString.starttime),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,

            };
            timestartrow.AddChidren(btnstarttimetext);
@@ -196,6 +200,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Tag = "0",
                TextSize = 14,
            };
            timestartrow.AddChidren(btnstarttime);

@@ -235,6 +240,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265),
                TextSize = 14,

            };
            timeendrow.AddChidren(btnendtimetext);

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

@@ -80,7 +80,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -165,7 +165,8 @@
                Text = Language.StringByID(MyInternationalizationString.type),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnTypeTextTitle);

@@ -179,6 +180,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID=MyInternationalizationString.immediateexecution,
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnimmediateexecution);

@@ -223,7 +225,8 @@
                Text = Language.StringByID(MyInternationalizationString.moment),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width=Application.GetRealWidth(265)
                Width=Application.GetRealWidth(265),
                TextSize = 14,
            };
            rowSelectedTimeType.AddChidren(btnTimeText);
            
@@ -236,6 +239,7 @@
                Width = Application.GetRealWidth(630),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 14,
            };
            rowSelectedTimeType.AddChidren(btnTimeTpye);

@@ -380,7 +384,8 @@
                    Text = Language.StringByID(MyInternationalizationString.Advancedelay),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Width = Application.GetRealWidth(265)
                    Width = Application.GetRealWidth(265),
                    TextSize = 14,
                };
                rowDelayType.AddChidren(btnDelayTimeText);

@@ -394,6 +399,7 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Text = textvalue,
                    TextSize = 14,
                };
                rowDelayType.AddChidren(btnDelayTime);

@@ -517,6 +523,7 @@
                BackgroundColor =ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor= ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            fra.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>
@@ -627,6 +634,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -654,6 +662,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -685,6 +694,7 @@
                TextID = MyInternationalizationString.sunrise,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            sunriseRow.AddChidren(btnsunrisetext);

@@ -718,6 +728,7 @@
                TextID = MyInternationalizationString.sunset,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            sunsetRow.AddChidren(btnsunsettext);

@@ -753,6 +764,7 @@
                TextID = MyInternationalizationString.noon,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            noonRow.AddChidren(btnnoontext);

@@ -785,6 +797,7 @@
                TextID = MyInternationalizationString.logiccustom,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            logiccustomRow.AddChidren(btnlogiccustomtext);


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

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

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -92,6 +92,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFramelayout.AddChidren(saveBtn);

@@ -189,6 +190,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = name,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextSize = 15,
                };
                weekRow.AddChidren(weekTextBtn);