From 37dc5f07121946aa03ce96030a9f400af032367d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 16:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath
---
HDL_ON/Entity/OnAppConfig.cs | 49 +++++++++++--------------------------------------
1 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index 5b40237..c3091aa 100644
--- a/HDL_ON/Entity/OnAppConfig.cs
+++ b/HDL_ON/Entity/OnAppConfig.cs
@@ -9,13 +9,17 @@
[System.Serializable]
public class OnAppConfig
{
+ /// <summary>
+ /// OnAppConfig
+ /// </summary>
+ //public const string ConfigFile = "OnAppConfig";
static OnAppConfig instance;
public static OnAppConfig Instance {
get {
if (instance == null) {
try {
- var userConfigBytes = FileUtils.ReadFile ("OnAppConfig");
+ var userConfigBytes = Common.FileUtlis.Files.ReadAppConfig ();
var userConfigString = System.Text.Encoding.UTF8.GetString (userConfigBytes);
OnAppConfig temp = null;
if (userConfigString != null) {
@@ -26,7 +30,9 @@
} else {
instance = temp;
}
- } catch { }
+ } catch {
+ instance = new OnAppConfig() { };
+ }
}
return instance;
}
@@ -36,11 +42,7 @@
{
return System.Text.Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (this));
}
- /// <summary>
- /// 缃戠粶杩炴帴鐘舵��
- /// 0:鏃犵綉缁�
- /// </summary>
- public int internetStatus = 2;
+
public void RefreshUserConfig ()
{
@@ -49,37 +51,8 @@
public void SaveUserConfig ()
{
- FileUtils.WriteFileByBytes ("OnAppConfig", GetUserConfigBytes ());
+ Common.FileUtlis.Files.WirteAppConfig ( GetUserConfigBytes ());
}
- /// <summary>
- /// 淇℃伅鎺ㄩ�佹爣璁�
- /// </summary>
- public string PushDeviceToken;
-
- public string SetLanguage = "";
-
- /// <summary>
- /// 杞欢瑙ｉ攣鐣岄潰
- /// 1:鍚姩鏃�
- /// 2:甯冮槻鎾ら槻鏃�
- /// 3:杩滅▼寮�閿佹椂
- /// </summary>
- public List<string> appUnlockPage = new List<string>();
- /// <summary>
- /// 杞欢瑙ｉ攣鏂瑰紡
- /// 1:鏁板瓧瀵嗙爜
- /// 2:鎵嬪娍瀵嗙爜
- /// 3:鎸囩汗瀵嗙爜
- /// 4:闈㈠ID
- /// </summary>
- public List<string> appUnlockType = new List<string>();
- /// <summary>
- /// 杞欢瑙ｉ攣瀵嗙爜
- /// </summary>
- public string appUnlockPasswrod = "";
- /// <summary>
- /// 瑙ｉ攣鏃堕棿
- /// </summary>
- public DateTime unlockTime = DateTime.MinValue;
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0