From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
similarity index 99%
rename from ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 95ca2a5..0dc5e74 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -270,6 +270,8 @@
rowMenu.frameTable.ButtonClickEvent += (sender, e) =>
{
+ //闅愯棌鑿滃崟
+ rowMenu.HideMenu();
//寮哄埗璺宠浆鐪熷疄璁惧鐣岄潰
if (UserCenterResourse.HideOption.GotoRealDeviceForm == 1)
{
@@ -378,6 +380,8 @@
rowDevice.frameTable.ButtonClickEvent += (sender, e) =>
{
+ //闅愯棌鑿滃崟
+ rowDevice.HideMenu();
//鐣岄潰璺宠浆,璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃
this.nowActionDeviceMac = device.DeviceAddr;
//鏄剧ず璁惧鍔熻兘閰嶇疆鐣岄潰
--
Gitblit v1.8.0