Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs

@@ -159,8 +159,8 @@
                //如果设置有内部防区

                string msg = string.Empty;

                if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)


                 {



                {

                    //在家布防设置成功

                    msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);

                }