From 87e614af0fa31d7fd632136d95c0c7e584c28477 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 26 二月 2021 13:36:10 +0800
Subject: [PATCH] 20210226-1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
index c08f7c4..6eb2862 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
@@ -170,6 +170,7 @@
btnVoiceIcon.X = btnChargeIcon.Right + Application.GetRealWidth(50);
btnVoiceIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobot/Voice.png";
btnVoiceIcon.SelectedImagePath = "FunctionIcon/Electrical/WeepRobot/VoiceSelect.png";
+ btnVoiceIcon.IsSelected = true;
FrameWhiteCentet1.AddChidren(btnVoiceIcon);
btnVoiceIcon.ButtonClickEvent += (sender, e) =>
{
@@ -280,7 +281,7 @@
//鍚稿姏1妗�
var iconPath = this.weepRobotData.Suction == "quiet" ? "FunctionIcon/Electrical/WeepRobot/SuctionSelect.png" : "FunctionIcon/Electrical/WeepRobot/Suction.png";
- menuContr.AddRowMenu(Language.StringByID(StringId.SuctionOneGear), iconPath, this.weepRobotData.Suction == "strong", () =>
+ menuContr.AddRowMenu(Language.StringByID(StringId.SuctionOneGear), iconPath, this.weepRobotData.Suction == "quiet", () =>
{
frameBack.Close();
//鍙戦�佸惛鍔涘懡浠�
@@ -298,7 +299,7 @@
//鍚稿姏3妗�
iconPath = this.weepRobotData.Suction == "strong" ? "FunctionIcon/Electrical/WeepRobot/SuctionSelect.png" : "FunctionIcon/Electrical/WeepRobot/Suction.png";
- menuContr.AddRowMenu(Language.StringByID(StringId.SuctionThreeGear), iconPath, this.weepRobotData.Suction == "quiet", () =>
+ menuContr.AddRowMenu(Language.StringByID(StringId.SuctionThreeGear), iconPath, this.weepRobotData.Suction == "strong", () =>
{
frameBack.Close();
//鍙戦�佸惛鍔涘懡浠�
@@ -476,12 +477,12 @@
//濡傛灉鏄竻鎵姸鎬�
if (this.weepRobotData.Cleaning == true)
{
- //鍚稿姏璋冭妭涓嶅彲鐢�
- this.btnSuctionIcon.IsSelected = false;
- this.btnSuctionIcon.CanClick = false;
+ //鍚稿姏璋冭妭鍙敤
+ this.btnSuctionIcon.IsSelected = true;
+ this.btnSuctionIcon.CanClick = true;
//澹伴煶涓嶅彲鐢�
- this.btnVoiceIcon.IsSelected = false;
- this.btnVoiceIcon.CanClick = false;
+ //this.btnVoiceIcon.IsSelected = false;
+ //this.btnVoiceIcon.CanClick = false;
//娓呮壂妯″紡涓嶅彲鐢�
this.btnModeIcon.IsSelected = false;
this.btnModeIcon.CanClick = false;
@@ -494,12 +495,12 @@
}
else
{
- //鍚稿姏璋冭妭鍙敤
- this.btnSuctionIcon.IsSelected = true;
- this.btnSuctionIcon.CanClick = true;
+ //鍚稿姏璋冭妭涓嶅彲鐢�
+ this.btnSuctionIcon.IsSelected = false;
+ this.btnSuctionIcon.CanClick = false;
//澹伴煶鍙敤
- this.btnVoiceIcon.IsSelected = true;
- this.btnVoiceIcon.CanClick = true;
+ //this.btnVoiceIcon.IsSelected = true;
+ //this.btnVoiceIcon.CanClick = true;
//娓呮壂妯″紡鍙敤
this.btnModeIcon.IsSelected = true;
this.btnModeIcon.CanClick = true;
@@ -560,8 +561,9 @@
/// </summary>
private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
{
- foreach (var data in i_LocalDevice.status)
+ for (int i = 0; i < i_LocalDevice.status.Count; i++)
{
+ var data = i_LocalDevice.status[i];
//寮�鍏�
if (data.key == "on_off") { this.weepRobotData.Cleaning = data.value.ToLower() == "on"; }
//瀵绘壘鏈哄櫒
@@ -651,7 +653,7 @@
/// <summary>
/// 鏄惁澶勪簬娓呮壂涓�
/// </summary>
- public bool Cleaning = true;
+ public bool Cleaning = false;
/// <summary>
/// 瀵绘壘鏈哄櫒
/// </summary>
@@ -705,7 +707,7 @@
/// </summary>
public int Filter = 0;
/// <summary>
- /// 娓呮壂鏃堕棿(0-432000)
+ /// 娓呮壂鏃堕棿(0-432000) 鍗曚綅涓哄垎閽�
/// </summary>
public int CleanTime = 0;
/// <summary>
--
Gitblit v1.8.0