Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 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 ()
        {
@@ -50,6 +55,14 @@
        /// 信息推送标记
        /// </summary>
        public string PushDeviceToken;
        /// <summary>
        /// phoneName
        /// </summary>
        public string PhoneName;
        /// <summary>
        /// 添加推送Token成功时返回的Id
        /// </summary>
        public string PushId;

        public string SetLanguage = "";