From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 313 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 268 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 5daaef9..564ee91 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
{
@@ -41,6 +42,15 @@
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
+
+ if (UserCenterResourse.HideOption.StartDebugApp == 1)
+ {
+ //寮�鍚皟璇曟椂,涓嶅厑璁稿叧闂繖涓晫闈�
+ this.BackButtonClickEvent += (sender) =>
+ {
+ return;
+ };
+ }
}
/// <summary>
@@ -50,11 +60,20 @@
{
listView.RemoveAll();
+ var rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
+ var btnTemp = new NormalViewControl(600, 100, true);
+ btnTemp.Text = "涓�鑸俊鎭儴鍒�";
+ btnTemp.Gravity = Gravity.Center;
+ btnTemp.TextSize = 16;
+ btnTemp.IsBold = true;
+ btnTemp.TextAlignment = TextAlignment.Center;
+ rowTemp.AddChidren(btnTemp);
+
this.AddNormalRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
- this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
+ //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 +85,31 @@
this.AddNormalRowControl("WIFI鍙橀噺", 400, Shared.Application.IsWifi == true ? "true" : "false", 400);
- int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
+ rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
+ btnTemp = new NormalViewControl(600, 100, true);
+ btnTemp.Text = "閾炬帴璋冭瘯閮ㄥ垎";
+ btnTemp.Gravity = Gravity.Center;
+ btnTemp.TextSize = 16;
+ btnTemp.IsBold = true;
+ btnTemp.TextAlignment = TextAlignment.Center;
+ rowTemp.AddChidren(btnTemp);
+
+ this.AddNormalRowControl("鎵嬫満鑾峰彇鐨処P", 600, new Shared.Net.NetWiFi().BroadcastIpAddress.ToString(), 600);
+
+ if (ZigBee.Common.Application.FindGateWaySocket.udpClient == null)
+ {
+ this.AddNormalRowControl("Socket閾炬帴", 400, "鏈垵濮嬪寲", 400);
+ }
+ else
+ {
+ this.AddNormalRowControl("Socket閾炬帴", 400, "宸插垵濮嬪寲", 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,40 +123,160 @@
row1.AddMostRightView(count + "涓�", 400);
row1.AddBottomLine();
+ //妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+ this.AddCheckReceviceGatewayRow();
+
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
- row1.AddLeftCaption("娓呴櫎缂撳瓨鏂囦欢", 500);
+ 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, "鏄惁娓呴櫎缂撳瓨鏂囦欢", () =>
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁閲嶆柊鍒濆鍖朣ocket瀵硅薄?", () =>
{
- var myPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory);
- try
- {
- System.IO.Directory.Delete(myPath, true);
- System.IO.Directory.CreateDirectory(myPath);
- this.ShowMassage(ShowMsgType.Tip, "娓呴櫎缂撳瓨鏂囦欢瀹屾垚,璇烽噸鏂扮櫥闄�");
- UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account);
- }
- catch (Exception ex)
- {
- this.ShowMassage(ShowMsgType.Error, "娓呴櫎缂撳瓨鏂囦欢寮傚父");
- HdlLogLogic.Current.WriteLog(ex, "娓呴櫎缂撳瓨鏂囦欢寮傚父");
- }
+ ZigBee.Common.Application.FindGateWaySocket.Stop();
+ ZigBee.Common.Application.FindGateWaySocket.Start();
+ this.ShowMassage(ShowMsgType.Tip, "鍒濆鍖栧畬鎴�");
});
};
+
+ rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
+ btnTemp = new NormalViewControl(600, 100, true);
+ btnTemp.Text = "鏌ョ湅缂撳瓨閮ㄥ垎";
+ btnTemp.Gravity = Gravity.Center;
+ btnTemp.TextSize = 16;
+ btnTemp.IsBold = true;
+ btnTemp.TextAlignment = TextAlignment.Center;
+ rowTemp.AddChidren(btnTemp);
+
+ 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();
+ };
+
+ 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();
+ };
+
+ rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
+ btnTemp = new NormalViewControl(600, 100, true);
+ btnTemp.Text = "鍏朵粬閮ㄥ垎";
+ btnTemp.Gravity = Gravity.Center;
+ btnTemp.TextSize = 16;
+ btnTemp.IsBold = true;
+ btnTemp.TextAlignment = TextAlignment.Center;
+ rowTemp.AddChidren(btnTemp);
+
+ //寮�鍚皟璇曞姛鑳�
+ if (UserCenterResourse.HideOption.StartDebugApp == 1)
+ {
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("鎴愬憳鍒楄〃", 500);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new Member.MemberListForm();
+ 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 HdlBackup.HdlBackupListForm();
+ form.AddForm();
+ };
+ }
#if Android
row1 = new FrameRowControl(listView.rowSpace / 2);
row1.UseClickStatu = false;
listView.AddChidren(row1);
- row1.AddLeftCaption("GBS瀹氫綅", 500);
+ 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)
+ if (System.IO.File.Exists(DirNameResourse.OpenGbsFile) == true)
{
btnGbsSwitch.IsSelected = true;
}
@@ -146,17 +287,32 @@
btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;
if (btnGbsSwitch.IsSelected == true)
{
- var file = System.IO.File.Create(checkFile);
- file.Close();
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.OpenGbsFile, "nmsl");
}
else
{
- System.IO.File.Delete(checkFile);
+ HdlFileLogic.Current.DeleteFile(DirNameResourse.OpenGbsFile);
}
HDLUtils.RestartApp();
});
};
#endif
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("閲嶇疆瀵煎叆鏍囪瘑", 500);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁閲嶇疆杩欎釜浣忓畢鐨勫鍏ユ爣璇�?\r\n閲嶇疆涔嬪悗鍙互鍐嶆瀵煎叆缃戝叧", () =>
+ {
+ Common.Config.Instance.Home.SendTemplateSuccess = false;
+ Common.Config.Instance.Home.Save();
+ this.ShowMassage(ShowMsgType.Tip, "閲嶇疆瀹屾垚");
+ });
+ };
+
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.AddLeftCaption("涓婁紶Log", 500);
@@ -165,9 +321,9 @@
{
this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶Log鏂囦欢", () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await HdlBackupLogic.Current.UpLoadLogBackup();
+ HdlBackupLogic.Current.UpLoadLogBackup();
});
});
};
@@ -213,6 +369,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