From 3add06f19c3c68289ca58fb61d15dfa059c5c8f5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 22 七月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs |   21 ++++++++++++++++++---
 1 files changed, 18 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..0b70665 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,22 @@
                                 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;
                     }
                 };
             }

--
Gitblit v1.8.0