From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
index 8916f55..4d7538c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
@@ -8,7 +8,6 @@
{
public class PirMethod
{
-
/// <summary>
/// 绾㈠瀹濈▼搴忎富鍏ュ彛
/// </summary>
@@ -544,6 +543,9 @@
{
str = Language.StringByID(StringId.tianjiashibai);
}
+ else if (text== "娣诲姞鎸夐挳瓒呭嚭30涓�") {
+ str = Language.StringByID(StringId.anniuchaochu30);
+ }
else
{
if (responsePackNew != null)
@@ -555,14 +557,31 @@
case "14005":
{
str = Language.StringByID(StringId.gatewayNotOnline);
-
}
break;
case "10807":
{
str = Language.StringByID(StringId.bunengchaoguo10);
-
-
+ }
+ break;
+ case "14002":
+ {
+ str = Language.StringByID(StringId.bucunzaichanpin);
+ }
+ break;
+ case "10805":
+ {
+ str = Language.StringByID(StringId.shebeibucunzai);
+ }
+ break;
+ case "14006":
+ {
+ str = Language.StringByID(StringId.shebeibuzaixian);
+ }
+ break;
+ case "9":
+ {
+ str = Language.StringByID(StringId.wangguanshebeibuzaixian);
}
break;
case "2":
@@ -671,13 +690,10 @@
public string id = "";
public List<Objects> objects = new List<Objects>();
public string time_stamp = string.Empty;
-
-
}
[Serializable]
public class Objects
{
-
public string sid = string.Empty;
public string spk = string.Empty;
public List<Attributes> attributes = new List<Attributes>();
--
Gitblit v1.8.0