From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index 27130ce..e3d9fca 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -1064,7 +1064,7 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
@@ -1366,7 +1366,7 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊
- ProgressTextSize = 14,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
SeekBarViewHeight = Application.GetRealHeight(10),
};
openframelayout.AddChidren(horizontalSeekBarVol);
@@ -1754,8 +1754,15 @@
var temperaturedictionary = new Dictionary<string, string>();
var modedictionary = new Dictionary<string, string>();
var speeddictionary = new Dictionary<string, string>();
+ dictionary(temperaturedictionary, "TaskType", "5");
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(speeddictionary, "TaskType", "5");
+ dictionary(speeddictionary, "Data1", "6");
+ taskListInfo.Add(temperaturedictionary);
+ taskListInfo.Add(modedictionary);
+ taskListInfo.Add(speeddictionary);
#endregion
-
#region 绌鸿皟View
devicefra.Y = Application.GetRealHeight(1920 - 600 - 210 - 160*2);
@@ -1802,11 +1809,12 @@
};
devicefra.AddChidren(PickerViewfra);
-
+ //閬尅绌鸿皟婊戝姩view锛�
var pausePickerViewfra= new FrameLayout
{
Y = openframelayout.Bottom,
Height = Application.GetRealHeight(600),
+ BackgroundColor=0x60ffffff,
};
devicefra.AddChidren(pausePickerViewfra);
@@ -1882,9 +1890,13 @@
closerowlayout.AddChidren(closeBtnSelected);
#endregion
-
+ //榛樿26,鑷姩,涓
+ int indextemperature = 10, indexmode = 2, indexspeed = 1;
mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
{
+ indextemperature = s1;
+ indexmode = s2;
+ indexspeed = s3;
if (openBtnSelected.Visible)
{
SelectedDeviceStatusaction = "yes";
@@ -1896,14 +1908,13 @@
dictionary(temperaturedictionary, "Data2", a.ToString());
SpeedState(speedstring, speeddictionary);
-
-
}
};
-
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
#endregion
- //榛樿26,鑷姩,涓
- int indextemperature = 10, indexmode = 2, indexspeed = 1;
+
if (edit && TaskList != null)
{
@@ -1911,6 +1922,9 @@
{
if (TaskList.Count == 1)
{
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
//鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
@@ -1924,6 +1938,9 @@
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
pausePickerViewfra.Height = Application.GetRealHeight(0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);
}
@@ -1997,7 +2014,7 @@
}
indexspeed = mList3.IndexOf(speedtext);
}
- //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+ //4-璁剧疆鍔犵儹搴︽暟;5-璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7-璁剧疆鑷姩搴︽暟
else if (value["Data1"] == "4" || value["Data1"] == "5" || value["Data1"] == "7")
{
var s = int.Parse(value["Data2"]) / 100;
@@ -2011,10 +2028,18 @@
}
///鏇存柊鏈�鏂扮┖璋冪姸鎬侊紱
mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
-
+
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);
+ mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
+ pausePickerViewfra.Height = Application.GetRealHeight(0);
+ SelectedDeviceStatusaction = "yes";
+ openBtnSelected.Visible = true;
+ closeBtnSelected.Visible = false;
//娓呴櫎涔嬪墠鏁版嵁锛�
taskListInfo.Clear();
//鍔犺浇鏂版暟鎹紱
@@ -2026,10 +2051,7 @@
taskListInfo.Add(temperaturedictionary);
taskListInfo.Add(modedictionary);
taskListInfo.Add(speeddictionary);
- pausePickerViewfra.Height = Application.GetRealHeight(0);
- SelectedDeviceStatusaction = "yes";
- openBtnSelected.Visible = true;
- closeBtnSelected.Visible = false;
+
var temperature = mList1[indextemperature].Split(' ')[0];
var modestring = mList2[indexmode].Split(' ')[0];
var speedstring = mList3[indexspeed].Split(' ')[0];
@@ -2048,7 +2070,10 @@
///鍙栨秷浜嬩欢
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
-
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
+ mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
//娓呴櫎涔嬪墠鏁版嵁锛�
taskListInfo.Clear();
dictionary(modedictionary, "TaskType", "5");
@@ -2083,9 +2108,9 @@
{
if (!edit)
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.confrim));
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
--
Gitblit v1.8.0