From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs | 6 +++---
1 files changed, 3 insertions(+), 3 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 da46c06..d4501dc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -31,11 +31,11 @@
if (Language.CurrentLanguage == "Chinese")
{
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(StringId.Add) + device.productName);
+ base.SetTitleText(Language.StringByID(StringId.Add) + device.ProductShowName);
}
else
{
- base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.productName);
+ base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.ProductShowName);
}
//杩欎釜鐣岄潰鐨勮儗鏅渶瑕佺櫧鑹�
bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;
@@ -88,7 +88,7 @@
textView.AddChidren(btnScan);
btnScan.MouseUpEventHandler = (sender, e) =>
{
- Scan.OpenScan((scanString) =>
+ Scan.Ins.OpenScan((scanString) =>
{
editText.Text = scanString;
});
--
Gitblit v1.8.0