From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libelianjni.so | 0
ZigbeeApp/Shared/Phone/Common/Logic/HdlAccountLogic.cs | 4 +-
ZigbeeApp/Shared/Phone/Common/Logic/HdlResidenceLogic.cs | 10 ++--
ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libjcore127.so | 0
ZigbeeApp/Shared/Phone/Common/Logic/HdlMemberLogic.cs | 10 ++--
ZigbeeApp/Shared/Phone/Common/Logic/HdlShardLogic.cs | 10 ++--
ZigbeeApp/Shared/Phone/Common/Logic/HdlUserCenterLogic.cs | 2
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs | 2
ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayBackupLogic.cs | 8 ++--
ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayLogic.cs | 6 +-
ZigbeeApp/Shared/Phone/Common/Logic/HdlTemplateCommonLogic.cs | 12 +++---
ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceDoorLockLogic.cs | 6 +-
ZigbeeApp/Shared/Phone/Common/Logic/HdlBackupLogic.cs | 14 +++---
14 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libelianjni.so b/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libelianjni.so
new file mode 100644
index 0000000..04e9fcc
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libelianjni.so
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libjcore127.so b/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libjcore127.so
new file mode 100644
index 0000000..d5fa49f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libjcore127.so
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlAccountLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlAccountLogic.cs
index 0ea13ee..7fe8264 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlAccountLogic.cs
@@ -973,7 +973,7 @@
return true;
}
var pra = new { homeId = Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/child/account/debug", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/child/account/debug", RestSharp.Method.POST, pra);
if (result == null || result.Code != HttpMessageEnum.A鎴愬姛)
{
return false;
@@ -1069,7 +1069,7 @@
public byte[] DownLoadAccountPictrue(string i_account)
{
var pra = new { account = i_account };
- var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/head/portrait/downWithAccount", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/app/head/portrait/downWithAccount", RestSharp.Method.POST, pra);
if (result != null && result.Length == 0)
{
result = null;
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlBackupLogic.cs
index 3c14b41..fce1d85 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlBackupLogic.cs
@@ -49,7 +49,7 @@
public List<BackupListNameInfo> GetBackupListNameFromDB(BackUpMode backupDiv, ShowNetCodeMode mode = ShowNetCodeMode.YES, bool getOptionBackup = false)
{
var pra = new { homeId = Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/backup/folder/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/backup/folder/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -125,7 +125,7 @@
//鈽呰缃渶瑕佽幏鍙栫殑鏂囦欢鍚嶅瓧鈽�
var pra = new { fileId = dicFile[fileName], folderId = i_folderId, homeId = Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/backup/file/downOne", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
+ var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/app/backup/file/downOne", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
//妫�娴嬬姸鎬佺爜
if (result == null || result.Length == 0)
{
@@ -169,7 +169,7 @@
{
//鑾峰彇杩欎釜澶囦唤涓嬬殑鏂囦欢鍒楄〃
var pra = new { folderId = i_folderId, homeId = Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/backup/file/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/backup/file/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -209,7 +209,7 @@
folderName = backupName,
homeId = Config.Instance.Home.Id
};
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/backup/folder/create", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/backup/folder/create", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -459,7 +459,7 @@
dicQuery["fileName"] = i_fileName;
dicQuery["homeId"] = Config.Instance.Home.Id;
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/backup/file/create", RestSharp.Method.POST, i_content, dicQuery, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/backup/file/create", RestSharp.Method.POST, i_content, dicQuery, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -482,7 +482,7 @@
public bool EditorBackupName(string i_folderId, string i_backName, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { folderId = i_folderId, folderName = i_backName, homeId = Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/backup/folder/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/backup/folder/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -724,7 +724,7 @@
public bool DeleteDbBackupData(string i_folderId, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { folderId = i_folderId, homeId = Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/backup/folder/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/backup/folder/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceDoorLockLogic.cs
index 4258168..02f19b8 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceDoorLockLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceDoorLockLogic.cs
@@ -54,7 +54,7 @@
unlockTime = DateTime.UtcNow.ToString()
};
//涓嶇杩斿洖鍊�
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/doorLockUnlockHistory/save", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/doorLockUnlockHistory/save", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
});
}
@@ -78,7 +78,7 @@
unlockBeginTime = i_dateTimeFrom.ToUniversalTime().ToString(),
unlockEndTime = i_dateTimeTo.ToUniversalTime().ToString()
};
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/doorLockUnlockHistory/list", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, false, 5);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/doorLockUnlockHistory/list", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, false, 5);
if (result == null || result.Code != HttpMessageEnum.A鎴愬姛)
{
return new List<DoorHistoryLogInfo>();
@@ -120,7 +120,7 @@
unlockEndTime = i_dateTimeTo.ToUniversalTime().ToString()
};
//娓呯┖璁板綍
- var result1 = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/doorLockUnlockHistory/clear", RestSharp.Method.POST, pra1, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result1 = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/doorLockUnlockHistory/clear", RestSharp.Method.POST, pra1, null, null, CheckMode.A璐﹀彿鏉冮檺);
if (result1 == null || result1.Code != HttpMessageEnum.A鎴愬姛)
{
return false;
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayBackupLogic.cs
index ad7d915..0cfe090 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayBackupLogic.cs
@@ -103,7 +103,7 @@
public bool DeleteGatewayBackup(string i_gwId, string i_backupId, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { gatewayId = i_gwId, folderId = i_backupId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/folder/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/folder/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -122,7 +122,7 @@
{
//鍒涘缓涓�涓浠藉悕瀛�
var pra = new { backupClassify = "USER_DEFINED_BACKUP", backupDataType = "ZIGBEE", folderName = i_backName, gatewayId = gwId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/folder/add", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/folder/add", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
@@ -243,7 +243,7 @@
public List<BackupListNameInfo> GetGatewayBackupListFromDb(string gatewayId, BackUpMode backMode, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { mac = gatewayId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/folder/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/folder/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -422,7 +422,7 @@
public bool EditorGatewayBackupName(string i_backId, string i_newName, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { gatewayFolderId = i_backId, folderName = i_newName, homeId = Common.Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/folder/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/folder/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayLogic.cs
index 0c4f93b..7d36d23 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayLogic.cs
@@ -2315,7 +2315,7 @@
{
//璋冪敤鎺ュ彛锛岀粦瀹氱綉鍏�(鍗充娇澶辫触锛屼篃杩斿洖true寰�涓嬭蛋)
var pra = new { homeId = Config.Instance.Home.Id, mac = i_gatewayId, gatewayType = "ZIGBEEGATEWAY" };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/bindGateway", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/bindGateway", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
if (result == null || result.Code != HttpMessageEnum.A鎴愬姛)
{
return -1;
@@ -2331,7 +2331,7 @@
{
//杩欎釜鎺ュ彛鐗规畩,涓嶉渶瑕佹娴嬫潈闄�
var pra = new { homeId = i_homeId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/getGatewayList", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/getGatewayList", RestSharp.Method.POST, pra);
if (result == null || result.Code != HttpMessageEnum.A鎴愬姛)
{
return null;
@@ -2356,7 +2356,7 @@
public bool DeleteDataBaseGateway(string strWayId)
{
var pra = new { homeId = Config.Instance.Home.Id, mac = strWayId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/gateway/untieGateway", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/gateway/untieGateway", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
if (result == null || result.Code != HttpMessageEnum.A鎴愬姛)
{
return false;
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlMemberLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlMemberLogic.cs
index b4907b3..0c49b14 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlMemberLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlMemberLogic.cs
@@ -41,7 +41,7 @@
public List<MemberInfoRes> GetMemberListInfo(ShowNetCodeMode mode = ShowNetCodeMode.No)
{
var pra = new { homeId = Common.Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/child/account/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/child/account/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -91,7 +91,7 @@
public bool SetRemoteOperationPermissions(string i_childAccountId, bool i_statu, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { childAccountId = i_childAccountId, homeId = Common.Config.Instance.Home.Id, isRemoteControl = i_statu };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/child/account/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/child/account/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -110,7 +110,7 @@
{
string authorityDiv = i_authorityNo == 3 ? "ADMIN" : "ORDINARY";
var pra = new { homeId = Common.Config.Instance.Home.Id, childAccountId = i_childAccountId, childAccountType = authorityDiv };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/child/account/update", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/child/account/update", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
@@ -133,7 +133,7 @@
public bool DeleteMember(string i_childAccountId, ShowNetCodeMode mode = ShowNetCodeMode.YES)
{
var pra = new { childAccountId = i_childAccountId, homeId = Common.Config.Instance.Home.Id };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/child/account/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/child/account/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -163,7 +163,7 @@
isRemoteControl = true,
nickName = i_nickName
};
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/child/account/add", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, false, 3, true);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/child/account/add", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, false, 3, true);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlResidenceLogic.cs
index ce765ec..df92624 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlResidenceLogic.cs
@@ -47,7 +47,7 @@
{
var pra = new { homeId = 0, homeName = residenceName, homeType = "ZIGBEE" };
//娣诲姞浣忓畢
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/add", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/add", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
@@ -163,7 +163,7 @@
List<string> listUintName, List<string> listUintContent, int TemplateMode = 1)
{
var pra = new { homeId = Config.Instance.Home.Id, homeType = "ZIGBEE", homeName = residenceName };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
@@ -265,7 +265,7 @@
}
var pra = new { homeId = Config.Instance.Home.Id, homeType = "ZIGBEE", latitude = i_latitude, longitude = i_longitude };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/update", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -394,7 +394,7 @@
{
var pra = new { homeType = "ZIGBEE" };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/list", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/list", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -772,7 +772,7 @@
public bool DeleteCloundHouse(string houseId)
{
var pra = new { homeId = houseId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/delete", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/delete", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlShardLogic.cs
index dd9e284..0689ba2 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlShardLogic.cs
@@ -315,7 +315,7 @@
{
//鑾峰彇涓讳汉鍒嗕韩缁欐垚鍛樼殑鏂囦欢鍒楄〃
var pra = new { homeId = Config.Instance.HomeId, childAccountId = i_childAccountId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/share/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/share/findAll", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
@@ -355,7 +355,7 @@
{
nowCount++;
var pra = new { homeId = Config.Instance.Home.Id, homeShareId = fileKey };
- var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/home/share/downOne", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
+ var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/app/home/share/downOne", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
//妫�娴嬬姸鎬佺爜
if (result == null)
{
@@ -446,7 +446,7 @@
return true;
}
var pra = new { homeId = Config.Instance.Home.Id, homeShareId = i_binFileId };
- var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/home/share/downOne", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
+ var result = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/app/home/share/downOne", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
//妫�娴嬬姸鎬佺爜
if (result == null)
{
@@ -837,7 +837,7 @@
dicQuery["childAccountId"] = i_childAccountId;
dicQuery["fileName"] = i_fileName;
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/share/add", RestSharp.Method.POST, i_content, dicQuery, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/share/add", RestSharp.Method.POST, i_content, dicQuery, null, CheckMode.A璐﹀彿鏉冮檺, true, 10);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
@@ -1113,7 +1113,7 @@
}
var pra = new { homeId = Config.Instance.Home.Id, homeShareId = this.DicShardKeys[fileName] };
//鎵ц鍒犻櫎
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/home/share/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/home/share/delete", RestSharp.Method.POST, pra, null, null, CheckMode.A璐﹀彿鏉冮檺);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlTemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlTemplateCommonLogic.cs
index 5cd1781..8bb9dae 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlTemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlTemplateCommonLogic.cs
@@ -758,7 +758,7 @@
/// <returns></returns>
public List<CloundModelBaseInfo> GetCloundAllModelList(ShowNetCodeMode mode= ShowNetCodeMode.YES)
{
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/template/metaInfo/findAll", RestSharp.Method.POST, null);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/template/metaInfo/findAll", RestSharp.Method.POST, null);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -862,7 +862,7 @@
var dicQuery = new Dictionary<string, object>();
dicQuery["fileName"] = "ModelData_Cloud_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
dicQuery["templateId"] = templateId;
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/template/file/add", RestSharp.Method.POST, Encoding.UTF8.GetBytes(binFileData), dicQuery, null, CheckMode.A涓嶆娴�, true, 10);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/template/file/add", RestSharp.Method.POST, Encoding.UTF8.GetBytes(binFileData), dicQuery, null, CheckMode.A涓嶆娴�, true, 10);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == true)
{
@@ -888,7 +888,7 @@
{
var pra = new { templateName = i_saveName };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/template/metaInfo/add", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/template/metaInfo/add", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -919,7 +919,7 @@
var pra = new { templateId = i_templateId };
//鑾峰彇鎸囧畾妯℃澘鐨勫垪琛ㄦ枃浠�
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/template/file/findAll", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/template/file/findAll", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, mode) == false)
{
@@ -941,7 +941,7 @@
//涓嬭浇妯℃澘鐨勫唴瀹�
var pra2 = new { templateFileId = listFileData[0].Id, templateMetaInfoId = i_templateId };
- var byteContent = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/template/file/downOne", RestSharp.Method.POST, pra2, null, null, CheckMode.A涓嶆娴�, true, 10);
+ var byteContent = HdlHttpLogic.Current.RequestByteFromZigbeeHttps("home-wisdom/app/template/file/downOne", RestSharp.Method.POST, pra2, null, null, CheckMode.A涓嶆娴�, true, 10);
if (byteContent == null || byteContent.Length == 0)
{
//涓嬭浇妯℃澘澶辫触
@@ -1016,7 +1016,7 @@
{
var pra = new { templateId = i_templateId };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/template/metaInfo/delete", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/template/metaInfo/delete", RestSharp.Method.POST, pra);
if (result != null && result.Code == HttpMessageEnum.A10605)
{
//妯℃澘瀵硅薄涓嶅瓨鍦�,褰撳仛鎴愬姛
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlUserCenterLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlUserCenterLogic.cs
index 2061215..0e4b896 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlUserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlUserCenterLogic.cs
@@ -183,7 +183,7 @@
if (hadNet == 1)
{
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
- HdlGatewayLogic.Current.SynchronizeDbGateway();
+ //HdlGatewayLogic.Current.SynchronizeDbGateway();
}
//鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
index 2d50b95..f8fae21 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
@@ -279,7 +279,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
var pra = new { contactWay = email, content = strContent, feedbackType = this.typeMode };
- var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/feedback/add", RestSharp.Method.POST, pra);
+ var result = HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/feedback/add", RestSharp.Method.POST, pra);
//妫�娴嬬姸鎬佺爜
if (HdlCheckLogic.Current.CheckNetCode(result, ShowNetCodeMode.YES) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index db67a6f..261ee6e 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -2567,7 +2567,7 @@
{
//鑾峰彇杩滅▼mqtt閾炬帴淇℃伅
var pra = new { attachClientId = RemoteClientId, homeType = "ZIGBEE" };
- var result = Shared.Phone.HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/mqtt/getRemoteInfo", RestSharp.Method.POST, pra);
+ var result = Shared.Phone.HdlHttpLogic.Current.RequestResponseFromZigbeeHttps("home-wisdom/app/mqtt/getRemoteInfo", RestSharp.Method.POST, pra);
if (result != null && result.Code == Shared.Phone.HttpMessageEnum.A鎴愬姛)
{
var jobject = JObject.Parse(result.Data.ToString());
--
Gitblit v1.8.0