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/Add/NewGateWayMenuSelectForm.cs | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
index 0e493af..3b4222c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
@@ -42,7 +42,7 @@
this.ClearBodyFrame();
var listView = new VerticalListControl(29);
- listView.Height = Application.GetRealHeight(340);
+ listView.Height = bodyFrameLayout.Height;
listView.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(listView);
@@ -74,6 +74,7 @@
var btntext2 = row2.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uWirelessGateway), 500);
btntext2.TextSize = 15;
row2.AddRightArrow();
+ row2.AddBottomLine();
row2.ButtonClickEvent += (sender, e) =>
{
//妫�娴嬩綇瀹呯粡绾害
@@ -97,6 +98,26 @@
});
};
+ //Mini缃戝叧
+ var row3 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row3);
+ var btnIcon3 = row3.AddLeftIcon(81);
+ btnIcon3.UnSelectedImagePath = "Gateway/MiniGateway.png";
+ var btntext3 = row3.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uMiniGateway), 500);
+ btntext3.TextSize = 15;
+ row3.AddRightArrow();
+ row3.ButtonClickEvent += (sender, e) =>
+ {
+ //妫�娴嬩綇瀹呯粡绾害
+ if (this.CheckResidencePoint() == false)
+ {
+ return;
+ }
+ var form = new MiniGatewayDirection1Form();
+ form.AddForm();
+ };
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+
//濡傛灉杩樻病鏈夎缃湴鐞嗕綅缃�
if (Common.Config.Instance.Home.Latitude == 0 && Common.Config.Instance.Home.Longitude == 0)
{
--
Gitblit v1.8.0