Merge branch 'wjc' into dev-cqy（1.5.9）

wjc

2023-03-28 bdc8f378f6d736fda030b3ceceab3acd91505679

 HDL_ON/Common/HDLCommon.cs

@@ -304,6 +304,7 @@
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
                    {

                        if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
                        
                        //字段兼容问题，只能直接取值了
@@ -397,7 +398,7 @@
                                return;
                            }
                            ///视频门锁
                            HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk);
                            HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk,true);
                        }
                        catch { }
                    }