From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 136 +++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 2526f82..40234dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -76,29 +76,11 @@
this.AddNormalRowControl("Socket閾炬帴", 400, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);
}
- int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
+ int count = ZbGateway.GateWayList.Count;
var row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.UseClickStatu = false;
- row1.AddLeftCaption("鏈湴缃戝叧", 400);
- if (count > 0)
- {
- row1.UseClickStatu = true;
- row1.AddRightArrow();
- row1.ButtonClickEvent += (sender, e) =>
- {
- var form = new HideOptionGatewayListForm();
- form.AddForm(1);
- };
- }
- row1.AddMostRightView(count + "涓�", 400);
- row1.AddBottomLine();
-
- count = ZigBee.Device.ZbGateway.GateWayList.Count;
- row1 = new FrameRowControl(listView.rowSpace / 2);
- listView.AddChidren(row1);
- row1.UseClickStatu = false;
- row1.AddLeftCaption("缂撳瓨涓殑缃戝叧", 400);
+ row1.AddLeftCaption("骞挎挱鍒扮殑缃戝叧", 400);
if (count > 0)
{
row1.UseClickStatu = true;
@@ -126,36 +108,6 @@
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("璁惧缂撳瓨鍙橀噺", 500);
@@ -167,6 +119,82 @@
form.AddForm();
};
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("鏀堕泦鍙戦�佸拰鎺ユ敹鐨勬暟鎹�", 600);
+ row1.AddBottomLine();
+ var btnSwitchLog = row1.AddMostRightSwitchIcon();
+ btnSwitchLog.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnSwitchLog.IsSelected == false)
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍鍙戦�佸強鎺ユ敹鏁版嵁鐨勮褰�?", () =>
+ {
+ btnSwitchLog.IsSelected = true;
+ HdlFileLogic.Current.DeleteFile(DirNameResourse.SendAndReceveDataLog);
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
+ });
+ }
+ else
+ {
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ btnSwitchLog.IsSelected = false;
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SendAndReceveDataLog);
+ if (txtvalue != null)
+ {
+ var form = new HideOptionFileContentForm();
+ form.AddForm(string.Empty);
+
+ form.SetTextContent(txtvalue);
+ }
+ }
+ };
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("SocketReceive", 600);
+ row1.AddBottomLine();
+ var btnSocketReceiveLog = row1.AddMostRightSwitchIcon();
+ btnSocketReceiveLog.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnSocketReceiveLog.IsSelected == false)
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍SocketReceive鐨勮褰�?", () =>
+ {
+ btnSocketReceiveLog.IsSelected = true;
+ HdlFileLogic.Current.DeleteFile(DirNameResourse.SocketReceiveDataLog);
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 1;
+ });
+ }
+ else
+ {
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
+ btnSocketReceiveLog.IsSelected = false;
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SocketReceiveDataLog);
+ if (txtvalue != null)
+ {
+ var form = new HideOptionFileContentForm();
+ form.AddForm(string.Empty);
+
+ form.SetTextContent(txtvalue);
+ }
+ }
+ };
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("閲嶆柊鍒濆鍖朣ocket", 600);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁閲嶆柊鍒濆鍖朣ocket瀵硅薄?", () =>
+ {
+ ZigBee.Common.Application.FindGateWaySocket.Stop();
+ ZigBee.Common.Application.FindGateWaySocket.Start();
+ this.ShowMassage(ShowMsgType.Tip, "鍒濆鍖栧畬鎴�");
+ });
+ };
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -176,9 +204,9 @@
{
this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶Log鏂囦欢", () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await HdlBackupLogic.Current.UpLoadLogBackup();
+ HdlBackupLogic.Current.UpLoadLogBackup();
});
});
};
@@ -283,8 +311,10 @@
/// </summary>
public override void CloseFormBefore()
{
- Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = null;
+ UserCenterResourse.DicReceiveGatewayTest = null;
UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
base.CloseFormBefore();
}
--
Gitblit v1.8.0