金茂科技系统更新

wxr

2022-11-15 02498f7744e6fdc413e518f96b25f3635540dc6b

 HDL_ON/Common/HDLCommon.cs

@@ -91,7 +91,7 @@
                    {
                        if (revertObj.Data != null)
                        {
                            var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString());
                            var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString());
                            if (appVersionRes != null)
                            {

@@ -99,24 +99,25 @@
                                {
                                    UpdateType = appVersionRes.isEnforce ? 2 : 1,
                                    NewVersion = appVersionRes.version,
                                    NewVersionUrl = appVersionRes.androidUrl
                                    NewVersionUrl = appVersionRes.packageUrl
                                };
#if __IOS__
                                mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
#endif
                                //解析更新内容详情
                                var reasonStrJson = GetReasonStrJson(appVersionRes.updateDescription);
                                if (reasonStrJson != null)
                                {
                                    if (Language.CurrentLanguage == "Chinese")
                                    {
                                        mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
                                    }
                                    else
                                    {
                                        mForceUpdateInfo.ReasonStr = reasonStrJson.English;
                                    }
                                }
                                //var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
                                //if (reasonStrJson != null)
                                //{
                                //    if (Language.CurrentLanguage == "Chinese")
                                //    {
                                //        mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
                                //    }
                                //    else
                                //    {
                                //        mForceUpdateInfo.ReasonStr = reasonStrJson.English;
                                //    }
                                //}
                                mForceUpdateInfo.ReasonStr = appVersionRes.remark;

                                Application.RunOnMainThread(() =>
                                {
@@ -301,9 +302,23 @@
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
                    {
                        if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;

                        
                        //字段兼容问题，只能直接取值了
                        var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
                        try
                        {
                            var pushTime = json["pushTime"];
                            if (!string.IsNullOrEmpty(pushTime.ToString()))
                            {
                                var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
                                if (pushDateTime.AddSeconds(30) < DateTime.Now)
                                {
                                    return;
                                }
                            }
                        }
                        catch { }

                        //1.视对讲厂家类型
                        string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
                        if (string.IsNullOrEmpty(interphoneTypeEnum)) return;