From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs |  102 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index 17beacf..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(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;
+                    });
+                }
             };
         }
 

--
Gitblit v1.8.0