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 | 84 +++++++++++++++++++++++-------------------
1 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 564ee91..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;
@@ -43,7 +43,7 @@
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
- if (UserCenterResourse.HideOption.StartDebugApp == 1)
+ if (HdlUserCenterResourse.HideOption.StartDebugApp == 1)
{
//寮�鍚皟璇曟椂,涓嶅厑璁稿叧闂繖涓晫闈�
this.BackButtonClickEvent += (sender) =>
@@ -69,19 +69,19 @@
btnTemp.TextAlignment = TextAlignment.Center;
rowTemp.AddChidren(btnTemp);
- this.AddNormalRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
+ this.AddNormalRowControl("褰撳墠韬唤", 400, HdlUserCenterResourse.ResidenceOption.AuthorityText, 400);
//this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 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);
+ 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);
@@ -138,15 +138,15 @@
this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍鍙戦�佸強鎺ユ敹鏁版嵁鐨勮褰�?", () =>
{
btnSwitchLog.IsSelected = true;
- HdlFileLogic.Current.DeleteFile(DirNameResourse.SendAndReceveDataLog);
- UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
+ HdlFileLogic.Current.DeleteFile(HdlFileNameResourse.SendAndReceveDataLog);
+ HdlUserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
});
}
else
{
- UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ HdlUserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
btnSwitchLog.IsSelected = false;
- var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SendAndReceveDataLog);
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(HdlFileNameResourse.SendAndReceveDataLog);
if (txtvalue != null)
{
var form = new HideOptionFileContentForm();
@@ -169,15 +169,15 @@
this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍SocketReceive鐨勮褰�?", () =>
{
btnSocketReceiveLog.IsSelected = true;
- HdlFileLogic.Current.DeleteFile(DirNameResourse.SocketReceiveDataLog);
- UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 1;
+ HdlFileLogic.Current.DeleteFile(HdlFileNameResourse.SocketReceiveDataLog);
+ HdlUserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 1;
});
}
else
{
- UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
+ HdlUserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
btnSocketReceiveLog.IsSelected = false;
- var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SocketReceiveDataLog);
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(HdlFileNameResourse.SocketReceiveDataLog);
if (txtvalue != null)
{
var form = new HideOptionFileContentForm();
@@ -244,7 +244,7 @@
rowTemp.AddChidren(btnTemp);
//寮�鍚皟璇曞姛鑳�
- if (UserCenterResourse.HideOption.StartDebugApp == 1)
+ if (HdlUserCenterResourse.HideOption.StartDebugApp == 1)
{
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -269,34 +269,42 @@
};
}
-#if Android
row1 = new FrameRowControl(listView.rowSpace / 2);
row1.UseClickStatu = false;
listView.AddChidren(row1);
- row1.AddLeftCaption("涓婃姤GBS瀹氫綅鍔熻兘", 500);
+ row1.AddLeftCaption("璁板綍瀹氫綅", 500);
row1.AddBottomLine();
var btnGbsSwitch = row1.AddMostRightSwitchIcon();
- if (System.IO.File.Exists(DirNameResourse.OpenGbsFile) == true)
- {
- btnGbsSwitch.IsSelected = true;
- }
btnGbsSwitch.ButtonClickEvent += (sender, e) =>
{
- this.ShowMassage(ShowMsgType.Confirm, "娉ㄦ剰:寮�鍚垨鑰呭叧闂鍔熻兘浼氶噸鍚疉pp", () =>
+ if (btnGbsSwitch.IsSelected == true)
{
- btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;
- if (btnGbsSwitch.IsSelected == true)
+ btnGbsSwitch.IsSelected = false;
+ HdlUserCenterResourse.HideOption.WriteGpsPoint = 0;
+ return;
+ }
+ this.ShowDialogInputForm("????", string.Empty, "璇疯緭鍏ヨ瘑鍒爜", (contr, value) =>
+ {
+ if (value == "542397")
{
- HdlFileLogic.Current.SaveTextToFile(DirNameResourse.OpenGbsFile, "nmsl");
+ HdlUserCenterResourse.HideOption.WriteGpsPoint = 1;
+ btnGbsSwitch.IsSelected = true;
}
- else
- {
- HdlFileLogic.Current.DeleteFile(DirNameResourse.OpenGbsFile);
- }
- HDLUtils.RestartApp();
+ contr.CloseDialog();
});
};
-#endif
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("浣跨敤鏃х殑璁惧鑾峰彇鏂瑰紡", 600);
+ row1.AddBottomLine();
+ var btnSwitchDeviceMethord = row1.AddMostRightSwitchIcon();
+ btnSwitchDeviceMethord.IsSelected = HdlUserCenterResourse.HideOption.UseOldSearchDeviceMethord == 1;
+ btnSwitchDeviceMethord.ButtonClickEvent += (sender, e) =>
+ {
+ btnSwitchDeviceMethord.IsSelected = !btnSwitchDeviceMethord.IsSelected;
+ HdlUserCenterResourse.HideOption.UseOldSearchDeviceMethord = btnSwitchDeviceMethord.IsSelected == true ? 1 : 0;
+ };
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -385,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)
@@ -403,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;
@@ -428,10 +436,10 @@
/// </summary>
public override void CloseFormBefore()
{
- UserCenterResourse.DicReceiveGatewayTest = null;
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
- UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
- UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
+ HdlGatewayResourse.DicReceiveGatewayTest = null;
+ HdlUserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ HdlUserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ HdlUserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
base.CloseFormBefore();
}
--
Gitblit v1.8.0