Merge branch 'dev' into dev-temp

hxb

2022-08-29 9a4629512ccf8359efd88671c9317c3cc7faf0c8

 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirQualitySensorDirectionForm.cs

@@ -54,7 +54,7 @@
                textMsg = string.Format(textMsg, "5");
            }
            var btnSecond2 = new NormalViewControl(this.GetPictrueRealSize(463), this.GetPictrueRealSize(45), false);
            btnSecond2.Y = this.GetPictrueRealSize(206);
            btnSecond2.Y = this.GetPictrueRealSize(200);
            btnSecond2.TextColor = UserCenterColor.Current.TextGrayColor3;
            btnSecond2.TextSize = 10;
            btnSecond2.TextAlignment = TextAlignment.Center;