Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-04-08 13faa230078dcf13bee96a101849e256c186de6e

 HDL_ON/Common/UserInfo.cs

@@ -322,5 +322,34 @@
            return path + "/";
        }


        /// <summary>
        /// 推送消息记录 
        /// </summary>
        public JPushMessageInfo pushMessageInfo = new JPushMessageInfo();
        /// <summary>
        /// 是否已经加载呼叫弹窗
        /// </summary>
        public bool alreadyShowCallInDialog = false;

        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesTitle;
        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesMessage;
        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesExtras;
        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesHomeId;
        //[Newtonsoft.Json.JsonIgnore]
        //public string pushMesMessageType;
        //[Newtonsoft.Json.JsonIgnore]
        //public string pushMesExpantContent;

        [Newtonsoft.Json.JsonIgnore]
        public bool inVideo = false;
        [Newtonsoft.Json.JsonIgnore]
        public DateTime inCall = DateTime.MinValue;


    }
}