From 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/Common/UserInfo.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index b7a8838..30e8267 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -181,7 +181,7 @@
/// 璁板綍鑷姩鍖栫瓫閫夌殑鍔熻兘鐨勬潯浠�
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public string logicselectedFunction;
+ public string logicselectedFunction = Language.StringByID(StringId.allFun);
#endregion
@@ -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