新版本

黄学彪

2020-07-24 0087dd7734e71dfcfd1bb54db394ad7855021ffd

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

@@ -713,8 +713,7 @@
        private void AddPirSensorWorkModeRow()

        {

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir

                || deviceEnumInfo.IsHdlDevice == false

                || this.listNewDevice.Count != 2)

                || deviceEnumInfo.IsHdlDevice == false)

            {

                return;

            }

@@ -743,8 +742,7 @@
        /// </summary>

        private void AddPirSensorBindRow()

        {

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir

                || this.listNewDevice.Count != 2)

            if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)

            {

                return;

            }

@@ -1078,7 +1076,7 @@
                paneTargetsBaseFormp.Show();

                paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>

                {

                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (string.IsNullOrEmpty(bindName))

                        {

@@ -1129,7 +1127,7 @@
                paneTargetsBaseFormp.Show();

                paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>

                {

                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (string.IsNullOrEmpty(bindName))

                        {

@@ -1164,7 +1162,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1176,7 +1174,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1439,13 +1437,13 @@


                if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)

                {

                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (btnNewVersion != null)

                        {

                            btnNewVersion.Visible = true;

                        }

                    });

                    }, ShowErrorMode.NO);

                }

            });

        }