From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceBindLogic.cs | 106 +++++++++++++++++++----------------------------------
1 files changed, 38 insertions(+), 68 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceBindLogic.cs
similarity index 88%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceBindLogic.cs
index 30cbe5b..8236982 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceBindLogic.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 璁惧缁戝畾鐨勯�昏緫
@@ -50,15 +50,15 @@
//鑾峰彇璁惧鐨勭粦瀹氱洰鏍囧け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceBindTargetFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return null;
}
var listDevice = new List<CommonDevice>();
foreach (var data in result.getAllBindResponseData.BindList)
{
- CommonDevice deviceTemp = Common.LocalDevice.Current.GetDevice(data.BindMacAddr, data.BindEpoint);
+ CommonDevice deviceTemp = HdlDeviceCommonLogic.Current.GetDevice(data.BindMacAddr, data.BindEpoint);
if (deviceTemp == null)
{
continue;
@@ -76,7 +76,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- var listBind = TemplateData.TemplateDeviceDataLogic.Current.GetDeviceBindList(device);
+ var listBind = HdlTemplateDeviceDataLogic.Current.GetDeviceBindList(device);
return new BindObj.GetDeviceBindResponseAllData()
{
getAllBindResponseData = new BindObj.GetDeviceBindResponseData
@@ -134,7 +134,7 @@
addData.BindList.Add(info);
//杩斿洖鎴愬姛璁惧鐨勬椂鍊欎娇鐢�
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
dicDevice[mainkeys] = device;
}
//鎵ц缁戝畾
@@ -144,16 +144,16 @@
//缁戝畾鐩爣璁剧疆澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return null;
}
var listSuccess = new List<CommonDevice>();
foreach (var data in result.addedDeviceBindResponseData.BindList)
{
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
if (dicDevice.ContainsKey(mainkeys) == true)
{
listSuccess.Add(dicDevice[mainkeys]);
@@ -164,7 +164,7 @@
{
//缁戝畾鐩爣璁剧疆澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail);
- this.ShowTipMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, msg);
}
return listSuccess;
}
@@ -177,10 +177,10 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, null);
+ return HdlTemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, null);
}
- var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
//鑾峰彇鍙戦�佺殑鍛戒护瀛楃
var sendData = this.GetAddDeviceListBindCommandText(addBindData);
//鍙戦��
@@ -191,7 +191,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);
+ HdlTemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceBindResponseData>(result.ReceiptData);
return new BindObj.AddedDeviceBindResponseAllData() { addedDeviceBindResponseData = tempData };
}
@@ -230,7 +230,7 @@
/// </summary>
public BindObj.AddedDeviceSingleBindResponseAllData AddDeviceSingleBindAsync(BindObj.AddSingleBindData addSingleBindData)
{
- var device = Common.LocalDevice.Current.GetDevice(addSingleBindData.DeviceAddr, addSingleBindData.Epoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(addSingleBindData.DeviceAddr, addSingleBindData.Epoint);
//鑾峰彇鍙戦�佺殑鍛戒护瀛楃
var sendData = this.GetAddDeviceListSingleBindCommandText(addSingleBindData);
//鍙戦��
@@ -305,9 +305,9 @@
//鍒犻櫎缁戝畾鐩爣澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return false;
}
@@ -323,7 +323,7 @@
{
//鍏朵粬缁戝畾鐩爣姝ｅ湪鍒犻櫎涓紝璇风◢鍚庡啀璇�
string msg = Language.StringByID(R.MyInternationalizationString.uOtherBindTargetsIsDelettingPleaseWait);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return false;
}
//2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
@@ -333,7 +333,7 @@
{
//鍒犻櫎缁戝畾鐩爣澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return false;
}
else
@@ -353,7 +353,7 @@
{
//鍒犻櫎缁戝畾鐩爣澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return false;
}
}
@@ -387,7 +387,7 @@
deleteData.RemoveBindList.Add(info);
//杩斿洖鎴愬姛璁惧鐨勬椂鍊欎娇鐢�
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
dicDevice[mainkeys] = device;
}
var listSuccess = new List<CommonDevice>();
@@ -398,15 +398,15 @@
//鍒犻櫎缁戝畾鐩爣澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
return listSuccess;
}
foreach (var data in result.delDeviceBindResponseData.RemoveBindList)
{
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
//0:鎴愬姛 1:璁惧涓嶅湪缁戝畾鍒楄〃涓� 锛屼篃鍙互浠ｈ〃鎴愬姛
if (data.Result == 0 || data.Result == 1)
{
@@ -416,9 +416,9 @@
else if (data.Result == 3)
{
//璁惧鍚嶇О 鍏朵粬缁戝畾鐩爣姝ｅ湪鍒犻櫎涓紝璇风◢鍚庡啀璇�
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
+ string msg = HdlDeviceCommonLogic.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
msg += Language.StringByID(R.MyInternationalizationString.uOtherBindTargetsIsDelettingPleaseWait);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
}
//2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
else if (data.Result == 2)
@@ -426,9 +426,9 @@
if (result.removeBindResultResponseData == null)
{
//璁惧鍚嶇О 鍒犻櫎缁戝畾鐩爣澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
+ string msg = HdlDeviceCommonLogic.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
msg += Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
}
else
{
@@ -446,9 +446,9 @@
else
{
//璁惧鍚嶇О 鍒犻櫎缁戝畾鐩爣澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
+ string msg = HdlDeviceCommonLogic.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
msg += Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
- this.ShowErrorMsg(msg);
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, msg);
}
}
}
@@ -466,9 +466,9 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
+ return HdlTemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
}
- var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
//鑾峰彇闇�瑕佸彂閫佺殑鏁版嵁
var sendData = this.GetDeleteDeviceBindCommandText(delDeviceBindData);
//鍙戦�佸懡浠�
@@ -493,7 +493,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
+ HdlTemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
return responseData;
}
@@ -506,7 +506,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);
+ return HdlTemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);
}
var jObject = new JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };
@@ -518,7 +518,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);
+ HdlTemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.ClearBindInfoResponseData>(result.ReceiptData);
return new BindObj.ClearBindInfoResponseAllData { clearBindInfoResponseData = tempData };
@@ -600,7 +600,7 @@
if (topic == errorTopic)
{
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
- reResult.ErrorMsg = HdlCheckLogic.Current.CheckCommonErrorCode(temp.Error);
+ reResult.ErrorMsg = HdlCheckLogic.Current.CheckGatewayErrorCode(temp.Error);
}
//濡傛灉鏄寚瀹氱殑涓婚
for (int i = 0; i < listReceiptTopic.Count; i++)
@@ -706,7 +706,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, null);
+ return HdlTemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, null);
}
//鑾峰彇鍙戦�佹暟鎹�
var sendData = this.GetConfigureHdlKeyCommandText(device.DeviceAddr, device.DeviceEpoint, value, clusterID);
@@ -717,7 +717,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, result.JsonData[0]);
+ HdlTemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, result.JsonData[0]);
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.SetWritableValueResponData>(result.ReceiptData);
return new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = tempData };
@@ -731,7 +731,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.ReadPanelConfigureKeyModel(device);
+ return HdlTemplateDeviceDataLogic.Current.ReadPanelConfigureKeyModel(device);
}
var JObject = new JObject {{ "DeviceAddr",device.DeviceAddr },{ "Epoint", device.DeviceEpoint },
@@ -766,36 +766,6 @@
var data = new JObject { { "Undivided", 0 }, { "AttributeId", 6533 }, { "AttributeDataType", 33 }, { "AttributeData", (int)value } };
jObject.Add("Data", data);
return jObject.ToString();
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鏄剧ず閿欒淇℃伅绐楀彛
- /// </summary>
- /// <param name="msg"></param>
- private void ShowErrorMsg(string msg)
- {
- Application.RunOnMainThread(() =>
- {
- var contr = new ShowMsgControl(ShowMsgType.Error, msg);
- contr.Show();
- });
- }
-
- /// <summary>
- /// 鏄剧ずTip淇℃伅绐楀彛
- /// </summary>
- /// <param name="msg"></param>
- private void ShowTipMsg(string msg)
- {
- Application.RunOnMainThread(() =>
- {
- var contr = new UserCenter.ShowMsgControl(ShowMsgType.Tip, msg);
- contr.Show();
- });
}
#endregion
--
Gitblit v1.8.0