From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 87fe48e..6708c7d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -5,6 +5,8 @@
using HDL_ON.UI.CSS;
#if __Android__
using Java.Interop;
+using Android.Content;
+using Hdl.Onpro;
#endif
using Shared;
namespace HDL_ON.UI
@@ -26,24 +28,10 @@
{
Action<string, string> action = (s, a) =>
{
- if (brand.productBrand == "")
- {
-#if __ANDROID__
- var backTemp = new AddLcCam();
- backTemp.backAction = () =>
- {
- Load3tyBrandDeviceList();
- };
- Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
-#endif
- }
- else
- {
- var page = new AddDevciePage(brand);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage(contentView);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
+ var page = new AddDevciePage(brand);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage(contentView);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -199,7 +187,7 @@
contentView.BeginHeaderRefreshing();
};
break;
- case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
var smPage1 = new SensorEnvironmentManagerPage();
@@ -363,6 +351,23 @@
#if __Android__
+
+ //[Android.Content.BroadcastReceiver(Enabled = true, Exported = false)]
+ //public class ImouReceiver : Android.Content.BroadcastReceiver
+ //{
+ // public override void OnReceive(Context context, Intent intent)
+ // {
+ // if (intent != null)
+ // {
+ // string action = intent.Action;
+ // if (action == "hdlUserDeviceBind")
+ // {
+ // string value = intent.GetStringExtra("data");
+ // }
+ // }
+ // }
+ //}
+
public class AddLcCam : Java.Lang.Object, Com.CallBack.IAddCamera
{
@@ -423,6 +428,17 @@
{
}
}
+
+ public class BindDeviceFeedback : Java.Lang.Object, Hdl.Onpro.IRegisterDeviceFeedback
+ {
+ public Action<string,string> tipAction;
+
+ public void Feedback(string method, string msg)
+ {
+ tipAction?.Invoke(method, msg);
+ }
+ }
+
#else
public class AddLcCam
{
@@ -434,4 +450,8 @@
}
}
#endif
+
+
+
+
}
--
Gitblit v1.8.0