From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
index d0b5faf..0277750 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
@@ -2,7 +2,6 @@
using System;
using System.Collections.Generic;
using System.Text;
-using System.Threading.Tasks;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.GatewayManage
@@ -39,16 +38,20 @@
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGatewayManagement));
- //娣诲姞鍥炬爣
- var btnAdd = new MostRightIconControl(69, 69);
- btnAdd.UnSelectedImagePath = "Item/Add.png";
- topFrameLayout.AddChidren(btnAdd);
- btnAdd.InitControl();
- btnAdd.ButtonClickEvent += (sender, e) =>
+ //灞曠ず妯℃澘涓嶅厑璁哥紪杈�
+ if (Config.Instance.Home.IsShowTemplate == false)
{
- var form = new GatewayAdd.NewGateWayMenuSelectForm();
- form.AddForm();
- };
+ //娣诲姞鍥炬爣
+ var btnAdd = new MostRightIconControl(69, 69);
+ btnAdd.UnSelectedImagePath = "Item/Add.png";
+ topFrameLayout.AddChidren(btnAdd);
+ btnAdd.InitControl();
+ btnAdd.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new GatewayAdd.NewGateWayMenuSelectForm();
+ form.AddForm();
+ };
+ }
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
@@ -101,8 +104,12 @@
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
this.listview.AdjustRealHeight(Application.GetRealHeight(23));
- //寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼
- this.StartGatewayOnlieCheckThread(listway);
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶉渶瑕佹娴�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
+ {
+ //寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼
+ this.StartGatewayOnlieCheckThread(listway);
+ }
}
#endregion
@@ -146,36 +153,46 @@
form.AddForm(gateway);
};
- //鍒囨崲
- var btnSwitch = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
- btnSwitch.BackgroundColor = 0xfffb744a;
- btnSwitch.TextAlignment = TextAlignment.Center;
- btnSwitch.TextColor = UserCenterColor.Current.White;
- btnSwitch.TextSize = 12;
- btnSwitch.TextID = R.MyInternationalizationString.uSwitch1;
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
{
- btnSwitch.TextID = R.MyInternationalizationString.uRefresh;
+ return;
}
- gatewayRow.AddRightView(btnSwitch);
- btnSwitch.ButtonClickEvent += (sender, e) =>
+
+ //闈炶櫄鎷熶綇瀹�,鎵嶆湁杩欎釜鍔熻兘
+ if (Common.Config.Instance.Home.IsVirtually == false)
{
- //鏄惁鍒囨崲鍒皗0}缃戝叧?
- string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ //鍒囨崲
+ var btnSwitch = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
+ btnSwitch.BackgroundColor = 0xfffb744a;
+ btnSwitch.TextAlignment = TextAlignment.Center;
+ btnSwitch.TextColor = UserCenterColor.Current.White;
+ btnSwitch.TextSize = 12;
+ btnSwitch.TextID = R.MyInternationalizationString.uSwitch1;
if (strWayId == GatewayResourse.AppOldSelectGatewayId)
{
- //鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
- msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ btnSwitch.TextID = R.MyInternationalizationString.uRefresh;
}
- this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ gatewayRow.AddRightView(btnSwitch);
+ btnSwitch.ButtonClickEvent += (sender, e) =>
{
- HdlThreadLogic.Current.RunThread(() =>
+ //鏄惁鍒囨崲鍒皗0}缃戝叧?
+ string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ if (strWayId == GatewayResourse.AppOldSelectGatewayId)
{
- //鎵ц鍒囨崲缃戝叧鎿嶄綔
- this.DoSwitchGateway(strWayId);
+ //鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
+ msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ }
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鎵ц鍒囨崲缃戝叧鎿嶄綔
+ this.DoSwitchGateway(strWayId);
+ });
});
- });
- };
+ };
+ }
//瀹氫綅
var btnPosition = gatewayRow.AddEditorControl(false);
--
Gitblit v1.8.0