增加预编译条件

chenqiyang

2022-05-17 39e83c7df7608b29a3f359bcc6d9ca9b7ff095f5

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -5,6 +5,7 @@
using System.Text;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;

namespace HDL_ON.DAL.Server
{
@@ -152,6 +153,10 @@
                sdm.AccessToken = UserInfo.Current.LoginTokenString;
                sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
            }
            else if (revertObj.Code == StateCode.PasswrodError)
            {
                UserInfo.Current.LastTime = DateTime.MinValue;
            }
            return revertObj.Code;
        }
@@ -1026,7 +1031,7 @@
                //是否生产模式
                bool isProduce = true;
#if DEBUG
                isProduce = false;
                isProduce = true;
#endif

                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))
@@ -1053,9 +1058,15 @@

                //var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
                var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);

                Utlis.WriteLine("mAddpushinfoJson: " + mAddpushinfoJson);

                //new Alert("", , "取消", "确定").Show();
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    //new Alert("", "提交pushToken成功" + OnAppConfig.Instance.PushDeviceToken, "取消", "确定").Show();

                    if (revertObj.Data != null)
                    {
                        var pushId = revertObj.Data.ToString();
@@ -1064,7 +1075,7 @@
                            OnAppConfig.Instance.PushId = pushId;
                            OnAppConfig.Instance.SaveConfig();
                            Utlis.WriteLine("PushId: " + pushId);

                            //new Alert("","提交pushToken成功"+ OnAppConfig.Instance.PushDeviceToken, "取消","确定").Show();
                            return true;
                        }
                    }
@@ -1072,7 +1083,7 @@
                }
                else
                {
                    //Utlis.WriteLine("AddToken 失败");
                    Utlis.WriteLine("AddToken 失败");
                }
                return false;
            }
@@ -1946,15 +1957,18 @@
        /// 获取设备列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetDeviceList()
        public ResponsePackNew GetDeviceList(string pageSize="",string pageNo ="")
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            //d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);
            //d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//可控参数，当需要分页获取，怎么知道分页总数
            //d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageNo", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            if (!string.IsNullOrEmpty(pageSize))
            {
                d.Add("pageSize", pageSize);
                d.Add("pageNo", pageNo);
            }

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);