2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

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

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

                string msg = string.Empty;

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


                 {

                {

                    //在家布防设置成功

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

                }

@@ -169,18 +168,8 @@
                    //布防设置成功

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

                }



                if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)

                {

                    //添加布防上报的行控件

                    var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];

                    form?.AddSafeguardLogPushRow(null);

                }

                else

                {

                    var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                    control.Show();

                }

                var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                control.Show();

            });

        }

@@ -209,19 +198,10 @@
                {

                    return;

                }

                if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)

                {

                    //添加布防上报的行控件

                    var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];

                    form?.AddSafeguardLogPushRow(null);

                }

                else

                {

                    //离家布防设置成功

                    string msg = Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess);

                    var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                    control.Show();

                }

                //离家布防设置成功

                string msg = Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess);

                var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                control.Show();

            });

        }

@@ -246,19 +226,10 @@
                //根据布防模式，设置图标的选择状态

                this.SetIconStatuByGarrisonMode(GarrisonMode.RemoveGarrison);



                if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)

                {

                    //添加布防上报的行控件

                    var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];

                    form?.AddSafeguardLogPushRow(null);

                }

                else

                {

                    //离家布防设置成功

                    string msg = Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess);

                    var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                    control.Show();

                }

                //离家布防设置成功

                string msg = Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess);

                var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                control.Show();

            });

        }