From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index c7da6e2..8f56b86 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -49,10 +49,9 @@
new System.Threading.Thread(() => {
try
{
- var pm = new DAL.Server.HttpServerRequest();
- //var result = pm.Get3tyBindBrandList
+ var pm = new HttpServerRequest();
var pack = pm.Get3TyBrandDeviceList(brand.productPlatform, brand.productBrand);
- if (pack.Code == DAL.Server.StateCode.SUCCESS)
+ if (pack.Code == StateCode.SUCCESS)
{
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());
Application.RunOnMainThread(() =>
@@ -147,6 +146,31 @@
refreshView.BeginHeaderRefreshing();
};
break;
+ case SPK.SenesorMegahealth:
+ var form1 = new AddSenesorMegahealthDirection1Page();
+ form1.AddForm(device);
+ form1.AddDeviceEvent = (functionObj) => {
+ refreshView.BeginHeaderRefreshing();
+ this.RemoveFromParent();
+ };
+ break;
+ case SPK.SensorEnvironment:
+ var form2 = new AddSensorEnvironmentPage();
+ form2.AddForm(device);
+ form2.AddDeviceEvent = (functionObj) => {
+ refreshView.BeginHeaderRefreshing();
+ this.RemoveFromParent();
+ };
+ break;
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
+ var form3 = new AddQingpingSensorEnvirTipPage();
+ form3.AddForm(device);
+ form3.AddDeviceEvent = (functionObj) => {
+ refreshView.BeginHeaderRefreshing();
+ this.RemoveFromParent();
+ };
+ break;
}
};
}
--
Gitblit v1.8.0