From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 272 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 213 insertions(+), 59 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 7bfb326..70d0230 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -27,7 +27,7 @@
public void ShowForm()
{
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText("闅愬尶涓荤晫闈�");
+ base.SetTitleText("璋冭瘯鑿滃崟鐣岄潰");
listView = new VerticalListRefreshControl(23);
listView.BackgroundColor = UserCenterColor.Current.White;
@@ -42,6 +42,15 @@
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
+
+ if (HdlUserCenterResourse.HideOption.StartDebugApp == 1)
+ {
+ //寮�鍚皟璇曟椂,涓嶅厑璁稿叧闂繖涓晫闈�
+ this.BackButtonClickEvent += (sender) =>
+ {
+ return;
+ };
+ }
}
/// <summary>
@@ -51,54 +60,56 @@
{
listView.RemoveAll();
- this.AddNormalRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
+ 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.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
+ this.AddNormalRowControl("褰撳墠韬唤", 400, HdlUserCenterResourse.ResidenceOption.AuthorityText, 400);
- this.AddTopButtomRowControl("璐﹀彿GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);
+ //this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
- this.AddNormalRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
+ //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.IsOtherShare == true ? "鏄�" : "鍚�", 400);
this.AddNormalRowControl("璐﹀彿绫诲瀷", 400, Common.Config.Instance.Home.AccountType.ToString(), 400);
this.AddNormalRowControl("杩滅▼杩炴帴", 400, ZigBee.Device.ZbGateway.IsRemote == true ? "鏄�" : "鍚�", 400);
- this.AddNormalRowControl("鎷ユ湁杩滅▼鏉冮檺", 400, ZigBee.Device.ZbGateway.AllowRemoteCtrl == true ? "鏄�" : "鍚�", 400);
+ this.AddNormalRowControl("鎷ユ湁杩滅▼鏉冮檺", 400, Common.Config.Instance.Home.IsRemoteControl == true ? "鏄�" : "鍚�", 400);
this.AddNormalRowControl("WIFI鍙橀噺", 400, Shared.Application.IsWifi == true ? "true" : "false", 400);
- if (ZigBee.Common.Application.FindGateWaySocket.busSocket == null)
+ 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, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);
+ this.AddNormalRowControl("Socket閾炬帴", 400, "宸插垵濮嬪寲", 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;
@@ -114,6 +125,92 @@
//妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
this.AddCheckReceviceGatewayRow();
+
+ 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(HdlFileNameResourse.SendAndReceveDataLog);
+ HdlUserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
+ });
+ }
+ else
+ {
+ HdlUserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ btnSwitchLog.IsSelected = false;
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(HdlFileNameResourse.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(HdlFileNameResourse.SocketReceiveDataLog);
+ HdlUserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 1;
+ });
+ }
+ else
+ {
+ HdlUserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
+ btnSocketReceiveLog.IsSelected = false;
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(HdlFileNameResourse.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, "鍒濆鍖栧畬鎴�");
+ });
+ };
+
+ 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);
@@ -137,34 +234,91 @@
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 (HdlUserCenterResourse.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();
+ };
+ }
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("璁板綍瀹氫綅", 500);
+ row1.AddBottomLine();
+ var btnGbsSwitch = row1.AddMostRightSwitchIcon();
+ btnGbsSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnGbsSwitch.IsSelected == true)
+ {
+ btnGbsSwitch.IsSelected = false;
+ HdlUserCenterResourse.HideOption.WriteGpsPoint = 0;
+ return;
+ }
+ this.ShowDialogInputForm("????", string.Empty, "璇疯緭鍏ヨ瘑鍒爜", (contr, value) =>
+ {
+ if (value == "542397")
+ {
+ HdlUserCenterResourse.HideOption.WriteGpsPoint = 1;
+ btnGbsSwitch.IsSelected = true;
+ }
+ contr.CloseDialog();
+ });
+ };
+
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
- row1.AddLeftCaption("鏀堕泦鍙戦�佸拰鎺ユ敹鐨勬暟鎹�", 600);
+ row1.AddLeftCaption("浣跨敤鏃х殑璁惧鑾峰彇鏂瑰紡", 600);
row1.AddBottomLine();
- var btnSwitchLog = row1.AddMostRightSwitchIcon();
- btnSwitchLog.ButtonClickEvent += (sender, e) =>
+ var btnSwitchDeviceMethord = row1.AddMostRightSwitchIcon();
+ btnSwitchDeviceMethord.IsSelected = HdlUserCenterResourse.HideOption.UseOldSearchDeviceMethord == 1;
+ btnSwitchDeviceMethord.ButtonClickEvent += (sender, e) =>
{
- if (btnSwitchLog.IsSelected == false)
- {
- this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍鍙戦�佸強鎺ユ敹鏁版嵁鐨勮褰�?", () =>
- {
- btnSwitchLog.IsSelected = true;
- HdlFileLogic.Current.DeleteFile(DirNameResourse.SendAndReceveDataLog);
- UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
- });
- }
- else
- {
- btnSwitchLog.IsSelected = false;
- var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SendAndReceveDataLog);
- if (txtvalue != null)
- {
- var form = new HideOptionFileContentForm();
- form.AddForm(string.Empty);
+ btnSwitchDeviceMethord.IsSelected = !btnSwitchDeviceMethord.IsSelected;
+ HdlUserCenterResourse.HideOption.UseOldSearchDeviceMethord = btnSwitchDeviceMethord.IsSelected == true ? 1 : 0;
+ };
- form.SetTextContent(txtvalue);
- }
- }
+ 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);
@@ -239,8 +393,8 @@
int waiteCount = 5;
this.ShowMassage(ShowMsgType.Confirm, "璇ユ搷浣滃皢绛夊緟" + waiteCount + "绉�,鏄惁缁х画锛�", () =>
{
- Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = new Dictionary<string, ZbGateway>();
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 1;
+ HdlGatewayResourse.DicReceiveGatewayTest = new Dictionary<string, ZbGateway>();
+ HdlUserCenterResourse.HideOption.CheckCanReceiveGateway = 1;
HdlThreadLogic.Current.RunThread(() =>
{
while (waiteCount > 0)
@@ -257,8 +411,8 @@
btnCount.Text = string.Empty;
});
//缁撴潫
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
- if (Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest.Count == 0)
+ HdlUserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ if (HdlGatewayResourse.DicReceiveGatewayTest.Count == 0)
{
this.ShowMassage(ShowMsgType.Normal, "鎶辨瓑,娌℃湁骞挎挱鍒颁换浣曠綉鍏�");
return;
@@ -282,10 +436,10 @@
/// </summary>
public override void CloseFormBefore()
{
- Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = null;
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
- UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
-
+ HdlGatewayResourse.DicReceiveGatewayTest = null;
+ HdlUserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ HdlUserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ HdlUserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
base.CloseFormBefore();
}
--
Gitblit v1.8.0