From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs
index 38484ea..c3d510f 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs
@@ -21,8 +21,8 @@
/// </summary>
public SafetyShortcutControl()
{
- this.Height = Application.GetMinRealAverage(69);
- this.Width = Application.GetMinRealAverage(69);
+ this.Height = HdlControlLogic.Current.GetPictrueRealSize(69);
+ this.Width = HdlControlLogic.Current.GetPictrueRealSize(69);
this.UnSelectedImagePath = "Item/SafetyShortcut.png";
this.MouseUpEventHandler += (sender, e) =>
{
@@ -75,7 +75,7 @@
return;
}
//鏄惁璁剧疆鏈夊唴閮ㄩ槻鍖�
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
RefreshSafeZone(bg1, HdlSafeguardLogic.Current.IsHadInternalDefenseArea());
});
@@ -127,16 +127,16 @@
new System.Threading.Thread(async () =>
{
var result = await HdlSafeguardLogic.Current.SetSafetyGarrisonByModel(GarrisonMode.AtHome);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
if (result == GarrisonMode.AtHome)
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonSuccess));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonSuccess));
}
else
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));
}
});
@@ -166,16 +166,16 @@
new System.Threading.Thread(async () =>
{
var result = await HdlSafeguardLogic.Current.RemoveSafetyGarrison(GarrisonMode.RemoveGarrison, true);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
if (result == 1)
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));
}
else
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));
}
});
})
@@ -208,16 +208,16 @@
new System.Threading.Thread(async () =>
{
var result = await HdlSafeguardLogic.Current.SetSafetyGarrisonByModel(GarrisonMode.AtHome);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
if (result == GarrisonMode.AtHome)
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess));
}
else
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));
}
});
})
@@ -244,16 +244,16 @@
new System.Threading.Thread(async () =>
{
var result = await HdlSafeguardLogic.Current.SetSafetyGarrisonByModel(GarrisonMode.RemoveHome);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
if (result == GarrisonMode.RemoveHome)
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess));
}
else
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetGarrisonFail));
}
});
})
@@ -280,16 +280,16 @@
new System.Threading.Thread(async () =>
{
var result = await HdlSafeguardLogic.Current.RemoveSafetyGarrison(GarrisonMode.RemoveGarrison, true);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
if (result == 1)
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess));
}
else
{
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonFail));
}
});
})
--
Gitblit v1.8.0