From 2eacb04ca1ec0ad20fda4186b59a9bce67004cb4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 30 四月 2020 17:45:33 +0800
Subject: [PATCH] 请合并小模块
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
old mode 100755
new mode 100644
index 51837e9..68aa327
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Org.BouncyCastle.Bcpg.OpenPgp;
using Shared.Common;
using ZigBee.Common;
using ZigBee.Device;
@@ -39,7 +40,7 @@
private string bindPmName = string.Empty;
#endregion
-
+
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
@@ -49,8 +50,8 @@
public void ShowForm(CommonDevice i_device)
{
this.deviceObj = i_device;
- //鑾峰彇鏁版嵁
- ReadDoorLockUserInfo(deviceObj);
+ //鑾峰彇鏁版嵁
+ ReadDoorLockUserInfo(deviceObj);
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
@@ -86,9 +87,9 @@
this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
//鍒濆鍖栬彍鍗曡
- this.InitMenuRow();
-
- //鍒濆鍖栨甯冨畬鎴�
+ this.InitMenuRow();
+
+ //鍒濆鍖栨甯冨畬鎴�
tableContr.FinishInitControl();
tableContr = null;
@@ -100,14 +101,14 @@
{
//鍏抽棴鑷韩
this.CloseForm();
- };
+ };
}
/// <summary>
/// 鍒濆鍖栬彍鍗曡
/// </summary>
private void InitMenuRow()
- {
+ {
this.listview.RemoveAll();
//娣诲姞鏂伴鐩爣
this.AddFreshAirRow();
@@ -163,7 +164,7 @@
});
}
#endregion
-
+
#region 鈻� 鏂伴鐩爣_________________________
/// <summary>
/// 鏂伴鐩爣琛�
@@ -177,15 +178,15 @@
//搴曠嚎
rowNewWind.AddBottomLine();
//鍙崇澶�
- rowNewWind.AddRightArrow();
+ rowNewWind.AddRightArrow();
- var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
if (!string.IsNullOrEmpty(bindFreshAirName))
{
msg = bindFreshAirName;
}
var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
-
+
rowNewWind.ButtonClickEvent += (sender, e) =>
{
var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 1);
--
Gitblit v1.8.0