From 373376967321bd172ed9dce8835a5b7ce138470b Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 04 七月 2024 11:08:48 +0800
Subject: [PATCH] 证书更新
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index b1cbf37..d801642 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -19,6 +19,7 @@
#if __ANDROID__
public class dddxx { }
#else
+ //澶у崕鎽勫儚澶磗dk浠ｇ悊锛圫hared.IOS.HDLCNVRSDK)
hdlLCNVRSDKDelegate hdlLCNVRDelegate;
public class hdlLCNVRSDKDelegate : HDLLCNVRSDKDelegate
{
@@ -54,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);
@@ -193,7 +196,7 @@
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- //璺宠浆娣诲姞鎽勫儚澶�
+ //璺宠浆娣诲姞鎽勫儚澶�(Shared.IOS.HDLCNVRSDK)
hdlLCNVRDelegate = new hdlLCNVRSDKDelegate(() =>
{//娣诲姞鎴愬姛杩斿洖浜嬩欢
refreshView.BeginHeaderRefreshing();
@@ -251,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);
}
}
@@ -340,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);
}
}
@@ -421,9 +404,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