From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 6454ead..38b713e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -96,7 +96,7 @@
//杩涙潵涓嶅厑璁稿乏婊�
MainPage.BasePageView.ScrollEnabled = false;
View.Buttons buttons = new View.Buttons();
- buttons.AddFrameLayout(this, (if_value, view) =>
+ buttons.AddFrameLayout(this, (if_value, view) =>
{
//鍏抽棴鍏佽宸︽粦
MainPage.BasePageView.ScrollEnabled = true;
@@ -106,8 +106,8 @@
PirMethod method = new PirMethod();
method.AddControl(this, (control) =>
{
- //鎴愬姛鍚庣Щ闄�;
- view.RemoveFromParent();
+ //鎴愬姛鍚庣Щ闄�;
+ view.RemoveFromParent();
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(control);
@@ -126,8 +126,8 @@
GetDeviceTypeList(true, () =>
{
DeviceTypeViewClick(if_value);
- //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
- view.RemoveFromParent();
+ //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+ view.RemoveFromParent();
});
}
@@ -136,7 +136,6 @@
DeviceTypeViewClick(if_value);
view.RemoveFromParent();
}
-
}
}, 7);
};
@@ -198,7 +197,7 @@
//閬ユ帶鍣ㄥ悕绉�
controlView.nameBtn.Text = control.name;
//閬ユ帶鍣ㄥ瓨鏀惧尯鍩�
- controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
//鏍囪閬ユ帶鍣�
controlView.delBtn.Tag = control;
//鍒犻櫎鐐瑰嚮浜嬩欢
@@ -237,7 +236,7 @@
{
//鍥炶皟鏇存柊鍚嶅瓧/鍖哄煙
controlView.nameBtn.Text = device.name;
- controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device);
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(device);
});
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -258,7 +257,6 @@
/// <param name="if_value">鎺т欢绱㈠紩鍊�</param>
private void DeviceTypeViewClick(int if_value)
{
-
var strings = View.Buttons.GetTypeString(if_value).Split('-');
var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
if (jobDeviceType == null)
@@ -274,7 +272,6 @@
});
});
-
}
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
@@ -285,7 +282,6 @@
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
-
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
//娓呯┖涔嬪墠鏁版嵁
--
Gitblit v1.8.0