From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index a17a61c..db02ddd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -215,9 +215,9 @@
rowInfo.MenuRow = rowMenu;
//鍚戝彸鍥炬爣
var btnRight = rowMenu.frameTable.AddMostRightEmptyIcon(58, 58);
- rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);
btnRight.UnSelectedImagePath = "Item/Next.png";
btnRight.SelectedImagePath = "Item/Down.png";
+ rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);
//鎻愮ず鏂扮増鏈�
var btnNew = new InformationTipView(rowMenu.btnIcon);
@@ -247,9 +247,21 @@
//灞曞紑,鎶樺彔
btnRight.ButtonClickEvent += (sender, e) =>
{
- btnRight.IsSelected = !btnRight.IsSelected;
- //灞曞紑鎴栬�呮姌鍙犳槑缁嗗垪琛�
- this.ShowDetailList(deviceMac, btnRight.IsSelected);
+ //鍥炶矾鏁板ぇ浜�1鎵嶅睍寮�
+ if (Common.LocalDevice.Current.GetDevicesCountByMac(deviceMac) > 1)
+ {
+ btnRight.IsSelected = !btnRight.IsSelected;
+ //灞曞紑鎴栬�呮姌鍙犳槑缁嗗垪琛�
+ this.ShowDetailList(deviceMac, btnRight.IsSelected);
+ }
+ else
+ {
+ btnNew.Visible = false;
+ var form = new DeviceMacInfoEditorForm();
+ form.AddForm(deviceMac);
+ //鐣岄潰璺宠浆,璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃
+ this.nowActionDeviceMac = deviceMac;
+ }
};
rowMenu.frameTable.ButtonClickEvent += (sender, e) =>
--
Gitblit v1.8.0