From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs | 60 +++++++++++++++++++++---------------------------------------
1 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
index 13fae51..9f402a0 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -85,7 +85,7 @@
this.frameClrean = new FrameLayout();
frameClrean.Width = Application.GetRealWidth(600);
frameClrean.Height = this.GetPictrueRealSize(69);
- frameClrean.X = ControlCommonResourse.XXLeft;
+ frameClrean.X = HdlControlResourse.XXLeft;
frameClrean.Y = Application.GetRealHeight(35);
frameWhiteBack.AddChidren(frameClrean);
frameClrean.Visible = false;
@@ -301,7 +301,7 @@
{
//婊戝姩杩囩▼涓�
int oldProgressValue = arcScaleSeekBar.Progress;//涔嬪墠鐨勫��
- arcScaleSeekBar.OnProgressChangedEvent += (send2, value) =>
+ arcScaleSeekBar.OnStopTrackingTouchEvent += (send2, value) =>
{
nowProgressValue = value;
};
@@ -460,7 +460,7 @@
{
var rowFrame = new FrameRowControl();
rowFrame.Y = frameBack.GetChildren(frameBack.ChildrenCount - 1).Bottom;
- rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
rowFrame.Height = Application.GetRealHeight(150);
frameBack.AddChidren(rowFrame);
@@ -520,20 +520,16 @@
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
{
- //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == false)
+ if (result == true)
{
+ //鎺ユ敹鍒扮綉鍏崇殑鍥炲
HdlThreadLogic.Current.RunMain(() =>
{
- //杩樺師鐘舵��
- listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(oldModel);
- listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(oldModel);
+ listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
+ listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
});
}
});
-
- listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
- listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
deviceAc.SetFanSwingAsyncMode(fanSwingMode);
}
@@ -629,7 +625,7 @@
{
var rowFrame = new FrameRowControl();
rowFrame.Y = frameBack.GetChildren(frameBack.ChildrenCount - 1).Bottom;
- rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
rowFrame.Height = Application.GetRealHeight(150);
frameBack.AddChidren(rowFrame);
@@ -705,20 +701,14 @@
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
{
- //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == false)
+ if (result == true)
{
+ //鎺ユ敹鍒扮綉鍏冲洖澶�
HdlThreadLogic.Current.RunMain(() =>
{
- //杩樺師鐘舵��
- listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(oldModel);
- listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(oldModel);
- });
- }
- else
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
+ listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(mode);
+ listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(mode);
+
//閫侀鐨勬椂鍊�,娌℃湁娓╁害鐨勬蹇�
if (mode == AC.AcMode.FanOnly)
{
@@ -741,10 +731,6 @@
});
}
});
-
- listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(mode);
- listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(mode);
-
deviceAc.SetSystemModeAsync(mode);
}
@@ -800,6 +786,7 @@
//閭ｅ洓涓浘鏍囧彉鏇�
this.listControl[0].IsSelected = isOpen;
this.listControl[1].IsSelected = isOpen;
+ this.listControl[2].IsSelected = isOpen;
this.listControl[3].IsSelected = isOpen;
if (isOpen == true)
{
@@ -823,7 +810,6 @@
}
});
- this.listControl[2].IsSelected = isOpen;
if (isOpen == true)
{
deviceAc.Open();
@@ -894,7 +880,7 @@
{
var rowFrame = new FrameRowControl();
rowFrame.Y = frameBack.GetChildren(frameBack.ChildrenCount - 1).Bottom;
- rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - HdlControlResourse.XXLeft;
rowFrame.Height = Application.GetRealHeight(150);
frameBack.AddChidren(rowFrame);
@@ -955,20 +941,16 @@
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
{
- //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == false)
+ //鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
{
- //杩樺師鐘舵��
- listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(oldModel);
- listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(oldModel);
+ listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
+ listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
});
}
});
-
- listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
- listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
deviceAc.SetFanModeAsync(mode);
}
@@ -1070,8 +1052,8 @@
this.listControl[1].IsSelected = false;
this.listControl[2].IsSelected = false;
this.listControl[3].IsSelected = false;
- arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
//璁剧疆鐘舵�佹枃瀛� 鍏抽棴
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
return;
@@ -1086,8 +1068,8 @@
this.listControl[1].IsSelected = true;
this.listControl[2].IsSelected = true;
this.listControl[3].IsSelected = true;
- arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
}
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
}
this.listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
this.listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
--
Gitblit v1.8.0