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 | 114 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 415b219..14acce9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -7,10 +7,41 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
+#if __IOS__
+using Shared.IOS.HDLCNVRSDK;
+#endif
namespace HDL_ON.UI
{
+
+
public class AddDevciePage : FrameLayout
{
+#if __ANDROID__
+ public class dddxx { }
+#else
+ //澶у崕鎽勫儚澶磗dk浠ｇ悊锛圫hared.IOS.HDLCNVRSDK)
+ hdlLCNVRSDKDelegate hdlLCNVRDelegate;
+ public class hdlLCNVRSDKDelegate : HDLLCNVRSDKDelegate
+ {
+ Action act;
+ public hdlLCNVRSDKDelegate(Action action)
+ {
+ act = action;
+
+
+ }
+
+ public override void AddDeviceFailWithErrorCode(string errorCode)
+ {
+
+ }
+
+ public override void BackFromAddDeviceView()
+ {
+ act?.Invoke();
+ }
+ }
+#endif
FrameLayout bodyView;
IntegratedBrand brand;
VerticalRefreshLayout contentView;
@@ -23,6 +54,7 @@
public void LoadPage(VerticalRefreshLayout refreshView)
{
+
new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -49,7 +81,8 @@
{
var waitPage = new Loading();
waitPage.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
try
{
var pm = new HttpServerRequest();
@@ -122,7 +155,7 @@
Width = Application.GetRealWidth(32),
Height = Application.GetRealWidth(32),
Radius = (uint)Application.GetRealWidth(4),
- UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
+ UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
};
row.AddChidren(btnIcon);
Button btnRight = new Button()
@@ -146,11 +179,30 @@
};
row.AddChidren(btnName);
- btnName.MouseUpEventHandler = (sender, e) => {
+
+
+ btnName.MouseUpEventHandler = (sender, e) =>
+ {
switch (device.spk)
{
case SPK.IpCam_Imou:
-#if __ANDROID__
+
+#if __IOS__
+
+ //鍒濆鍖栧ぇ鍗庢憚鍍忓ごsdk
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+ 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();
+ this.RemoveFromParent();
+ });
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().Delegate = hdlLCNVRDelegate;
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToAddDeviceView();
+#else
FunctionList.List.GetIpCamImouList();
if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
{
@@ -183,6 +235,7 @@
Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+
#if __ANDROID__
Application.RunOnMainThread(() =>
{
@@ -199,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);
}
}
@@ -288,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);
}
}
@@ -333,24 +366,28 @@
case SPK.IrModule:
var form = new AddMiniRemoteControlDirection1Page();
form.AddForm();
- form.AddDeviceEvent = (functionObj) => {
+ form.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
- };
+ };
break;
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
case SPK.SensorMmvPose:
var form1 = new AddSenesorMegahealthDirection1Page();
form1.AddForm(device);
- form1.AddDeviceEvent = (functionObj) => {
+ form1.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
this.RemoveFromParent();
};
break;
- case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
+ case SPK.SensorEnvironment:
+ case SPK.SensorEnvironmentHailin:
var form2 = new AddSensorEnvironmentPage();
form2.AddForm(device);
- form2.AddDeviceEvent = (functionObj) => {
+ form2.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
this.RemoveFromParent();
};
@@ -359,11 +396,20 @@
case SPK.SensorEnvironment3:
var form3 = new AddQingpingSensorEnvirTipPage();
form3.AddForm(device);
- form3.AddDeviceEvent = (functionObj) => {
+ form3.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
this.RemoveFromParent();
};
break;
+ 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