From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期四, 07 十一月 2019 13:48:36 +0800 Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs index 5dad7f0..f99c5f9 100644 --- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs +++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs @@ -223,7 +223,7 @@ functionTypeRow.ClickBtn.MouseUpEventHandler += (sender, e) => { var DfunctionType = device.CommonDevice.DfunctionType; - + //鍔熻兘绫诲瀷鐨勭炕璇戝悕瀛� int nowSelectNo = 1; string strType = string.Empty; @@ -247,7 +247,8 @@ listText.Add(Language.StringByID(R.MyInternationalizationString.uSwitch));//寮�鍏� listText.Add(Language.StringByID(R.MyInternationalizationString.uLight));//鐏厜 listText.Add(Language.StringByID(R.MyInternationalizationString.uSocket1));//鎻掑骇 - var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);//鏍囬:閫夋嫨鍔熻兘绫诲瀷 + //鏍囬:閫夋嫨鍔熻兘绫诲瀷 + var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType); var form = new BottomDialogSelectForm(); form.AddForm(title, listText, nowSelectNo); -- Gitblit v1.8.0