From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 71 ++++++-----------------------------
1 files changed, 13 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index c2f7d13..de95fbe 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -122,63 +122,18 @@
foreach (var data in result.addedDeviceBindResponseData.BindList)
{
string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
- //0:娣诲姞鎴愬姛 3:宸茬粡瀛樺湪锛屼篃鍙互浠ｈ〃鎴愬姛
- if (data.Result == 0 || data.Result == 3)
+ if (dicDevice.ContainsKey(mainkeys) == true)
{
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- listSuccess.Add(dicDevice[mainkeys]);
- }
- }
- //1锛氬け璐ワ紝鑺傜偣璁惧鎴栧満鏅笉瀛樺湪
- else if (data.Result == 1)
- {
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- }
- //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 2)
- {
- if (result.addBindResultResponseData == null)
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- else
- {
- //娣诲姞鎴愬姛
- if (result.addBindResultResponseData.Result == 0)
- {
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- listSuccess.Add(dicDevice[mainkeys]);
- }
- }
- //璁惧鍚嶇О 缁戝畾鍒楄〃宸叉弧
- else if (result.addBindResultResponseData.Result == 140)
- {
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.uBindListIsFull);
- this.ShowTipMsg(msg);
- }
- else
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = Common.LocalDevice.Current.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- }
+ listSuccess.Add(dicDevice[mainkeys]);
}
}
+ if (listSuccess.Count == 0)
+ {
+ //缁戝畾鐩爣璁剧疆澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail);
+ this.ShowTipMsg(msg);
+ }
return listSuccess;
}
@@ -223,7 +178,7 @@
foreach (var data in result.delDeviceBindResponseData.RemoveBindList)
{
//0:鎴愬姛 1:璁惧涓嶅湪缁戝畾鍒楄〃涓� 锛屼篃鍙互浠ｈ〃鎴愬姛
- if (data.Result == 0 || data.Result == 1)
+ if (data.Result == 0 || data.Result == 1 || data.Result == 5)
{
return true;
}
@@ -235,8 +190,8 @@
this.ShowErrorMsg(msg);
return false;
}
- //4锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 4)
+ //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
+ else if (data.Result == 2)
{
if (result.removeBindResultResponseData == null)
{
@@ -329,8 +284,8 @@
msg += Language.StringByID(R.MyInternationalizationString.uOtherBindTargetsIsDelettingPleaseWait);
this.ShowErrorMsg(msg);
}
- //4锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 4)
+ //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
+ else if (data.Result == 2)
{
if (result.removeBindResultResponseData == null)
{
--
Gitblit v1.8.0