Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -40,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.securitymode,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -86,6 +87,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize=16,

            };
            middle.AddChidren(btnsave);
@@ -391,6 +393,11 @@
            {
                if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
                {
                   
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                              Language.StringByID(MyInternationalizationString.securitytip),
                             Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }