合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

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

@@ -97,6 +97,7 @@


            //初始化【信息通知】的行

            var row4 = new FrameRowControl(listView.rowSpace / 2);

            row4.UseClickStatu = false;

            listView.AddChidren(row4);

            row4.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uInformationPush), 500);

            //开关图标

@@ -161,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)