2020-11-23 1.我的二维码界面。2.隐私政策页面调整。

JLChen

2020-11-23 b1ced13098c3202482d9d83e6f6ba1f601e59ae8

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -3,6 +3,7 @@
using System.IO;
using System.Net;

using System.Text;
using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -462,17 +463,18 @@
        {
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
            var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
            if(resultObj.Code == StateCode.SUCCESS)
            if (resultObj.Code == StateCode.SUCCESS)
            {
                var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
                if (homeList == null || homeList.Count == 0) {
                if (homeList == null || homeList.Count == 0)
                {


                }
                else
                {
                     UserInfo.Current.regionList = new List<RegionInfoRes>();
                   
                    UserInfo.Current.regionList = new List<RegionInfoRes>();

                    foreach (var mHome in homeList)
                    {
                        var home = new RegionInfoRes()
@@ -496,16 +498,17 @@
                        {
                            continue;
                        }
                         UserInfo.Current.regionList.Add(home);
                        if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
                        {
                            DB_ResidenceData.residenceData.CurReginID =  UserInfo.Current.regionList[0].RegionID;
                        }
                        UserInfo.Current.regionList.Add(home);
                    }

                    if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
                    {
                        DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
                    }
                    DB_ResidenceData.residenceData.SaveResidenceData();
                     UserInfo.Current.SaveUserInfo();
                    UserInfo.Current.SaveUserInfo();
                }
               

            }

            return resultObj.Code;
@@ -859,6 +862,155 @@

        #endregion

        /// <summary>
        /// 获取MQTT远程连接信息接口
        /// </summary>
        public MqttInfo GetMqttRemoteInfo(string attachClientId)
        {
            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
                {
                    attachClientId = attachClientId,
                    homeType = HomeTypeEnum.BUSPRO.ToString()
                });
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
                }
                else
                {
                    Utlis.WriteLine("GetMqttRemoteInfo error");
                    return null;
                }
            }
            catch
            {
                return null;
            }
        }

        #region 推送
        //        /// <summary>
        //        /// 提交推送需要的关键标识信息
        //        /// </summary>
        //        public bool PushserivceAddPushInfo()
        //        {
        //            try
        //            {
        //                string DeviceType = "Android";
        //#if __IOS__
        //                DeviceType = "Iphone";
        //#endif
        //                //是否生成模式
        //                bool isProduce = true;
        //#if DEBUG
        //                isProduce = false;
        //#endif

        //                if (string.IsNullOrEmpty(UserConfig.Instance.tokenID)) return false;

        //                var mAddpushinfoObj = new AddpushinfoObj()
        //                {
        //                    pushid = UserConfig.Instance.tokenID,
        //                    deviceName = UserConfig.Instance.phoneName,
        //                    deviceType = DeviceType,
        //                    produce = isProduce,

        //                };
        //                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
        //                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Pushserivce_Addpushinfo, mAddpushinfoJson);
        //                if (revertObj.Code == StateCode.SUCCESS)
        //                {
        //                    if (revertObj.Data != null)
        //                    {
        //                        var pushId = revertObj.Data.ToString();
        //                        if (!string.IsNullOrEmpty(pushId))
        //                        {
        //                            UserConfig.Instance.PushId = pushId;
        //                            UserConfig.Instance.SaveUserConfig();
        //                            return true;
        //                        }
        //                    }
        //                    Utlis.WriteLine("Addpushinfo 成功");
        //                }
        //                else
        //                {
        //                    Utlis.WriteLine("Addpushinfo 失败");
        //                }

        //                return false;
        //            }
        //            catch
        //            {
        //                return false;
        //            }
        //        }

        //        /// <summary>
        //        /// 查询推送信息列表
        //        /// </summary>
        //        /// <returns></returns>
        //        public ResponsePackNew PushserivceGetpushmessagelist()
        //        {
        //            var urlSegmentDic = HttpUtil.GetBaseQueryDictionary();
        //            urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
        //            return HttpUtil.RequestHttpsGet(NewAPI.API_GET_Pushserivce_Getpushmessagelist, null, urlSegmentDic);
        //        }

        //        /// <summary>
        //        /// 清空消息记录
        //        /// </summary>
        //        /// <returns></returns>
        //        public bool PushserivceClearmessagelist()
        //        {
        //            if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false;

        //            var urlSegmentDic = new Dictionary<string, object>();
        //            urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
        //            var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Clearmessagelist, null, null, urlSegmentDic);
        //            if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
        //            {
        //                return true;
        //            }
        //            else
        //            {

        //            }
        //            return false;
        //        }

        //        /// <summary>
        //        /// 退出登录，清空推送标识
        //        /// </summary>
        //        /// <returns></returns>
        //        public bool PushserivceSignOut()
        //        {
        //            if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false;
        //            try
        //            {
        //                var urlSegmentDic = new Dictionary<string, object>();
        //                urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
        //                var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Deletepushinfo, null, null, urlSegmentDic);
        //                if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
        //                {
        //                    return true;
        //                }
        //                else
        //                {

        //                }
        //                return false;
        //            }
        //            catch
        //            {
        //                return false;
        //            }
        //        }

        #endregion

        #region 获取天气部分
        /// <summary>
        /// 获取指定经纬度的城市信息
@@ -1000,6 +1152,7 @@
            }
            return backupList;
        }

        /* 2020-09-01 弃用 恢复旧数据功能在bus软件上实现
        /// <summary>
        /// 获取备份文件列表