From be95e839f40eb3ddf64706b60cba6dfcf4fad5e5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 四月 2020 14:31:44 +0800
Subject: [PATCH] 2020-04-03 1.去掉登录前ping百度域名的网络监测。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 16 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 121ba5d..a246b63 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -6,6 +6,11 @@
{
public static class UserMiddle
{
+ //public static Button AppBtnTip = new Button () {
+ // Height = Application.GetRealHeight (140),
+ // BackgroundColor = 0xFFD7D7D7,
+ //};
+
public static int userMenuItemHeight {
get {
@@ -175,6 +180,21 @@
}
#endregion
+ //public static void CleanPageView ()
+ //{
+ // FavoriteRoom.RemoveAll ();
+ // FavoriteBodyView.RemoveAll ();
+ // FavoritePageView.RemoveAll ();
+ // DeviceView.RemoveAll ();
+ // DeviceBodyView.RemoveAll ();
+ // DevicePageView.RemoveAll ();
+ // RoomBodyView.RemoveAll ();
+ // RoomPageView.RemoveAll ();
+ // SettingView.RemoveAll ();
+ // SettingBodyView.RemoveAll ();
+ // SettingPageView.RemoveAll ();
+ // UserPageView.RemoveAll ();
+ //}
static void CleanPageView (FrameLayout BodyView)
{
FavoriteRoom.RemoveAll ();
@@ -192,7 +212,7 @@
BodyView.AddChidren (UserMenuItem);
foreach (var thread in UserMiddle.updateSensorhreadList) {
thread.Abort ();
- Console.WriteLine ("abortThread");
+ Utlis.WriteLine ("abortThread");
}
UserMiddle.updateSensorhreadList.Clear ();
}
@@ -208,20 +228,24 @@
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
//if (UserConfig.Instance.GatewayList.Count == 0) {
- //2020-01-11 Mac娌＄粦瀹氬苟涓斾负涓昏处鍙� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
+ //2020-01-11 Mac娌＄粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
if (bFromLogin) {
- if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty () && MainPage.LoginUser.AccountType == 0) {
+ if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
+ if (guidePageView != null) {
+ guidePageView.RemoveAll ();
+ guidePageView.RemoveFromParent ();
+ }
UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
var guide = new GuideAddResidence ();
guide.IsHideBack = true;
guidePageView.AddChidren (guide);
- guide.ShowHomeList (true);
+ guide.ShowHomeView (true);
guidePageView.PageIndex = 0;
MainPage.LoginUser.LastTime = DateTime.MinValue;
MainPage.LoginUser.SaveUserInfo ();
- guidePageView.PageChange += (ddf, ffd) => {
- if (ffd < guidePageView.ChildrenCount - 1) {
+ guidePageView.PageChange += (sender, e) => {
+ if (e < guidePageView.ChildrenCount - 1) {
guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
}
};
@@ -242,6 +266,8 @@
MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
MainPage.LoginUser.LastTime = DateTime.Now;
MainPage.LoginUser.SaveUserInfo ();
+ //2020-01-14 鐧诲綍鎴愬姛鍚庯紝鍒锋柊涓�娆″綋鍓嶄綇瀹呯綉鍏�
+ GetNowHomeGatewayAfterLoginSuccess ();
} else if (!string.IsNullOrEmpty (revertObj.StateCode)) {
MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
MainPage.LoginUser.SaveUserInfo ();
@@ -272,6 +298,7 @@
//SystemRemote.LinkRemote ("", "", "",true);
if (null != UserPageView.Parent) {
if (guidePageView.Parent != null) {
+ guidePageView.RemoveAll ();
guidePageView.RemoveFromParent ();
}
CleanPageView (FavoriteBodyView);
@@ -287,8 +314,8 @@
#if DEBUG
//UserConfig.Instance.SkinCode = 1;
Language.CurrentLanguage = "English";
- //var lii = new LightLogic () { Type = DeviceType.LightRGB, LoopID = 1, DeviceID = 4, SubnetID = 42, Name = "RGB" };
- //IO.FileUtils.SaveEquipmentMessage (lii, lii.LoopID.ToString ());
+ var lii = new LightLogic () { Type = DeviceType.LightRGB, LoopID = 1, DeviceID = 4, SubnetID = 42, Name = "RGB" };
+ IO.FileUtils.SaveEquipmentMessage (lii, lii.LoopID.ToString ());
var lii1 = new LightSwitch () { LoopID = 1, DeviceID = 2, SubnetID = 232, Name = "缁х數鍣�" };
IO.FileUtils.SaveEquipmentMessage (lii1, lii1.LoopID.ToString ());
//var lii11 = new LightDimming () { LoopID = 1, DeviceID = 1, SubnetID = 232, Name = "璋冨厜鍣�" };
@@ -297,8 +324,21 @@
//IO.FileUtils.SaveEquipmentMessage (lii111, lii111.LoopID.ToString ());
- //var licci11 = new CurtainModel () { LoopID = 1, DeviceID = 9, SubnetID = 42, Name = "绐楀笜" };
- //IO.FileUtils.SaveEquipmentMessage (licci11, licci11.LoopID.ToString ());
+ var mCurtainModel1 = new CurtainModel () { LoopID = 1, DeviceID = 9, SubnetID = 42, Name = "绐楀笜" };
+ IO.FileUtils.SaveEquipmentMessage (mCurtainModel1, mCurtainModel1.LoopID.ToString ());
+ //var mCurtainModel2 = new CurtainModel () { LoopID = 2, DeviceID = 9, SubnetID = 42, Name = "绐楀笜2" };
+ //IO.FileUtils.SaveEquipmentMessage (mCurtainModel2, mCurtainModel2.LoopID.ToString ());
+ //var mCurtainModel3 = new CurtainModel () { LoopID = 1, DeviceID = 2, SubnetID = 42, Name = "绐楀笜3" };
+ //IO.FileUtils.SaveEquipmentMessage (mCurtainModel3, mCurtainModel3.LoopID.ToString ());
+
+ var mCurtainRoller = new CurtainRoller () { LoopID = 1, DeviceID = 88, SubnetID = 42, Name = "绐楀笜CurtainRoller" };
+ IO.FileUtils.SaveEquipmentMessage (mCurtainRoller, mCurtainRoller.LoopID.ToString ());
+
+ var mCurtainTrietex = new CurtainTrietex () { LoopID = 1, DeviceID = 87, SubnetID = 42, Name = "绐楀笜CurtainTrietex" };
+ IO.FileUtils.SaveEquipmentMessage (mCurtainTrietex, mCurtainTrietex.LoopID.ToString ());
+
+
+
//var s1 = new LightEnergySocket () { LoopID = 1, DeviceID = 1, SubnetID = 44, Name = "EnergySocket" };
//IO.FileUtils.SaveEquipmentMessage (s1, s1.LoopID.ToString ());
@@ -308,8 +348,20 @@
InfraredMode infraredMode = new InfraredMode () { LoopID = 1, SubnetID = 100, DeviceID = 12, InfraredType = InfraredType.TV, Name = "娴嬭瘯鐢佃" };
IO.FileUtils.SaveEquipmentMessage (infraredMode, "1");
- ACInfrared aCInfrared = new ACInfrared () { LoopID = 1, SubnetID = 100, DeviceID = 112, Name = "娴嬭瘯绌鸿皟" };
+ ACInfrared aCInfrared = new ACInfrared () { LoopID = 1, SubnetID = 100, DeviceID = 112, Name = "绌鸿皟ACInfrared" };
IO.FileUtils.SaveEquipmentMessage (aCInfrared, "1");
+
+
+ ACPanel mACPanel = new ACPanel () { LoopID = 1, SubnetID = 100, DeviceID = 42, Name = "绌鸿皟闈㈡澘ACPanel" };
+ IO.FileUtils.SaveEquipmentMessage (mACPanel, "1");
+
+ CustomAC mCustomAC = new CustomAC () { LoopID = 1, SubnetID = 99, DeviceID = 42, Name = "绌鸿皟CustomAC" };
+ IO.FileUtils.SaveEquipmentMessage (mCustomAC, "1");
+
+ HVAC mHVAC = new HVAC () { LoopID = 1, SubnetID = 98, DeviceID = 42, Name = "绌鸿皟HVAC" };
+ IO.FileUtils.SaveEquipmentMessage (mHVAC, "1");
+
+
//var fanM = new FanModule () { Name = "Fan Module",SubnetID = 2,DeviceID = 1,LoopID = 1};
//IO.FileUtils.SaveEquipmentMessage (fanM);
//var fanLoop1 = new FanModule () { Name = "Fan 1", SubnetID = 2, DeviceID = 1, LoopID = 1 };
@@ -400,6 +452,10 @@
if (e < SettingPageView.ChildrenCount - 1) {
SettingPageView.GetChildren (SettingPageView.ChildrenCount - 1).RemoveFromParent ();
}
+ if (e == 0) {
+ //2020-01-15 鍥炲埌涓荤晫闈紝閲嶇疆涓哄姞瀵�
+ UserConfig.Instance.IsLocalEncrypt = true;
+ }
};
RoomPageView.PageChange += (sender, e) => {
if (e < RoomPageView.ChildrenCount - 1) {
@@ -441,15 +497,45 @@
curPageView = 2;
}
- public static void ReadAllDeviceStatus ()
+ public static void ReadAllDeviceStatus (bool isRefresh = true, bool isCheckIsReadingAll = false)
{
if (MainPage.LoginUser == null || !MainPage.LoginUser.IsLogin) {
return;
}
- UserDeviceToLight.readAllStatus (true);
- UserDeviceToSocket.readAllStatus (true);
- UserDeviceToAC.readAllStatus (true);
- UserDeviceToFH.readAllStatus (true);
+ UserDeviceToLight.readAllStatus (isRefresh, isCheckIsReadingAll);
+ UserDeviceToSocket.readAllStatus (isRefresh, isCheckIsReadingAll);
+ UserDeviceToAC.readAllStatus (isRefresh, isCheckIsReadingAll);
+ UserDeviceToFH.readAllStatus (isRefresh);
}
+
+
+
+ /// <summary>
+ /// 鐧诲綍鎴愬姛鍚庯紝鏌ヨ鍒锋柊涓�娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
+ /// 2020-01-11
+ /// </summary>
+ static void GetNowHomeGatewayAfterLoginSuccess ()
+ {
+ var requestObj3 = new GetSingleHomeGatewayPaggerObj ();
+ requestObj3.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
+ requestObj3.ReqDto.HomeId = UserConfig.Instance.CurrentRegion.Id;
+ requestObj3.ReqDto.PageSetting.Page = 1;
+ requestObj3.ReqDto.PageSetting.PageSize = 10;
+ string urlHead = MainPage.RequestHttpsHost;
+ if (requestObj3.IsOtherAccountCtrl) {
+ urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ }
+
+ var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
+ var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
+ if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
+ //2020-01-11
+ UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
+
+ }
+ }
+
}
}
--
Gitblit v1.8.0