Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs

@@ -541,7 +541,7 @@
        /// <returns></returns>
        private string GetSendToBluetoothData()
        {
            var pra = new { id = "id010203", ssid = this.wifiName, password = this.wifiPsw };
            var pra = new { id = "id010203", ssid = this.wifiName, password = this.wifiPsw, homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.id };
            var praData = Newtonsoft.Json.JsonConvert.SerializeObject(pra);

            var sendData = "Topic:/user/id/custom/wifi/set\r\n";