Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

 HDL_ON/DAL/Server/NewAPI.cs

@@ -4,7 +4,7 @@
{
    public class NewAPI
    {
        #region 新微服务接口
        //#region 新微服务接口
        //***********************************************
        //注意：和住宅相关的接口要请求住宅所在区域的域名   regionUrl    
        //***********************************************
@@ -53,18 +53,18 @@
        /// 更新个人信息
        /// </summary>
        public const string API_POST_Member_UpdateMemberInfo = "/smart-footstone/member/memberInfo/updateMemberInfo";
        /// <summary>
        /// 上传头像
        /// </summary>
        public const string API_POST_Head_Upload = "/home-wisdom/head/portrait/upload";
        /// <summary>
        /// 下载头像
        /// </summary>
        public const string API_POST_Head_Down = "/home-wisdom/head/portrait/down";
        /// <summary>
        /// 根据账号下载头像
        /// </summary>
        public const string API_POST_Head_DownWithAccount = "/home-wisdom/head/portrait/downWithAccount";
        ///// <summary>
        ///// 上传头像
        ///// </summary>
        //public const string API_POST_Head_Upload = "/home-wisdom/app/head/portrait/upload";
        ///// <summary>
        ///// 下载头像
        ///// </summary>
        //public const string API_POST_Head_Down = "/home-wisdom/app/head/portrait/down";
        ///// <summary>
        ///// 根据账号下载头像
        ///// </summary>
        //public const string API_POST_Head_DownWithAccount = "/home-wisdom/app/head/portrait/downWithAccount";
        /// <summary>
        /// 绑定认证(手机/邮箱)
        /// </summary>
@@ -75,91 +75,109 @@
        public const string API_POST_Member_UnbindWithAccount = "/smart-footstone/member/memberInfo/unbindWithAccount";
        #endregion

        /// <summary>
        /// 查询功能介绍列表
        /// </summary>
        public const string API_POST_FunctionIntroductionList = "/home-wisdom/app/functionIntroduction/list";
        #endregion

        #region ■ HomeCluster -- 住宅管理接口___________________________
        ///// <summary>
        ///// 添加住宅
        ///// </summary>
        //public const string API_POST_Addhome = "/HomeCluster/V1/addhome";

        /// <summary>
        /// 绑定住宅
        /// </summary>
        public const string Api_Post_BindlingResidence = "/app/home/deliver";
        /// <summary>
        /// 获取住宅分页
        /// </summary>
        public const string API_POST_Gethomepager = "/home-wisdom/home/list";
        public const string API_POST_Gethomepager = "/home-wisdom/app/home/list";
        /// <summary>
        /// 删除住宅
        /// </summary>
        public const string API_POST_Home_Delete = "/home-wisdom/home/delete";
        public const string API_POST_Home_Delete = "/home-wisdom/app/home/delete";
        /// <summary>
        /// 更新住宅
        /// </summary>
        public const string API_POST_Home_UpdateHome = "/home-wisdom/home/update";

        public const string API_POST_Home_UpdateHome = "/home-wisdom/app/home/update";
        /// <summary>
        /// 住宅迁移
        /// </summary>
        public const string API_POST_Home_Transfer = "/home-wisdom/app/home/transfer";
        /// <summary>
        /// 更改住宅权限
        /// </summary>
        public const string API_Post_Home_UpdateDebugPerm = "/home-wisdom/app/home/updateDebugPerm";
        #endregion

        #region ■ 子账号 -- 添加住宅成员___________________________
        /// <summary>
        /// 添加子账户
        /// </summary>
        public const string API_POST_Child_Add = "/home-wisdom/child/account/add";
        public const string API_POST_Child_Add = "/home-wisdom/app/child/account/add";
        /// <summary>
        /// 删除子账户
        /// </summary>
        public const string API_POST_Child_Delete = "/home-wisdom/child/account/delete";
        public const string API_POST_Child_Delete = "/home-wisdom/app/child/account/delete";
        /// <summary>
        /// 根据住宅 id 查询所有的子账户
        /// </summary>
        public const string API_POST_Child_FindAll = "/home-wisdom/child/account/findAll";
        public const string API_POST_Child_FindAll = "/home-wisdom/app/child/account/findAll";
        /// <summary>
        /// 更新远程控制
        /// </summary>
        public const string API_POST_Child_Update = "/home-wisdom/child/account/update";
        public const string API_POST_Child_Update = "/home-wisdom/app/child/account/update";
        /// <summary>
        /// 子账号管理员获取主账号授权Token
        /// </summary>
        public const string API_POST_Child_GetMasterToken = "/home-wisdom/child/account/masterToken/get";
        public const string API_POST_Child_GetMasterToken = "/home-wisdom/app/child/account/masterToken/get";
        ///// <summary>
        ///// 下载子账号头像
        ///// </summary>
        //public const string API_POST_Child_DownloadHeadImage = "/home-wisdom/app/child/account/getHeadPortrait";
        /// <summary>
        /// 下载子账号头像
        /// 下载账号头像
        /// </summary>
        public const string API_POST_Child_DownloadHeadImage = "/home-wisdom/child/account/getHeadPortrait";
        public const string API_POST_DownloadHeadImage = "/home-wisdom/app/head/portrait/downWithAccount";
        
        #region 数据分享
        /// <summary>
        /// 分享指定文件给指定成员
        /// </summary>
        public const string API_POST_Home_Share_Add = "/home-wisdom/home/share/add";
        public const string API_POST_Home_Share_Add = "/home-wisdom/app/home/share/add";
        /// <summary>
        /// 查询指定成员的所有分享文件
        /// </summary>
        public const string API_POST_Home_Share_FindAll = "/home-wisdom/home/share/findAll";
        public const string API_POST_Home_Share_FindAll = "/home-wisdom/app/home/share/findAll";
        /// <summary>
        /// 下载指定的分享文件
        /// </summary>
        public const string API_POST_Home_Share_DownOne = "/home-wisdom/home/share/downOne";
        public const string API_POST_Home_Share_DownOne = "/home-wisdom/app/home/share/downOne";
        /// <summary>
        /// 删除指定的分享文件
        /// </summary>
        public const string API_POST_Home_Share_Delete = "/home-wisdom/home/share/delete";
        public const string API_POST_Home_Share_Delete = "/home-wisdom/app/home/share/delete";

        #endregion

        #endregion

        #region  ■ GatewayCluster -- 网关___________________________

        /// <summary>
        /// 绑定网关到住宅
        /// </summary>
        public const string API_POST_BindGateway = "/home-wisdom/gateway/bindGateway";

        ///// <summary>
        ///// 绑定网关到住宅
        ///// </summary>
        //public const string API_POST_BindGateway = "/home-wisdom/app/gateway/bindGateway";
        /// <summary>
        /// 获取住宅网关分页
        /// </summary>
        public const string API_POST_GetGatewayList = "/home-wisdom/gateway/getGatewayList";

        public const string API_POST_GetGatewayList = "/home-wisdom/app/gateway/getGatewayList";
        /// <summary>
        /// 获取网关信息
        /// </summary>
        public const string Api_Post_GetGatewayInfo = "/home-wisdom/app/gateway/info";
        ///// <summary>
        ///// 解绑绑网关到住宅
        ///// </summary>
        public const string API_POST_UntieGateway = "/home-wisdom/gateway/untieGateway";
        public const string API_POST_UntieGateway = "/home-wisdom/app/gateway/untieGateway";

        #endregion

@@ -175,75 +193,73 @@
        /// <summary>
        /// 获取远程连接
        /// </summary>
        public const string API_POST_GetMqttRemoteInfo = "/home-wisdom/mqtt/getRemoteInfo";
        public const string API_POST_GetMqttRemoteInfo = "/home-wisdom/app/mqtt/getRemoteInfo";
        #endregion

        #region ■ HomebackupCluster -- 住宅备份微服务___________________________
        /// <summary>
        /// 创建文件夹
        /// </summary>
        public const string API_POST_Folder_Create = "/home-wisdom/backup/folder/create";

        /// <summary>
        /// 删除文件夹
        /// </summary>
        public const string API_POST_Folder_Delete = "/home-wisdom/backup/folder/delete";

        /// <summary>
        /// 查找所有文件夹
        /// </summary>
        public const string API_POST_Folder_FindAll = "/home-wisdom/backup/folder/findAll";

        /// <summary>
        /// 更新文件夹
        /// </summary>
        public const string API_POST_Folder_Update = "/home-wisdom/backup/folder/update";

        /// <summary>
        /// 上传文件
        /// </summary>
        public const string API_POST_File_Create = "/home-wisdom/backup/file/create";
        ///// <summary>
        ///// 创建文件夹
        ///// </summary>
        //public const string API_POST_Folder_Create = "/home-wisdom/app/backup/folder/create";

        ///// <summary>
        ///// 删除文件
        ///// 删除文件夹
        ///// </summary>
        //public const string API_DELETE_File_Delete = "/HomebackupCluster/V1/file/delete";
        //public const string API_POST_Folder_Delete = "/home-wisdom/app/backup/folder/delete";

        /// <summary>
        /// 下载备份文件
        /// </summary>
        public const string API_POST_File_Down = "/home-wisdom/backup/file/downOne";
        ///// <summary>
        ///// 查找所有文件夹
        ///// </summary>
        //public const string API_POST_Folder_FindAll = "/home-wisdom/app/backup/folder/findAll";

        /// <summary>
        /// 查询一个文件夹所有文件名
        /// </summary>
        public const string API_POST_File_FindAll = "/home-wisdom/backup/file/findAll";
        ///// <summary>
        ///// 更新文件夹
        ///// </summary>
        //public const string API_POST_Folder_Update = "/home-wisdom/app/backup/folder/update";

        ///// <summary>
        ///// 上传文件
        ///// </summary>
        //public const string API_POST_File_Create = "/home-wisdom/app/backup/file/create";

        /////// <summary>
        /////// 删除文件
        /////// </summary>
        ////public const string API_DELETE_File_Delete = "/HomebackupCluster/V1/file/delete";

        ///// <summary>
        ///// 下载备份文件
        ///// </summary>
        //public const string API_POST_File_Down = "/home-wisdom/app/backup/file/downOne";

        ///// <summary>
        ///// 查询一个文件夹所有文件名
        ///// </summary>
        //public const string API_POST_File_FindAll = "/home-wisdom/app/backup/file/findAll";

        #endregion

        #region ■ zigbeespeakerservice -- 语音控制服务___________________________

        #region ■ Speaker -- 语音控制服务___________________________
        /// <summary>
        /// 获取音箱列表
        /// 获取已授权的音箱列表
        /// </summary>
        public const string API_GET_Speaker_Auth = "/speakerservices/Auth";

        public const string API_POST_Speaker_List_Get = "/smart-footstone/app/token/list";
        /// <summary>
        /// 修改音箱备注
        /// 编辑音箱授权备注
        /// </summary>
        public const string API_PUT_Speaker_Auth_Rename = "/speakerservices/Auth";

        public const string API_POST_Speaker_Remark_Update = "/smart-footstone/app/token/update";
        /// <summary>
        /// 获取设备和场景列表
        /// 解绑音箱
        /// </summary>
        public const string API_GET_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";

        public const string API_POST_Speaker_Unbind = "/smart-footstone/app/token/delete";
        /// <summary>
        /// 添加设备和场景列表
        /// 获取音箱分配的设备和场景列表
        /// </summary>
        public const string API_POST_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";


        public const string API_POST_Speaker_DeviceList_Get = "/home-wisdom/app/tokenRelation/list";
        /// <summary>
        /// 更新音箱控制的设备和场景目标
        /// </summary>
        public const string API_POST_Speaker_DeviceList_Update = "/home-wisdom/app/tokenRelation/save";
        #endregion

        #region ■ PushSerivce -- 推送服务接口___________________________
@@ -281,26 +297,336 @@
        /// <summary>
        /// 检测更新,是否需要强制更新
        /// </summary>
        public const string API_POST_CheckAppVersion= "/smart-footstone/app/checkAppVersion";
        /// <summary>
        /// 查询APP最新版本
        /// </summary>
        public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion";
        #endregion

        #region ■  -- 自动化接口___________________________
        ///// <summary>
        ///// 检测更新,是否需要强制更新
        ///// </summary>
        //public const string API_POST_CheckAppVersion = "/smart-footstone/app/checkAppVersion";
        public const string API_POST_CheckAppVersion= "/smart-footstone/app/appVersion/check";
        ///// <summary>
        ///// 查询APP最新版本
        ///// </summary>
        //public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion";
        #endregion

        

        #region ■  -- 房间场景背景图片上传下载接口___________________________
        /// <summary>
        /// 上传图片
        /// </summary>
        public const string API_POST_UploadImage = "/home-wisdom/app/images/upload_image";
        /// <summary>
        /// 查询图片路径
        /// </summary>
        public const string API_POST_GetImageUrl = "/home-wisdom/app/images/get_image_url";
        #endregion


        #region Kaede -- 设备接口____________________________
        /// <summary>
        /// 获取设备列表
        /// </summary>
        public const string Api_Post_GetDevcieList = "/home-wisdom/app/device/list";
        /// <summary>
        /// 获取第三方品牌设备列表
        /// </summary>
        public const string Api_Post_Get3tyBrandDevcieList = "/home-wisdom/app/product/list";
        /// <summary>
        /// 获取设备详情
        /// </summary>
        public const string Api_Post_GetDevcieInfoList = "/home-wisdom/app/device/info";
    
        /// <summary>
        /// 刷新设备状
        /// </summary>
        public const string Api_Post_RefreshDeviceStatus = "/home-wisdom/app/device/status/refresh";
        /// <summary>
        /// 设备控制
        /// </summary>
        public const string Api_Post_ControlDevice = "/home-wisdom/app/device/control";
        /// <summary>
        /// 编辑设备信息
        /// </summary>
        public const string Api_Post_EditDevice = "/home-wisdom/app/device/edit";
        /// <summary>
        /// 设备绑定房间
        /// </summary>
        public const string Api_Post_BindDeviceToRoom = "/home-wisdom/app/device/bindRoom";
        /// <summary>
        /// 设备解绑房间
        /// </summary>
        public const string Api_Post_UnbindDeviceToRoom = "/home-wisdom/app/device/unbindRoom";
        /// <summary>
        /// 设备名称修改
        /// </summary>
        public const string Api_Post_EditDeviceName = "/home-wisdom/app/device/rename";
        /// <summary>
        /// 收藏设备
        /// </summary>
        public const string Api_Post_CollectDevice = "/home-wisdom/app/device/collect";
        /// <summary>
        /// 取消收藏设备
        /// </summary>
        public const string Api_Post_CancelCollectDevice = "/home-wisdom/app/device/cancelCollect";
        /// <summary>
        /// 获取环境传感器历史数据 小时/周/月统计数据
        /// </summary>
        public const string Api_Post_EnvironmentalSensorHistoricalData = "/home-wisdom/app/statistics/device/hourWeekMonth";
        /// <summary>
        /// 获取安防传感器历史数据
        /// </summary>
        public const string Api_Post_ArmSensorHistoricalData = "/home-wisdom/app/device/message";
        #endregion

        #region Kaede -- 场景接口____________________________
        /// <summary>
        /// 获取场景列表
        /// </summary>
        public const string Api_Post_GetSecneList = "/home-wisdom/app/scene/list";
        /// <summary>
        /// 获取场景详情
        /// </summary>
        public const string Api_Post_GetSecneInfo = "/home-wisdom/app/scene/info";
        /// <summary>
        /// 添加场景
        /// </summary>
        public const string Api_Post_AddSecne = "/home-wisdom/app/scene/add";
        /// <summary>
        /// 编辑场景
        /// </summary>
        public const string Api_Post_EditSecne = "/home-wisdom/app/scene/update";
        /// <summary>
        /// 删除场景
        /// </summary>
        public const string Api_Post_DeleteSecne = "/home-wisdom/app/scene/delete";
        /// <summary>
        /// 执行场景
        /// </summary>
        public const string Api_Post_ExecuteSecne = "/home-wisdom/app/scene/execute";
        /// <summary>
        /// 收藏场景
        /// </summary>
        public const string Api_Post_CollectScene = "/home-wisdom/app/scene/collect";
        /// <summary>
        /// 取消收藏场景
        /// </summary>
        public const string Api_Post_CancelCollectScene = "/home-wisdom/app/scene/cancelCollect";
        #endregion

        #region Kaede -- 房间接口____________________________
        /// <summary>
        /// 获取设备列表
        /// </summary>
        public const string Api_Post_GetRoomList = "/home-wisdom/app/room/list";
        /// <summary>
        /// 添加房间
        /// </summary>
        public const string Api_Post_AddRoom = "/home-wisdom/app/room/add";
        /// <summary>
        /// 删除房间
        /// </summary>
        public const string Api_Post_DelRoom = "/home-wisdom/app/room/delete";
        /// <summary>
        /// 修改房间
        /// </summary>
        public const string Api_Post_UpdateRoom = "/home-wisdom/app/room/update";

        #endregion

        #region Kaede -- 安防接口____________________________
        /// <summary>
        /// 获取安防列表
        /// </summary>
        public const string Api_Post_Security_List = "/home-wisdom/app/security/list";
        /// <summary>
        /// 获取安防详情
        /// </summary>
        public const string Api_Post_Security_Info = "/home-wisdom/app/security/info";
        /// <summary>
        /// 添加安防
        /// </summary>
        public const string Api_Post_Security_Add = "/home-wisdom/app/security/add";
        /// <summary>
        /// 编辑安防
        /// </summary>
        public const string Api_Post_Security_Edit = "/home-wisdom/app/security/update";
        /// <summary>
        /// 删除安防
        /// </summary>
        public const string Api_Post_Security_Delete = "/home-wisdom/app/security/delete";
        /// <summary>
        /// 读取安防防区状态
        /// </summary>
        public const string Api_Post_Security_StatusRead = "/home-wisdom/app/security/statusRead";
        /// <summary>
        /// 设置安防防区状态
        /// </summary>
        public const string Api_Post_Security_StatusSet = "/home-wisdom/app/security/statusSet";
        /// <summary>
        /// 安防bypass设置
        /// </summary>
        public const string Api_Post_Security_BypassSet = "/home-wisdom/app/security/bypassSet";
        /// <summary>
        /// 安防bypass读取
        /// </summary>
        public const string Api_Post_Security_BypassRead = "/home-wisdom/app/security/bypassRead";
        /// <summary>
        /// 查询安防所有记录
        /// </summary>
        public const string Api_Post_Security_ListSecurityLog = "/home-wisdom/app/security/listSecurityLog";
        /// <summary>
        /// 查询安防报警记录
        /// </summary>
        public const string Api_Post_Security_ListAlarmLog = "/home-wisdom/app/security/listAlarmLog";

        #endregion


        #region ■  -- 房间、设备、场景分享___________________________
        /// <summary>
        /// 添加分享
        /// </summary>
        public const string API_POST_Share_Add = "/home-wisdom/app/share/add";
        /// <summary>
        /// 删除分享
        /// </summary>
        public const string API_POST_Share_Delete = "/home-wisdom/app/share/delete";
        /// <summary>
        /// 获取分享
        /// </summary>
        public const string API_POST_Share_GetList = "/home-wisdom/app/share/list";
        #endregion


        #region ■  -- 自动化接口___________________________
        /// <summary>
        /// 获取自动化列表
        /// </summary>
        public const string API_POST_Logic_List = "/home-wisdom/app/logic/list";
        /// <summary>
        ///获取自动化详情
        /// </summary>
        public const string API_POST_Logic_Info = "/home-wisdom/app/logic/info";
        /// <summary>
        /// 添加自动化
        /// </summary>
        public const string API_POST_Logic_Add = "/home-wisdom/app/logic/add";
        /// <summary>
        /// 编辑自动化
        /// </summary>
        public const string API_POST_Logic_Update = "/home-wisdom/app/logic/update";
        /// <summary>
        /// 删除自动化
        /// </summary>
        public const string API_POST_Logic_Delete = "/home-wisdom/app/logic/delete";
        /// <summary>
        /// 启用禁用自动化
        /// </summary>
        public const string API_POST_Logic_Enable = "/home-wisdom/app/logic/enable";
        #endregion

        #region -- 第三方设备相关接口___________________________
        /// <summary>
        /// 获取添加过的品牌列表
        /// </summary>
        public const string Api_Post_GetBindBrandList = "/home-wisdom/app/product/brand/bindList";
        /// <summary>
        /// 获取品牌列表
        /// </summary>
        public const string Api_Post_GetBrandList = "/home-wisdom/app/product/brand/list";

        #region ■  -- 红外宝接口___________________________
        /// <summary>
        /// 红外宝设备定位
        /// </summary>
        public const string API_POST_Ir_DeviceFind = "/home-wisdom/app/device/ir/deviceFind";
        /// <summary>
        /// 红外宝下的遥控器列表
        /// </summary>
        public const string API_POST_Ir_List = ":/home-wisdom/app/device/ir/list";
        /// <summary>
        /// 遥控器红外码学习
        /// </summary>
        public const string API_POST_Ir_CodeStudy = "/home-wisdom/app/device/ir/codeStudy";
        /// <summary>
        ///红外宝红外码库试码
        /// </summary>
        public const string API_POST_Ir_CodeTest = "/home-wisdom/app/device/ir/codeTest";
        /// <summary>
        /// 红外宝遥控器添加
        /// </summary>
        public const string API_POST_Ir_Add = "/home-wisdom/app/device/ir/add";
        /// <summary>
        /// 遥控器自学按键删除
        /// </summary>
        public const string API_POST_Ir_CodeRemove = "/home-wisdom/app/device/ir/codeRemove";
        /// <summary>
        /// 获取设备详情通过(spk,sid)
        /// </summary>
        public const string Api_Post_GetinfoBySid = "/home-wisdom/app/device/infoBySid";
        /// <summary>
        /// 红外宝/遥控器删除
        /// </summary>
        public const string API_POST_Ir_DeviceDel = "/home-wisdom/app/device/remove";
        /// <summary>
        /// 修改设备名称
        /// </summary>
        public const string API_POST_Ir_DeviceRename = "/home-wisdom/app/device/rename";

        #endregion

        #endregion


        #region ■  -- 萤石SDK相关接口___________________________
        /// <summary>
        /// 河东获取萤石云子账号token的接口
        /// </summary>
        public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/childToken";
       

        #endregion

        #region  ■  -- 丰林相关相关接口___________________________
        /// <summary>
        /// 检查住宅是否绑定丰林，并获取门口机列表
        /// </summary>
        public const string API_POST_FL_Check = "/home-wisdom/app/fl/vi/check";
        /// <summary>
        /// 接听
        /// </summary>
        public const string API_POST_FL_Answer = "/home-wisdom/app/fl/vi/answer";
        /// <summary>
        /// 拒接
        /// </summary>
        public const string API_POST_FL_Reject = "/home-wisdom/app/fl/vi/reject";
        /// <summary>
        /// 开锁成功
        /// </summary>
        public const string API_POST_FL_Unlock= "/home-wisdom/app/fl/vi/unlock";
        /// <summary>
        /// 通话视频截图上传
        /// </summary>
        public const string API_POST_FL_Screenshot = "/home-wisdom/app/fl/vi/screenshot";
        /// <summary>
        /// 挂断
        /// </summary>
        public const string API_POST_FL_HangUp = "/home-wisdom/app/fl/vi/hang-up";
        /// <summary>
        /// 获取通话记录
        /// </summary>
        public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
        /// <summary>
        /// 删除通话记录
        /// </summary>
        public const string API_POST_FL_DeleteCallInfo = "/home-wisdom/app/fl/vi/delete";
        /// <summary>
        /// 获取门口机列表
        /// </summary>
        public const string API_POST_FL_List = "http://112.74.164.111:180/api.php/Device/getmonitorUUID";
        /// <summary>
        /// 动态密码/二维码开锁
        /// </summary>
        public const string API_POST_FL_QRcode = "http://112.74.164.111:180/api.php/Device/setdynamicpwd";
        #endregion


    }

    ///// <summary>