From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/AiererTimeControl.cs | 79 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/AiererTimeControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/AiererTimeControl.cs
index 23c6094..12d5840 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/AiererTimeControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/AiererTimeControl.cs
@@ -68,47 +68,48 @@
btnTextView.Y += chidrenYaxis;
}
- //鍙崇澶�
- this.AddRightArrow();
+ //鍙崇澶� {鐑樺共銆侀骞插拰娑堟瘨鐨勮缃粯璁ゆ椂闂存殏鏃跺彇鍘绘帀锛屼笖鍊掕鏃朵篃鍘绘帀锛屽洜涓虹涓夋柟璁惧涓嶆敮鎸併��
+ //榛樿鏈�澶�3灏忔椂锛屾墍浠ヤ笅娆¤澶勭悊鏃朵负3锛屽垎閽熶笉鑳芥搷浣滃ぇ鎯呭喌
+ //this.AddRightArrow();
//濡傛灉褰撳墠涓嶆槸灞曠ず妯℃澘,鍒欓渶瑕佸鐞�
- if (Common.Config.Instance.Home.IsShowTemplate == false)
- {
- this.ButtonClickEvent += (sender, e) =>
- {
- //鍖哄煙閫夋嫨
- SelectTimeEvent = (min, curType) =>
- {
- switch (curType)
- {
- case 1:
- case 2:
- double result = min / 60.0;
- var hour = Math.Round(result, 2);
- var text = hour + Language.StringByID(R.MyInternationalizationString.AirerHour);
+ //if (Common.Config.Instance.Home.IsShowTemplate == false)
+ //{
+ // this.ButtonClickEvent += (sender, e) =>
+ // {
+ //鍖哄煙閫夋嫨
+ //SelectTimeEvent = (min, curType) =>
+ //{
+ // switch (curType)
+ // {
+ // case 1:
+ // case 2:
+ // double result = min / 60.0;
+ // var hour = Math.Round(result, 2);
+ // var text = hour + Language.StringByID(R.MyInternationalizationString.AirerHour);
- if (min == 0)
- {
- text = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 3 + Language.StringByID(R.MyInternationalizationString.AirerHour);
- }
- btnTextView.Text = text;
+ // if (min == 0)
+ // {
+ // text = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 3 + Language.StringByID(R.MyInternationalizationString.AirerHour);
+ // }
+ // btnTextView.Text = text;
- break;
- case 3:
- int result2 = min;
- var text2 = result2 + Language.StringByID(R.MyInternationalizationString.AirerMin);
+ // break;
+ // case 3:
+ // int result2 = min;
+ // var text2 = result2 + Language.StringByID(R.MyInternationalizationString.AirerMin);
- if (min == 0)
- {
- text2 = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 30 + Language.StringByID(R.MyInternationalizationString.AirerMin);
- }
- btnTextView.Text = text2;
- break;
- }
- };
- this.ShowSelectTime(airer, bodyFrameLayout, btnTextView, i_caption, type);
- };
- }
+ // if (min == 0)
+ // {
+ // text2 = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 30 + Language.StringByID(R.MyInternationalizationString.AirerMin);
+ // }
+ // btnTextView.Text = text2;
+ // break;
+ // }
+ //};
+ //this.ShowSelectTime(airer, bodyFrameLayout, btnTextView, i_caption, type);
+ // };
+ //}
}
#endregion
@@ -205,8 +206,8 @@
this.DetailCardActionTimeEvent?.Invoke(airer.DisinfectRemainTime, type);
break;
}
- //鎴愬姛鍚庢洿鏂板闈㈡枃鏈�
- this.SelectTimeEvent?.Invoke(totalMin, type);
+ //鎴愬姛鍚庢洿鏂板闈㈡枃鏈�
+ this.SelectTimeEvent?.Invoke(totalMin, type);
this.SelectTimeEvent = null;
this.shadowRadiusFrameLayout.RemoveFromParent();
@@ -229,7 +230,7 @@
base.RemoveFromParent();
}
- #endregion
+ #endregion
}
}
--
Gitblit v1.8.0