From b1a0bdaa13e1eced0da2c411ce6dd0cbf7327a9a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 三月 2021 16:24:44 +0800
Subject: [PATCH] 2021-24-3-3
---
HDL-ON_iOS/Resources/Language.ini | 1 +
HDL-ON_Android/Assets/Language.ini | 1 +
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 6 +++++-
HDL_ON/Common/R.cs | 1 +
.vs/HDL_APP_Project/xs/UserPrefs.xml | 9 ++++++---
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 8f4f5e8..9bb4beb 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,5 +1,5 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs">
<Files>
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="132" Column="58" IsPinned="True" />
<File FileName="../../Application.cs" Line="16" Column="35" IsPinned="True" />
@@ -10,7 +10,7 @@
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs" Line="895" Column="32" />
<File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="1" Column="1" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs" Line="18" Column="132" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="322" Column="77" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="40" Column="57" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs" Line="16" Column="40" />
<File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="338" Column="36" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="1" Column="1" />
@@ -39,7 +39,7 @@
<Node name="4-PersonalCenter" expanded="True">
<Node name="PirDevice" expanded="True">
<Node name="View" expanded="True" />
- <Node name="Pir.cs" selected="True" />
+ <Node name="PirMain.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -48,6 +48,9 @@
<Node name="HDL-ON_Android" expanded="True">
<Node name="Assets" expanded="True" />
</Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 1ad65a9..5afb712 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1393,6 +1393,7 @@
6077=鐗堟湰鍗囩骇
6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
6079=鑾峰彇鏁版嵁澶辫触
+6080=鏆傛椂涓嶆敮鎸佽鍔熻兘
7000=鏂板缓鑷姩鍖�
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 850d302..3a87da3 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1393,6 +1393,7 @@
6077=鐗堟湰鍗囩骇
6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
6079=鑾峰彇鏁版嵁澶辫触
+6080=鏆傛椂涓嶆敮鎸佽鍔熻兘
7000=鏂板缓鑷姩鍖�
7001=缂栬緫鑷姩鍖�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 65f372e..a99bf97 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -870,6 +870,7 @@
public const int banbenshengji = 6077;
public const int xitongweihuzhong = 6078;
public const int huoqushujushibao = 6079;
+ public const int zanshibuzhichigaigongneng = 6080;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 1ee2bb0..2967f1e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -7,8 +7,12 @@
{
public class PirMain : FrameLayout
{
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
public PirMain()
{
+ /// 鏍囪鐣岄潰
Tag = "PirMain";
}
/// <summary>
@@ -123,7 +127,7 @@
{
if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
{
- new TipPopView().FlashingBox("鏆傛椂涓嶆敮鎸佽鍔熻兘.");
+ new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
return;
}
if (DeviceTypeList.Count == 0)
--
Gitblit v1.8.0