From 8615f80ef3a66cb115298510c625db4cb2ba6f8e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 02 七月 2020 12:08:14 +0800
Subject: [PATCH] 2020-07-02-1
---
ZigbeeApp/Shared/Common/CommonPage.cs | 118 ++++++++++++----------------------------------------------
1 files changed, 25 insertions(+), 93 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index e9bbe31..572bdba 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -43,26 +43,14 @@
Application.MainPage.AddChidren(Loading);
//}
Phone.UserView.HomePage.Instance.InitPage();
-
- var roomList = new Shared.Phone.Device.Room.RoomManagement();
-
- Instance.AddLeftView(roomList);
- roomList.Show();
}
- public static string SoftTitle = "ZigBee";
- /// <summary>
- /// 鐭俊妯℃澘缂栧彿
- /// </summary>
- public static int SoftSmsType = 0;
- public static string LogoString = @"Logo/Logo.png";
- public static string RegisterLogoString = @"Logo/Register_logo.png";
- public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
- //public static string RequestHttpsHost = "http://172.16.2.192:13061";
+ //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
+ public static string RequestHttpsHost = "https://global.hdlcontrol.com/ProposedProductionApi";
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.19121201";
+ public static string CodeIDString = "1.1.0120061701";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -85,10 +73,6 @@
/// </summary>
public static int XLeft = 58;
/// <summary>
- /// button楂樺害--110
- /// </summary>
- public static int ButtonHeight = 110;
- /// <summary>
/// 浣跨敤鐨勮瑷�
/// </summary>
public static string ZigBeeLanguage
@@ -99,10 +83,6 @@
}
}
/// <summary>
- /// 澶ф帶浠跺渾瑙� --- 10銆備笉鏄笉鍗婂渾閭ｇ銆�
- /// </summary>
- public static uint BigFormRadius = 10;
- /// <summary>
/// 榛樿鎵嬫満鍖哄彿涓�86涓浗澶ч檰
/// </summary>
public static string PhoneZoneStr = "86";
@@ -111,46 +91,9 @@
/// </summary>
public static string ZoneNameStr = "涓浗澶ч檰";
/// <summary>
- /// 璺濈椤剁楂樺害--80 鐘舵�佹爮楂樺害
- /// </summary>
- public static int NavigationTitle_Y = 80;
- /// <summary>
- /// 琛岄珮--180
- /// </summary>
- public static int RowHeight = 180;
- /// <summary>
/// APP瀹藉害 -- 1080
/// </summary>
public static int AppRealWidth = 1080;
- /// <summary>
- /// APP楂樺害 -- 1920
- /// </summary>
- public static int AppRealHeight = 1920;
- /// <summary>
- /// 杩斿洖閿窛绂诲乏杈圭殑璺濈 30
- /// </summary>
- public static int Navigation_X = 30;
- /// <summary>
- /// 瀵艰埅鏍忛珮搴�-220
- /// </summary>
- public static int Navigation_Height = 220;
- /// <summary>
- /// 搴曡竟鏍忛珮搴�
- /// </summary>
- public const int TabbarHeight = 141;
- /// <summary>
- /// 绾挎潯鐨勯珮搴�--瀹為檯鍍忕礌3
- /// </summary>
- public static int LineHeight = 3;
- /// <summary>
- /// 鏁翠釜鍦烘櫙寤舵椂鏃堕棿--60绉�
- /// </summary>
- public static int SceneDelayTime = 60;
-
- /// <summary>
- /// 闂撮殧澶氶暱鏃堕棿璇诲彇璁惧鐘舵�� 鍗曚綅 绉� --榛樿30
- /// </summary>
- public static int ReadDeviceStatuSpan = 30;
/// <summary>
/// 璇诲彇澶氬皯椤�--999
/// </summary>
@@ -168,21 +111,10 @@
/// 鐢ㄤ簬楠岃瘉閭姝ｅ垯琛ㄨ揪寮�
/// </summary>
public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
-
-
- //public static Encoding EncodingUTF8 = Encoding.UTF8;
- //public static Encoding EncodingGB2312 = Encoding.GetEncoding("gb2312");
- public static bool IsRemote = false;
- public static bool FindGateway = false;
/// <summary>
/// 褰撳墠缃戠粶杩炴帴鐨勬ā寮� 0:娌℃湁缃戠粶 1锛氳繙绋嬭繛鎺ワ紝涔熷彨3G,4G 2锛歐IFI
/// </summary>
public static int nowNetworkMode = 0;
- /// <summary>
- /// 鍗犱綅瀛椾綋澶у皬
- /// 11
- /// </summary>
- public static int PlaceHolderTextSize = 11;
/// <summary>
/// 瀹夊崜鐨勭郴缁熻繑鍥炴寜閿兘鍚︽寜涓�(姣斿鍦ㄥ浠借繕鍘熸椂,涓嶈兘鎸変笅杩斿洖閿�)
/// </summary>
@@ -379,30 +311,30 @@
}
}
}
+ }
+
+ /// <summary>
+ /// 鐧诲嚭
+ /// </summary>
+ public void SingOut()
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //璁惧畾涓�涓椂闂�
+ Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+ Config.Instance.Save();
+ CommonPage.Instance.RemoveAll();
+ CommonPage.Instance.Show();
+ var login = new Phone.Login.AccountLoginForm();
+ CommonPage.Instance.AddChidren(login);
+ login.ShowForm();
+ });
+ }
+ catch { }
}
-
- /// <summary>
- /// 鐧诲嚭
- /// </summary>
- public void SingOut()
- {
- try
- {
- Application.RunOnMainThread(() =>
- {
- //璁惧畾涓�涓椂闂�
- Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
- Config.Instance.Save();
- CommonPage.Instance.RemoveAll();
- CommonPage.Instance.Show();
- var login = new Phone.Device.Account.AccountLogin();
- CommonPage.Instance.AddChidren(login);
- login.Show();
- });
- }
- catch { }
- }
/// <summary>
/// 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹�
/// </summary>
--
Gitblit v1.8.0