From 62a6405035f4ef3557250c9f80fe90a103da4109 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 三月 2021 11:41:48 +0800
Subject: [PATCH] 2021-3-24-1
---
HDL-ON_iOS/Resources/Language.ini | 4 +++-
HDL-ON_Android/Assets/Language.ini | 6 +++++-
HDL_ON/Common/R.cs | 2 ++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 30 +++++++++++++++---------------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | 8 ++++----
5 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 53ff4f7..4e87591 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,21 +1,14 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.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" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="131" Column="23" IsPinned="True" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="113" IsPinned="True" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="16" Column="13" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="237" Column="71" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="527" Column="23" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="449" Column="22" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1339" Column="31" />
- <File FileName="HDL-ON_Android/Application.cs" Line="365" Column="29" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="253" Column="72" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="356" Column="53" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="27" Column="22" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs" Line="17" Column="21" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="113" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="19" Column="1" />
- <File FileName="HDL-ON_Android/Scan.cs" Line="14" Column="59" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="9" Column="24" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -30,20 +23,27 @@
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True">
+ <Node name="LogicView" expanded="True" />
+ </Node>
+ </Node>
<Node name="4-PersonalCenter" expanded="True">
<Node name="PirDevice" expanded="True">
<Node name="View" expanded="True" />
+ <Node name="Method.cs" selected="True" />
</Node>
- <Node name="MyQRCodePage.cs" selected="True" />
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_Android" expanded="True">
- <Node name="Other" expanded="True">
- <Node name="JPush" expanded="True" />
- </Node>
+ <Node name="Assets" expanded="True" />
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index d1df129..6539302 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1387,10 +1387,14 @@
6071=淇敼鍚嶅瓧
6072=纭鍒犻櫎
6073=鍙栨秷
-6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓紵
+6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓�
6075=閬ユ帶鍣ㄦ墍灞炲尯鍩�:
6076=缂栬緫淇℃伅
6077=鐗堟湰鍗囩骇
+6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
+6079=鑾峰彇鏁版嵁澶辫触
+
+
6015=鍦ㄧ嚎
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index ae19318..930ba63 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1387,10 +1387,12 @@
6071=淇敼鍚嶅瓧
6072=纭鍒犻櫎
6073=鍙栨秷
-6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓紵
+6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓�
6075=閬ユ帶鍣ㄦ墍灞炲尯鍩�:
6076=缂栬緫淇℃伅
6077=鐗堟湰鍗囩骇
+6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
+6079=鑾峰彇鏁版嵁澶辫触
6015=鍦ㄧ嚎
6016=绂荤嚎
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 7ae6f60..65f372e 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -868,6 +868,8 @@
public const int yaokongqiquyu = 6075;
public const int bianjixinxi = 6076;
public const int banbenshengji = 6077;
+ public const int xitongweihuzhong = 6078;
+ public const int huoqushujushibao = 6079;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
index 122c30f..9236d52 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
@@ -502,7 +502,7 @@
}
else if (text == "璇诲彇绾㈠瀹濆垪琛ㄥけ璐�")
{
- str = "璇诲彇绾㈠瀹濆垪琛ㄥけ璐�"; //Language.StringByID(StringId.delFail);
+ str = Language.StringByID(StringId.huoqushujushibao);
}
else
{
@@ -520,19 +520,19 @@
break;
case "10807":
{
- str = "绾㈠瀹濅笅閬ユ帶鍣ㄨ秴杩囨渶澶�(10涓�)鏁伴噺闄愬埗";// Language.StringByID(StringId.gatewayNotOnline);
+ str = Language.StringByID(StringId.bunengchaoguo10);
}
break;
case "2":
{
- str = "绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘";
+ str = Language.StringByID(StringId.xitongweihuzhong);
}
break;
default:
{
- str ="鑾峰彇鏁版嵁澶辫触" ;// Language.StringByID(StringId.saveFail);
+ str = Language.StringByID(StringId.huoqushujushibao);
}
break;
--
Gitblit v1.8.0