From b3e96fce4cc01113128ddf8e0a18fc19594a9e56 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 05 十二月 2019 18:38:30 +0800 Subject: [PATCH] 一个新的版本 --- ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs | 58 ++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 22 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs index 2c934c4..daf0928 100755 --- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs +++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs @@ -16,7 +16,7 @@ /// <summary> /// SceneIcon /// </summary> - public Button SceneIcon; + public ImageView SceneIcon; /// <summary> /// statu /// </summary> @@ -58,12 +58,17 @@ } } + /// <summary> + /// SceneMainView + /// </summary> + /// <param name="x"></param> + /// <param name="y"></param> public SceneMainView(int x, int y) { X = Application.GetRealWidth(x); Y = Application.GetRealHeight(y); - Width = Application.GetMinRealAverage(487); - Height = Application.GetMinRealAverage(348); + Width = Application.GetRealWidth(487); + Height = Application.GetRealHeight(358); } /// <summary> @@ -83,29 +88,32 @@ /// </summary> private void InitFrame() { - CardBG = new Button - { - Width = Application.GetMinRealAverage(487), - Height = Application.GetMinRealAverage(348), - UnSelectedImagePath = "Item/FunctionCardView.png", - Gravity = Gravity.CenterHorizontal - }; - AddChidren(CardBG); + //CardBG = new Button + //{ + // Width = Application.GetMinRealAverage(487), + // Height = Application.GetMinRealAverage(348), + // UnSelectedImagePath = "Item/FunctionCardView.png", + // Gravity = Gravity.CenterHorizontal + //}; + //AddChidren(CardBG); - SceneIcon = new Button + SceneIcon = new ImageView { - X = Application.GetMinRealAverage(14), + X=Application.GetRealWidth(14), Width = Application.GetMinRealAverage(458), - Height = Application.GetRealHeight(305), - Gravity = Gravity.CenterHorizontal + Height = Application.GetMinRealAverage(305), + Gravity = Gravity.CenterHorizontal, + Radius= (uint)Application.GetRealHeight(17) }; AddChidren(SceneIcon); + //SceneIcon.SetViewShadow(true); + //SceneIcon.SetCornerWithSameRadius(Application.GetRealHeight(100), HDLUtils.RectCornerBottomRight); sceneBG = new Button { Width = Application.GetMinRealAverage(487), Height = Application.GetMinRealAverage(348), - UnSelectedImagePath = "Item/SceneCard.png", + UnSelectedImagePath = "Scene/Background.png", Gravity = Gravity.CenterHorizontal }; AddChidren(sceneBG); @@ -138,7 +146,7 @@ Y = Application.GetMinRealAverage(239), Width = Application.GetMinRealAverage(279), Height = Application.GetMinRealAverage(60), - TextColor = ZigbeeColor.Current.GXCTextBlackColor, + TextColor = ZigbeeColor.Current.GXCTextWhiteColor, SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor, TextAlignment = TextAlignment.CenterLeft, }; @@ -150,7 +158,7 @@ /// </summary> private void InitStatu() { - SetIimeByDelayTime(scene.SceneDelayTime); + SetTimeByDelayTime(scene.SceneDelayTime); SetSceneNameText(scene.Name); SetIcon(scene.IconPath); SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName)); @@ -158,7 +166,6 @@ TimeButton.MouseUpEventHandler += SetTimeEvents; CollectButton.MouseUpEventHandler += CollectionEvent; SceneIcon.MouseUpEventHandler += SceneUpHandler; - sceneBG.MouseUpEventHandler += SceneUpHandler; SceneNameButton.MouseUpEventHandler += SceneUpHandler; } @@ -189,7 +196,7 @@ /// SetIimeByDelayTime /// </summary> /// <param name="time"></param> - public void SetIimeByDelayTime(int time) + public void SetTimeByDelayTime(int time) { if (time > 0) { @@ -216,7 +223,14 @@ /// <param name="iconPath"></param> public void SetIcon(string iconPath) { - SceneIcon.UnSelectedImagePath = iconPath; + if (scene.IconPathType == 0) + { + SceneIcon.ImagePath = iconPath; + } + else + { + SceneIcon.ImagePath = System.IO.Path.Combine(Config.Instance.FullPath, iconPath); + } } /// <summary> @@ -322,7 +336,7 @@ timeSelect.TimeAction = (t) => { scene.SceneDelayTime = t; - SetIimeByDelayTime(t); + SetTimeByDelayTime(t); }; } -- Gitblit v1.8.0