From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index eb85316..419b95e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -83,7 +83,7 @@
#endregion
-
+
var middle = new VerticalScrolViewLayout
{
@@ -1156,7 +1156,7 @@
{
Y = Application.GetRealHeight(20),
Height = Application.GetRealHeight(50),
- Width = Application.GetRealWidth(450),
+ Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
Text = deviceinof.DeviceEpointName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -1168,7 +1168,7 @@
var btnregionname = new Button
{
Y = btndevicename.Bottom + Application.GetRealHeight(10),
- Width = Application.GetRealWidth(450),
+ Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
Height = Application.GetRealHeight(50),
Text = "",//Language.StringByID(MyInternationalizationString.customroom),
@@ -1180,11 +1180,11 @@
///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
var devicestatus = new Button
{
- Width = Application.GetRealWidth(350),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(130),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(450),
+ X = Application.GetRealWidth(400),
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
};
@@ -1361,6 +1361,8 @@
// devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
ifclose = false;
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
else if (status["Data1"].ToString() == "1")
{
@@ -1428,7 +1430,7 @@
//4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
{
- var s = int.Parse(status["Data2"]) /100;
+ var s = int.Parse(status["Data2"]) / 100;
temperaturetext = s.ToString();
}
else if (status["Data1"] == "20")
@@ -2246,14 +2248,7 @@
flMain.RemoveFromParent();
};
- var timetypeframelayout1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(timetypeframelayout1);
+
var framelayout = new FrameLayout
{
Width = Application.GetRealWidth(1080),
@@ -2263,6 +2258,7 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(framelayout);
+ framelayout.SetCornerWithSameRadius(20,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
--
Gitblit v1.8.0