上传一个版本

黄学彪

2020-09-01 dee21bf452a8979d0515d13e534fbb69ed9715dd

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

@@ -74,7 +74,7 @@
                || this.device.Type == DeviceType.OnOffOutput)

            {

                //没被强制干涉的话

                if (m_SetCanSelect == true)

                if (m_SetCanSelect == true && Common.Config.Instance.Home.IsShowTemplate == false)

                {

                    this.UseClickStatu = true;

                    //右箭头

@@ -111,7 +111,7 @@


            var form = new BottomItemSelectForm();

            form.CancelCallEvent = true;//允许取消

            form.AddForm(title, listText, nowSelectNo - 1);

            form.AddForm(title, listText, null, nowSelectNo - 1);

            form.FinishSelectEvent += (selectNo) =>

            {

                if (selectNo == nowSelectNo - 1)

@@ -137,7 +137,7 @@
                            this.RefreshDfunctionType();



                            //设备改变功能类型的话,主页需要重新刷新

                            UserView.UserPage.Instance.RefreshForm = true;

                            UserView.UserPage.Instance.RefreshAllForm = true;



                            //调用回调函数

                            this.FinishSelectEvent?.Invoke(nowSelectNo);

@@ -194,25 +194,29 @@
                || this.device.Type == DeviceType.DimmableLight)

            {

                //灯光类固定为 灯光

                strType = Language.StringByID(R.MyInternationalizationString.uLight);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A418");

                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = 2;

            }

            else if (this.device.Type == DeviceType.WindowCoveringDevice)

            {

                //窗帘固定为 遮阳

                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A400");

                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = -1;

            }

            else if (this.device.Type == DeviceType.Thermostat)

            {

                //空调固定为 空调

                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A406");

                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = -1;

            }

            else if (this.device.Type == DeviceType.DoorLock)

            {

                //门锁固定为 门锁

                strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");

                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = -1;

            }

            else if (this.device.Type == DeviceType.FreshAir)