请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -238,7 +238,7 @@


            topFrameLayout.AddChidren(btnShortCut);

            btnShortCut.InitControl();

            if (UserCenterResourse.Option.SafetyShortcut == true)

            if (UserCenterResourse.ResidenceOption.SafetyShortcut == true)

            {

                //使用快捷方式

                btnShortCut.IsSelected = true;

@@ -250,8 +250,8 @@
                    //确定取消主页的「安防」捷径？

                    this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uCancelSafetyShortcutMsg), () =>

                    {

                        UserCenterResourse.Option.SafetyShortcut = false;

                        UserCenterResourse.Option.Save();

                        UserCenterResourse.ResidenceOption.SafetyShortcut = false;

                        UserCenterResourse.ResidenceOption.Save();

                        btnShortCut.IsSelected = false;

                    });

                }

@@ -260,8 +260,8 @@
                    //确定创建「安防」捷径到主页？

                    this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uCreatSafetyShortcutMsg), () =>

                    {

                        UserCenterResourse.Option.SafetyShortcut = true;

                        UserCenterResourse.Option.Save();

                        UserCenterResourse.ResidenceOption.SafetyShortcut = true;

                        UserCenterResourse.ResidenceOption.Save();

                        btnShortCut.IsSelected = true;

                    });

                }

@@ -549,7 +549,16 @@
                        //界面关闭

                        return;

                    }

                    Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                    int statu = 0;

                    var list = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);

                    if (statu != -1)

                    {

                        for (int i = 0; i < list.Count; i++)

                        {

                            //设置设备在线状态

                            this.ReceiveDeviceStatuPush(list[i]);

                        }

                    }

                }

            });

        }