Merge branch 'Dev-Branch' into wjc

wjc

2023-06-07 ad51f05f31440bcc64e0ef248ab32fd12997e565

 HDL_ON/Common/HDLCommon.cs

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

                //Extras为空不处理
                if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;

@@ -396,6 +398,7 @@
                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                    }

                   
                }
            }
            catch (Exception EX)
@@ -439,6 +442,8 @@
            }catch(Exception ex){
                MainPage.Log($"回到跟类失败:{ex.Message}");
            }
#else
            //Application.Activity.StartActivity()
#endif

            //测试账号，不挤下线