From b94f318b1cb5c3618dd53b5240c1d999c8427b71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 13:09:25 +0800
Subject: [PATCH] 2019.11.29
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index 01a76f9..ab15511 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -73,6 +73,11 @@
Radius = (uint)Application.GetRealHeight(17)
};
sceneRowLayout.AddChidren(sceneImg);
+ if (scene.IconPathType != 0)
+ {
+ sceneImg.UnSelectedImagePath = System.IO.Path.Combine(Config.Instance.FullPath, scene.IconPath);
+ }
+ sceneImg.SetViewShadow(true);
var leftFL = new FrameLayout
{
@@ -141,7 +146,7 @@
Y = Application.GetRealHeight(317),
Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(58),
- Text = CommonFormResouce.GetTimeString(scene.RemainTime),
+ Text = CommonFormResouce.GetTimeString(scene.SceneDelayTime),
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.GXCTextSelectedColor3
};
@@ -314,19 +319,18 @@
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ControlSceneFail);
}
- var times = scene.SceneDelayTime;
- scene.RemainTime = times;
+ scene.RemainTime = scene.SceneDelayTime;
scene.SceneDelayTime = 0;
new System.Threading.Thread(() =>
{
- while (times > 0)
+ while (scene.RemainTime > 0)
{
System.Threading.Thread.Sleep(1000);
Application.RunOnMainThread(() =>
{
- SetTimeText(CommonFormResouce.GetTimeString(times));
+ SetTimeText(CommonFormResouce.GetTimeString(scene.RemainTime));
});
- times -= 1;
+ scene.RemainTime -= 1;
}
Application.RunOnMainThread(() =>
{
--
Gitblit v1.8.0