From 063cbc112d293883a05980ef62054b2909e33a39 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 19 三月 2021 09:41:50 +0800
Subject: [PATCH] 2021-3-19-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 8 ++++----
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 +++++++++++-------------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 1 -
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs | 8 ++++----
4 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 8559aa4..6a5faf9 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,15 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs">
<Files>
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="175" Column="59" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="72" Column="37" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="340" Column="86" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="125" Column="65" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="242" Column="78" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="96" Column="21" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="234" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="39" Column="19" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="105" Column="30" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -24,7 +25,7 @@
<Node name="4-PersonalCenter" expanded="True">
<Node name="PirDevice" expanded="True">
<Node name="View" expanded="True" />
- <Node name="Matching.cs" selected="True" />
+ <Node name="PirSend.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -56,10 +57,7 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="337" column="1" />
- <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="330" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
index a4d2912..57194ab 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
@@ -89,14 +89,14 @@
//绾㈠瀹濇槸鍚﹀湪绾�-绂荤嚎
if (pirDevice.online)
{
- pirView.stateIconBtn.IsSelected = false;
- pirView.stateTextBtn.IsSelected = false;
+ pirView.stateIconBtn.IsSelected = true;
+ pirView.stateTextBtn.IsSelected = true;
pirView.stateTextBtn.TextID = StringId.zaixian;
}
else
{
- pirView.stateIconBtn.IsSelected = true;
- pirView.stateTextBtn.IsSelected = true;
+ pirView.stateIconBtn.IsSelected = false;
+ pirView.stateTextBtn.IsSelected = false;
pirView.stateTextBtn.TextID = StringId.lixian;
}
//鏍囪绾㈠瀹�
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 1e1bb3c..af9c380 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -207,7 +207,6 @@
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeRemove);
return responsePackNew;
}
-
/// <summary>
/// 绾㈠瀹�/閬ユ帶鍣ㄥ垹闄�
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
index 3e333ec..27d39e7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -101,8 +101,8 @@
X = Application.GetRealWidth(291),
Width = Application.GetRealWidth(8),
Height = Application.GetRealWidth(8),
- UnSelectedImagePath = "PirIcon/online.png",
- SelectedImagePath = "PirIcon/offline.png",
+ UnSelectedImagePath ="PirIcon/offline.png",
+ SelectedImagePath = "PirIcon/online.png",
};
/// <summary>
@@ -117,8 +117,8 @@
TextID = StringId.zaixianhwb,
TextAlignment = TextAlignment.CenterLeft,
TextSize = TextSize.text12,
- TextColor = 0xFF67D569,// CSS.CSS_Color.textColor,
- SelectedTextColor = CSS.CSS_Color.textRedColor,
+ TextColor = CSS.CSS_Color.textRedColor,// CSS.CSS_Color.textColor,
+ SelectedTextColor = 0xFF67D569,
IsBold = true,
};
/// <summary>
--
Gitblit v1.8.0