Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 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 = FileUtils.ReadFile (ConfigFile);
                        var userConfigString = System.Text.Encoding.UTF8.GetString (userConfigBytes);
                        OnAppConfig temp = null;
                        if (userConfigString != null) {
@@ -51,21 +55,9 @@

        public void SaveUserConfig ()
        {
            FileUtils.WriteFileByBytes ("OnAppConfig", GetUserConfigBytes ());
            FileUtils.WriteFileByBytes (ConfigFile, GetUserConfigBytes ());
        }
        /// <summary>
        /// 信息推送标记
        /// </summary>
        public string PushDeviceToken;
        /// <summary>
        /// phoneName
        /// </summary>
        public string PhoneName;
        /// <summary>
        /// 添加推送Token成功时返回的Id
        /// </summary>
        public string PushId;

      
        public string SetLanguage = "";

        /// <summary>