From 0bf9e65bc3ba98391e7835c922b15baab3c77876 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 01 六月 2020 14:59:39 +0800
Subject: [PATCH] 上传一个合并的版本
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index 25ec696..db710c9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -109,6 +109,48 @@
HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);
};
+ //鎵�灞炰綇瀹�
+ caption = Language.StringByID(R.MyInternationalizationString.uBelongResidence);
+ var btnBeloneArea = new FrameCaptionViewControl(caption, Common.Config.Instance.Home.Name, listview.rowSpace / 2);
+ btnBeloneArea.UseClickStatu = false;
+ listview.AddChidren(btnBeloneArea);
+ btnBeloneArea.InitControl();
+ //鍒掔嚎
+ btnBeloneArea.AddBottomLine();
+
+ //mini缃戝叧鏈変釜鍔熻兘璁剧疆
+ if (this.zbGateway.getGwInfo != null && this.zbGateway.getGwInfo.LinuxImageType == 11)
+ {
+ var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
+ CommonDevice miniDevice = null;
+ foreach (var device in listDevice)
+ {
+ //鑾峰彇杩欎釜缃戝叧涓嬬殑灏忓鐏澶�
+ if (Common.LocalDevice.Current.IsMiniLight(device) == true)
+ {
+ miniDevice = device;
+ break;
+ }
+ }
+ //濡傛灉鎵惧緱鍒扮殑璇�
+ if (miniDevice != null)
+ {
+ //鍔熻兘璁剧疆
+ var rowFunction = new RowLayoutControl(listview.rowSpace / 2);
+ listview.AddChidren(rowFunction);
+ rowFunction.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp), 700);
+ //鍙冲浘鏍�
+ rowFunction.frameTable.AddRightArrow();
+ //搴曠嚎
+ rowFunction.frameTable.AddBottomLine();
+ rowFunction.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceLight.MiniNightLightFunctionSettionForm();
+ form.AddForm(miniDevice);
+ };
+ }
+ }
+
//鏁版嵁涓婁紶涓庝笅杞�
var rowData = new RowLayoutControl(listview.rowSpace / 2);
listview.AddChidren(rowData);
@@ -394,7 +436,7 @@
else
{
//鍒锋柊涓荤敾闈�(涓嶉噸鏂拌幏鍙栬澶囩姸鎬�)
- this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame", false);
+ this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame");
}
});
}
--
Gitblit v1.8.0