From 774baeb1f5d2d49bfd692b79faa240bd7949dc17 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 九月 2021 10:06:48 +0800
Subject: [PATCH] 2021-09-02 1.更新控件库,iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库,监视关闭麦克风。3.Android丰林和乐橙截图后增加广播推送系统相册刷新。

---
 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