From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 721151e..49bab2e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -61,7 +61,12 @@
};
middFLayout.AddChidren(addDevice);
-
+ if (Pir.currPir.FunctioList.Count < 10)
+ {
+ //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
+ // middFLayout.AddChidren(addDevice);
+ addDevice.Visible = true;
+ }
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
@@ -71,7 +76,7 @@
////鍏抽棴鍒锋柊View锛�
vv.EndHeaderRefreshing();
- PirMethod.GetControlList(this, () =>
+ Method.GetControlList(this, () =>
{
Application.RunOnMainThread(() =>
{
@@ -103,7 +108,7 @@
//1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
if (if_value == 7)
{
- PirMethod method = new PirMethod();
+ Method method = new Method();
method.AddControl(this, (control) =>
{
//鎴愬姛鍚庣Щ闄�;
@@ -116,7 +121,7 @@
}
else
{
- if (if_value == 6)
+ if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
{
new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
return;
@@ -143,18 +148,13 @@
///鍒濆鍖栫晫闈�
UIView(vv);
}
+
/// <summary>
/// 鍔犺浇UI鐣岄潰
/// </summary>
/// <param name="vv">涓婁笅婊戞帶浠�</param>
private void UIView(VerticalRefreshLayout vv)
{
- if (Pir.currPir.FunctioList.Count < 10)
- {
- //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
- // middFLayout.AddChidren(addDevice);
- addDevice.Visible = true;
- }
vv.RemoveAll();
#region 绾㈠瀹濆浘鏍� 鐗堟湰鍙� 鍚嶇О 鐘舵��
FrameLayout fLayout = new FrameLayout
@@ -208,7 +208,7 @@
TipPopView tipPopView = new TipPopView();
tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
- PirMethod.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
+ Method.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
{
dialog.Close();
var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid);
@@ -313,7 +313,7 @@
{
if (tag)
{
- PirMethod method = new PirMethod();
+ Method method = new Method();
method.ErrorShow(responsePackNew, "");
}
}
@@ -360,7 +360,7 @@
}
else
{
- PirMethod method = new PirMethod();
+ Method method = new Method();
method.ErrorShow(responsePackNew, "");
}
}, id, "鍝佺墝鍒楄〃");
--
Gitblit v1.8.0