From be95e839f40eb3ddf64706b60cba6dfcf4fad5e5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 四月 2020 14:31:44 +0800
Subject: [PATCH] 2020-04-03 1.去掉登录前ping百度域名的网络监测。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs | 719 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 394 insertions(+), 325 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
index ff4698b..b95835f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
@@ -6,6 +6,7 @@
{
public class GuideSettingGateway : FrameLayout
{
+
static byte TYPEStandardMQTT = 5;
static byte TYPEHdlMQTT = 4;
static GuideSettingGateway curView;
@@ -145,11 +146,11 @@
{
if (gatewayDeicve.Type == DeviceType.OnePortMqttFR) {
- Console.WriteLine ("Assign OnePortMqttFR锛孒DL MQTT");
+ Utlis.WriteLine ("Assign OnePortMqttFR锛孒DL MQTT");
//RemoteSetting ();
RemoteSettingWithHDLMQTT ();
} else {
- Console.WriteLine ("Assign OnePortWirelessFR");
+ Utlis.WriteLine ("Assign OnePortWirelessFR");
RemoteSettingWithOldDevice ();
//RemoteSettingWithMQTT ();
}
@@ -194,7 +195,7 @@
if (common.Type == DeviceType.MusicModel)
continue;
if (common.isMixBox) {
- Console.WriteLine ("IsMixBox");
+ Utlis.WriteLine ("IsMixBox");
continue;
}
countDevcie++;
@@ -228,7 +229,7 @@
}
if (Control.ControlBytesSendHasReturn (Command.ReadDeviceLoopInfo, common.SubnetID, common.DeviceID, new byte [] { bigClass, minClass, (byte)k }) == null) {
j++;
- //杩炵画涓ゆ璇诲彇涓嶅埌鏁版嵁鍒欒烦鍑鸿寰幆
+ //杩炵画涓ゆ璇诲彇涓嶅埌鏁版嵁鍒欒烦鍑鸿寰幆锛屼唬琛ㄨ澶囩绾�2020-01-11
if (j == 2 && k == 2)
break;
} else {
@@ -247,6 +248,8 @@
this.AddChidren (myLoading);
//myLoading.Start ("鐐瑰嚮灞忓箷鍏抽棴閰嶉妯″紡");
myLoading.Start ("Searching, Please touch the here to exit the searching mode.");
+ //myLoading.Start ("Waiting for new device, Please touch the here to exit the waiting mode.");
+
this.AddChidren (btnCloseLoading);
}
});
@@ -460,7 +463,7 @@
btnDelDevice.Parent.RemoveFromParent ();
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -498,7 +501,7 @@
// }
// }
// } catch (Exception ex) {
- // Console.WriteLine ("Cinfig Read Device Loop Info " + ex.Message);
+ // Utlis.WriteLine ("Cinfig Read Device Loop Info " + ex.Message);
// }
//});
}
@@ -520,12 +523,17 @@
//杩欓噷鎼滅储璁惧锛岀洿鍒板畬鎴愬氨閫�鍑�
readDevice ();
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
Application.RunOnMainThread (action);
}) { IsBackground = true }.Start ();
}
+ ///// <summary>
+ ///// 2020-02-11
+ ///// 鎼滅储閲嶅娆℃暟 鐢�4娆″鍔犱负6娆�
+ ///// </summary>
+ //static readonly int READ_COUNT = 6;
/// <summary>
/// 璇诲彇璁惧
/// </summary>
@@ -539,7 +547,8 @@
CommonPage.DeviceList.Clear ();
CommonPage.searchTotal = 0;
//濡傛灉涓ゆ閮芥病鏈夋暟鎹弽棣堬紝灏变笉璇诲彇
- int readCount = 4;
+ //2020 - 02 - 11鎼滅储閲嶅娆℃暟 鐢�4娆″鍔犱负6娆�
+ int readCount = 6;
while (0 < readCount) {
readCount--;
var ms = new System.IO.MemoryStream ();
@@ -559,7 +568,7 @@
ms.WriteByte (common.SubnetID);
ms.WriteByte (common.DeviceID);
}
- Console.WriteLine ("鎼滅储闈炵綉鍏宠澶囷紝缃戠粶鍦板潃鏄�:" + CommonPage.EndPoint.ToString ());
+ Utlis.WriteLine ("鎼滅储闈炵綉鍏宠澶囷紝缃戠粶鍦板潃鏄�:" + CommonPage.EndPoint.ToString ());
var control = new Control ();
control.Send (new Target () {
IPEndPoint = CommonPage.EndPoint,
@@ -574,7 +583,7 @@
System.Threading.Thread.Sleep (1000);
//濡傛灉鏁伴噺涓嶇浉绛夛紝灏遍噸缃鏁�
if (tempCount != CommonPage.DeviceList.Count) {
- readCount = 4;
+ readCount = 6;
}
}
CommonPage.DeviceList = CommonPage.DeviceList.FindAll ((obj) => { return obj != null && obj.SubnetID == gatewayDeicve.SubnetID; });
@@ -671,7 +680,7 @@
var mobytes = Control.ControlBytesSendHasReturn (Command.SetGateWayModelInternetInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, serverIPBytes);
if (mobytes == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline),
+ new Alert ("", ErrorCode.GatewayNoResponse,
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
} else if (mobytes [0] == 0xF5) {
@@ -684,7 +693,7 @@
var bindReginIdStatus = Control.ControlBytesSendHasReturn (Command.Write_APP_Data_STORE_1D5E_CMD, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, currentRegionIdBytes);
if (bindReginIdStatus == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ new Alert ("", ErrorCode.GatewayNoResponse, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return;
} else if (bindReginIdStatus [0] != 0xF8) {
@@ -695,10 +704,10 @@
return;
}
}
- BindGateways ();
+ BindGatewaysNew ();
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
Application.RunOnMainThread (() => {
new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
@@ -723,64 +732,32 @@
byte [] gatewayBytes = null;
string [] strServerIP = (MainPage.SeviceIP).Split ('.');
string [] strServerIP1 = (MainPage.SeviceIP).Split ('.');
- MainPage.Loading.Start ("Configuring device...");
+ MainPage.Loading.Start ("Configuring gateway...");
System.Threading.Tasks.Task.Run (() => {
try {
- //璇诲彇涓�绔彛浜ゆ崲鏈恒�佹棤绾跨綉鍏崇殑閰嶇疆淇℃伅
- gatewayBytes = Control.ControlBytesSendHasReturn (Command.ReadGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, new byte [] { });
-
- gatewayDeicve.Remote_GroupName = MainPage.LoginUser.AccountString;//UserConfig.Instance.CurrentRegion.RegionName;
- gatewayDeicve.Remote_ProjectName = gatewayDeicve.MAC.Replace (".", "");//UserConfig.Instance.CurrentRegion.RegionName;
- gatewayDeicve.Remote_UserName = "Admin";
- gatewayDeicve.Remote_Password = "c" + MainPage.LoginUser.ID;
- //gatewayDeicve.Remote_Password = "85521566";
- byte [] ggn = new byte [20];
- byte [] b1 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_GroupName);
- gatewayDeicve.Remote_GroupName = CommonPage.MyEncodingGB2312.GetString (b1);
- Array.Copy (b1, 0, ggn, 0, 20 < b1.Length ? 20 : b1.Length);
-
- byte [] gpn = new byte [20];
- byte [] b2 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_ProjectName);
- Array.Copy (b2, 0, gpn, 0, 20 < b2.Length ? 20 : b2.Length);
-
- byte [] gun = new byte [8];
- byte [] b3 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_UserName);
- Array.Copy (b3, 0, gun, 0, 8 < b3.Length ? 8 : b3.Length);
-
- byte [] gpw = new byte [8];
- byte [] b4 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_Password);
- Array.Copy (b4, 0, gpw, 0, 8 < b4.Length ? 8 : b4.Length);
-
-
- gatewayBytes [0] = TYPEHdlMQTT;//HDL MQTT
- Array.Copy (ggn, 0, gatewayBytes, 1, 20);
- Array.Copy (gpn, 0, gatewayBytes, 21, 20);
- Array.Copy (gun, 0, gatewayBytes, 41, 8);
- Array.Copy (gpw, 0, gatewayBytes, 49, 8);
- //1.淇敼鐢ㄦ埛鍚嶄俊鎭�
- Control.ControlBytesSend (Command.SetGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, gatewayBytes);
- ////2.璇诲彇涓�娆＄鐞嗕俊鎭�
- //byte [] adminBytes = Control.ControlBytesSendHasReturn (Command.ReadGateWayAdminInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, new byte [] { });
- ////3.淇敼绠＄悊淇℃伅
- //if (SetGateWayAdminInfo (adminBytes)) {
- // //4.鍐欓厤缃垚鍔熷悗涓嬩竴姝ユ搷浣�
- // GatewaySettingSucceeded ();
+ ////璇诲彇涓�绔彛浜ゆ崲鏈恒�佹棤绾跨綉鍏崇殑閰嶇疆淇℃伅
+ //gatewayBytes = Control.ControlBytesSendHasReturn (Command.ReadGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, new byte [] { });
+ //if (gatewayBytes == null) {
+ // //璇诲彇涓�绔彛浜ゆ崲鏈恒�佹棤绾跨綉鍏崇殑閰嶇疆淇℃伅澶辫触
+ // new Alert ("", "Read gateway configuration failed!", "Close").Show ();
+ // return;
//}
-
- //2.淇敼绠＄悊淇℃伅
- if (SetGateWayAdminInfo ()) {
- //3.鍐欓厤缃垚鍔熷悗涓嬩竴姝ユ搷浣�
- GatewaySettingSucceeded ();
+
+ //1.淇敼鐢ㄦ埛鍚嶄俊鎭� 鍜屼慨鏀硅繛鎺ユā寮�
+ if (SetGateWayModelInfo()) {
+ //2.淇敼绠＄悊淇℃伅
+ if (SetGateWayAdminInfo ()) {
+ //3.鍐欓厤缃垚鍔熷悗涓嬩竴姝ユ搷浣�
+ GatewaySettingSucceeded ();
+ }
}
-
-
-
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ //淇敼缃戝叧杩炴帴妯″紡澶辫触
+ new Alert ("", "Failed to modify gateway connection mode!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
bool canRemove = false;
} finally {
@@ -791,6 +768,40 @@
}
});
//Room.InitAllRoom ();
+ }
+
+ bool SetGateWayModelInfo () {
+ byte [] gatewayBytes = new byte [60];
+ gatewayDeicve.Remote_GroupName = MainPage.LoginUser.AccountString;//UserConfig.Instance.CurrentRegion.RegionName;
+ gatewayDeicve.Remote_ProjectName = gatewayDeicve.MAC.Replace (".", "");//UserConfig.Instance.CurrentRegion.RegionName;
+ gatewayDeicve.Remote_UserName = "Admin";
+ gatewayDeicve.Remote_Password = "c" + MainPage.LoginUser.ID;
+ //gatewayDeicve.Remote_Password = "85521566";
+ byte [] ggn = new byte [20];
+ byte [] b1 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_GroupName);
+ gatewayDeicve.Remote_GroupName = CommonPage.MyEncodingGB2312.GetString (b1);
+ Array.Copy (b1, 0, ggn, 0, 20 < b1.Length ? 20 : b1.Length);
+
+ byte [] gpn = new byte [20];
+ byte [] b2 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_ProjectName);
+ Array.Copy (b2, 0, gpn, 0, 20 < b2.Length ? 20 : b2.Length);
+
+ byte [] gun = new byte [8];
+ byte [] b3 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_UserName);
+ Array.Copy (b3, 0, gun, 0, 8 < b3.Length ? 8 : b3.Length);
+
+ byte [] gpw = new byte [8];
+ byte [] b4 = CommonPage.MyEncodingGB2312.GetBytes (gatewayDeicve.Remote_Password);
+ Array.Copy (b4, 0, gpw, 0, 8 < b4.Length ? 8 : b4.Length);
+
+
+ gatewayBytes [0] = TYPEHdlMQTT;//HDL MQTT
+ Array.Copy (ggn, 0, gatewayBytes, 1, 20);
+ Array.Copy (gpn, 0, gatewayBytes, 21, 20);
+ Array.Copy (gun, 0, gatewayBytes, 41, 8);
+ Array.Copy (gpw, 0, gatewayBytes, 49, 8);
+ byte [] backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, gatewayBytes);
+ return CheckIsSuccessfulWithBytes (backBytes, "Failed to modify gateway connection mode.");
}
/// <summary>
@@ -837,64 +848,7 @@
byte [] backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayAdminInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, adminBytes);
- return CheckIsSuccessfulWithBytes (backBytes);
- }
-
-
- /// <summary>
- /// 杩滅▼閰嶇疆 Standard MQTT妯″紡
- /// </summary>
- void RemoteSettingWithStandardMQTT ()
- {
- byte [] gatewayBytes = null;
- string [] strServerIP = (MainPage.SeviceIP).Split ('.');
- string [] strServerIP1 = (MainPage.SeviceIP).Split ('.');
- MainPage.Loading.Start ("Configuring device...");
- System.Threading.Tasks.Task.Run (() => {
- try {
-
- //璇诲彇涓�绔彛浜ゆ崲鏈恒�佹棤绾跨綉鍏崇殑閰嶇疆淇℃伅
- gatewayBytes = Control.ControlBytesSendHasReturn (Command.ReadGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, new byte [] { });
- //杩炴帴绫诲瀷閰嶇疆涓�5 Standard MQTT妯″紡
- gatewayBytes [0] = TYPEStandardMQTT;//Standard MQTT
- Control.ControlBytesSend (Command.SetGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, gatewayBytes);
- //1.淇敼URL
- //2.淇敼璇诲彇瀹㈡埛绔疘D锛岀敤鎴峰悕锛屽瘑鐮�
- //3.淇敼AES鍔犲瘑
- //4.淇敼涓婚
-
- //1.淇敼URL
- if (SetGateWayURL ("https://developer.hdlcontrol.com/api/")) {
- //2.淇敼瀹㈡埛绔疘D锛岀敤鎴峰悕锛屽瘑鐮�
- if (SetGateWayClientIDUsernamePassword ("85521566", "Admin", "85521566")) {
- //3.淇敼AES鍔犲瘑
- if (SetGateWayAESEncryption (true, "85521566")) {
- //4.1淇敼璁㈤槄涓婚
- if (SetGateWayTopic ("SubscribeTopic")) {
- //4.2淇敼鍙戝竷涓婚
- if (SetGateWayTopic ("PublishTopic", true)) {
- //5.鍐欓厤缃垚鍔熷悗涓嬩竴姝ユ搷浣�
- GatewaySettingSucceeded ();
- }
- }
- }
- }
- }
-
- } catch (Exception ex) {
- Console.WriteLine (ex.Message);
- Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- });
- bool canRemove = false;
- } finally {
- Application.RunOnMainThread (() => {
- MainPage.Loading.Hide ();
- //this.RemoveAll ();
- });
- }
- });
- //Room.InitAllRoom ();
+ return CheckIsSuccessfulWithBytes (backBytes, "Failed to modify gateway administrator information!");
}
/// <summary>
@@ -902,11 +856,11 @@
/// </summary>
/// <param name="backBytes"></param>
/// <returns></returns>
- private bool CheckIsSuccessfulWithBytes (byte [] backBytes)
+ private bool CheckIsSuccessfulWithBytes (byte [] backBytes, string errorStr = "Modify gateway configuration failed!")
{
if (backBytes == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline),
+ new Alert ("", ErrorCode.GatewayNoResponse,
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return false;
@@ -914,87 +868,11 @@
return true;
} else {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed),
+ new Alert ("", errorStr,
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return false;
}
- }
-
- /// <summary>
- /// 淇敼URL
- /// </summary>
- /// <returns></returns>
- bool SetGateWayURL (string urlStr = "", int pointID = 1883)
- {
- byte [] sendBytes = new byte [63];
- byte [] url = CommonPage.MyEncodingGB2312.GetBytes (urlStr);
- Array.Copy (url, 0, sendBytes, 1, 60 < url.Length ? 60 : url.Length);
- sendBytes [0] = GuideSettingGateway.TYPEStandardMQTT;
- sendBytes [61] = Convert.ToByte (pointID / 256);
- sendBytes [62] = Convert.ToByte (pointID % 256);
- var backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayURL, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
-
- return CheckIsSuccessfulWithBytes (backBytes);
- }
-
-
- /// <summary>
- /// 淇敼瀹㈡埛绔疘D锛岀敤鎴峰悕锛屽瘑鐮�
- /// </summary>
- /// <returns></returns>
- bool SetGateWayClientIDUsernamePassword (string clientIDStr = "", string usernameStr = "", string passwordStr = "")
- {
-
- byte [] userInfoBytes = new byte [64];
- byte [] clientID = CommonPage.MyEncodingGB2312.GetBytes (clientIDStr);
- Array.Copy (clientID, 0, userInfoBytes, 0, 32 < clientID.Length ? 32 : clientID.Length);
- byte [] username = CommonPage.MyEncodingGB2312.GetBytes (usernameStr);
- Array.Copy (username, 0, userInfoBytes, 32, 16 < username.Length ? 16 : username.Length);
- byte [] password = CommonPage.MyEncodingGB2312.GetBytes (passwordStr);
- Array.Copy (password, 0, userInfoBytes, 48, 16 < password.Length ? 16 : password.Length);
- var setUserInfoBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayClientIDUsernamePassword, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, userInfoBytes);
-
- return CheckIsSuccessfulWithBytes (setUserInfoBytes);
- }
-
- /// <summary>
- /// 淇敼AES鍔犲瘑
- /// </summary>
- /// <returns></returns>
- bool SetGateWayAESEncryption (bool enable = false, string passwordStr = "")
- {
- byte [] sendBytes = new byte [17];
- sendBytes [0] = enable ? (byte)1 : (byte)0; //0:涓嶄娇鑳� 1 - 255:浣胯兘
- byte [] password = CommonPage.MyEncodingGB2312.GetBytes (passwordStr);
- Array.Copy (password, 0, sendBytes, 1, 16 < password.Length ? 16 : password.Length);
- var backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayAESEncryption, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
-
- return CheckIsSuccessfulWithBytes (backBytes);
- }
-
- /// <summary>
- /// 淇敼涓婚
- /// </summary>
- /// <param name="bPublish">鏄惁涓哄彂甯冧富棰�</param>
- /// <param name="bDefault">鏄惁榛樿</param>
- /// <returns></returns>
- bool SetGateWayTopic (string topicInfoStr = "", bool bPublish = false, bool bDefault = false)
- {
- byte [] sendBytes = new byte [50];
- sendBytes [0] = bPublish ? (byte)2 : (byte)1; //1锛氳闃� 2锛氬彂甯�
- sendBytes [1] = bDefault ? (byte)0 : (byte)1; //1:闈為粯璁� 0:榛樿
-
- byte [] topicInfo = CommonPage.MyEncodingGB2312.GetBytes (topicInfoStr);
- Array.Copy (topicInfo, 0, sendBytes, 2, 48 < topicInfo.Length ? 48 : topicInfo.Length);
- var backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayTopic, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
-
- if (backBytes != null && backBytes.Length >= 2) {
- if (backBytes [0] == sendBytes [0] && backBytes [1] == sendBytes [1]) {
- return true;
- }
- }
- return CheckIsSuccessfulWithBytes (backBytes);
}
@@ -1015,7 +893,7 @@
var bindReginIdStatus = Control.ControlBytesSendHasReturn (Command.Write_APP_Data_STORE_1D5E_CMD, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
if (bindReginIdStatus == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ new Alert ("", ErrorCode.GatewayNoResponse, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return;
} else if (bindReginIdStatus [0] != 0xF8) {
@@ -1027,139 +905,194 @@
}
}
- BindGateways ();
+ BindGatewaysNew ();
}
+
/// <summary>
/// Gateway setting succeeded锛宒ata up.Please wait...
+ /// 缁戝畾Mac(鍗板害鐗�)
/// </summary>
- void BindGateways (){
-
+ void BindGatewaysNew ()
+ {
Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up.Please wait...");
+ MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up. Please wait...");
});
IO.FileUtils.SaveEquipmentMessage (gatewayDeicve);
var gatewayMAC = gatewayDeicve.MAC.Replace (".", "");
- var oldMac = "";
- if (UserConfig.Instance.CheckHomeGateways () && !string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId)) {
+ //璧版柊鏇存柊缁戝畾鎺ュ彛
+ var mBindMacObj = new BindMacObj () {
+ LoginAccessToken = MainPage.LoginUser.LoginTokenString,
+ HomeId = UserConfig.Instance.CurrentRegion.Id,
+ MAC = gatewayMAC
- //淇敼MAC鎺ュ彛
- oldMac = UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId;
- if(oldMac == gatewayMAC) {//鍜岀粦瀹歮ac涓�鑷达紝涓嶇敤淇敼
- AddMacToUserConfig (gatewayMAC);
- return;
- }
-
- var mUpdateMacObj = new UpdateMacObj () {
- LoginAccessToken = MainPage.LoginUser.LoginTokenString,
- HomeId = UserConfig.Instance.CurrentRegion.Id,
- NewMac = gatewayMAC,
- OldMac = oldMac
- };
- string urlHead = MainPage.RequestHttpsHost;
- if (mUpdateMacObj.IsOtherAccountCtrl) {
- urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
- mUpdateMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
- }
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mUpdateMacObj);
-
- //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
- var respone = MainPage.RequestHttps (API.UpdateMac, requestJson, urlHead);
- if (respone.StateCode.ToUpper () != "SUCCESS") {
- Application.RunOnMainThread (() => {
- new Alert ("", "Failed to update Mac address, gateway binding failed!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
- new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- }
- });
- return;
- }
- //GetNowHomeGateway ();
- AddMacToUserConfig (gatewayMAC);
- } else {
- //璧版柊缁戝畾鎺ュ彛
- var mBindMacObj = new BindGatewayToHomeObj () {
- LoginAccessToken = MainPage.LoginUser.LoginTokenString,
- HomeId = UserConfig.Instance.CurrentRegion.Id,
-
- };
- mBindMacObj.BindGateways.Add (gatewayMAC);
- string urlHead = MainPage.RequestHttpsHost;
- if (mBindMacObj.IsOtherAccountCtrl) {
- urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
- mBindMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
- }
-
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mBindMacObj);
-
- //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
- var respone = MainPage.RequestHttps (API.BindGatewayToHome, requestJson, urlHead);
- if (respone.StateCode.ToUpper () != "SUCCESS" && respone.StateCode != "BindGatewaysExists") {
- Application.RunOnMainThread (() => {
- new Alert ("", "Failed to bind Mac address, gateway binding failed!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
- new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- }
- });
- return;
- }
- //GetNowHomeGateway ();
- AddMacToUserConfig (gatewayMAC);
+ };
+
+ string urlHead = MainPage.RequestHttpsHost;
+ if (mBindMacObj.IsOtherAccountCtrl) {
+ urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ mBindMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
}
+
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mBindMacObj);
+
+ //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
+ var respone = MainPage.RequestHttps (API.BindMac, requestJson, urlHead);
+ if (respone.StateCode.ToUpper () != "SUCCESS") {
+ GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
+ Application.RunOnMainThread (() => {
+ new Alert ("", $"Failed to bind Mac address! {ErrorCode.Reason }{respone.StateCode}", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
+ new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ }
+ });
+ return;
+ }
+ //GetNowHomeGateway ();
+ AddMacToUserConfig (gatewayMAC);
+
}
-
- //void GetAllBindGatewarysPagger ()
- //{
- // var gatewayListObj = new GetAllBindGatewarysPaggerObj ();
- // gatewayListObj.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
- // var gatewayListJson = Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListObj);
- // var gatewayListRevertObj = MainPage.RequestHttps (API.GetAllBindGatewarysPagger, gatewayListJson);
- // if (gatewayListRevertObj.StateCode.ToUpper () == "SUCCESS") {
- // var mGateRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AllBindGatewarysPaggerRes> (gatewayListRevertObj.ResponseData.ToString ());
- // var responseGatewayDataObj = mGateRes.PageData;
- // if (responseGatewayDataObj.Count > 0) {
- // UserConfig.Instance.GatewayList.Clear ();
- // UserConfig.Instance.GatewayList.AddRange (responseGatewayDataObj);
- // UserConfig.Instance.GatewayMAC = gatewayDeicve.MAC;
- // UserConfig.Instance.SaveUserConfig ();
- // MainPage.LoginUser.LastTime = DateTime.Now;
- // Application.RunOnMainThread (() => {
- // UserMiddle.Init (true);
- // });
- // } else {
- // Application.RunOnMainThread (() => {
- // new Alert ("", "Communication abnormality, gateway failed to bind residence.Please try again.", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- // if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
- // new Alert ("22:" + gatewayListRevertObj.StateCode, gatewayListRevertObj.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- // }
- // });
- // }
- // } else {
-
- // ShowGetAllBindGatewarysPaggerErrorInfo (gatewayListRevertObj.StateCode);
- // }
-
- //}
/// <summary>
/// 淇敼鍒囨崲鏈湴浣忓畢 缃戝叧
/// </summary>
void AddMacToUserConfig (string gatewayMAC)
{
-
+
UserConfig.Instance.GatewayMAC = gatewayMAC;
UserConfig.Instance.SaveUserConfig ();
MainPage.LoginUser.LastTime = DateTime.Now;
Application.RunOnMainThread (() => {
bodyView.RemoveAll ();
+ //MainPage.WiFiStatus = "CrabtreeAdd/WiFi.png";
UserMiddle.Init (true);
+ MainPage.WiFiStatus = "CrabtreeAdd/WiFi.png";
+ UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
});
+
+ //Utlis.ShowAppLinkStatus (AppLinkStatus.WiFi);
+
+ }
+
+
+
+
+ ///// <summary>
+ ///// Gateway setting succeeded锛宒ata up.Please wait...
+ ///// </summary>
+ //void BindGateways ()
+ //{
+
+ // Application.RunOnMainThread (() => {
+ // MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up.Please wait...");
+ // });
+ // IO.FileUtils.SaveEquipmentMessage (gatewayDeicve);
+ // var gatewayMAC = gatewayDeicve.MAC.Replace (".", "");
+ // var oldMac = "";
+ // //2020-01-11
+ // if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
+ // //褰撳墠浣忓畢瀛樺湪Mac 淇敼MAC鎺ュ彛
+ // oldMac = UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId;
+ // if (oldMac == gatewayMAC) {//鍜岀粦瀹歮ac涓�鑷达紝涓嶇敤淇敼
+ // AddMacToUserConfig (gatewayMAC);
+ // return;
+ // }
+
+ // var mUpdateMacObj = new UpdateMacObj () {
+ // LoginAccessToken = MainPage.LoginUser.LoginTokenString,
+ // HomeId = UserConfig.Instance.CurrentRegion.Id,
+ // NewMac = gatewayMAC,
+ // OldMac = oldMac
+ // };
+ // string urlHead = MainPage.RequestHttpsHost;
+ // if (mUpdateMacObj.IsOtherAccountCtrl) {
+ // urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ // mUpdateMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ // }
+
+ // var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mUpdateMacObj);
+
+ // //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
+ // var respone = MainPage.RequestHttps (API.UpdateMac, requestJson, urlHead);
+ // if (respone.StateCode.ToUpper () != "SUCCESS") {
+ // GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
+ // Application.RunOnMainThread (() => {
+ // new Alert ("", "Failed to update Mac address, gateway binding failed!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
+ // new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // }
+ // });
+ // return;
+ // }
+ // //GetNowHomeGateway ();
+ // AddMacToUserConfig (gatewayMAC);
+ // } else {
+ // //璧版柊缁戝畾鎺ュ彛
+ // var mBindMacObj = new BindGatewayToHomeObj () {
+ // LoginAccessToken = MainPage.LoginUser.LoginTokenString,
+ // HomeId = UserConfig.Instance.CurrentRegion.Id,
+
+ // };
+ // mBindMacObj.BindGateways.Add (gatewayMAC);
+ // string urlHead = MainPage.RequestHttpsHost;
+ // if (mBindMacObj.IsOtherAccountCtrl) {
+ // urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ // mBindMacObj.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ // }
+
+
+ // var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (mBindMacObj);
+
+ // //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new EditMACByHomeId { RegionID = UserConfig.Instance.CurrentRegion.Id, MAC = gatewayMAC, IsReBind = true });
+ // var respone = MainPage.RequestHttps (API.BindGatewayToHome, requestJson, urlHead);
+ // if (respone.StateCode.ToUpper () != "SUCCESS" && respone.StateCode != "BindGatewaysExists") {
+ // GetNowHomeGatewayAfterBindMacFailed ();//2020-01-11
+ // Application.RunOnMainThread (() => {
+ // new Alert ("", "Failed to bind Mac address, gateway binding failed!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // if (MainPage.LoginUser.AccountString == "464027401@qq.com") {
+ // new Alert (respone.StateCode, respone.ErrorInfo, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // }
+ // });
+ // return;
+ // }
+ // //GetNowHomeGateway ();
+ // AddMacToUserConfig (gatewayMAC);
+ // }
+
+ //}
+
+
+ /// <summary>
+ /// 缁戝畾澶辫触涔嬪悗锛屾煡璇㈠埛鏂颁竴娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
+ /// 2020-01-11
+ /// </summary>
+ void GetNowHomeGatewayAfterBindMacFailed ()
+ {
+
+ var requestObj3 = new GetSingleHomeGatewayPaggerObj ();
+ requestObj3.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
+ requestObj3.ReqDto.HomeId = UserConfig.Instance.CurrentRegion.Id;
+ requestObj3.ReqDto.PageSetting.Page = 1;
+ requestObj3.ReqDto.PageSetting.PageSize = 10;
+ string urlHead = MainPage.RequestHttpsHost;
+ if (requestObj3.IsOtherAccountCtrl) {
+ urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ }
+
+ var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
+ var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
+ if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
+ //2020-01-11
+ UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
+
+ }
+
}
@@ -1222,27 +1155,163 @@
- /// <summary>
- ///
- /// </summary>
- /// <param name="stateCodeStr"></param>
- void ShowGetAllBindGatewarysPaggerErrorInfo (string stateCodeStr)
- {
- string mes = "";
- //2020-01-06 寰呰ˉ鍏�
- if (stateCodeStr == ErrorCode.NetworkError) {
- mes = ErrorCode.NetworkError;
- } else {
- mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="stateCodeStr"></param>
+ //void ShowGetAllBindGatewarysPaggerErrorInfo (string stateCodeStr)
+ //{
+ // string mes = "";
+ // //2020-01-06 寰呰ˉ鍏�
+ // if (stateCodeStr == ErrorCode.NetworkError) {
+ // mes = ErrorCode.NetworkError;
+ // } else {
+ // mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
- }
- if (!string.IsNullOrEmpty (mes)) {
- Application.RunOnMainThread (() => {
- new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- });
- }
+ // }
+ // if (!string.IsNullOrEmpty (mes)) {
+ // Application.RunOnMainThread (() => {
+ // new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // });
+ // }
- }
+ //}
+
+ //*****************StandardMQTT 閰嶇疆鏂瑰紡 鐩墠鐢ㄤ笉涓�*****************
+ ///// <summary>
+ ///// 杩滅▼閰嶇疆 Standard MQTT妯″紡
+ ///// </summary>
+ //void RemoteSettingWithStandardMQTT ()
+ //{
+ // byte [] gatewayBytes = null;
+ // string [] strServerIP = (MainPage.SeviceIP).Split ('.');
+ // string [] strServerIP1 = (MainPage.SeviceIP).Split ('.');
+ // MainPage.Loading.Start ("Configuring device...");
+ // System.Threading.Tasks.Task.Run (() => {
+ // try {
+
+ // //璇诲彇涓�绔彛浜ゆ崲鏈恒�佹棤绾跨綉鍏崇殑閰嶇疆淇℃伅
+ // gatewayBytes = Control.ControlBytesSendHasReturn (Command.ReadGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, new byte [] { });
+ // //杩炴帴绫诲瀷閰嶇疆涓�5 Standard MQTT妯″紡
+ // gatewayBytes [0] = TYPEStandardMQTT;//Standard MQTT
+ // Control.ControlBytesSend (Command.SetGateWayModelInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, gatewayBytes);
+ // //1.淇敼URL
+ // //2.淇敼璇诲彇瀹㈡埛绔疘D锛岀敤鎴峰悕锛屽瘑鐮�
+ // //3.淇敼AES鍔犲瘑
+ // //4.淇敼涓婚
+
+ // //1.淇敼URL
+ // if (SetGateWayURL ("https://developer.hdlcontrol.com/api/")) {
+ // //2.淇敼瀹㈡埛绔疘D锛岀敤鎴峰悕锛屽瘑鐮�
+ // if (SetGateWayClientIDUsernamePassword ("85521566", "Admin", "85521566")) {
+ // //3.淇敼AES鍔犲瘑
+ // if (SetGateWayAESEncryption (true, "85521566")) {
+ // //4.1淇敼璁㈤槄涓婚
+ // if (SetGateWayTopic ("SubscribeTopic")) {
+ // //4.2淇敼鍙戝竷涓婚
+ // if (SetGateWayTopic ("PublishTopic", true)) {
+ // //5.鍐欓厤缃垚鍔熷悗涓嬩竴姝ユ搷浣�
+ // GatewaySettingSucceeded ();
+ // }
+ // }
+ // }
+ // }
+ // }
+
+ // } catch (Exception ex) {
+ // Utlis.WriteLine (ex.Message);
+ // Application.RunOnMainThread (() => {
+ // new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // });
+ // bool canRemove = false;
+ // } finally {
+ // Application.RunOnMainThread (() => {
+ // MainPage.Loading.Hide ();
+ // //this.RemoveAll ();
+ // });
+ // }
+ // });
+ // //Room.InitAllRoom ();
+ //}
+
+
+
+ ///// <summary>
+ ///// 淇敼URL
+ ///// </summary>
+ ///// <returns></returns>
+ //bool SetGateWayURL (string urlStr = "", int pointID = 1883)
+ //{
+ // byte [] sendBytes = new byte [63];
+ // byte [] url = CommonPage.MyEncodingGB2312.GetBytes (urlStr);
+ // Array.Copy (url, 0, sendBytes, 1, 60 < url.Length ? 60 : url.Length);
+ // sendBytes [0] = GuideSettingGateway.TYPEStandardMQTT;
+ // sendBytes [61] = Convert.ToByte (pointID / 256);
+ // sendBytes [62] = Convert.ToByte (pointID % 256);
+ // var backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayURL, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
+
+ // return CheckIsSuccessfulWithBytes (backBytes);
+ //}
+
+
+ ///// <summary>
+ ///// 淇敼瀹㈡埛绔疘D锛岀敤鎴峰悕锛屽瘑鐮�
+ ///// </summary>
+ ///// <returns></returns>
+ //bool SetGateWayClientIDUsernamePassword (string clientIDStr = "", string usernameStr = "", string passwordStr = "")
+ //{
+
+ // byte [] userInfoBytes = new byte [64];
+ // byte [] clientID = CommonPage.MyEncodingGB2312.GetBytes (clientIDStr);
+ // Array.Copy (clientID, 0, userInfoBytes, 0, 32 < clientID.Length ? 32 : clientID.Length);
+ // byte [] username = CommonPage.MyEncodingGB2312.GetBytes (usernameStr);
+ // Array.Copy (username, 0, userInfoBytes, 32, 16 < username.Length ? 16 : username.Length);
+ // byte [] password = CommonPage.MyEncodingGB2312.GetBytes (passwordStr);
+ // Array.Copy (password, 0, userInfoBytes, 48, 16 < password.Length ? 16 : password.Length);
+ // var setUserInfoBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayClientIDUsernamePassword, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, userInfoBytes);
+
+ // return CheckIsSuccessfulWithBytes (setUserInfoBytes);
+ //}
+
+ ///// <summary>
+ ///// 淇敼AES鍔犲瘑
+ ///// </summary>
+ ///// <returns></returns>
+ //bool SetGateWayAESEncryption (bool enable = false, string passwordStr = "")
+ //{
+ // byte [] sendBytes = new byte [17];
+ // sendBytes [0] = enable ? (byte)1 : (byte)0; //0:涓嶄娇鑳� 1 - 255:浣胯兘
+ // byte [] password = CommonPage.MyEncodingGB2312.GetBytes (passwordStr);
+ // Array.Copy (password, 0, sendBytes, 1, 16 < password.Length ? 16 : password.Length);
+ // var backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayAESEncryption, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
+
+ // return CheckIsSuccessfulWithBytes (backBytes);
+ //}
+
+ ///// <summary>
+ ///// 淇敼涓婚
+ ///// </summary>
+ ///// <param name="bPublish">鏄惁涓哄彂甯冧富棰�</param>
+ ///// <param name="bDefault">鏄惁榛樿</param>
+ ///// <returns></returns>
+ //bool SetGateWayTopic (string topicInfoStr = "", bool bPublish = false, bool bDefault = false)
+ //{
+ // byte [] sendBytes = new byte [50];
+ // sendBytes [0] = bPublish ? (byte)2 : (byte)1; //1锛氳闃� 2锛氬彂甯�
+ // sendBytes [1] = bDefault ? (byte)0 : (byte)1; //1:闈為粯璁� 0:榛樿
+
+ // byte [] topicInfo = CommonPage.MyEncodingGB2312.GetBytes (topicInfoStr);
+ // Array.Copy (topicInfo, 0, sendBytes, 2, 48 < topicInfo.Length ? 48 : topicInfo.Length);
+ // var backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayTopic, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
+
+ // if (backBytes != null && backBytes.Length >= 2) {
+ // if (backBytes [0] == sendBytes [0] && backBytes [1] == sendBytes [1]) {
+ // return true;
+ // }
+ // }
+ // return CheckIsSuccessfulWithBytes (backBytes);
+ //}
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0