From e4ff4b4f64015836f109999b3421e7e6bd39982a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 37 ++++++++++---------------------------
1 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index c0a6841..14acce9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -252,24 +252,14 @@
var bindResult = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(msg);
if (bindResult != null)
{
+ string tipTitle = Language.StringByID(StringId.Tip);
if (bindResult.Code == "147021") {
- string tipTitle = "鎻愮ず";
- string tipMsg = "鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- tipMsg = "Unable to bind this device. Please purchase this type of product from HDL";
- }
+ string tipMsg = Language.StringByID(StringId.UnableToBindThisDeviceTip);
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
else
{
- string tipTitle = "鎻愮ず";
string tipMsg = $"{bindResult.message}({bindResult.Code})";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- }
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
}
@@ -341,25 +331,15 @@
var bindResult = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(msg);
if (bindResult != null)
{
+ string tipTitle = Language.StringByID(StringId.Tip);
if (bindResult.Code == "147021")
{
- string tipTitle = "鎻愮ず";
- string tipMsg = "鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- tipMsg = "Unable to bind this device. Please purchase this type of product from HDL";
- }
+ string tipMsg = Language.StringByID(StringId.UnableToBindThisDeviceTip);
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
else
{
- string tipTitle = "鎻愮ず";
string tipMsg = $"{bindResult.message}({bindResult.Code})";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- }
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
}
@@ -422,9 +402,12 @@
this.RemoveFromParent();
};
break;
- case SPK.VideoDoorLock: {
- //璺宠浆鍒癮ndroid閭ｈ竟鍘�
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(SPK.VideoDoorLock);
+ case SPK.Peephole:
+ case SPK.VideoDoorLock:
+ case SPK.Ev_Ipcam:
+ {
+ //璺宠浆鍒癮ndroid,ios閭ｈ竟鍘�
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk);
}
break;
}
--
Gitblit v1.8.0