Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -1196,7 +1196,7 @@
            HdlThreadLogic.Current.RunThread(async () =>

            {

                //读取空调模块版本

                var result = await ((AC)listNewDevice[0]).ReadACFirewareVersionAsync();

                var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);

                if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)

                {

                    HdlThreadLogic.Current.RunMain(() =>