From f6e34a69f1d1e0b0b3a6252fe20acddca7fe56e5 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 17 三月 2020 15:43:44 +0800
Subject: [PATCH] 2020-03-17-1
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
old mode 100755
new mode 100644
index 317bb6c..19dbbc7
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -34,29 +34,31 @@
openView.titleBtn.TextID = MyInternationalizationString.open;
mFunView closeView = new mFunView();
- closeView.frameLayout.Y = openView.frameLayout.Bottom;
+ closeView.frameLayout.Y = Application.GetRealHeight(140 + 20+160);
+ // closeView.frameLayout.Y = openView.frameLayout.Bottom;
//completeView.Show(l).AddChidren(closeView.Show());
closeView.titleBtn.TextID = MyInternationalizationString.close;
mFunView takebackView = new mFunView();
- takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
+ takebackView.frameLayout.Y = Application.GetRealHeight(140+20+160+160);
+ // takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
//completeView.Show(l).AddChidren(takebackView.Show());
takebackView.titleBtn.TextID = MyInternationalizationString.onoff;
takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-
+ #region -------杩涘害鏉℃帶浠�
var horizontalSeekBarRowLien = new RowLayout
{
- Y = openView.frameLayout.Bottom,
- Width = Application.GetRealWidth(920),
+ //Y = openView.frameLayout.Bottom,
+ Width = Application.GetRealWidth(915),
Height = Application.GetRealHeight(160),
X = Application.GetRealWidth(80),
LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
var horizontalSeekBarVol = new DiyImageSeekBar
{
- Y = openView.frameLayout.Bottom,
+ //Y = openView.frameLayout.Bottom,
X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(920),
+ Width = Application.GetRealWidth(915),
Height = Application.GetRealHeight(160),
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
@@ -64,9 +66,10 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
- SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
+ ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(5),//杩涘害鏉＄殑楂樺害10
};
+ #endregion
#endregion
#region -------鏁版嵁澶勭悊閮ㄥ垎
@@ -207,7 +210,9 @@
completeView.Show(l).AddChidren(openView.Show());
completeView.Show(l).AddChidren(closeView.Show());
+ //closeView.frameLayout.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(takebackView.Show());
+ //takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
#endregion
@@ -631,8 +636,12 @@
taskListInfo.Add(switchdictionary);
completeView.Show(l).AddChidren(openView.Show());
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+ horizontalSeekBarRowLien.Y = openView.frameLayout.Bottom;
+ horizontalSeekBarVol.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(horizontalSeekBarRowLien);
completeView.Show(l).AddChidren(horizontalSeekBarVol);
+
closeView.frameLayout.Y = horizontalSeekBarRowLien.Bottom;
completeView.Show(l).AddChidren(closeView.Show());
@@ -748,6 +757,9 @@
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+ horizontalSeekBarRowLien.Y = openView.frameLayout.Bottom;
+ horizontalSeekBarVol.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(horizontalSeekBarRowLien);
completeView.Show(l).AddChidren(horizontalSeekBarVol);
--
Gitblit v1.8.0