From 57ddcc855793fd41d1dca73bc1b6006713859d55 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 20 五月 2021 17:40:08 +0800
Subject: [PATCH] 2021-5-20-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 3 +--
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 12 ++++++++++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 34 +++++++++++++++++++++-------------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 6 ++++++
4 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 4cc1ec5..f0fe5be 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,30 +1,36 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="79" Column="23" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="52" Column="48" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="275" Column="76" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs" Line="67" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="211" Column="40" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs" Line="583" Column="34" />
+ <File FileName="HDL_ON/Common/R.cs" Line="942" Column="26" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="333" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="Mqtt" expanded="True">
+ <Node name="MqttClient.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True" />
+ </Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="Video" expanded="True">
- <Node name="View" expanded="True">
- <Node name="ShowDialog.cs" selected="True" />
- </Node>
- </Node>
+ <Node name="Music" expanded="True" />
</Node>
</Node>
</Node>
+ </Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True" />
</Node>
</Node>
</State>
@@ -40,7 +46,9 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="333" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 41b3be7..7fbc2ab 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -27,7 +27,7 @@
BackgroundColor = CSS.CSS_Color.viewMiddle,
};
this.AddChidren(viewLayout);
- #region 鏃堕棿 鍔熻兘
+ #region 鏃堕棿 鍔熻兘 瀹ゅ鍙樺寲
//鏃堕棿
LogicView.SelectTypeView timeView = new LogicView.SelectTypeView();
timeView.btnText.TextID = StringId.time;
@@ -59,7 +59,6 @@
viewLayout.AddChidren(shiwaiView.FLayoutView());
}
#endregion
-
#region 鎵�鏈夌偣鍑讳簨浠�
//鏃堕棿
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d4c9df7..85fd063 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -325,13 +325,21 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
- var lightjosn = deviceList.Find((device) => device.spk == SPK.LightSwitch || device.spk == SPK.LightDimming || device.spk == SPK.LightCCT || device.spk == SPK.LightRGB || device.spk == SPK.LightRGBW);
+ var lightjosn = deviceList.Find((device) =>
+ device.spk == SPK.LightSwitch
+ || device.spk == SPK.LightDimming
+ || device.spk == SPK.LightCCT
+ || device.spk == SPK.LightRGB
+ || device.spk == SPK.LightRGBW);
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
}
- var curtainjosn = deviceList.Find((device) => device.spk == SPK.CurtainSwitch || device.spk == SPK.CurtainTrietex || device.spk == SPK.CurtainRoller);
+ var curtainjosn = deviceList.Find((device) =>
+ device.spk == SPK.CurtainSwitch
+ || device.spk == SPK.CurtainTrietex
+ || device.spk == SPK.CurtainRoller);
if (curtainjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
index 7016043..a13f447 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
@@ -580,6 +580,12 @@
str = Language.StringByID(StringId.shebeibuzaixian);
}
break;
+ case "9":
+ {
+ str = Language.StringByID(StringId.shebeibucunzai);
+ }
+ break;
+
case "2":
{
str = Language.StringByID(StringId.xitongweihuzhong);
--
Gitblit v1.8.0