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/Device/AirConditioner/IndoorUnitSettionForm.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
index 63fab2d..8c174d1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勭綉鍏�
/// </summary>
@@ -78,15 +78,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.deviceAc);
//璁惧澶囨敞
@@ -137,7 +141,7 @@
rowBeloneArea.AddBottomLine();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
- Common.Room.CurrentRoom.ChangedRoom(deviceAc, roomKeys);
+ HdlRoomLogic.Current.ChangedRoom(deviceAc, roomKeys);
};
//绌鸿皟妯″紡
@@ -167,7 +171,7 @@
{
//涓嶈兘鍐嶇偣鍑�
btnSwingSwitch.CanClick = false;
- string statu = btnSwingSwitch.IsSelected == true ? "1" : "0";
+ string statu = btnSwingSwitch.IsSelected == true ? "0" : "1";
//灏嗕簩杩涘埗杞崲涓哄崄杩涘埗
int sendData = Convert.ToInt32(this.fixValue + statu, 2);
HdlThreadLogic.Current.RunThread(async () =>
@@ -190,7 +194,7 @@
};
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
@@ -280,7 +284,7 @@
//杞崲涓轰簩杩涘埗
var value = Convert.ToString(data.AttriButeData, 2).PadLeft(16, '0');
//杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
- this.fixValue = value.Substring(0, value.Length - 15);
+ this.fixValue = value.Substring(0, value.Length - 1);
this.swingMode = Convert.ToInt32(value.Substring(this.fixValue.Length));
}
}
--
Gitblit v1.8.0