From 1265d531759b5565e9f641b17045896b52dfdba8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 18:37:47 +0800
Subject: [PATCH] 2020-12-03 1.主页增加未读消息查询和提示处理。2.房间和场景背景上传和下载和读取方法修改处理。3.头像上传和下载方案修改处理。4.增加子账号头像下载。5.Loading 调用方法修复。6.封装ImageUtlis 图片上传和下载管理工具类 7.读取本地住宅增加判空处理。

---
 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
index 3c8eef1..bce99bf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -99,7 +99,7 @@
                 Height = Application.GetMinRealAverage(40),
                 SelectedImagePath = "Collection/CollectionIcon.png",
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
-                IsSelected = fan.collection
+                IsSelected = fan.collect
             };
             controlView.AddChidren(btnCollection);
 
@@ -109,7 +109,7 @@
                 Y = Application.GetRealHeight(100),
                 Width = Application.GetRealWidth(198),
                 Height = Application.GetRealWidth(198),
-                IsSelected = fan.trait_on_off.value.ToString() == "on",
+                IsSelected = fan.trait_on_off.curValue.ToString() == "on",
                 SelectedImagePath = "FunctionIcon/Electrical/FanIconBg.png",
                 UnSelectedImagePath = "FunctionIcon/Electrical/FanIconBgGray.png",
             };
@@ -146,6 +146,7 @@
                 MinValue = 1,
                 MaxValue = 7,
                 Progress = 0,
+                SeekBarPadding = Application.GetRealWidth(20),
             };
             controlView.AddChidren(barGradualChange);
 
@@ -160,14 +161,14 @@
                 Height = Application.GetMinRealAverage(40),
                 UnSelectedImagePath = "Public/PowerClose.png",
                 SelectedImagePath = "Public/PowerOpen.png",
-                IsSelected = fan.trait_on_off.value.ToString() == "on"
+                IsSelected = fan.trait_on_off.curValue.ToString() == "on"
             };
             controlView.AddChidren(btnSwitch);
 
 
             LoadEventList();
 
-            new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView(fan, actionRefresh);
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(fan, actionRefresh);
 
         }
 

--
Gitblit v1.8.0