Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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);