From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
index fa5e841..0e14181 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
@@ -23,6 +23,10 @@
/// 鍔熻兘
/// </summary>
public NormalViewControl btnFunction = null;
+ /// <summary>
+ /// 浣忓畢鍚嶇О
+ /// </summary>
+ public NormalViewControl btnHouse = null;
#endregion
@@ -33,6 +37,8 @@
/// </summary>
public virtual void ShowFrom()
{
+ Phone.MainPage.ListRoomViewFrom.Instance.CanClick = false;
+
UserView.UserPage.Instance.AddChidren(this);
this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -49,7 +55,7 @@
btnMsg.UnSelectedImagePath = "Item/Message.png";
this.AddChidren(btnMsg);
//浣忓畢鍚嶅瓧
- var btnHouse = new NormalViewControl(300, 95, true);
+ this.btnHouse = new NormalViewControl(300, 95, true);
btnHouse.TextSize = 24;
btnHouse.X = ControlCommonResourse.XXLeft;
btnHouse.Y = Application.GetRealHeight(161);
@@ -62,31 +68,33 @@
roomPageView.Height = Application.GetRealHeight(478);
this.AddChidren(roomPageView);
//绐佸嚭杈硅窛
- roomPageView.TCBJ = Application.GetRealWidth(181);
+ roomPageView.TCBJ = Application.GetRealWidth(124);
//涓や釜page涔嬮棿鐨勯棿璺�
- roomPageView.JMBJ = Application.GetRealWidth(0);
+ roomPageView.JMBJ = Application.GetRealWidth(58);
//瀹㈠巺
var room1 = new Common.Room();
- room1.BackgroundImage = "RoomIcon/0.JPG";
+ room1.BackgroundImage = "RoomIcon/0.jpg";
room1.Name = Language.StringByID(R.MyInternationalizationString.uLivingRoom);
var roomView1 = new Phone.Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView1);
roomView1.Init(room1);
//闃冲彴
var room2 = new Common.Room();
- room2.BackgroundImage = "RoomIcon/1.JPG";
+ room2.BackgroundImage = "RoomIcon/1.jpg";
room2.Name = Language.StringByID(R.MyInternationalizationString.uBalcony);
var roomView2 = new Phone.Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView2);
roomView2.Init(room2);
//鍗у
var room3 = new Common.Room();
- room3.BackgroundImage = "RoomIcon/2.JPG";
+ room3.BackgroundImage = "RoomIcon/2.jpg";
room3.Name = Language.StringByID(R.MyInternationalizationString.uBedroom);
var roomView3 = new Phone.Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView3);
roomView3.Init(room3);
+
+ roomPageView.PageIndex = 1;
//鍦烘櫙鍜屽姛鑳界殑鎺т欢
this.contrSwitch = new FrameLayout();
@@ -121,25 +129,25 @@
sceneView1.X = Application.GetRealWidth(46);
sceneView1.Y = roomPageView.Bottom + Application.GetRealHeight(233);
this.AddChidren(sceneView1);
- sceneView1.Init(new Common.SceneUI() { Name = "Getup", IconPath = "SceneIcon/0.jpg" });
+ sceneView1.Init(new Common.SceneUI() { Name = "Getup", IconPath = "SceneIcon/0.png" });
//鑷畾涔夊満鏅�2
var sceneView2 = new Phone.Device.CommonForm.SceneMainView(0, 0);
sceneView2.X = Application.GetRealWidth(553);
sceneView2.Y = sceneView1.Y;
this.AddChidren(sceneView2);
- sceneView2.Init(new Common.SceneUI() { Name = "Relax", IconPath = "SceneIcon/1.jpg" });
+ sceneView2.Init(new Common.SceneUI() { Name = "Relax", IconPath = "SceneIcon/1.png" });
//鑷畾涔夊満鏅�3
var sceneView3 = new Phone.Device.CommonForm.SceneMainView(0, 0);
sceneView3.X = sceneView1.X;
sceneView3.Y = sceneView1.Bottom + Application.GetRealHeight(14);
this.AddChidren(sceneView3);
- sceneView3.Init(new Common.SceneUI() { Name = "Dinner", IconPath = "SceneIcon/2.jpg" });
+ sceneView3.Init(new Common.SceneUI() { Name = "Dinner", IconPath = "SceneIcon/2.png" });
//鑷畾涔夊満鏅�4
var sceneView4 = new Phone.Device.CommonForm.SceneMainView(0, 0);
sceneView4.X = sceneView2.X;
sceneView4.Y = sceneView3.Y;
this.AddChidren(sceneView4);
- sceneView4.Init(new Common.SceneUI() { Name = "Goodnight", IconPath = "SceneIcon/3.jpg" });
+ sceneView4.Init(new Common.SceneUI() { Name = "Goodnight", IconPath = "SceneIcon/3.png" });
//搴曢儴鑿滃崟
var frameMenu = new FrameLayout();
--
Gitblit v1.8.0