上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -173,7 +173,7 @@
                //设备控制状态反馈

                else if (reportTopic == "DeviceDefaultAck")

                {

                    this.DeviceControlResponePush(JObject.Parse(msgData));

                    //this.DeviceControlResponePush(JObject.Parse(msgData));

                }

                //撤防

                else if (topic == gatewayId + "/Security/WithdrawMode_Respon")

@@ -612,7 +612,7 @@
                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());

                if (info.Clusterid == 257)

                {

                    //216：锁上设置的常开 
                    //216：锁上设置的常开

                    if (info.AlarmCode == 216)

                    {

                        HdlThreadLogic.Current.RunMain(() =>

@@ -620,7 +620,7 @@
                            //更新门锁涉及的常开/常关的界面

                            if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)

                            {

                                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr + device.DeviceEpoint, true);

                                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr, true);

                            }

                        });

                    }

@@ -840,12 +840,16 @@


                        HdlThreadLogic.Current.RunThread(async () =>

                        {

                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device[0]);

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //弹出徐梅的那个窗口

                                DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device[0], DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,

                                    result != 0 ? true : false, ControlCommonResourse.UpdateDoorLockStatusAction);

                                //提示门锁已经失效

                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);



                                //更新门锁涉及的常开/常关的界面

                                if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)

                                {

                                    UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(deviceAddr, false);

                                }

                            });

                        });

                    }