blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2022-05-18 b1b3f47f3eeff8536b1a2851781da0b04f346fef 
 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


{


@@ -45,13 +46,17 @@


        /// <param name="deviceId">设备ID</param>


        /// <param name="deviceKey">功能查询类型：pm25</param>


        /// <returns></returns>


        public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey)


        public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey,string time = "")


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("type", qType);


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("deviceId", deviceId);


            d.Add("key", deviceKey);


            if(time!= "")


            {


                d.Add("time", time);


            }




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);


@@ -152,6 +157,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;


        }


@@ -395,7 +404,11 @@


                        }


                    }


                }




//#if __IOS__


//                //登录全视通


//                Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);


//                //Shared.IOS.HDLFVSDK.Video.Init("", "466196456122637");


//#endif


                UserInfo.Current.SaveUserInfo();


                MainPage.Log("获取用户信息成功。");


            }


@@ -506,9 +519,9 @@


            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);


        }




        #endregion


#endregion




        #region 住宅部分


#region 住宅部分


        /// <summary>


        /// 获取住宅列表


        /// </summary>


@@ -781,7 +794,7 @@


            return result != null && result.Code == StateCode.SUCCESS;


        }




        #region 新数据分享


#region 新数据分享


        /// <summary>


        /// 添加分享


        /// </summary>


@@ -822,7 +835,7 @@


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);


        }




        #endregion


#endregion




        ///// <summary>


        ///// 获取住宅下子账号的共享数据列表


@@ -978,7 +991,7 @@








        #endregion


#endregion


        /// <summary>


        /// 获取MQTT远程连接信息接口


        /// </summary>


@@ -1008,7 +1021,7 @@


            }


        }




        #region 推送


#region 推送


        /// <summary>


        /// 提交推送需要的关键标识信息


        /// </summary>


@@ -1025,10 +1038,16 @@


#endif


                //是否生产模式


                bool isProduce = true;


#if DEBUG


                isProduce = false;


#endif


                if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")


                {


#if __IOS__


                    isProduce = true;




#else


                    isProduce = false;




#endif


                }


                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))


                {


                    Utlis.WriteLine("PushDeviceToken 为空");


@@ -1053,9 +1072,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 +1089,7 @@


                            OnAppConfig.Instance.PushId = pushId;


                            OnAppConfig.Instance.SaveConfig();


                            Utlis.WriteLine("PushId: " + pushId);




                            //new Alert("","提交pushToken成功"+ OnAppConfig.Instance.PushDeviceToken, "取消","确定").Show();


                            return true;


                        }


                    }


@@ -1072,7 +1097,7 @@


                }


                else


                {


                    //Utlis.WriteLine("AddToken 失败");


                    Utlis.WriteLine("AddToken 失败");


                }


                return false;


            }


@@ -1321,9 +1346,9 @@


            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);


        }


        #endregion


#endregion




        #region 检测更新


#region 检测更新


        /// <summary>


        /// 


        /// </summary>


@@ -1341,9 +1366,9 @@








        #endregion


#endregion




        #region 获取天气部分


#region 获取天气部分


        /// <summary>


        /// 获取指定经纬度的城市信息天气信息


        /// </summary>


@@ -1464,10 +1489,10 @@


        //}






        #endregion


#endregion






        #region 备份部分


#region 备份部分


        ///// <summary>


        ///// 获取住宅备份列表


        ///// </summary>


@@ -1938,23 +1963,26 @@


        }


        */




        #endregion


#endregion






        #region Kaede --设备功能——————————————————————————————————


#region Kaede --设备功能——————————————————————————————————


        /// <summary>


        /// 获取设备列表


        /// </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);


@@ -2173,9 +2201,9 @@


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);


        }




        #endregion


#endregion




        #region Kaede --场景功能--------------------------


#region Kaede --场景功能--------------------------


        /// <summary>


        /// 获取场景列表


        /// 房间ID可空，默认查询住宅下所有房间


@@ -2307,9 +2335,9 @@


            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;


        }


        #endregion


#endregion




        #region Kaede --房间功能--------------------------


#region Kaede --房间功能--------------------------


        /// <summary>


        /// 获取房间列表


        /// </summary>


@@ -2384,10 +2412,10 @@


            return pack;


        }




        #endregion


#endregion






        #region Kaede -- 安防接口____________________________


#region Kaede -- 安防接口____________________________


        /// <summary>


        /// 获取安防列表


        /// </summary>


@@ -2551,10 +2579,10 @@


            return pack;


        }




        #endregion


#endregion






        #region Kaede --第三方品牌功能--------------------------


#region Kaede --第三方品牌功能--------------------------


        /// <summary>


        /// 获取第三方品牌列表


        /// </summary>


@@ -2579,9 +2607,9 @@


            return pack;


        }




        #endregion


#endregion




        #region ■ 萤石云SDK相关接口_________________________


#region ■ 萤石云SDK相关接口_________________________


        /// <summary>


        /// 河东获取萤石云子账号token的接口


        /// 2021-07-07 新方案接口调整对接


@@ -2594,10 +2622,10 @@


            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);


        }


        #endregion


#endregion






        #region ■ 可视对讲_________________________


#region ■ 可视对讲_________________________


        /// <summary>


        /// 检查住宅是否绑定丰林


        /// </summary>


@@ -2610,9 +2638,28 @@


            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Check, requestJson);


            return pack;


        }


        #endregion


        /// <summary>


        /// 获取门口机徘徊报警数据


        /// </summary>


        /// <param name="deviceId"></param>


        /// <returns></returns>


        public ResponsePackNew GetAlarmRecords(string deviceId, int pageSize, int pageNo, string alarmType = "PROWLER_ALARM")


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("deviceId", deviceId);


            d.Add("alarmType", alarmType);


            d.Add("pageSize", pageSize);


            d.Add("pageNo", pageNo);


            var requestJson = HttpUtil.GetSignRequestJson(d);


            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_ALARM_RECORDS, requestJson);


            return pack;




        #region ■ 门锁相关____________________________


        }




#endregion




#region ■ 门锁相关____________________________




        /// <summary>


        /// 获取门锁历史记录(按日期降序)


@@ -2681,8 +2728,8 @@


            return listSortLog;


        }




        #endregion


        #region ■ 音箱语言控制相关_________________________


#endregion


#region ■ 音箱语言控制相关_________________________


        /// <summary>


        /// 获取已授权的音箱列表


        /// </summary>


@@ -2746,7 +2793,7 @@


            var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);


        }


        #endregion


#endregion




        /// <summary>


        /// 绑定source面板


@@ -2807,5 +2854,26 @@


            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);


        }




        /// <summary>


        /// 获取三方账户详情（可视对讲）


        /// </summary>


        /// <returns></returns>


        public string GetVideoThirdPartUserInfo()


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);




            var requestJson = HttpUtil.GetSignRequestJson(d);


            var resultObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_Third_Account, requestJson);


            if (resultObj.Code == StateCode.SUCCESS)


            {


                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfoThirdPartVideo>(resultObj.Data.ToString());


                return info.extUserId;


            }


            else {


                return "";


            }


        }


    }


}