From 3292b5b7fe6c14476df002d78bf186e80f2aab08 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 09:30:30 +0800
Subject: [PATCH] 2020-05-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 8cb0a34..36f760b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -18,7 +18,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 妤煎眰涓婚敭
/// </summary>
@@ -54,35 +54,60 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
+ //鍔犱竴涓櫧鑹茶儗鏅�
+ var frameBack1 = new FrameLayout();
+ frameBack1.Height = Application.GetRealHeight(450);
+ frameBack1.Y = Application.GetRealHeight(196);
+ frameBack1.BackgroundColor = UserCenterColor.Current.White;
+ frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ listBackControl.frameTable.AddChidren(frameBack1);
+
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
+
+ //鎴块棿鍥剧墖搴曢儴闃村奖
+ var btnShadow = new PicViewControl(853, 593);
+ btnShadow.Y = Application.GetRealHeight(58);
+ btnShadow.Gravity = Gravity.CenterHorizontal;
+ btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
+ listBackControl.frameTable.AddChidren(btnShadow);
//鎴块棿鍥剧墖
var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
- btnPic.Width = Application.GetMinRealAverage(887);
- btnPic.Height = Application.GetMinRealAverage(444);
+ btnPic.Width = this.GetPictrueRealSize(824);
+ btnPic.Height = this.GetPictrueRealSize(549);
btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.ImagePath = "RoomIcon/0.JPG";
- bodyFrameLayout.AddChidren(btnPic);
- var btnShadow = new PicViewControl(916, 487);
- btnShadow.Y = btnPic.Y;
- btnShadow.Gravity = Gravity.CenterHorizontal;
- btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
- bodyFrameLayout.AddChidren(btnShadow);
- btnShadow.MouseUpEventHandler += (sender, e) =>
+ btnPic.ImagePath = "RoomIcon/0.jpg";
+ listBackControl.frameTable.AddChidren(btnPic);
+ //鍥剧墖閬僵
+ var btnZhezhao = new FrameLayout();
+ btnZhezhao.Width = btnPic.Width;
+ btnZhezhao.Height = btnPic.Height;
+ btnZhezhao.Y = btnPic.Y;
+ btnZhezhao.Gravity = Gravity.CenterHorizontal;
+ btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
+ btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
+ listBackControl.frameTable.AddChidren(btnZhezhao);
+ btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
this.RoomPictrueSelect(btnPic);
};
+
+ //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
+ frameBack1.Y = btnPic.Y + btnPic.Height / 2;
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
newRoom.BackgroundImage = btnPic.ImagePath;
newRoom.Humidity = -1000;
newRoom.Temperatrue = -1000;
-
- //鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -154,7 +179,7 @@
};
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -180,6 +205,14 @@
}
newRoom.FloorId = this.floorKeys;
+ if (newRoom.Humidity == -1000)
+ {
+ newRoom.Humidity = 0;
+ }
+ if (newRoom.Temperatrue == -1000)
+ {
+ newRoom.Temperatrue = 0;
+ }
HdlRoomLogic.Current.AddRoom(newRoom);
this.FinishEditorEvent?.Invoke();
@@ -442,11 +475,9 @@
//榛樿鍥惧簱
menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
{
- var localPic = new Phone.Device.Room.AddRoomSelectPicByLocal();
- Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (imgPath) =>
+ var form = new SelectLocalRoomImageForm();
+ form.AddForm();
+ form.FinishSelectEvent = (imgPath) =>
{
if (string.IsNullOrEmpty(imgPath) == true)
{
--
Gitblit v1.8.0