From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs
index 5283a41..f9ece64 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs
@@ -135,9 +135,9 @@
setEquipmentsBackGroud (deviceTypes [i], btnEquipmentIcon, equipmentLayout, btnOpenNumber, equipmentLayout);
}
System.Threading.Tasks.Task.Run (() => {
- UserDeviceToLight.readAllStatus ();
- UserDeviceToSocket.readAllStatus ();
- UserDeviceToAC.readAllStatus ();
+ UserDeviceToLight.readAllStatus (false, true);
+ UserDeviceToSocket.readAllStatus (false, true);
+ UserDeviceToAC.readAllStatus (false, true);
UserDeviceToFH.readAllStatus ();
UserFresAirList.readAllStatus ();
});
@@ -216,6 +216,71 @@
}
}
+
+ public static void UpdataScenesCountNumber ()
+ {
+ try {
+ Application.RunOnMainThread (() => {
+ for (int i = 0; i < UserMiddle.DeviceView.ChildrenCount; i++) {
+ if (UserMiddle.DeviceView.GetChildren (i).GetType () == typeof (FrameLayout)) {
+ FrameLayout rowView = (FrameLayout)UserMiddle.DeviceView.GetChildren (i);
+ for (int j = 0; j < rowView.ChildrenCount; j++) {
+ if (rowView.GetChildren (j).GetType () == typeof (FrameLayout)) {
+ FrameLayout frameView = (FrameLayout)rowView.GetChildren (j);
+ if (frameView.GetTagByKey ("DeviceType").ToString () == Shared.Language.StringByID (R.MyInternationalizationString.Scenes)) {
+ for (int k = 0; k < frameView.ChildrenCount; k++) {
+ if (frameView.GetChildren (k).GetType () == typeof (Button)) {
+ Button btn = (Button)frameView.GetChildren (k);
+ if (btn.GetTagByKey ("DeviceType") != null && btn.GetTagByKey ("DeviceType").ToString () == Shared.Language.StringByID (R.MyInternationalizationString.Scenes)) {
+
+ //int eCount = 0;
+ btn.IsSelected = false;
+ CheckAndSetScenesCount (btn);
+
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ });
+ } catch {
+ }
+ }
+
+ static void CheckAndSetScenesCount (Button mButton) {
+ int eCount = 0;
+ System.Threading.Tasks.Task.Run (() => {
+ foreach (var room in Room.Lists) {
+ if (string.IsNullOrEmpty (room.Name)) {
+ continue;
+ }
+ if (room != null) {
+ foreach (var sceneFilePath in room.SceneFilePathList) {
+ var scene = Scene.GetSceneByFilePath (sceneFilePath);
+ if (scene != null)
+ eCount += scene.LoopCount;
+ }
+ }
+ }
+ var globalSceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>> (CommonPage.MyEncodingUTF8.GetString (IO.FileUtils.ReadFile (Scene.GlobalSceneFilePath)));
+ if (globalSceneList != null) {
+ foreach (var sceneFilePath in globalSceneList) {
+ var scene = Scene.GetSceneByFilePath (sceneFilePath);
+ if (scene == null)
+ continue;
+ eCount += scene.LoopCount;
+ }
+ }
+
+
+ Application.RunOnMainThread (() => {
+ mButton.Text = eCount.ToString ();
+ });
+ });
+ }
//static void DelUserEquipmentView (int deviceCount, int deviceType)
//{
// if (deviceCount == 0) {
--
Gitblit v1.8.0