From 0e9129254837bf36523d69e735527448f71d6337 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 01 二月 2021 14:20:26 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/HDL/Common/CommonUtlis.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
index 933002e..b023a58 100644
--- a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
+++ b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
@@ -8,8 +8,8 @@
{
public class CommonUtlis
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� Current___________________________
/// <summary>
/// 閫氱敤鏂规硶
/// </summary>
@@ -159,14 +159,14 @@
var mes = "Your phone has been ROOT and you cannot use the APP.";
#endif
- if (Shared.HDLUtils.ISJailBreak ()) {
+ //if (Shared.HDLUtils.ISJailBreak ()) {
- Alert alert = new Alert ("", mes, Language.StringByID (SimpleControl.R.MyInternationalizationString.Confrim));
- alert.ResultEventHandler += (sender2, e2) => {
- Shared.HDLUtils.ExitApplication ();
- };
- alert.Show ();
- }
+ // Alert alert = new Alert ("", mes, Language.StringByID (SimpleControl.R.MyInternationalizationString.Confrim));
+ // alert.ResultEventHandler += (sender2, e2) => {
+ // Shared.HDLUtils.ExitApplication ();
+ // };
+ // alert.Show ();
+ //}
}
@@ -466,7 +466,6 @@
{
var backuplist = IO.FileUtils.ReadFiles ();
var mFileList = backuplist.FindAll ((obj) => obj != "null" && obj != UserConfig.configFile && obj != UserInfo.GlobalRegisterFile && obj != "AccountListDB" && obj != CommonConfig.ConfigFile && (!obj.Contains (".json")));
-
if (mFileList.Count <= 0) return;
int resultCount = mFileList.Count;
--
Gitblit v1.8.0