???????

黄学彪

2020-04-15 23532fa8ad34c89b6d24b01eaef6475fd0aad898

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs

@@ -93,6 +93,32 @@
                });

                return;

            }

            else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Home.Id + "_" + Common.Config.Instance.Guid + "/PrimaryUserDelYou")

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //分享住宅已更改，请联系管理员！

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

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

                    contr.Show();



                    UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);

                });

                return;

            }

            else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Update")

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //您的权限已经变更,请重新登陆

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

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

                    contr.Show();



                    UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);

                });

                return;

            }

            else if (UserCenterResourse.UserInfo.AuthorityNo == 3)

            {

                if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Deleted"

@@ -102,19 +128,6 @@
                    {

                        //分享数据已经变更,请重新登陆

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

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

                        contr.Show();



                        UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);

                    });

                    return;

                }

                else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Home.Id + "_" + Common.Config.Instance.Guid + "/PrimaryUserDelYou")

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        //分享住宅已更改，请联系管理员！

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

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

                        contr.Show();



@@ -802,19 +815,23 @@
                //没有添加监听

                return;

            }

            lock (this.dicDeviceEvent)

            //lock (this.dicDeviceEvent)

            {

                var list = new List<Action<CommonDevice>>();

                foreach (string keys in this.dicDeviceEvent.Keys)

                try

                {

                    if (this.dicCommandDiv[keys] != comand)

                    foreach (string keys in this.dicDeviceEvent.Keys)

                    {

                        //命令区分不一致，则不调用回调函数

                        continue;

                        if (this.dicCommandDiv[keys] != comand)

                        {

                            //命令区分不一致，则不调用回调函数

                            continue;

                        }

                        //命令区分一致时，则调用回调函数

                        list.Add(this.dicDeviceEvent[keys]);

                    }

                    //命令区分一致时，则调用回调函数

                    list.Add(this.dicDeviceEvent[keys]);

                }

                catch { return; }

                //有可能在回调函数中移除了事件，导致报错，所以先收集，再调用

                foreach (var action in list)

                {