From c6ff92e84b6cb2815cb98065ecb0ecf95d0689c3 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 15 一月 2020 09:42:29 +0800
Subject: [PATCH] 2020-01-15-1
---
ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
old mode 100755
new mode 100644
index 6e89f8d..932c51b
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
@@ -118,7 +118,7 @@
Height = Application.GetMinRealAverage(207),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetMinRealAverage(207)
+ Radius = (uint)Application.GetMinRealAverage(207/2)
};
bodyFrameLayout.AddChidren(deviceBG);
@@ -129,7 +129,7 @@
Height = Application.GetMinRealAverage(184),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.GXCSelectedBackgroundColor,
- Radius = (uint)Application.GetMinRealAverage(184)
+ Radius = (uint)Application.GetMinRealAverage(184/2)
};
bodyFrameLayout.AddChidren(deviceBG2);
@@ -162,6 +162,8 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
bodyFrameLayout.AddChidren(infoFL);
+ var rectCornerID = HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight;
+ infoFL.SetCornerWithSameRadius(Application.GetRealHeight(50), rectCornerID);
var tipBtn = new Button
{
@@ -223,7 +225,7 @@
functionTypeRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
{
var DfunctionType = device.CommonDevice.DfunctionType;
-
+
//鍔熻兘绫诲瀷鐨勭炕璇戝悕瀛�
int nowSelectNo = 1;
string strType = string.Empty;
@@ -250,7 +252,7 @@
//鏍囬:閫夋嫨鍔熻兘绫诲瀷
var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
- var form = new BottomDialogSelectForm();
+ var form = new BottomItemSelectForm();
form.AddForm(title, listText, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
@@ -272,19 +274,19 @@
};
};
- sharedRow = new DeviceInfoRow(723);
- sharedRow.Init();
- sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
- sharedRow.SetTitle("2浜�");
- infoFL.AddChidren(sharedRow);
+ //sharedRow = new DeviceInfoRow(723);
+ //sharedRow.Init();
+ //sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
+ //sharedRow.SetTitle("2浜�");
+ //infoFL.AddChidren(sharedRow);
}
else
{
- sharedRow = new DeviceInfoRow(585);
- sharedRow.Init();
- sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
- sharedRow.SetTitle("2浜�");
- infoFL.AddChidren(sharedRow);
+ //sharedRow = new DeviceInfoRow(585);
+ //sharedRow.Init();
+ //sharedRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.Share)} : ");
+ //sharedRow.SetTitle("2浜�");
+ //infoFL.AddChidren(sharedRow);
}
var confirmBtn = new CommonForm.CompleteButton(962, 907, 127);
--
Gitblit v1.8.0