Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -65,6 +65,12 @@
                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
            }

            if (!string.IsNullOrEmpty(pushMes.spk))//自研可视对讲需要记录时间反呼
            {
                UserInfo.Current.pushMessageInfo = pushMes;
                UserInfo.Current.inCall = DateTime.Now;
            }

            Utlis.WriteLine("PushMes title : " + pushMes.Title);
            Utlis.WriteLine("PushMes message : " + pushMes.Content);
            Utlis.WriteLine("PushMes extras : " + pushMes.Extras);