Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/Common/HDLCommon.cs

@@ -258,7 +258,7 @@
        {
            try
            {
               
                MainPage.Log($"接收到推送");

                //Extras为空不处理
                if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -398,6 +398,7 @@
                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                    }

                   
                }
            }
            catch (Exception EX)