From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index 71f5915..9763cd1 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -132,14 +132,7 @@
}
else if (targetDevice.Type == 2)
{
- if(targetDevice.DelayTime<60)
- {
- devNameText = $"{targetDevice.DelayTime} {Language.StringByID(R.MyInternationalizationString.Second)}";
- }
- else
- {
- devNameText = $"{targetDevice.DelayTime / 60} {Language.StringByID(R.MyInternationalizationString.Minute)} {targetDevice.DelayTime % 60} {Language.StringByID(R.MyInternationalizationString.Second)}";
- }
+ devNameText = CommonFormResouce.GetTimeString(targetDevice.DelayTime);
devNameText += Language.StringByID(R.MyInternationalizationString.Later);
var targetRow = new SceneTargetTimeRow(23);
targetRowLayout.AddChidren(targetRow);
@@ -158,7 +151,6 @@
targetRow.SetNameText(devNameText);
targetRow.SetZoneText(targetDevice.SceneUI.GetZone());
}
-
var editBtn = new Button()
{
@@ -339,9 +331,10 @@
Gravity = Gravity.Center,
Radius = (uint)Application.GetMinRealAverage(CommonFormResouce.BigFormRadius),
//UnSelectedImagePath = ImagePath
- UnSelectedImagePath = "SceneIcon/3.png"
+ UnSelectedImagePath = "SceneIcon/3.jpg"
};
imgFL.AddChidren(backGround);
+ backGround.SetViewShadow(true);
var infoFL = new FrameLayout
{
@@ -546,6 +539,7 @@
localPic.action = (imgPath) =>
{
IconPathType = 0;
+ backGround.ImageBytes = null;
backGround.UnSelectedImagePath = imgPath;
};
};
@@ -1024,7 +1018,7 @@
try
{
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Scene_{tradeTime}";
+ var fileName = $"SceneIcon_{tradeTime}.png";
string imgPath;
//鍥剧墖
if (IconPathType == 1 || IconPathType == 2)
--
Gitblit v1.8.0