From 38ab16c66df6fc523f2c385fd583a2f2e86a781c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 17:58:45 +0800
Subject: [PATCH] 2020-4-29-1
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index 390b7e9..428d2c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -322,7 +322,9 @@
//鍙湁绠�绾﹂潰鏉挎墠浼氭湁杩欎釜鑿滃崟
if (myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleTwo
|| myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleThree
- || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour)
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FourButtonScene
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
{
//闇囧姩鍙嶉
var rowContr = new FrameRowControl(listview.rowSpace / 2);
@@ -436,8 +438,8 @@
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(150);
frameBorder.Gravity = Gravity.CenterHorizontal;
- frameBorder.Width = Application.GetMinRealAverage(426);
- frameBorder.Height = Application.GetMinRealAverage(426);
+ frameBorder.Width = this.GetPictrueRealSize(426);
+ frameBorder.Height = this.GetPictrueRealSize(426);
listBackControl.frameTable.AddChidren(frameBorder);
var btnPic = new PicViewControl(frameBorder.Width, frameBorder.Height, false);
@@ -468,12 +470,12 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="isFirst">鏄惁鏄涓�涓�</param>
/// <returns></returns>
- private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)
+ private void InitDeviceIcon(FrameLayoutStatuControl frame, CommonDevice device)
{
//涓嶄娇鐢ㄧ偣鍑荤壒鏁�
frame.UseClickStatu = false;
- var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
+ var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
btnIcon.Name = "btn" + device.DeviceEpoint;
btnIcon.Gravity = Gravity.Center;
btnIcon.RadiusEx = 16;
@@ -506,20 +508,20 @@
private void InitTwoButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
{
//鎸夐敭1
- var frame1 = new FrameLayoutControl();
- frame1.Height = Application.GetMinRealAverage(110);
- frame1.Width = Application.GetMinRealAverage(110);
- frame1.Y = Application.GetMinRealAverage(63);
+ var frame1 = new FrameLayoutStatuControl();
+ frame1.Height = this.GetPictrueRealSize(110);
+ frame1.Width = this.GetPictrueRealSize(110);
+ frame1.Y = this.GetPictrueRealSize(63);
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
- var frame2 = new FrameLayoutControl();
- frame2.Height = Application.GetMinRealAverage(110);
- frame2.Width = Application.GetMinRealAverage(110);
- frame2.Y = Application.GetMinRealAverage(245);
+ var frame2 = new FrameLayoutStatuControl();
+ frame2.Height = this.GetPictrueRealSize(110);
+ frame2.Width = this.GetPictrueRealSize(110);
+ frame2.Y = this.GetPictrueRealSize(245);
frame2.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
@@ -538,31 +540,31 @@
private void InitThreeButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
{
//鎸夐敭1
- var frame1 = new FrameLayoutControl();
- frame1.Height = Application.GetMinRealAverage(110);
- frame1.Width = Application.GetMinRealAverage(110);
- frame1.Y = Application.GetMinRealAverage(63);
+ var frame1 = new FrameLayoutStatuControl();
+ frame1.Height = this.GetPictrueRealSize(110);
+ frame1.Width = this.GetPictrueRealSize(110);
+ frame1.Y = this.GetPictrueRealSize(63);
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
- var frame2 = new FrameLayoutControl();
- frame2.Height = Application.GetMinRealAverage(110);
- frame2.Width = Application.GetMinRealAverage(110);
- frame2.X = Application.GetMinRealAverage(63);
- frame2.Y = Application.GetMinRealAverage(245);
+ var frame2 = new FrameLayoutStatuControl();
+ frame2.Height = this.GetPictrueRealSize(110);
+ frame2.Width = this.GetPictrueRealSize(110);
+ frame2.X = this.GetPictrueRealSize(63);
+ frame2.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame2, listDevice[1]);
//鎸夐敭3
- var frame3 = new FrameLayoutControl();
- frame3.Height = Application.GetMinRealAverage(110);
- frame3.Width = Application.GetMinRealAverage(110);
- frame3.X = Application.GetMinRealAverage(245);
- frame3.Y = Application.GetMinRealAverage(245);
+ var frame3 = new FrameLayoutStatuControl();
+ frame3.Height = this.GetPictrueRealSize(110);
+ frame3.Width = this.GetPictrueRealSize(110);
+ frame3.X = this.GetPictrueRealSize(245);
+ frame3.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame3, listDevice[2]);
@@ -580,41 +582,41 @@
private void InitFourButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
{
//鎸夐敭1
- var frame1 = new FrameLayoutControl();
- frame1.Height = Application.GetMinRealAverage(110);
- frame1.Width = Application.GetMinRealAverage(110);
- frame1.X = Application.GetMinRealAverage(63);
- frame1.Y = Application.GetMinRealAverage(63);
+ var frame1 = new FrameLayoutStatuControl();
+ frame1.Height = this.GetPictrueRealSize(110);
+ frame1.Width = this.GetPictrueRealSize(110);
+ frame1.X = this.GetPictrueRealSize(63);
+ frame1.Y = this.GetPictrueRealSize(63);
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
- var frame2 = new FrameLayoutControl();
- frame2.Height = Application.GetMinRealAverage(110);
- frame2.Width = Application.GetMinRealAverage(110);
- frame2.X = Application.GetMinRealAverage(245);
- frame2.Y = Application.GetMinRealAverage(63);
+ var frame2 = new FrameLayoutStatuControl();
+ frame2.Height = this.GetPictrueRealSize(110);
+ frame2.Width = this.GetPictrueRealSize(110);
+ frame2.X = this.GetPictrueRealSize(245);
+ frame2.Y = this.GetPictrueRealSize(63);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame2, listDevice[1]);
//鎸夐敭3
- var frame3 = new FrameLayoutControl();
- frame3.Height = Application.GetMinRealAverage(110);
- frame3.Width = Application.GetMinRealAverage(110);
- frame3.X = Application.GetMinRealAverage(63);
- frame3.Y = Application.GetMinRealAverage(245);
+ var frame3 = new FrameLayoutStatuControl();
+ frame3.Height = this.GetPictrueRealSize(110);
+ frame3.Width = this.GetPictrueRealSize(110);
+ frame3.X = this.GetPictrueRealSize(63);
+ frame3.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame3, listDevice[2]);
//鎸夐敭4
- var frame4 = new FrameLayoutControl();
- frame4.Height = Application.GetMinRealAverage(110);
- frame4.Width = Application.GetMinRealAverage(110);
- frame4.X = Application.GetMinRealAverage(245);
- frame4.Y = Application.GetMinRealAverage(245);
+ var frame4 = new FrameLayoutStatuControl();
+ frame4.Height = this.GetPictrueRealSize(110);
+ frame4.Width = this.GetPictrueRealSize(110);
+ frame4.X = this.GetPictrueRealSize(245);
+ frame4.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame4);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame4, listDevice[3]);
--
Gitblit v1.8.0