Merge branch 'dev-cqy（1.5.9）' into wjc

wjc

2023-03-29 adf7df175e590b7d9e0f33c0c2ea1d2897da6301

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs

@@ -123,7 +123,7 @@
            {
                editText.PlaceholderText = Language.StringByID(StringId.PlsEntryMacCode);
            }
            if (integratedDevice.spk == SPK.SensorEnvironment)
            if (integratedDevice.spk == SPK.SensorEnvironment || integratedDevice.spk == SPK.SensorEnvironmentHailin)
            {
                Button btnScan = new Button()
                {
@@ -160,7 +160,7 @@
                        try
                        {
                            var pm = new HttpServerRequest();
                            var pack = pm.IndependentRegister3TyDevcie(integratedDevice.spk, snCode,integratedDevice.ProductShowName, pairString);// Language.StringByID(StringId.SensorEnvironment)
                            var pack = pm.IndependentRegister3TyDevcie(integratedDevice.spk, snCode,integratedDevice.ProductShowName, integratedDevice.productBrand, pairString);// Language.StringByID(StringId.SensorEnvironment)
                            if (pack.Code == StateCode.SUCCESS)
                            {
                                //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());