From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
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 9db9698..d801642 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -55,13 +55,15 @@
public void LoadPage(VerticalRefreshLayout refreshView)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice));
+ topView.maginY = 10;
+ topView.LoadTopView();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
VerticalScrollBarEnabled = false,
};
bodyView.AddChidren(contentView);
@@ -252,24 +254,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 +333,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);
}
}
@@ -424,6 +406,7 @@
break;
case SPK.Peephole:
case SPK.VideoDoorLock:
+ case SPK.Ev_Ipcam:
{
//璺宠浆鍒癮ndroid,ios閭ｈ竟鍘�
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk);
--
Gitblit v1.8.0