From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/MainPage/HomeMainPageForm.cs | 77 ++++++++++++++++----------------------
1 files changed, 33 insertions(+), 44 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp20200414/Shared/Phone/MainPage/HomeMainPageForm.cs
old mode 100644
new mode 100755
index b5ead6e..97428b0
--- a/ZigbeeApp20200414/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -370,13 +370,13 @@
//鎴块棿婊戝姩鎺т欢宸﹁竟鐨勮櫄鎷熷浘鐗�
var mLeftImageView = new ImageView();
- mLeftImageView.ImagePath = "RoomIcon/1.jpg";
+ mLeftImageView.ImagePath = "RoomIcon/19.jpg";
mLeftImageView.Radius = (uint)Application.GetRealHeight(17);
mLeftImageView.Width = Application.GetRealWidth(717);
mLeftImageView.Height = Application.GetRealHeight(478);
//鎴块棿婊戝姩鎺т欢鍙宠竟鐨勮櫄鎷熷浘鐗�
var mRightImageView = new ImageView();
- mRightImageView.ImagePath = "RoomIcon/2.jpg";
+ mRightImageView.ImagePath = "RoomIcon/19.jpg";
mRightImageView.Radius = (uint)Application.GetRealHeight(17);
mRightImageView.Width = mLeftImageView.Width;
mRightImageView.Height = mLeftImageView.Height;
@@ -428,7 +428,7 @@
btnRoomLeftShadow.Gravity = Gravity.CenterVertical;
btnRoomLeftShadow.BackgroundColor = 0x1c000000;
btnRoomLeftShadow.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);
- frameBack.AddChidren(btnRoomLeftShadow);
+ //frameBack.AddChidren(btnRoomLeftShadow);//鏆傛椂涓嶅姞閬僵
//鍦ㄦ埧闂村崱鐗囧彸杈规坊鍔犻伄缃�
var btnRoomRightShadow = new FrameLayout();
@@ -438,7 +438,7 @@
btnRoomRightShadow.Gravity = Gravity.CenterVertical;
btnRoomRightShadow.BackgroundColor = btnRoomLeftShadow.BackgroundColor;
btnRoomRightShadow.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
- frameBack.AddChidren(btnRoomRightShadow);
+ //frameBack.AddChidren(btnRoomRightShadow);//鏆傛椂涓嶅姞閬僵
//鎺т欢寮�濮嬫粦鍔ㄧ殑浜嬩欢
roomPageView.StartScrollAction += () =>
@@ -480,13 +480,11 @@
};
//璁剧疆鎴块棿鐨勫垵濮嬮�夋嫨
roomPageView.PageIndex = curIndex;
-#if iOS
- //Ios濡傛灉绱㈠紩鏄涓�涓椂锛屽畠瑙﹀彂涓嶄簡浜嬩欢,闇�瑕佹墜鍔ㄨЕ鍙�
+ //濡傛灉绱㈠紩鏄涓�涓椂锛屽畠瑙﹀彂涓嶄簡浜嬩欢,闇�瑕佹墜鍔ㄨЕ鍙�
if (curIndex == 0)
{
roomPageView.EndScrollAction();
}
-#endif
}
/// <summary>
@@ -628,17 +626,7 @@
else if (device.Type == DeviceType.DoorLock)
{
cardContr = new Controls.DeviceDoorLockCardControl();
- }
- ////鏂伴
- //else if (device.Type == DeviceType.FreshAir)
- //{
- // cardContr = new Controls.DeviceAcCardControl();
- //}
- ////鏂伴婀垮害浼犳劅鍣�
- //else if (device.Type == DeviceType.FreshAirHumiditySensor)
- //{
- // cardContr = new Controls.DeviceTemperatureCardControl();
- //}
+ }
//鏃犳硶璇嗗埆
else
{
@@ -695,8 +683,11 @@
}, ShowErrorMode.NO);
}
});
-
- System.Threading.Thread.Sleep(50);
+ if (contrCount > 6)
+ {
+ //璁╁畠鍛堢幇涓�绉嶇洿鎺ヤ竴娆℃�у埛鍑烘潵鐨勬晥鏋�
+ System.Threading.Thread.Sleep(50);
+ }
}
}
@@ -844,7 +835,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
- //鍒濆鍖栬澶囧崱鐗囧垪琛ㄦ帶浠�
+ //鍒濆鍖栧満鏅崱鐗囧垪琛ㄦ帶浠�
this.InitSceneListCardControl(listSceneBackContr, listScene);
});
}
@@ -858,7 +849,7 @@
//鍦烘櫙璁℃暟
int contrCount = 0;
//X杞村潗鏍�(鍥剧墖宸﹁竟鏈変綑鐧�)
- int XX = Application.GetMinRealAverage(44);
+ int XX = this.GetPictrueRealSize(44);
//Y杞村潗鏍�
int YY = 0;
foreach (var sceneUi in listScene)
@@ -885,11 +876,11 @@
//璁惧璁℃暟
contrCount++;
//姣忎袱涓悗,X杞撮噸缃�
- XX = contrCount % 2 == 0 ? Application.GetMinRealAverage(44) : cardContr.Right + Application.GetMinRealAverage(20);
+ XX = contrCount % 2 == 0 ? this.GetPictrueRealSize(44) : cardContr.Right + this.GetPictrueRealSize(20);
if (contrCount % 2 == 0)
{
//娌′袱涓箣鍚�,Y杞撮�掑
- YY = cardContr.Bottom + Application.GetMinRealAverage(15);
+ YY = cardContr.Bottom + this.GetPictrueRealSize(15);
}
//鎺т欢璁板綍鍒扮紦瀛樹腑
this.dicSceneCardControl[sceneUi.Id] = cardContr;
@@ -910,7 +901,11 @@
});
}
});
- System.Threading.Thread.Sleep(50);
+ if (contrCount > 6)
+ {
+ //璁╁畠鍛堢幇涓�绉嶄竴娆℃�ф樉绀哄嚭鏉ョ殑鏁堟灉
+ System.Threading.Thread.Sleep(50);
+ }
}
}
@@ -919,25 +914,19 @@
/// </summary>
private void ShowNoSceneTip()
{
- var noScene = new Button
- {
- Y = Application.GetRealHeight(69),
- Width = Application.GetMinRealAverage(683),
- Height = Application.GetMinRealAverage(392),
- Gravity = Gravity.CenterHorizontal,
- UnSelectedImagePath = "Item/NoFunction.png"
- };
- bodyFrameLayout.AddChidren(noScene);
- var noScenceTip = new Button()
- {
- Y = noScene.Bottom,
- Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true
- };
- bodyFrameLayout.AddChidren(noScenceTip);
+ var picNoFunc = new PicViewControl(683, 392);
+ picNoFunc.Y = Application.GetRealHeight(69);
+ picNoFunc.Gravity = Gravity.CenterHorizontal;
+ picNoFunc.UnSelectedImagePath = "Item/NoFunction.png";
+ bodyFrameLayout.AddChidren(picNoFunc);
+
+ var btnTip = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(200), false);
+ btnTip.Y = picNoFunc.Bottom;
+ btnTip.Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n");
+ btnTip.TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor;
+ btnTip.TextAlignment = TextAlignment.Center;
+ btnTip.IsMoreLines = true;
+ bodyFrameLayout.AddChidren(btnTip);
}
/// <summary>
--
Gitblit v1.8.0