From 301d3f15ba03ff942c029bd4c0b1ff544f7cfede Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 30 十二月 2020 11:19:48 +0800
Subject: [PATCH] 2020-12-30 1.解决RGB灯,色盘ColorPicker部分安卓手机,刷新图片时会变小问题

---
 HDL_ON/UI/UI0-Public/TopViewDiv.cs |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 31e109f..49edaf8 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -100,8 +100,7 @@
 
             btnBack = new Button()
             {
-                Width = Application.GetRealWidth(50),
-                //BackgroundColor = CSS_Color.AuxiliaryColor2,
+                Width = Application.GetRealWidth(100),
             };
             contentView.AddChidren(btnBack);
 
@@ -146,8 +145,12 @@
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
             };
-            contentView.AddChidren(btnSetting);
 
+            //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            {
+                contentView.AddChidren(btnSetting);
+            }
             btnSetting.MouseUpEventHandler = (sender, e) =>
             {
                 editAction();
@@ -173,7 +176,11 @@
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
             };
-            contentView.AddChidren(btnSetting);
+            //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            {
+                contentView.AddChidren(btnSetting);
+            }
 
             btnSetting.MouseUpEventHandler = (sender, e) =>
             {
@@ -201,7 +208,12 @@
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
             };
-            contentView.AddChidren(btnSetting);
+
+            //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            {
+                contentView.AddChidren(btnSetting);
+            }
 
             btnSetting.MouseUpEventHandler += (sender, e) =>
             {

--
Gitblit v1.8.0