合并了代码

黄学彪

2019-12-13 6cbd0936d3245fd7c433884ac9c1f5448a7cf657

 ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs

@@ -162,7 +162,7 @@
            {

                //静音防区不受布防、撤防影响，防区被{0}触发立即报警，通常不产生声音或{0}其他提示，只发送信息到特定的接收者

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

                btnIcon.X = Application.GetRealWidth(182);

                btnIcon.X = Application.GetRealWidth(175);

            }

            //内部防区

            else if (zoonID == 4)