2021-02-23 1.增加场景数据转换和上传测试方法。2.增加风扇和通用开关设备spk

JLChen

2021-02-23 2b380862ab304f049ae7181a058b0791671d1bb4

 Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs

@@ -853,6 +853,46 @@

        #endregion

        #region * 上传设备列表___________________________
        /// <summary>
        /// 
        /// </summary>
        /// <param name="mOids"></param>
        /// <returns></returns>
        public ResponsePackNew UploadDeviceOidList (Oids mOids)
        {
            var requestJson = HttpUtil.GetSignRequestJson (mOids);
            return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Device_Oid_Add, requestJson);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="mOids"></param>
        /// <returns></returns>
        public ResponsePackNew UploadDeviceSidList (Sids mSids)
        {
            var requestJson = HttpUtil.GetSignRequestJson (mSids);
            return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Device_Sid_Add, requestJson);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="mOids"></param>
        /// <returns></returns>
        public ResponsePackNew GetDeviceList ()
        {
            var requestJson = HttpUtil.GetSignRequestJson (new HomeIdObj {
                homeId = UserConfig.Instance.CurrentRegion.Id,
            });
            return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_GetDevcieList, requestJson);
        }


        #endregion


        //#region Kaede --设备功能——————————————————————————————————
        ///// <summary>
        ///// 获取设备列表
@@ -1060,23 +1100,23 @@
        //    return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
        //}

        ///// <summary>
        ///// 添加场景
        ///// </summary>
        ///// <returns></returns>
        //public ResponsePackNew AddScene(Scene scene)
        //{
        //    Dictionary<string, object> d = new Dictionary<string, object>();
        //    d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID);
        //    d.Add("scenes", new List<Scene>() { scene });
        /// <summary>
        /// 添加场景
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddScene (List<HDLLinkScene> sceneList)
        {
            Dictionary<string, object> d = new Dictionary<string, object> ();
            d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
            d.Add ("scenes", sceneList);

        //    var requestJson = HttpUtil.GetSignRequestJson(d);
        //    var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
            var requestJson = HttpUtil.GetSignRequestJson (d);
            var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_AddSecne, requestJson);

        //    Utlis.WriteLine($"{pack.Data}");
            Utlis.WriteLine ($"{pack.Data}");

        //    return pack;
        //}
            return pack;
        }
        ///// <summary>
        ///// 编辑场景
        ///// </summary>
@@ -1164,7 +1204,7 @@
        //    d.Add("pageSize", "1000");
        //    var requestJson = HttpUtil.GetSignRequestJson(d);
        //    var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
            

        //    return pack;
        //}
        ///// <summary>