From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 564ee91..8cf8634 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -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)
- {
- HdlFileLogic.Current.SaveTextToFile(DirNameResourse.OpenGbsFile, "nmsl");
- }
- else
- {
- HdlFileLogic.Current.DeleteFile(DirNameResourse.OpenGbsFile);
- }
- HDLUtils.RestartApp();
- });
+ btnGbsSwitch.IsSelected = false;
+ UserCenterResourse.HideOption.WriteGpsPoint = 0;
+ return;
+ }
+ this.ShowDialogInputForm("????", string.Empty, "璇疯緭鍏ヨ瘑鍒爜", (contr, value) =>
+ {
+ if (value == "542397")
+ {
+ UserCenterResourse.HideOption.WriteGpsPoint = 1;
+ btnGbsSwitch.IsSelected = true;
+ }
+ contr.CloseDialog();
+ });
};
-#endif
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("浣跨敤鏃х殑璁惧鑾峰彇鏂瑰紡", 600);
+ row1.AddBottomLine();
+ var btnSwitchDeviceMethord = row1.AddMostRightSwitchIcon();
+ btnSwitchDeviceMethord.IsSelected = UserCenterResourse.HideOption.UseOldSearchDeviceMethord == 1;
+ btnSwitchDeviceMethord.ButtonClickEvent += (sender, e) =>
+ {
+ btnSwitchDeviceMethord.IsSelected = !btnSwitchDeviceMethord.IsSelected;
+ UserCenterResourse.HideOption.UseOldSearchDeviceMethord = btnSwitchDeviceMethord.IsSelected == true ? 1 : 0;
+ };
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -328,6 +336,16 @@
});
};
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("钃濈墮娴嬭瘯", 500);
+ row1.AddRightArrow();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new AndroidBluetoothTestForm1();
+ form.AddForm();
+ };
+
listView.AdjustRealHeight(Application.GetRealHeight(23));
}
--
Gitblit v1.8.0