From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 66242e7..1b5698f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using ZigBee.Device;
namespace Shared.Phone.UserCenter.HideOption
{
@@ -54,7 +55,7 @@
this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
- this.AddTopButtomRowControl("璐﹀彿GUID", 400, Common.Config.Instance.Home.MainUserDistributedMark, 900);
+ this.AddTopButtomRowControl("璐﹀彿GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);
this.AddNormalRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
@@ -88,7 +89,7 @@
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.UseClickStatu = false;
- row1.AddLeftCaption("骞挎挱鎼滃埌鐨勭綉鍏�", 400);
+ row1.AddLeftCaption("缂撳瓨涓殑缃戝叧", 400);
if (count > 0)
{
row1.UseClickStatu = true;
@@ -102,6 +103,50 @@
row1.AddMostRightView(count + "涓�", 400);
row1.AddBottomLine();
+ //妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+ this.AddCheckReceviceGatewayRow();
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("娓呴櫎缂撳瓨鏂囦欢", 500);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionDirectoryListForm();
+ form.AddForm();
+ };
+
+#if Android
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("GBS瀹氫綅", 500);
+ row1.AddBottomLine();
+ var btnGbsSwitch = row1.AddMostRightSwitchIcon();
+ string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
+ if (System.IO.File.Exists(checkFile) == true)
+ {
+ btnGbsSwitch.IsSelected = true;
+ }
+ btnGbsSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "娉ㄦ剰:寮�鍚垨鑰呭叧闂鍔熻兘浼氶噸鍚疉pp", () =>
+ {
+ btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;
+ if (btnGbsSwitch.IsSelected == true)
+ {
+ var file = System.IO.File.Create(checkFile);
+ file.Close();
+ }
+ else
+ {
+ System.IO.File.Delete(checkFile);
+ }
+ HDLUtils.RestartApp();
+ });
+ };
+#endif
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.AddLeftCaption("涓婁紶Log", 500);
@@ -158,6 +203,71 @@
return row1;
}
+ /// <summary>
+ /// 妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+ /// </summary>
+ private void AddCheckReceviceGatewayRow()
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�", 700);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ var btnCount = row1.AddMostRightView("", 400);
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ int waiteCount = 5;
+ this.ShowMassage(ShowMsgType.Confirm, "璇ユ搷浣滃皢绛夊緟" + waiteCount + "绉�,鏄惁缁х画锛�", () =>
+ {
+ Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = new Dictionary<string, ZbGateway>();
+ UserCenterResourse.HideOption.CheckCanReceiveGateway = 1;
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ while (waiteCount > 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnCount.Text = "璇风瓑寰�" + waiteCount + "绉�";
+ });
+ System.Threading.Thread.Sleep(1000);
+ waiteCount--;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnCount.Text = string.Empty;
+ });
+ //缁撴潫
+ UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ if (Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest.Count == 0)
+ {
+ this.ShowMassage(ShowMsgType.Normal, "鎶辨瓑,娌℃湁骞挎挱鍒颁换浣曠綉鍏�");
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form = new HideOptionGatewayListForm();
+ form.AddForm(3);
+ });
+ });
+ });
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = null;
+ UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+
+ base.CloseFormBefore();
+ }
+
#endregion
}
}
--
Gitblit v1.8.0