From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index 47590b7..3a46d58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -417,8 +417,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);
@@ -448,12 +448,12 @@
/// <param name="frame">鎵╁ぇ鐐瑰嚮鍖哄煙鐨勫鍣�</param>
/// <param name="device">璁惧瀵硅薄</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;
@@ -486,20 +486,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);
//鍒濆鍖栬澶囧浘鏍�
@@ -518,31 +518,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]);
@@ -560,41 +560,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