合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs

@@ -159,7 +159,7 @@
                    }
                    else if(taskListInfo.Data1==4 || taskListInfo.Data1==5)
                    {
                        tempareture = $"{ taskListInfo.Data2} ℃";
                        tempareture = $"{ taskListInfo.Data2/100} ℃";
                    }
                    else if (taskListInfo.Data1 == 6)
                    {
@@ -179,7 +179,6 @@
                }
                return $"{tempareture},{model},{wind}";
            }

            else
            {
                return null;