合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs

@@ -426,10 +426,10 @@
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);

            var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);



            //欧标2路5A没有背光灯

            if (myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad

                || myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad

                || myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA

                || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA

                || myType.ConcreteType == DeviceConcreteType.Relay_SevenLoadInOutPutDryContact)

            {

                //背光灯

@@ -444,10 +444,9 @@
                btnLight.ButtonClickEvent += (sender, e) =>

                {

                    if (myType.ConcreteType == DeviceConcreteType.Relay_NationalThreeLoadTenA

                    || myType.ConcreteType == DeviceConcreteType.Relay_EuropeanTwoLoadFiveA

                    || myType.ConcreteType == DeviceConcreteType.Relay_SevenLoadInOutPutDryContact)

                    {

                        //国标3路10A继电器小模块 或者 欧标2路5A继电器小模块 或者 7路干接点输入输出模块

                        //国标3路10A继电器小模块 或者 7路干接点输入输出模块

                        var form = new DeviceRelay.RelayNationalBackLightSettionForm();

                        form.AddForm(deviceObj.DeviceAddr);

                    }