From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 10:34:17 +0800
Subject: [PATCH] IOS使用新的项目名称
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 121 +++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index 2c46711..437df5b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -52,11 +52,9 @@
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- //鍒濆鍖栧彸涓婅鍥炬爣
- this.InitTopRightIcon();
- }
+
+ //鍒濆鍖栧彸涓婅鍥炬爣
+ this.InitTopRightIcon();
//鍒濆鍖栧叏閮ㄥ唴瀛樹俊鎭�
this.InitAllMemoryData();
@@ -168,28 +166,84 @@
/// </summary>
private void InitTopRightIcon()
{
- var btnIcon = new MostRightIconControl(69, 69);
- btnIcon.UnSelectedImagePath = "Item/More.png";
- topFrameLayout.AddChidren(btnIcon);
- btnIcon.InitControl();
- btnIcon.ButtonClickEvent += (sender, e) =>
+ //蹇嵎鏂瑰紡
+ var btnShortCut = new MostRightIconControl(69, 69);
+ btnShortCut.UnSelectedImagePath = "Safeguard/SafetyShortcut.png";
+ btnShortCut.SelectedImagePath = "Safeguard/SafetyShortcutSelected.png";
+
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
- //鑿滃崟鎺т欢
- var frameMenu = new TopRightMenuControl(this, 2);
- //闃插尯鍒楄〃
- string menu1 = Language.StringByID(R.MyInternationalizationString.uGarrisonAreaList);
- frameMenu.AddRowMenu(menu1, "Item/GarrisonList.png", "Item/GarrisonListSelected.png", () =>
+ //蹇嵎鏂瑰紡鍚戝乏绉诲姩
+ btnShortCut.X = Application.GetRealWidth(855);
+
+ var btnIcon = new MostRightIconControl(69, 69);
+ btnIcon.UnSelectedImagePath = "Item/More.png";
+ topFrameLayout.AddChidren(btnIcon);
+ btnIcon.InitControl();
+ btnIcon.ButtonClickEvent += (sender, e) =>
{
- var form = new GarrisonAreaListMenuForm();
- form.AddForm();
- });
- //瀵嗙爜璁剧疆
- string menu2 = Language.StringByID(R.MyInternationalizationString.uPasswordSettion);
- frameMenu.AddRowMenu(menu2, "Item/PswSettion.png", "Item/PswSettionSelected.png", () =>
+ //鑿滃崟鎺т欢
+ var frameMenu = new TopRightMenuControl(2);
+ //闃插尯鍒楄〃
+ string menu1 = Language.StringByID(R.MyInternationalizationString.uGarrisonAreaList);
+ frameMenu.AddRowMenu(menu1, "Item/GarrisonList.png", "Item/GarrisonListSelected.png", () =>
+ {
+ HdlCheckLogic.Current.CheckSecondarySecurity(() =>
+ {
+ //楠岃瘉鎴愬姛
+ var form = new GarrisonAreaListMenuForm();
+ form.AddForm();
+ },
+ () =>
+ {
+ //璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+ string msg = Language.StringByID(R.MyInternationalizationString.uGotoCenterAndSetSecondAuthentication).Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ var form = new UserMain.SecondAuthenticationForm();
+ form.AddForm();
+ });
+ });
+ });
+ //瀵嗙爜璁剧疆
+ string menu2 = Language.StringByID(R.MyInternationalizationString.uPasswordSettion);
+ frameMenu.AddRowMenu(menu2, "Item/PswSettion.png", "Item/PswSettionSelected.png", () =>
+ {
+ var form = new PasswordMenuForm();
+ form.AddForm();
+ });
+ };
+ }
+
+ topFrameLayout.AddChidren(btnShortCut);
+ btnShortCut.InitControl();
+ if (UserCenterResourse.Option.SafetyShortcut == true)
+ {
+ //浣跨敤蹇嵎鏂瑰紡
+ btnShortCut.IsSelected = true;
+ }
+ btnShortCut.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnShortCut.IsSelected == true)
{
- var form = new SafetyPasswordMenuForm();
- form.AddForm();
- });
+ //纭畾鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勶紵
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uCancelSafetyShortcutMsg), () =>
+ {
+ UserCenterResourse.Option.SafetyShortcut = false;
+ UserCenterResourse.Option.Save();
+ btnShortCut.IsSelected = false;
+ });
+ }
+ else
+ {
+ //纭畾鍒涘缓銆屽畨闃层�嶆嵎寰勫埌涓婚〉锛�
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uCreatSafetyShortcutMsg), () =>
+ {
+ UserCenterResourse.Option.SafetyShortcut = true;
+ UserCenterResourse.Option.Save();
+ btnShortCut.IsSelected = true;
+ });
+ }
};
}
@@ -444,16 +498,19 @@
{
return;
}
- var timeValue = (DateTime.Now - oldGetOnlineTime).Milliseconds;
- if (timeValue <= 10000)
+ if (oldGetOnlineTime.Year != 1900)
{
- //鏈�灏戣闂撮殧鍗佺,鎵嶅幓閲嶆柊鑾峰彇
- return;
+ var timeValue = (DateTime.Now - oldGetOnlineTime).TotalSeconds;
+ if (timeValue < 10)
+ {
+ //鏈�灏戣闂撮殧鍗佺,鎵嶅幓閲嶆柊鑾峰彇
+ return;
+ }
}
oldGetOnlineTime = DateTime.Now;
//浠庤澶囧垪琛ㄤ腑鑾峰彇鍦ㄧ嚎鐘舵��
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//棣栧厛鑾峰彇杩欎簺浼犳劅鍣ㄦ墍鍦ㄧ殑缃戝叧
var listWay = new List<ZbGateway>();
@@ -474,18 +531,18 @@
//鐣岄潰鍏抽棴
return;
}
- await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);
+ Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);
}
});
}
/// <summary>
- /// 鎺ュ彈璁惧鍦ㄧ嚎鎺ㄩ��(涓嶈蹇樿鏈�鍚庡畠浼氭帹閫佷竴涓狽ull鐨勪笢瑗胯繃鏉�)
+ /// 鎺ュ彈璁惧鍦ㄧ嚎鎺ㄩ��
/// </summary>
/// <param name="device"></param>
private void ReceiveDeviceStatuPush(CommonDevice device)
{
- if (this.Parent == null || device == null)
+ if (this.Parent == null)
{
//鐣岄潰鍏抽棴
return;
--
Gitblit v1.8.0