From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Entity/OnAppConfig.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index 7a841e9..4446f29 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);
@@ -26,7 +26,9 @@
} else {
instance = temp;
}
- } catch { }
+ } catch {
+ instance = new OnAppConfig() { };
+ }
}
return instance;
}
@@ -34,8 +36,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 +57,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