From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 207 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 172 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index ea1a998..40234dc 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);
@@ -66,29 +67,20 @@
this.AddNormalRowControl("WIFI鍙橀噺", 400, Shared.Application.IsWifi == true ? "true" : "false", 400);
- int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
+ if (ZigBee.Common.Application.FindGateWaySocket.busSocket == null)
+ {
+ this.AddNormalRowControl("Socket閾炬帴", 400, "鏈垵濮嬪寲", 400);
+ }
+ else
+ {
+ this.AddNormalRowControl("Socket閾炬帴", 400, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);
+ }
+
+ 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;
@@ -102,27 +94,105 @@
row1.AddMostRightView(count + "涓�", 400);
row1.AddBottomLine();
+ //妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+ this.AddCheckReceviceGatewayRow();
+
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
- row1.AddLeftCaption("娓呴櫎缂撳瓨鏂囦欢", 500);
+ row1.AddLeftCaption("鏌ョ湅缂撳瓨鏂囦欢", 500);
row1.AddRightArrow();
+ row1.AddBottomLine();
row1.ButtonClickEvent += (sender, e) =>
{
- this.ShowMassage(ShowMsgType.Confirm, "鏄惁娓呴櫎缂撳瓨鏂囦欢", () =>
+ var form = new HideOptionDirectoryListForm();
+ form.AddForm();
+ };
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("璁惧缂撳瓨鍙橀噺", 500);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionMemoryListDeviceForm();
+ 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)
{
- var myPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory);
- try
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍鍙戦�佸強鎺ユ敹鏁版嵁鐨勮褰�?", () =>
{
- System.IO.Directory.Delete(myPath, true);
- System.IO.Directory.CreateDirectory(myPath);
- this.ShowMassage(ShowMsgType.Tip, "娓呴櫎缂撳瓨鏂囦欢瀹屾垚,璇烽噸鏂扮櫥闄�");
- UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account);
- }
- catch (Exception ex)
+ 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)
{
- this.ShowMassage(ShowMsgType.Error, "娓呴櫎缂撳瓨鏂囦欢寮傚父");
- HdlLogLogic.Current.WriteLog(ex, "娓呴櫎缂撳瓨鏂囦欢寮傚父");
+ 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, "鍒濆鍖栧畬鎴�");
});
};
@@ -134,9 +204,9 @@
{
this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶Log鏂囦欢", () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await HdlBackupLogic.Current.UpLoadLogBackup();
+ HdlBackupLogic.Current.UpLoadLogBackup();
});
});
};
@@ -182,6 +252,73 @@
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()
+ {
+ UserCenterResourse.DicReceiveGatewayTest = null;
+ UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
+
+ base.CloseFormBefore();
+ }
+
#endregion
}
}
--
Gitblit v1.8.0