From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/Entity/OnAppConfig.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index 7a841e9..56b5fa1 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,7 +34,7 @@
byte [] GetUserConfigBytes ()
{
- return CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (this));
+ return System.Text.Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (this));
}
public void RefreshUserConfig ()
--
Gitblit v1.8.0