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/Gateway/Manage/GatewayInfoEditorForm.cs | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index 6b3fb19..25ec696 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勭綉鍏�
/// </summary>
@@ -51,15 +51,19 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1368);
//鍥剧墖
var btnPic = new DeviceInfoIconControl();
btnPic.Y = Application.GetRealHeight(92);
btnPic.Gravity = Gravity.CenterHorizontal;
- bodyFrameLayout.AddChidren(btnPic);
+ listBackControl.frameTable.AddChidren(btnPic);
btnPic.InitControl(this.zbGateway);
//璁惧澶囨敞
@@ -84,15 +88,26 @@
}
};
- //璁惧绫诲瀷
+ //璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧)
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
- var btnType = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
+ var btnType = new FrameCaptionViewControl(caption, Language.StringByID(60004), listview.rowSpace / 2);
btnType.UseClickStatu = false;
listview.AddChidren(btnType);
btnType.InitControl();
- HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, this.zbGateway);
//鍒掔嚎
btnType.AddBottomLine();
+
+ //瀹夎浣嶇疆
+ var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
+ listview.AddChidren(rowBeloneArea);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.zbGateway);
+ //搴曠嚎
+ rowBeloneArea.AddBottomLine();
+ rowBeloneArea.SelectRoomEvent += (roomKeys) =>
+ {
+ //鍙樻洿缃戝叧鎴块棿
+ HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);
+ };
//鏁版嵁涓婁紶涓庝笅杞�
var rowData = new RowLayoutControl(listview.rowSpace / 2);
@@ -104,6 +119,8 @@
rowData.frameTable.AddBottomLine();
rowData.frameTable.ButtonClickEvent += (sender, e) =>
{
+ var form = new GatewayUploadAndDownLoadForm();
+ form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
};
//閫氱敤淇℃伅
@@ -138,10 +155,12 @@
rowUpDate.ButtonClickEvent += (sender, e) =>
{
btnNewVersion.Visible = false;
+ var form = new GatewayUpdate.GatewayFirmwareUpdateForm();
+ form.AddForm(zbGateway);
};
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
@@ -170,7 +189,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//妫�娴嬫柊鐗堟湰
- this.CheckNewVersion(btnNewVersion, btnType);
+ this.CheckNewVersion(btnNewVersion);
});
}
@@ -200,7 +219,7 @@
private void ShowTopRightMenu()
{
bool flage = UserCenterResourse.DicActionForm.ContainsKey("NewGateWayMenuSelectForm");
- var frame = new TopRightMenuControl(flage == true ? 1 : 3);
+ var frame = new TopRightMenuControl(flage == true ? 1 : 3, 1);
//瀹氫綅
string MenuName = Language.StringByID(R.MyInternationalizationString.uFixedPosition);
frame.AddRowMenu(MenuName, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
@@ -264,8 +283,7 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <param name="btnNewVersion">鎻愮ず鏈夋柊鐗堟湰鐨勬帶浠�</param>
- /// <param name="btnType">缃戝叧绫诲瀷鎺т欢</param>
- private async void CheckNewVersion(PicViewControl btnNewVersion, FrameCaptionViewControl btnType)
+ private async void CheckNewVersion(PicViewControl btnNewVersion)
{
//鑾峰彇缃戝叧鐗堟湰淇℃伅
var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
@@ -277,7 +295,6 @@
{
if (this.Parent != null)
{
- HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, this.zbGateway);
if (result[0] != null || result[1] != null || result[2] != null)
{
//鎻愮ず鏈夋柊鐗堟湰
@@ -362,7 +379,7 @@
this.CloseForm();
//鍏抽棴鎸囧畾鐣岄潰(缃戝叧鎼滅储)
- this.CloseFormByFormName("WiredGatewayListForm");
+ this.CloseFormByFormName("GatewaySearchListForm");
this.CloseFormByFormName("NewGateWayMenuSelectForm");
//鍏抽棴鎸囧畾鐣岄潰(缃戝叧缂栬緫)
@@ -391,21 +408,32 @@
/// </summary>
/// <param name="strWayId"></param>
/// <param name="row"></param>
- private async void DeleteGateway(string strWayId)
+ private void DeleteGateway(string strWayId)
{
- //鍒犻櫎浜戠缃戝叧
- bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(async () =>
{
- return;
- }
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
- {
- HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
- }
- //鍏抽棴鑷韩
- this.CloseForm();
+ //鍒犻櫎浜戠缃戝叧
+ bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+
+ if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ {
+ HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ });
+ });
}
#endregion
--
Gitblit v1.8.0