From 13faa230078dcf13bee96a101849e256c186de6e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 08 四月 2022 10:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/Common/UserInfo.cs | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index 5ba0686..30e8267 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/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;
+
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0