合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs

@@ -132,11 +132,11 @@
                        CommonPage.Loading.Hide();

                        if (result == GarrisonMode.AtHome)

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonSuccess));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonSuccess));

                        }

                        else

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));

                        }

                    });



@@ -171,11 +171,11 @@
                        CommonPage.Loading.Hide();

                        if (result == 1)

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));

                        }

                        else

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));

                        }

                    });

                })

@@ -213,11 +213,11 @@
                        CommonPage.Loading.Hide();

                        if (result == GarrisonMode.AtHome)

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess));

                        }

                        else

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));

                        }

                    });

                })

@@ -249,11 +249,11 @@
                        CommonPage.Loading.Hide();

                        if (result == GarrisonMode.RemoveHome)

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess));

                        }

                        else

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));

                        }

                    });

                })

@@ -285,11 +285,11 @@
                        CommonPage.Loading.Hide();

                        if (result == 1)

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));

                        }

                        else

                        {

                            HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));

                            CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));

                        }

                    });

                })