From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index 58ce04e..aaab4fc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -375,6 +375,24 @@
{
midVerticalScrolViewLayout.RemoveAll();
curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
+ //娉ㄦ剰锛佸悓涓寜閿鐐瑰鏋滄敮鎸佺粦瀹氬绉嶅姛鑳界被鍨嬶紝闇�瑕佹敞鎰忓涓嬪鐞�
+ //褰撴洿鎹㈣澶囧姛鑳界被鍨嬪悗
+ // 缁戝畾鐨勫紑鍏炽�佹彃搴с�佺伅鍏夋墍鐢ㄧ殑鎸夐敭鍥炶矾浜掔浉鍏宠仈锛屾墍浠ヨ繖閲岄噸鏂拌幏鍙栧皢杩欎笁绉嶇被鍨嬬殑鍏朵粬2绉嶏紝涓轰簡鑾峰彇姝ｇ‘鐨勫紑鍏炽�佹彃搴с�佺伅鍏夌粦瀹氱殑涓暟
+ switch (curBindType)
+ {
+ case 1:
+ MutilfunctionPanelMethod.GetMatchBindList(2);
+ MutilfunctionPanelMethod.GetMatchBindList(3);
+ break;
+ case 2:
+ MutilfunctionPanelMethod.GetMatchBindList(1);
+ MutilfunctionPanelMethod.GetMatchBindList(3);
+ break;
+ case 3:
+ MutilfunctionPanelMethod.GetMatchBindList(1);
+ MutilfunctionPanelMethod.GetMatchBindList(2);
+ break;
+ }
int curIndex = 0;
for (int i = 0; i < curBindTypeList.Count; i++)
{
@@ -633,7 +651,7 @@
RefreshBindListUI();
midVerticalScrolViewLayout.EndHeaderRefreshing();
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
break;
}
@@ -756,7 +774,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
});
return;
@@ -785,7 +803,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail) + "(" + "5003_8" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
});
return;
@@ -796,7 +814,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003_9" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
});
return;
--
Gitblit v1.8.0