From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期一, 27 六月 2022 10:54:32 +0800 Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114 --- 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