From 40f46f32cb00f4304a691d4f027a76a13a9ebb6d Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 16 十二月 2019 15:11:36 +0800
Subject: [PATCH] 2019.12.16
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 94 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 5076d01..a26095e 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -466,7 +466,8 @@
TextAlignment = TextAlignment.CenterLeft,
Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
TextSize = 24,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ IsBold=true
};
if (Config.Instance.Home.IsOthreShare)
{
@@ -646,7 +647,7 @@
};
AddChidren(roomPageView);
//绐佸嚭杈硅窛
- roomPageView.TCBJ = Application.GetRealWidth(127);
+ roomPageView.TCBJ = Application.GetRealWidth(112);
//涓や釜page涔嬮棿鐨勯棿璺�
roomPageView.JMBJ = Application.GetRealWidth(69);
@@ -686,7 +687,8 @@
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Scence,
IsSelected = true,
- TextSize=16
+ TextSize=16,
+ IsBold=true
};
functionSceneView.AddChidren(sceneBtn);
@@ -721,7 +723,9 @@
sceneBtn.IsSelected = false;
functionBtn.IsSelected = true;
sceneBtn.TextSize = 14;
+ sceneBtn.IsBold = false;
functionBtn.TextSize = 16;
+ functionBtn.IsBold = true;
RefreshBodyView();
};
//閫夋嫨鍦烘櫙鍒嗘爮
@@ -730,7 +734,9 @@
functionBtn.IsSelected = false;
sceneBtn.IsSelected = true;
sceneBtn.TextSize = 16;
+ sceneBtn.IsBold = true;
functionBtn.TextSize = 14;
+ functionBtn.IsBold = false;
RefreshBodyView();
};
@@ -1690,63 +1696,59 @@
/// GetDelayScene
/// </summary>
/// <param name="scrolViewLayout"></param>
- private void GetDelayScene(VerticalScrolViewLayout scrolViewLayout)
+ private async void GetDelayScene(VerticalScrolViewLayout scrolViewLayout)
{
- new System.Threading.Thread(async () =>
- {
- var catDelaySceneResponseAllData = await Scene.CatDelaySceneAsync();
- if (catDelaySceneResponseAllData == null)
- {
- return;
- }
- var catDelaySceneResponseData = catDelaySceneResponseAllData.catDelaySceneResponseData;
- if (catDelaySceneResponseData == null || catDelaySceneResponseData.DelayScenesList.Count == 0)
- {
- return;
- }
- var delayList = catDelaySceneResponseData.DelayScenesList;
- Application.RunOnMainThread(() =>
+ var catDelaySceneResponseAllData = await Scene.CatDelaySceneAsync();
+ if (catDelaySceneResponseAllData == null)
+ {
+ return;
+ }
+ var catDelaySceneResponseData = catDelaySceneResponseAllData.catDelaySceneResponseData;
+ if (catDelaySceneResponseData == null || catDelaySceneResponseData.DelayScenesList.Count == 0)
+ {
+ return;
+ }
+ var delayList = catDelaySceneResponseData.DelayScenesList;
+
+ for (int i = 0; scrolViewLayout != null && i < scrolViewLayout.ChildrenCount; i++)
+ {
+ var iView = scrolViewLayout.GetChildren(i) as FrameLayout;
+ for (int j = 0; iView != null && j < iView.ChildrenCount; j++)
{
- for (int i = 0; scrolViewLayout != null && i < scrolViewLayout.ChildrenCount; i++)
+ var sceneView = iView.GetChildren(j) as SceneMainView;
+ foreach (var delayScenesListResponseInfo in delayList)
{
- var iView = scrolViewLayout.GetChildren(i) as FrameLayout;
- for (int j = 0; iView != null && j < iView.ChildrenCount; j++)
+ if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
{
- var sceneView = iView.GetChildren(j) as SceneMainView;
- foreach (var delayScenesListResponseInfo in delayList)
+ var remainTime = delayScenesListResponseInfo.RemainTime;
+ sceneView.scene.RemainTime = remainTime;
+
+ if (remainTime > 0)
{
- if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
+ new System.Threading.Thread(() =>
{
- var times = delayScenesListResponseInfo.RemainTime;
- sceneView.scene.RemainTime = times;
- new System.Threading.Thread(() =>
+ while (remainTime-- > 0)
{
- while (times > 0)
- {
- System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() =>
- {
- sceneView.SetTimeText(CommonFormResouce.GetTimeString(times));
- });
- times -= 1;
- }
+ System.Threading.Thread.Sleep(1000);
Application.RunOnMainThread(() =>
{
- sceneView.SetTimeImage();
+ sceneView.SetTimeText(CommonFormResouce.GetTimeString(remainTime));
});
- })
- { IsBackground = true }.Start();
-
- break;
- }
+ }
+ Application.RunOnMainThread(() =>
+ {
+ sceneView.scene.RemainTime = 0;
+ sceneView.SetTimeImage();
+ });
+ })
+ { IsBackground = true }.Start();
}
-
+ break;
}
}
- });
- })
- { IsBackground = true }.Start();
+ }
+ }
}
#endregion
--
Gitblit v1.8.0