From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
HDL_ON/Entity/OnAppConfig.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index 7a841e9..5b40237 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 ()
{
--
Gitblit v1.8.0