新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

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

            var myType = HdlDeviceCommonLogic.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,7 +444,6 @@
                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路干接点输入输出模块