From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 414 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 234 insertions(+), 180 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f156f7b..6ff56cb 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -59,7 +59,7 @@
d.Add("QueryType", queryType);
d.Add("loopId", loopId);
d.Add("NowMonth", nowMonth);
- d.Add("MAC", DB_ResidenceData.residenceData.residenceGatewayMAC);
+ d.Add("MAC", DB_ResidenceData.Instance.residenceGatewayMAC);
d.Add("LocalTimeZone", 8);
var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString, true);
@@ -99,7 +99,7 @@
public ResponsePackNew GetRegionByAccount(string account)
{
var requestJson = HttpUtil.GetSignRequestJson(new RegionByAccountObj() { account = account });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson, HttpUtil.GlobalRequestHttpsHost);
}
/// <summary>
@@ -127,6 +127,18 @@
#endregion
+ /// <summary>
+ /// 缁戝畾璋冭瘯浜哄憳鎻愪氦鐨勪綇瀹�,涓�涓綇瀹呭彧鑳界粦瀹氫竴娆�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew BindingResidence(string key)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ //d.Add("homeId", homeId);
+ d.Add("secretKey", key);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindlingResidence, requestJson, HttpUtil.GlobalRequestHttpsHost);
+ }
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
@@ -204,7 +216,7 @@
/// <returns></returns>
public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
{
- var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code, memberName = account };
+ var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code};//, memberName = account
if (isPhone)
{
requestObj.memberPhone = account;
@@ -285,6 +297,7 @@
UserInfo.Current.userEmailInfo = info.memberEmail;
UserInfo.Current.userMobileInfo = info.memberPhone;
UserInfo.Current.userName = info.memberName;
+
if (!string.IsNullOrEmpty(info.memberPhonePrefix))
{
UserInfo.Current.areaCode = info.memberPhonePrefix;
@@ -292,14 +305,16 @@
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
- var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
-
- var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);
-
- if (headImageBytes != null && headImageBytes.Length > 0)
+ //2020-12-15 淇敼澶村儚鏂规
+ if (!string.IsNullOrEmpty(info.memberHeadIcon))
{
- //UserInfo.Current.headImagePageBytes = headImageBytes;
- UserInfo.Current.headImagePagePath = imageKey;
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
+
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ UserInfo.Current.headImagePagePath = info.memberHeadIcon;
+ //UserInfo.Current.headImagePagePath = imageKey;
+ }
}
}
@@ -359,7 +374,20 @@
}
-
+ /// <summary>
+ /// 鑾峰彇鐢ㄦ埛澶村儚
+ /// </summary>
+ /// <param name="userId"></param>
+ public void GetUserHeadImageByKey(string imageKey)
+ {
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(imageKey);
+
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ //UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePagePath = imageKey;
+ }
+ }
/// <summary>
/// 鏇存柊鐢ㄦ埛鏄电О
@@ -374,6 +402,20 @@
});
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
+
+ ///// <summary>
+ ///// 鏇存柊鐢ㄦ埛澶村儚
+ ///// </summary>
+ ///// <param name="userName"></param>
+ ///// <returns></returns>
+ //public ResponsePackNew UpdateMemberHeadIcon(string memberHeadIcon)
+ //{
+ // var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberHeadIconRes()
+ // {
+ // memberHeadIcon = memberHeadIcon
+ // });
+ // return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
+ //}
///// <summary>
///// 鏇存柊鐢ㄦ埛澶村儚
@@ -436,16 +478,13 @@
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());
if (homeList == null || homeList.Count == 0)
{
-
-
}
else
{
- UserInfo.Current.regionList = new List<RegionInfoRes>();
-
foreach (var mHome in homeList)
{
var home = new RegionInfoRes()
@@ -464,114 +503,53 @@
homeRegionName = mHome.homeRegionName,
homeRegionId = mHome.homeRegionId,
Address = mHome.homeAddress,
+ isAllowCreateScene = mHome.isAllowCreateScene,
};
- if (home.IsOthreShare)
- {
- continue;
- }
UserInfo.Current.regionList.Add(home);
}
-
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+ //-------濡傛灉璐﹀彿鏄娆＄櫥褰�
+ if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID))
{
- DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
- //鎭㈠澶囦唤
- HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
+ //鍒锋柊褰撳墠浣忓畢
+ DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ GetHomeGatewayList();
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.residenceData.CurReginID);
- if(curRegion == null)
+ //浣忓畢琚垹闄�
+ var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ if (findHome == null)
{
- DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
- //鎭㈠澶囦唤
- HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
+ Shared.Application.RunOnMainThread(() =>
+ {
+ DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+ GetHomeGatewayList();
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ Action action = () =>
+ {
+ MainPage.GoUserPage();
+ };
+ new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
+ });
+ }
+ else
+ {
+ //鍒锋柊褰撳墠浣忓畢
+ DB_ResidenceData.Instance.CurrentRegion = findHome;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ GetHomeGatewayList();
}
}
-
-
- DB_ResidenceData.residenceData.SaveResidenceData();
- UserInfo.Current.SaveUserInfo();
-
- //鍒锋柊涓�娆′綇瀹呯綉鍏�
- GetHomeGatewayList();
}
-
}
return resultObj.Code;
-
- //string jsonString = "{" +
- // "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
- // "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
- // "\"HomeType\":" + "\"" + "1" + "\"" + "," +
- // "\"LoginAccessToken\":" + "\"" + UserInfo.Current.loginTokenString + "\"" +
- // "}";
- //var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
-
- //if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
- //{
- // var dataStr = JObject.FromObject(responsePack.ResponseData);
- // //娌℃湁浣忓畢
- // if (dataStr.GetValue("PageData").ToString() == "[]")
- // {
-
- // }
- // else
- // {
- // //{
- // // {
- // // "Id": "1107487",
- // // "HomeStatus": 2,
- // // "UserGuid": "22980",
- // // "Name": "鍟�",
- // // "Address": null,
- // // "Longitude": 0.0,
- // // "Latitude": 0.0,
- // // "RegionName": null,
- // // "Company": null,
- // // "ContactPerson": null,
- // // "ContactPersonPhone": null,
- // // "Remarks": null,
- // // "ChangeDate": null,
- // // "AccountType": 0,
- // // "CreatedOnUtc": "2020-05-27T06:52:03",
- // // "IsOthreShare": false,
- // // "MainUserDistributedMark": null,
- // // "HomeGateways": [
- // // {
- // // "GatewayUniqueId": "4E47323347591243"
- // // }
- // // ]
- // //}}
- // UserInfo.Current.regionList = new List<RegionInfoRes>();
- // foreach (var jsonData in dataStr.GetValue("PageData"))
- // {
- // var homeJsonStr = JObject.FromObject(jsonData);
- // var home = new RegionInfoRes()
- // {
- // RegionID = homeJsonStr.GetValue("Id").ToString(),
- // RegionName = homeJsonStr.GetValue("RegionName").ToString(),
- // Name = homeJsonStr.GetValue("Name").ToString(),
- // Address = homeJsonStr.GetValue("Address").ToString(),
- // IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
- // homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
- // };
- // if (home.IsOthreShare)
- // {
- // continue;
- // }
- // UserInfo.Current.regionList.Add(home);
- // if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
- // {
- // DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
- // }
- // }
- // DB_ResidenceData.residenceData.SaveResidenceData();
- // UserInfo.Current.SaveUserInfo();
- // }
- //}
- //return responsePack.StateCode;
}
/// <summary>
@@ -584,7 +562,7 @@
{
var requestObj = new AddOrUpdateHomeObj()
{
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
};
if (editId == 0)
@@ -607,27 +585,36 @@
{
try
{
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;
- var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) return;
+ var nowhomeId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
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.residenceData.residecenInfo.RegionID)
+ if (nowhomeId == DB_ResidenceData.Instance.CurrentRegion.RegionID)
{
if (mHomeGatewayRes != null)
{
if (mHomeGatewayRes.Count > 0)
{
- DB_ResidenceData.residenceData.HomeGateway = mHomeGatewayRes[0];
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
+ if(mHomeGatewayRes[0].gatewayStatus)
+ {
+ //DriverLayer.Control.Ins.IsRemote = true;
+ DriverLayer.Control.Ins.GatewayOnline = true;
+ }
+ else
+ {
+ DriverLayer.Control.Ins.GatewayOnline = false;
+ }
+ DB_ResidenceData.Instance.SaveResidenceData();
return;
}
}
//鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
- DB_ResidenceData.residenceData.HomeGateway = null;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.HomeGateway = null;
+ DB_ResidenceData.Instance.SaveResidenceData();
}
}
else
@@ -647,7 +634,7 @@
/// <returns></returns>
public ResponsePackNew GetResidenceMemberAccount()
{
- var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID });
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
}
@@ -676,7 +663,7 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
{
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
childAccountId = childAccountId,
nickName = nickName,
});
@@ -693,7 +680,7 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
{
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
childAccountId = childAccountId,
isAllowCreateScene = isAllow,
});
@@ -734,7 +721,7 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new GetShareObj()
{
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
childAccountId = childAccountId,
});
@@ -873,7 +860,7 @@
public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
{
//娣诲姞瀛愯处鍙�
- var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
+ var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID, account = subAccount, nickName = nickName };
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
@@ -907,7 +894,7 @@
attachClientId = attachClientId,
homeType = HomeTypeEnum.BUSPRO.ToString()
});
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
+ var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.Instance.CurrentRegion.regionUrl);
if (revertObj.Code == StateCode.SUCCESS)
{
return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
@@ -966,7 +953,8 @@
if (!string.IsNullOrEmpty(pushId))
{
OnAppConfig.Instance.PushId = pushId;
- OnAppConfig.Instance.SaveUserConfig();
+ OnAppConfig.Instance.SaveConfig();
+ Utlis.WriteLine("PushId: " + pushId);
return true;
}
@@ -1781,14 +1769,15 @@
public ResponsePackNew GetDeviceList()
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ //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);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetDevcieList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
}
/// <summary>
/// 鑾峰彇璁惧璇︽儏鍒楄〃
@@ -1797,12 +1786,26 @@
public ResponsePackNew GetDeviceInfoList(List<string> functionIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("deviceIds", functionIds);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
}
+ /// <summary>
+ /// 鍒锋柊璁惧鐘舵��
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew RefreshDeviceStatus(List<string> functionIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceIds", functionIds);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_RefreshDeviceStatus, requestJson);
+ }
+
/// <summary>
/// 鎺у埗璁惧
/// </summary>
@@ -1810,25 +1813,42 @@
public ResponsePackNew ControlDevice(List<ApiAlinkControlActionObj> actionObjs)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- d.Add("gatewayId", DriverLayer.Control.Ins.GatewayId);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId);
d.Add("actions", actionObjs);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ControlDevice, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
+ }
+ /// <summary>
+ /// 缂栬緫璁惧淇℃伅
+ /// 缁戝畾鍏崇郴銆佸悕绉般�佹敹钘�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdataDevcieInfo(Function function)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceId", function.deviceId);//DriverLayer.Control.Ins.GatewayId);
+ d.Add("name", function.name);
+ d.Add("collect", function.collect);
+ d.Add("roomIds", function.roomIds);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson);
}
/// <summary>
/// 璁惧缁戝畾鎴块棿
/// </summary>
- public string BindDeviceToRoom(string deviceId,string roomId)
+ public ResponsePackNew BindDeviceToRoom(List<string> deviceIds,List<string> roomIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- d.Add("deviceIds", new List<string>() { deviceId});
- d.Add("roomIds", new List<string>() { roomId});
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceIds", deviceIds);
+ d.Add("roomIds", roomIds);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindDeviceToRoom, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_BindDeviceToRoom, requestJson);
}
/// <summary>
/// 璁惧瑙ｇ粦鎴块棿
@@ -1836,12 +1856,12 @@
public string UnbindDeviceToRoom(string deviceId, string roomId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("deviceIds", new List<string>() { deviceId });
d.Add("roomIds", new List<string>() { roomId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_UnbindDeviceToRoom, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UnbindDeviceToRoom, requestJson).Code;
}
/// <summary>
/// 璁惧鍚嶇О淇敼
@@ -1849,36 +1869,36 @@
public string EditDeviceName(string deviceId, string deviceName)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("deviceId", deviceId);
d.Add("name", deviceName);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditDeviceName, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDeviceName, requestJson).Code;
}
/// <summary>
/// 鏀惰棌璁惧
/// </summary>
- public string CollectDevice(string deviceId)
+ public ResponsePackNew CollectDevice(string deviceId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- d.Add("deviceId",new List<string>() { deviceId });
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceIds",new List<string>() { deviceId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectDevice, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectDevice, requestJson);
}
/// <summary>
/// 鍙栨秷鏀惰棌璁惧
/// </summary>
- public string CancelCollectDevice(string deviceId)
+ public ResponsePackNew CancelCollectDevice(string deviceId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- d.Add("deviceId", new List<string>() { deviceId });
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceIds", new List<string>() { deviceId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectDevice, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
}
#endregion
@@ -1893,14 +1913,14 @@
public ResponsePackNew GetSceneList(string roomId = null)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
if (roomId != null)
{
d.Add("roomId", roomId);
}
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetSecneList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
}
/// <summary>
/// 鑾峰彇鍦烘櫙璇︽儏
@@ -1913,7 +1933,7 @@
d.Add("userSceneIds",new List<string>() { seceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetSecneList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
}
/// <summary>
/// 娣诲姞鍦烘櫙
@@ -1922,10 +1942,11 @@
public ResponsePackNew AddScene(Scene scene)
{
Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("scenes", new List<Scene>() { scene });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditSecne, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
}
/// <summary>
/// 缂栬緫鍦烘櫙
@@ -1935,11 +1956,11 @@
public ResponsePackNew EditScene(Scene scene)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("scenes", new List<Scene>() { scene });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditSecne, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson);
}
/// <summary>
/// 鍒犻櫎鍦烘櫙
@@ -1948,11 +1969,11 @@
public string DeleteScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_DeleteSecne, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DeleteSecne, requestJson).Code;
}
/// <summary>
/// 鎵ц鍦烘櫙
@@ -1961,11 +1982,11 @@
public string ExecuteScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ExecuteSecne, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ExecuteSecne, requestJson).Code;
}
/// <summary>
/// 鏀惰棌鍦烘櫙
@@ -1975,11 +1996,11 @@
public string CollectScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectScene, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectScene, requestJson).Code;
}
/// <summary>
/// 鍙栨秷鏀惰棌鍦烘櫙
@@ -1989,11 +2010,11 @@
public string CancelCollectScene(string userSceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("userSceneIds", new List<string>() { userSceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
}
#endregion
@@ -2001,42 +2022,75 @@
/// <summary>
/// 鑾峰彇鎴块棿鍒楄〃
/// </summary>
+ /// <param name="GetType">鑾峰彇绫诲瀷锛歊OOM\FLOOR;涓嶈緭鍏ヨ繑鍥炲叏閮�</param>
/// <returns></returns>
- public ResponsePackNew GetRoomList()
+ public ResponsePackNew GetRoomList(string GetType = "All")
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
-
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ if (GetType != "All")
+ {
+ d.Add("roomType", GetType);
+ }
+ d.Add("pageSize", "1000");
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetRoomList, requestJson);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
+
+ return pack;
}
/// <summary>
- /// 娣诲姞鎴块棿
+ /// 娣诲姞鎴块棿\妤煎眰
/// 妤煎眰涔熷睘浜庢埧闂�
/// </summary>
/// <returns></returns>
- public ResponsePackNew AddRoom(List<Room> rooms)
+ public ResponsePackNew AddRoom(List<SpatialInfo> rooms)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- foreach(var room in rooms)
- {
- Dictionary<string, string> d1 = new Dictionary<string, string>();
- d1.Add("roomName", room.name);
- d1.Add("roomType", "ROOM");
- //d1.
- }
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("rooms", rooms);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_AddRoom, requestJson);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddRoom, requestJson);
+ //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
+ //if (revData != null)
+ //{
+ // SpatialInfo.CurrentSpatial.UpdateSpatialList(revData, OptionType.Update);
+ //}
+ return pack;
}
/// <summary>
- /// 娣诲姞妤煎眰
+ /// 淇敼鎴块棿淇℃伅
/// </summary>
/// <returns></returns>
- public ResponsePackNew AddFloor()
+ public ResponsePackNew UpdateRoom(List<SpatialInfo> rooms)
{
- return null;
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("rooms", rooms);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateRoom, requestJson);
+ //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
+ //if (revData != null)
+ //{
+ // SpatialInfo.CurrentSpatial.UpdateSpatialList(revData,OptionType.Update);
+ //}
+ return pack;
+ }
+ /// <summary>
+ /// 鍒犻櫎鎴块棿
+ /// </summary>
+ /// <param name="roomIds"></param>
+ /// <returns></returns>
+ public ResponsePackNew DeleteRoom(List<string> roomIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("ids", roomIds);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelRoom, requestJson);
+ return pack;
}
#endregion
--
Gitblit v1.8.0