From 9bd930de5cb72d9e1ad0788961a469231b06338f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 21 五月 2021 14:44:10 +0800
Subject: [PATCH] 2021-5-21-1
---
HDL-ON_iOS/Resources/Language.ini | 1 +
HDL-ON_Android/Assets/Language.ini | 1 +
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 13 +++++++------
HDL_ON/Common/R.cs | 2 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 ++++++++----------------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 3 +--
6 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f0fe5be..120f042 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,6 @@
锘�<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/DAL/Mqtt/MqttClient.cs">
- <Files>
- <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>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -14,14 +8,14 @@
<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 name="Mqtt" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
+ <Node name="PirDevice" expanded="True">
+ <Node name="PirMethod.cs" selected="True" />
+ </Node>
</Node>
<Node name="FuntionControlView" expanded="True">
<Node name="Music" expanded="True" />
@@ -29,8 +23,8 @@
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -46,9 +40,7 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <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>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 88c6f2a..59b5396 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1450,6 +1450,7 @@
6091=涓嶅瓨鍦ㄧ殑浜у搧
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
+6094=缃戝叧璁惧涓嶅瓨鍦�
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 68df652..6ca7646 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1446,6 +1446,7 @@
6091=涓嶅瓨鍦ㄧ殑浜у搧
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
+6094=缃戝叧璁惧涓嶅瓨鍦�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 12b3d5f..9166e5a 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -940,7 +940,7 @@
public const int bucunzaichanpin = 6091;
public const int shebeibucunzai = 6092;
public const int shebeibuzaixian = 6093;
-
+ public const int wangguanshebeibuzaixian = 6094;
public const int newAutomation = 7000;
public const int editAutomation = 7001;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index e6c1598..6454ead 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -61,12 +61,7 @@
};
middFLayout.AddChidren(addDevice);
- if (Pir.currPir.FunctioList.Count < 10)
- {
- //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
- // middFLayout.AddChidren(addDevice);
- addDevice.Visible = true;
- }
+
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
@@ -155,6 +150,12 @@
/// <param name="vv">涓婁笅婊戞帶浠�</param>
private void UIView(VerticalRefreshLayout vv)
{
+ if (Pir.currPir.FunctioList.Count < 10)
+ {
+ //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
+ // middFLayout.AddChidren(addDevice);
+ addDevice.Visible = true;
+ }
vv.RemoveAll();
#region 绾㈠瀹濆浘鏍� 鐗堟湰鍙� 鍚嶇О 鐘舵��
FrameLayout fLayout = new FrameLayout
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
index a13f447..f8d4655 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
@@ -582,10 +582,9 @@
break;
case "9":
{
- str = Language.StringByID(StringId.shebeibucunzai);
+ str = Language.StringByID(StringId.wangguanshebeibuzaixian);
}
break;
-
case "2":
{
str = Language.StringByID(StringId.xitongweihuzhong);
--
Gitblit v1.8.0