From a3b92962f31cb3bbebaba37475b3a8417831520f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 23 九月 2021 15:30:29 +0800
Subject: [PATCH] 合并嘉乐本地加密代码
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index f84cdcc..bee290a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -41,7 +41,7 @@
/// <summary>
/// 鑹叉俯鐨勬粦鍔ㄦ帶浠�
/// </summary>
- SeekBarControl barColorTemplatrue;
+ CCTSeekBarControl barColorTemplatrue;
/// <summary>
/// 寮�鍏虫寜閽�
/// </summary>
@@ -130,7 +130,7 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
//{
@@ -205,7 +205,7 @@
btnColorTemplatrueBack.UnSelectedImagePath = "FunctionIcon/Light/ColorTemperatureBar.png";
controlView.AddChidren(btnColorTemplatrueBack);
//婊戝姩鏉℃帶浠�
- barColorTemplatrue = new SeekBarControl();
+ barColorTemplatrue = new CCTSeekBarControl();
barColorTemplatrue.X = btnTempClolorMin.Right;
barColorTemplatrue.Y = Application.GetRealHeight(340);
barColorTemplatrue.MinValue = 27;
@@ -537,11 +537,12 @@
btnReadIcon.IsSelected = true;
}
}
-
- /// <summary>
- /// 宸﹀彸婊戝姩鐨勮繘搴︽潯鎺т欢
- /// </summary>
- private class SeekBarControl : DiyImageSeekBar
+ }
+
+ /// <summary>
+ /// 宸﹀彸婊戝姩鐨勮繘搴︽潯鎺т欢
+ /// </summary>
+ public class CCTSeekBarControl : DiyImageSeekBar
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -649,7 +650,7 @@
/// 宸﹀彸婊戝姩鐨勮繘搴︽潯鎺т欢
/// </summary>
/// <param name="i_width">瀹藉害,闈炵湡瀹炲��</param>
- public SeekBarControl(int i_width = 210)
+ public CCTSeekBarControl(int i_width = 210)
{
this.Width = Application.GetRealWidth(i_width);
this.Height = Application.GetRealHeight(54);
@@ -773,5 +774,4 @@
#endregion
}
- }
}
--
Gitblit v1.8.0