From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 681 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 570 insertions(+), 111 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index d693f04..aec2776 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -49,9 +49,9 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("type", qType);
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
- d.Add("deviceId", new List<string>() { deviceId });
- d.Add("key", new List<string>() { deviceKey });
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("deviceId", deviceId );
+ d.Add("key", deviceKey );
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
@@ -66,7 +66,7 @@
public ResponsePackNew GetArmSensorHistory( string deviceId,string pageSize, string pageNo)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", deviceId);
d.Add("pageSize", pageSize);
d.Add("pageNo", pageNo);
@@ -74,8 +74,20 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ArmSensorHistoricalData, requestJson);
}
+ /// <summary>
+ /// 璇诲彇鏈�杩戜竴涓湀鐨勬暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetLastMonthHistory(string deviceId,string key)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("deviceId", deviceId);
+ d.Add("key", key);
-
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_SensorLastMonthHistoricalData, requestJson);
+ }
#endregion
@@ -452,49 +464,50 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
}
+ /// <summary>
+ /// 鏍规嵁璐﹀彿,鑾峰彇璐﹀彿淇℃伅
+ /// </summary>
+ /// <param name="i_account">鎸囧畾璐﹀彿</param>
+ /// <returns></returns>
+ public ResponsePackNew GetMemberInfoByAccount(string i_account)
+ {
+ var pra = new { account = i_account };
+ var requestJson = HttpUtil.GetSignRequestJson(pra);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);
+ }
+
#endregion
#region 浣忓畢閮ㄥ垎
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
- public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
+ public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL,string homeId = "")
{
var requestJson = HttpUtil.GetSignRequestJson(new GetHomeListObj() { homeType = homeType.ToString() });
var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
if (resultObj.Code == StateCode.SUCCESS)
{
UserInfo.Current.regionList = new List<RegionInfoRes>();
- var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
+ var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString());
if (homeList == null || homeList.Count == 0)
{
}
else
{
- foreach (var mHome in homeList)
+ foreach (var home in homeList)
{
- var home = new RegionInfoRes()
- {
- RegionID = mHome.Id,
- Name = mHome.homeName,
- IsOthreShare = mHome.IsOtherShare,
- accountType = mHome.accountType,
- isRemoteControl = mHome.isRemoteControl,
- isBindGateway = mHome.isBindGateway,
- longitude = mHome.longitude,
- latitude = mHome.latitude,
- deliverstatus = mHome.deliverstatus,
- homeType = mHome.homeType,
- regionUrl = mHome.regionUrl,
- emqUrl = mHome.emqUrl,
- homeRegionName = mHome.homeRegionName,
- homeRegionId = mHome.homeRegionId,
- Address = mHome.homeAddress,
- isAllowCreateScene = mHome.isAllowCreateScene,
- };
if (home.isBindGateway)
{
UserInfo.Current.regionList.Add(home);
+ //鏂扮粦瀹氱殑浣忓畢锛岀洿鎺ュ垏鎹㈠埌鏂颁綇瀹�
+ if (!string.IsNullOrEmpty(homeId))
+ {
+ if (homeId.Contains(home.id))
+ {
+ DB_ResidenceData.Instance.CurrentRegion = home;
+ }
+ }
}
}
if(UserInfo.Current.regionList.Count== 0)
@@ -502,7 +515,7 @@
return "null";
}
//-------濡傛灉璐﹀彿鏄娆＄櫥褰�
- if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID))
+ if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.id))
{
//鍒锋柊褰撳墠浣忓畢
DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
@@ -514,7 +527,7 @@
else
{
//浣忓畢琚垹闄�
- var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ var findHome = UserInfo.Current.regionList.Find((obj) => obj.id == DB_ResidenceData.Instance.CurrentRegion.id);
if (findHome == null)
{
Shared.Application.RunOnMainThread(() =>
@@ -556,7 +569,7 @@
{
var requestObj = new AddOrUpdateHomeObj()
{
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
if (editId == 0)
@@ -565,7 +578,7 @@
}
else if (editId == 1)
{
- requestObj.Address = editName;
+ requestObj.homeAddress = editName;
}
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
@@ -579,14 +592,14 @@
{
try
{
- if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) return "";
- var nowhomeId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.id)) return "";
+ var nowhomeId = DB_ResidenceData.Instance.CurrentRegion.id;
var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
{
var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
- if (nowhomeId == DB_ResidenceData.Instance.CurrentRegion.RegionID)
+ if (nowhomeId == DB_ResidenceData.Instance.CurrentRegion.id)
{
if (mHomeGatewayRes != null)
{
@@ -622,7 +635,7 @@
if (DB_ResidenceData.Instance.HomeGateway == null)
return StateCode.NETWORK_ERROR;
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
var jsonString = HttpUtil.GetSignRequestJson(d);
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGatewayInfo, jsonString);
@@ -643,7 +656,7 @@
/// <returns></returns>
public ResponsePackNew GetResidenceMemberAccount()
{
- var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID });
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.id });
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
}
@@ -672,7 +685,7 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
{
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
childAccountId = childAccountId,
nickName = nickName,
});
@@ -689,11 +702,47 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
{
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
childAccountId = childAccountId,
isAllowCreateScene = isAllow,
});
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
+ }
+
+ /// <summary>
+ /// 杩囨埛
+ /// </summary>
+ /// <param name="i_account">瀵规柟璐﹀彿</param>
+ /// <returns></returns>
+ public bool TransferResidence(string i_account)
+ {
+ var pra2 = new
+ {
+ homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.id,
+ account = i_account
+ };
+ var requestJson = HttpUtil.GetSignRequestJson(pra2);
+ var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_TransferResidence, requestJson);
+
+ return result != null && result.Code == StateCode.SUCCESS;
+ }
+
+ /// <summary>
+ /// 绠＄悊鍛樻潈闄愯縼绉�
+ /// </summary>
+ /// <param name="i_childAccountId">鎴愬憳璐﹀彿id</param>
+ /// <returns></returns>
+ public bool AdminAuthorityMigration(string i_childAccountId)
+ {
+ var pra2 = new
+ {
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
+ childAccountId = i_childAccountId
+ };
+ var requestJson = HttpUtil.GetSignRequestJson(pra2);
+ var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_AdminAuthorityMigration, requestJson);
+
+ return result != null && result.Code == StateCode.SUCCESS;
}
#region 鏂版暟鎹垎浜�
@@ -730,12 +779,13 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new GetShareObj()
{
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
childAccountId = childAccountId,
});
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
}
+
#endregion
///// <summary>
@@ -869,26 +919,28 @@
public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
{
//娣诲姞瀛愯处鍙�
- var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID, account = subAccount, nickName = nickName };
+ var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.id, account = subAccount, nickName = nickName };
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
}
- ///// <summary>
- ///// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
- ///// </summary>
- ///// <returns></returns>
- //public ResponsePack GetResidenceMemberAccountInfo(string account)
- //{
- // Dictionary<string, object> d = new Dictionary<string, object>();
- // d.Add("Account", account);
- // string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- // return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
- //}
+ /// <summary>
+ /// 淇敼浣忓畢璋冭瘯鏉冮檺
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew ChangeResidenceDebugPerm(bool debugPerm)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("debugPerm", debugPerm);
+ var jsonString = HttpUtil.GetSignRequestJson(d,d);
+ var pack = HttpUtil.RequestHttpsPost(NewAPI.API_Post_Home_UpdateDebugPerm, jsonString);
+ return pack;
+ }
-
-
+
+
#endregion
/// <summary>
@@ -928,6 +980,9 @@
{
try
{
+ //鍏堟竻绌烘帹閫両D锛岄伩鍏嶄娇鐢ㄧ紦瀛樼殑PushId涓哄叾瀹冭处鍙风殑鎯呭喌锛屽鑷存煡璇㈠埌鍏跺畠璐﹀彿鐨勬帹閫佽褰�
+ OnAppConfig.Instance.PushId = "";
+
string deviceType = PhoneDeviceType.Android.ToString();
#if __IOS__
deviceType = PhoneDeviceType.IOS.ToString();
@@ -949,7 +1004,15 @@
deviceName = OnAppConfig.Instance.PhoneName,
deviceType = deviceType,
produce = isProduce,
+
};
+ mAddpushinfoObj.languageType = Utlis.GetPostLanguageType();
+
+#if DEBUG
+ //List<string> communityCodes = new List<string>();
+ //communityCodes.Add("");
+ //mAddpushinfoObj.communityCodes = communityCodes;
+#endif
//var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
@@ -986,7 +1049,7 @@
/// <summary>
/// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
/// </summary>
- /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
/// <returns></returns>
public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
{
@@ -1004,13 +1067,18 @@
{
pushType = PushType.Prompt.ToString();
}
-
+ else if (queryType == 4)
+ {
+ pushType = PushType.Notice.ToString();
+ }
var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
pushId = OnAppConfig.Instance.PushId,
- pushType = pushType
+ pushType = pushType,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
});
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
+ //2021-08-28 鏀逛负鍒嗛〉鏌ヨ
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist_Paging, requestJson);
}
/// <summary>
@@ -1138,16 +1206,13 @@
/// </summary>
/// <param name="msgId"></param>
/// <returns></returns>
- public bool PushSerivceDeleteMessage(string msgId)
+ public bool PushSerivceDeleteMessage(PushMsgIdObj mPushMsgIdObj)
{
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
+ if (mPushMsgIdObj == null) return false;
try
{
- var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
- {
- msgId = msgId
- });
+ var requestJson = HttpUtil.GetSignRequestJson(mPushMsgIdObj);
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
@@ -1206,6 +1271,18 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// 鑾峰彇鐗╀笟鍏憡璇︽儏
+ /// </summary>
+ /// <param name="noticeId"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetPropertyNoticeDetails(string noticeId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("noticeId", noticeId);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);
+ }
#endregion
#region 妫�娴嬫洿鏂�
@@ -1226,9 +1303,9 @@
- #endregion
+#endregion
- #region 鑾峰彇澶╂皵閮ㄥ垎
+#region 鑾峰彇澶╂皵閮ㄥ垎
/// <summary>
/// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅
/// </summary>
@@ -1273,6 +1350,9 @@
MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString();
MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString();
MainPage.cityInfo.weather = jt.GetValue("Weather").ToString();
+ MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString();
+ MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString();
+
break;
}
catch (Exception ex)
@@ -1293,10 +1373,10 @@
});
}
- #endregion
+#endregion
- #region 澶囦唤閮ㄥ垎
+#region 澶囦唤閮ㄥ垎
///// <summary>
///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
///// </summary>
@@ -1342,11 +1422,11 @@
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/UserBackupList", requestJson, true);
var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
- #region 鎭㈠鎴块棿鏁版嵁
+#region 鎭㈠鎴块棿鏁版嵁
GetBackupRoom(jt,loading);
- #endregion
+#endregion
Application.RunOnMainThread(() => {
loading.Hide();
@@ -1767,10 +1847,10 @@
}
*/
- #endregion
+#endregion
- #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
/// <summary>
/// 鑾峰彇璁惧鍒楄〃
/// </summary>
@@ -1778,7 +1858,7 @@
public ResponsePackNew GetDeviceList()
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ 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);
@@ -1797,10 +1877,13 @@
public ResponsePackNew Get3TyBrandBindDeviceList(string productPlatform, string productBrand)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("productPlatform", productPlatform);
d.Add("productBrand", productBrand);
- d.Add("networkConfig", true);
+ if (productBrand != "MegaHealth")
+ {
+ d.Add("networkConfig", true);
+ }
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
@@ -1819,10 +1902,31 @@
d.Add("productBrand", productBrand);
d.Add("networkConfig", true);
-
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
}
+ /// <summary>
+ /// 娉ㄥ唽绗笁鏂硅澶�
+ /// </summary>
+ /// <param name="productPlatform"></param>
+ /// <param name="productBrand"></param>
+ /// <returns></returns>
+ public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName,string pairCode = "")
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("spk", spk);
+ d.Add("extDevId", extDevId);
+ d.Add("name", deviceName);
+ d.Add("code", pairCode);
+
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson);
+ }
+
+
+
/// <summary>
/// 鑾峰彇璁惧璇︽儏
@@ -1831,7 +1935,7 @@
public ResponsePackNew GetDeviceInfo(string functionId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", new List<string>() { functionId });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -1845,7 +1949,7 @@
public ResponsePackNew GetDeviceInfoList(List<string> functionIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", functionIds);
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -1858,7 +1962,7 @@
public ResponsePackNew RefreshDeviceStatus(List<string> functionIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", functionIds);
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -1873,11 +1977,12 @@
public ResponsePackNew ControlDevice(List<ApiAlinkControlActionObj> actionObjs)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway == null ? "0" : DB_ResidenceData.Instance.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId);
d.Add("actions", actionObjs);
var requestJson = HttpUtil.GetSignRequestJson(d);
+ MainPage.Log($"api鍔熻兘鎺у埗锛歿requestJson}");
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
}
/// <summary>
@@ -1888,7 +1993,7 @@
public ResponsePackNew UpdataDevcieInfo(Function function)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", function.deviceId);
d.Add("name", function.name);
d.Add("collect", function.collect);
@@ -1904,7 +2009,7 @@
public ResponsePackNew UpdataDevcieBindRoomInfo(Function function)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", function.deviceId);
d.Add("roomIds", function.roomIds);
@@ -1919,7 +2024,7 @@
public ResponsePackNew BindDeviceToRoom(List<string> deviceIds,List<string> roomIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", deviceIds);
d.Add("roomIds", roomIds);
@@ -1932,7 +2037,7 @@
public string UnbindDeviceToRoom(string deviceId, string roomId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", new List<string>() { deviceId });
d.Add("roomIds", new List<string>() { roomId });
@@ -1945,7 +2050,7 @@
public string EditDeviceName(string deviceId, string deviceName)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", deviceId);
d.Add("name", deviceName);
@@ -1958,7 +2063,7 @@
public ResponsePackNew CollectDevice(string deviceId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds",new List<string>() { deviceId });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -1970,16 +2075,16 @@
public ResponsePackNew CancelCollectDevice(string deviceId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", new List<string>() { deviceId });
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
}
- #endregion
+#endregion
- #region Kaede --鍦烘櫙鍔熻兘--------------------------
+#region Kaede --鍦烘櫙鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
/// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
@@ -1989,7 +2094,7 @@
public ResponsePackNew GetSceneList(string roomId = null)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
if (roomId != null)
{
d.Add("roomId", roomId);
@@ -2033,7 +2138,7 @@
public ResponsePackNew AddScene(Scene scene)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("scenes", new List<Scene>() { scene });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2051,7 +2156,7 @@
public ResponsePackNew EditScene(Scene scene)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("scenes", new List<Scene>() { scene });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2064,7 +2169,7 @@
public string DeleteScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2077,7 +2182,7 @@
public string ExecuteScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2091,7 +2196,7 @@
public string CollectScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2105,15 +2210,15 @@
public string CancelCollectScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
}
- #endregion
+#endregion
- #region Kaede --鎴块棿鍔熻兘--------------------------
+#region Kaede --鎴块棿鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鎴块棿鍒楄〃
/// </summary>
@@ -2122,7 +2227,7 @@
public ResponsePackNew GetRoomList(string GetType = "All")
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
if (GetType != "All")
{
d.Add("roomType", GetType);
@@ -2141,7 +2246,7 @@
public ResponsePackNew AddRoom(List<SpatialInfo> rooms)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("rooms", rooms);
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2160,7 +2265,7 @@
public ResponsePackNew UpdateRoom(List<SpatialInfo> rooms)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("rooms", rooms);
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2180,7 +2285,7 @@
public ResponsePackNew DeleteRoom(List<string> roomIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("ids", roomIds);
var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2188,10 +2293,177 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede --鎴块棿鍔熻兘--------------------------
+#region Kaede -- 瀹夐槻鎺ュ彛____________________________
+ /// <summary>
+ /// 鑾峰彇瀹夐槻鍒楄〃
+ /// </summary>
+ public ResponsePackNew GetSecurityList()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_List, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 鑾峰彇瀹夐槻璇︽儏
+ /// </summary>
+ /// <param name="sidList">瀹夐槻sid闆嗗悎</param>
+ /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+ /// <returns></returns>
+ public ResponsePackNew GetSecurityInfo(List<string> sidList, List<string> userSecurityIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+ d.Add("sids", sidList);
+ d.Add("userSecurityIds", userSecurityIds);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Info, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 娣诲姞瀹夐槻
+ /// </summary>
+ public ResponsePackNew AddSecurity(List<SecurityAlarm> securities)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ d.Add("securitys", securities);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Add, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 缂栬緫瀹夐槻
+ /// </summary>
+ public ResponsePackNew EditSecurity(List<SecurityAlarm> securities)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ d.Add("securitys", securities);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Edit, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 鍒犻櫎瀹夐槻
+ /// </summary>
+ /// <param name="sidList">瀹夐槻sid</param>
+ /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+ /// <returns></returns>
+ public ResponsePackNew DeleteSecurity(List<string> sidList, List<string> userSecurityIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+ d.Add("sids", sidList);
+ d.Add("userSecurityIds", userSecurityIds);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Delete, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 璇诲彇瀹夐槻闃插尯鐘舵��
+ /// </summary>
+ /// <param name="sidList">瀹夐槻sid</param>
+ /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+ /// <returns></returns>
+ public ResponsePackNew ReadSecurityStatus(List<string> sidList, List<string> userSecurityIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+ d.Add("sids", sidList);
+ d.Add("userSecurityIds", userSecurityIds);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_StatusRead, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 璁剧疆瀹夐槻闃插尯鐘舵��
+ /// </summary>
+ public ResponsePackNew SetSecurityStatus(List<SecurityState> securityStates)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("securitys", securityStates);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ MainPage.Log($"api瀹夐槻鎺у埗锛歿requestJson}");
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_StatusSet, requestJson);
+ return pack;
+ }
+
+ /// <summary>
+ /// 瀹夐槻bypass璁剧疆
+ /// </summary>
+ public ResponsePackNew SetSecurityBypass(List<SecurityBypass> securityBypassStates)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("securitys", securityBypassStates);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_BypassSet, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 瀹夐槻bypass璇诲彇
+ /// </summary>
+ /// <param name="sidList">瀹夐槻sid</param>
+ /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+ /// <returns></returns>
+ public ResponsePackNew ReadSecurityBypass(List<string> sidList, List<string> userSecurityIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+ //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+ d.Add("sids", sidList);
+ d.Add("userSecurityIds", userSecurityIds);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_BypassRead, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 鏌ヨ瀹夐槻鎵�鏈夎褰�
+ /// </summary>
+ public ResponsePackNew GetSecurityLogList(string pageSize,string pageNo)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("pageSize", pageSize);
+ d.Add("pageNo", pageNo);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_ListSecurityLog, requestJson);
+ return pack;
+ }
+ /// <summary>
+ /// 鏌ヨ瀹夐槻鎶ヨ璁板綍
+ /// </summary>
+ public ResponsePackNew GetSecurityAlarmLogList(string pageSize, string pageNo)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("pageSize", pageSize);
+ d.Add("pageNo", pageNo);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_ListAlarmLog, requestJson);
+ return pack;
+ }
+
+#endregion
+
+
+#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
/// <summary>
/// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
/// </summary>
@@ -2209,41 +2481,228 @@
public ResponsePackNew Get3tyBindBrandList()
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetBindBrandList, requestJson);
return pack;
}
- #endregion
+#endregion
- #region 钀ょ煶浜慡DK鐩稿叧鎺ュ彛
+#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
/// <summary>
/// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
+ /// 2021-07-07 鏂版柟妗堟帴鍙ｈ皟鏁村鎺�
/// </summary>
public ResponsePackNew EZGetChildToken()
{
Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("platform", "1");
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
}
- #endregion
+#endregion
- #region 鍙瀵硅
+#region 鈻� 鍙瀵硅_________________________
/// <summary>
- /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙ｆ満鍒楄〃
+ /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
/// </summary>
/// <returns></returns>
public ResponsePackNew CheckFlVideo()
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome( NewAPI.API_POST_FL_Check, requestJson);
return pack;
}
- #endregion
+#endregion
+
+#region 鈻� 闂ㄩ攣鐩稿叧____________________________
+
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
+ /// </summary>
+ /// <param name="i_device">璁惧瀵硅薄</param>
+ /// <returns></returns>
+ public List<Stan.DoorHistoryLog> GetDoorHistoryLogs(Function i_device)
+ {
+ //var dicPra = new Dictionary<string, object>();
+ //dicPra.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ //dicPra.Add("deviceId", i_device.deviceId);
+ //dicPra.Add("logType", "OPEN_DOOR");
+ //dicPra.Add("pageSize", "200");
+ //var requestJson = HttpUtil.GetSignRequestJson(dicPra);
+ //var packData = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_DoorHistory, requestJson);
+ //if (packData.Code != StateCode.SUCCESS)
+ //{
+ // return null;
+ //}
+
+
+ //娴嬭瘯
+ var listLog = new List<Stan.DoorHistoryLog>();
+ for (int i = 1; i <= 3; i++)
+ {
+ var logInfo = new Stan.DoorHistoryLog { StrMsg = "鐢甸噺浣庯紝璇锋洿鎹㈢數姹�" };
+ logInfo.Time = new DateTime(2000, 5, 6, 10, 45, 23).AddDays(i);
+ listLog.Add(logInfo);
+ }
+ for (int i = 1; i <= 3; i++)
+ {
+ var logInfo = new Stan.DoorHistoryLog { StrMsg = "鐢甸噺浣庯紝璇锋洿鎹㈢數姹�" };
+ logInfo.Time = new DateTime(2001, 5, 6, 10, 45, 23).AddDays(i);
+ listLog.Add(logInfo);
+ }
+ for (int i = 1; i <= 3; i++)
+ {
+ var logInfo = new Stan.DoorHistoryLog { StrMsg = "鐢甸噺浣庯紝璇锋洿鎹㈢數姹�" };
+ logInfo.Time = new DateTime(2002, 5, 6, 10, 45, 23).AddDays(i);
+ listLog.Add(logInfo);
+ }
+
+ //鎸夋椂闂撮檷搴�
+ var listSortLog = new List<Stan.DoorHistoryLog>();
+ foreach (var logInfo in listLog)
+ {
+ bool canAdd = true;
+ for (int i = 0; i < listSortLog.Count; i++)
+ {
+ if (logInfo.Time > listSortLog[i].Time)
+ {
+ //鏃堕棿姣斿綋鍓嶇殑绱㈠紩澶�,鍒欐彃鍏ュ埌瀹冪殑鍓嶉潰
+ listSortLog.Insert(i, logInfo);
+ canAdd = false;
+ break;
+ }
+ }
+ if (canAdd == true)
+ {
+ //鏃ユ湡鏈�灏�,鍒欐坊鍔犲埌鏈熬
+ listSortLog.Add(logInfo);
+ }
+ }
+ //鎻愮ず
+ //IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
+ return listSortLog;
+ }
+
+#endregion
+#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
+ /// <summary>
+ /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetSpeakerList()
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(new GetSpeakerObj
+ {
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
+ });
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_List_Get, requestJson);
+ }
+
+ /// <summary>
+ /// 缂栬緫闊崇鎺堟潈澶囨敞
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdateSpeakerRemark(UpdateSpeakerRemarkObj remarkObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(remarkObj);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_Remark_Update, requestJson);
+ }
+
+ /// <summary>
+ /// 瑙ｉ櫎闊崇缁戝畾
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UnbindSpeaker(string tokenId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("tokenId", tokenId);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_Unbind, requestJson);
+ }
+
+ /// <summary>
+ /// 鑾峰彇闊崇鍒嗛厤鐨勮澶囧拰鍦烘櫙鍒楄〃
+ /// </summary>
+ /// <param name="getType">0 鏄煡璇㈠叏閮� 1鏄煡璇㈣澶� 2鏄煡璇㈠満鏅�</param>
+ /// <param name="tokenId"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetSpeakerDeviceList(int getType, string tokenId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("tokenId", tokenId);
+ if (getType > 0)
+ {
+ d.Add("isDevice", getType == 1);
+ }
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Get, requestJson);
+ }
+
+ /// <summary>
+ /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdateSpeakerDeviceList(UpdateSpeakerDeviceListObj updateSpeakerDeviceListObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
+ }
+#endregion
+
+
+ /// <summary>
+ /// 浜鸿劯褰曞叆
+ /// </summary>
+ /// <param name="imageBytes"></param>
+ /// <returns></returns>
+ public ResponsePackNew FaceSetting(string imageBytes)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+ //MainPage.Log(imageBytes);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_InputUserFace, requestJson);
+ }
+
+
+ /// <summary>
+ /// 淇敼浣忔埛浜鸿劯鍏抽棴鐘舵��
+ /// 1锛氬紑鍚姸鎬� 2锛氬叧闂姸鎬�
+ /// 3:娓呴櫎浜鸿劯鏁版嵁
+ /// </summary>
+ public ResponsePackNew EditFaceFunction(int status)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("faceClose", status);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_SwitchFaceFunction, requestJson);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇浣忔埛璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetCustomerInfo()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0