From acb2b278663952ce555b06a2e821f359225f15e0 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 10 七月 2020 09:41:15 +0800
Subject: [PATCH] 备份
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Home0630/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
similarity index 99%
rename from Home0630/Shared/Phone/MainPage/HomeMainPageForm.cs
rename to ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 9d9ac37..fd85bdd 100644
--- a/Home0630/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -54,9 +54,9 @@
public void ShowForm()
{
this.FormID = "HomeMainPageForm";
- Instance = this;
-
- //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
+ Instance = this;
+
+ //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
if (ListRoomViewFrom.Instance == null) { }
//鏁翠釜鑳屾櫙鐨勪笂涓嬫粦鍔ㄦ帶浠�
@@ -90,7 +90,7 @@
private void InitTopFrameLayoutControl()
{
//澶撮儴瀹瑰櫒
- base.topFrameLayout = new FrameLayout();
+ base.topFrameLayout = new NormalFrameLayout();
topFrameLayout.Y = Application.GetRealHeight(60);
topFrameLayout.Height = Application.GetRealHeight(127);
topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -255,7 +255,7 @@
}
//鍔熻兘鍜屽満鏅痓odyView
- this.bodyFrameLayout = new FrameLayout();
+ this.bodyFrameLayout = new NormalFrameLayout();
bodyFrameLayout.Y = functionSceneView.Bottom;
bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;
bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -543,8 +543,9 @@
var listDevice = new List<CommonDevice>();
foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
- {
+ {
var device = LocalDevice.Current.GetDevice(mainkeys);
+
//鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
{
--
Gitblit v1.8.0