From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs
index acd8f61..367b0a9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs
@@ -4,8 +4,6 @@
using HDL_ON.UI.UI2.PersonalCenter.PirDevice;
using Shared;
using System;
-using System.Collections.Generic;
-using System.Text;
namespace HDL_ON.UI
{
@@ -67,11 +65,11 @@
if (Language.CurrentLanguage == "Chinese")
{
- btnTip.Text = "璇ヨ澶囧凡鐗╂嫙鍒板畨闃蹭紶鎰熷櫒绫诲埆鍙埌瀵瑰簲绫诲埆鏌ョ湅浣跨敤";
+ btnTip.Text = "璇ヨ澶囧凡娣诲姞鍒板畨闃蹭紶鎰熷櫒绫诲埆锛屽彲鍒板搴斿姛鑳芥澘鍧楁煡鐪�";
}
else
{
- btnTip.Text = "The device is planned to be used in the corresponding category for security sensor.";
+ btnTip.Text = "The device has been added to the security sensor category, which can be viewed in the corresponding function block.";
}
var btnDel = new Button() {
@@ -87,11 +85,28 @@
btnDel.MouseUpEventHandler = (sender, e) => {
var pack = PirSend.DeleteDevice(function.deviceId);
- if(pack.Code == StateCode.SUCCESS)
+ if (pack.Code == StateCode.SUCCESS)
{
DelDeviceEvent?.Invoke();
this.CloseForm();
- }else
+ var mes = "";
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ mes = "璁惧鍒犻櫎鎴愬姛銆�";
+ }
+ else
+ {
+ mes = "Device deleted successfully.";
+ }
+ var tip = new Tip()
+ {
+ Text = mes,
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
+ else
{
IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
--
Gitblit v1.8.0