From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
index 2d0768c..da46c06 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -3,8 +3,6 @@
using HDL_ON.Stan;
using Shared;
using System;
-using System.Collections.Generic;
-using System.Text;
namespace HDL_ON.UI
{
@@ -20,6 +18,7 @@
/// </summary>
public Action<Function> AddDeviceEvent = null;
+ public IntegratedBrandDevice device;
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,6 +27,7 @@
/// </summary>
public void ShowForm(IntegratedBrandDevice device)
{
+ this.device = device;
if (Language.CurrentLanguage == "Chinese")
{
//璁剧疆澶撮儴淇℃伅
@@ -115,17 +115,39 @@
try
{
var pm = new HttpServerRequest();
- var pack = pm.IndependentRegister3TyDevcie(SPK.SenesorMegahealth, snCode);
+ var pack = pm.IndependentRegister3TyDevcie(device.spk, snCode,Language.StringByID(StringId.SenesorMillimeterWave));
if (pack.Code == StateCode.SUCCESS)
{
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());
+ //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());
Application.RunOnMainThread(() =>
{
waitPage.Hide();
var tipDialog = new OperationResultDisPalyPage();
tipDialog.LoadPage(true, Language.StringByID(StringId.AddSuccess), "", Language.StringByID(StringId.CanStartUsingZhaoguanMillimeterWave), Language.StringByID(StringId.Next));
tipDialog.Show();
+ AddDeviceEvent?.Invoke(new Function());
this.CloseForm();
+ });
+ }else if(pack.Code == "10801" || pack.Code == "9")
+ {
+ var mes = "";
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ mes = "璇ヨ澶囧凡缁忚娣诲姞銆�";
+ }
+ else
+ {
+ mes = "This device has been added.";
+ }
+ Application.RunOnMainThread(() =>
+ {
+ var tip = new Tip()
+ {
+ Text = mes,
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
});
}
else
@@ -139,7 +161,13 @@
}
finally
{
- Application.RunOnMainThread(() => { waitPage.Hide(); });
+ Application.RunOnMainThread(() => {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
}
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0