From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC

---
 HDL_ON/Entity/OnAppConfig.cs |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index 7a841e9..d77875c 100644
--- a/HDL_ON/Entity/OnAppConfig.cs
+++ b/HDL_ON/Entity/OnAppConfig.cs
@@ -16,7 +16,7 @@
                 if (instance == null) {
                     try {
                         var userConfigBytes = FileUtils.ReadFile ("OnAppConfig");
-                        var userConfigString = CommonPage.MyEncodingUTF8.GetString (userConfigBytes);
+                        var userConfigString = System.Text.Encoding.UTF8.GetString (userConfigBytes);
                         OnAppConfig temp = null;
                         if (userConfigString != null) {
                             temp = Newtonsoft.Json.JsonConvert.DeserializeObject<OnAppConfig> (userConfigString);
@@ -34,8 +34,13 @@
 
         byte [] GetUserConfigBytes ()
         {
-            return CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (this));
+            return System.Text.Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (this));
         }
+        /// <summary>
+        /// 缃戠粶杩炴帴鐘舵��
+        /// 0:鏃犵綉缁�
+        /// </summary>
+        public int internetStatus = 2;
 
         public void RefreshUserConfig ()
         {
@@ -50,6 +55,14 @@
         /// 淇℃伅鎺ㄩ�佹爣璁�
         /// </summary>
         public string PushDeviceToken;
+        /// <summary>
+        /// phoneName
+        /// </summary>
+        public string PhoneName;
+        /// <summary>
+        /// 娣诲姞鎺ㄩ�乀oken鎴愬姛鏃惰繑鍥炵殑Id
+        /// </summary>
+        public string PushId;
 
         public string SetLanguage = "";
 

--
Gitblit v1.8.0