From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs
index 2c7f627..d9ea79b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs
@@ -203,12 +203,12 @@
//鍙互寮�濮嬩娇鐢ㄧ孩澶栭仴鎺у姛鑳斤紒
var strMsg = Language.StringByID(StringId.AddInfraredRemoteControlMsg7);
- int yy = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS.CSS_FontSize.TextFontSize, CSS.CSS_Color.TextualColor,
+ var listContr = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS.CSS_FontSize.TextFontSize, CSS.CSS_Color.TextualColor,
Application.GetRealHeight(20), btnFail.Bottom + Application.GetRealHeight(8));
//寮�濮嬩娇鐢�
var btnUse = new BottomClickButton(220);
- btnUse.Y = yy + Application.GetRealHeight(60);
+ btnUse.Y = listContr[listContr.Count - 1].Bottom + Application.GetRealHeight(60);
btnUse.TextID = StringId.StartUse;
bodyFrameLayout.AddChidren(btnUse);
btnUse.ButtonClickEvent += (sender, e) =>
@@ -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";
--
Gitblit v1.8.0