From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 55 ++++++-------------------------------------------------
1 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index c793d2b..aab6fc4 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -89,7 +89,7 @@
this.btnDelayTime = new NormalViewControl(400, 58, true);
btnDelayTime.X = Application.GetRealWidth(580);
btnDelayTime.Y = Application.GetRealHeight(317);
- btnDelayTime.Text = this.GetTimeString(scene.SceneDelayTime);
+ btnDelayTime.Text = CommonFormResouce.GetTimeString(scene.SceneDelayTime);
btnDelayTime.TextAlignment = TextAlignment.CenterRight;
btnDelayTime.TextColor = ZigbeeColor.Current.GXCTextSelectedColor3;
btnDelayTime.IsBold = true;
@@ -183,7 +183,7 @@
var removeSceneAllData = await ZigBee.Device.Scene.DeleteSceneAsync(scene.Id);
if (removeSceneAllData == null || removeSceneAllData.removeSceneData == null)
{
- HdlMessageLogic.Current.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.RequestServerFailed));
+ CommonPage.Instance.FailureToServer();
return;
}
//1鎴愬姛
@@ -195,7 +195,7 @@
//0 绉婚櫎澶辫触
else if (removeSceneAllData.removeSceneData.Result == 0)
{
- HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.FailedPleaseTryAgain));
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.FailedPleaseTryAgain));
return;
}
//2 娌℃湁璇ュ満鏅�
@@ -234,7 +234,7 @@
{
if (scene.RemainTime > 0)
{
- HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.TheSceneIsDelaying));
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneIsDelaying));
return;
}
var timeSelect = new SelectTime();
@@ -248,7 +248,7 @@
if (t != 0)
{
scene.SceneDelayTime = t;
- btnDelayTime.Text = this.GetTimeString(t);
+ btnDelayTime.Text = CommonFormResouce.GetTimeString(t);
//缂栬緫寤舵椂鏃�,闇�瑕佸埛鏂颁富椤�
UserView.UserPage.Instance.RefreshAllForm = true;
}
@@ -298,7 +298,7 @@
System.Threading.Thread.Sleep(1000);
HdlThreadLogic.Current.RunMain(() =>
{
- SetTimeText(this.GetTimeString(scene.RemainTime));
+ SetTimeText(CommonFormResouce.GetTimeString(scene.RemainTime));
}, ShowErrorMode.NO);
myRemainTime--;
}
@@ -369,49 +369,6 @@
frameBack1.RemoveFromParent();
frameBack2.RemoveFromParent();
};
- }
-
- /// <summary>
- /// 鑾峰彇鍦烘櫙寤舵椂瀛楃涓�
- /// </summary>
- /// <param name="second"></param>
- /// <returns></returns>
- private string GetTimeString(int second)
- {
- if (second == 0)
- {
- return null;
- }
- string timeStr = string.Empty;
- int hour = second / 3600;
- int minu = second % 3600 / 60;
- int sec = second % 60;
- if (hour > 0)
- {
- timeStr += $"{hour}{Language.StringByID(R.MyInternationalizationString.Hour)}";
- if (minu > 0)
- {
- timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
- }
- if (sec > 0)
- {
- timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
- }
- return timeStr;
- }
- else if (minu > 0)
- {
- timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
- if (sec > 0)
- {
- timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
- }
- return timeStr;
- }
- else
- {
- return $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
- }
}
/// <summary>
--
Gitblit v1.8.0