From ac2ee45fadc64fe840bbba6264df3ca4622adb15 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 12 一月 2020 16:06:13 +0800
Subject: [PATCH] 2020-01-12 1.优化修改。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index efeb54a..121ba5d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -19,11 +19,11 @@
public static FrameLayout UserPageView = new FrameLayout ();
- public static Button LinkStatusTip = new Button () {
- Height = Application.GetRealHeight (36),
- Width = Application.GetRealWidth (640),
- BackgroundColor = SkinStyle.Current.LinkStatusTipColor
- };
+ //public static Button LinkStatusTip = new Button () {
+ // Height = Application.GetRealHeight (36),
+ // Width = Application.GetRealWidth (640),
+ // BackgroundColor = SkinStyle.Current.LinkStatusTipColor
+ //};
public static PageLayout FavoritePageView = new PageLayout () {
IsShowPoint = false,
@@ -76,7 +76,7 @@
Y = Application.GetRealHeight (1136 - 90 - 90),
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (90),
- Text = Language.StringByID (R.MyInternationalizationString.Version) + " : " + MainPage.CodeIDString,
+ Text = Language.StringByID (R.MyInternationalizationString.Version) + " : " + MainPage.RequestVersion,
TextColor = SkinStyle.Current.TextColor1,
BackgroundColor = SkinStyle.Current.ViewColor,
Enable = false
@@ -197,7 +197,8 @@
UserMiddle.updateSensorhreadList.Clear ();
}
- public static void Init (bool isGuide = false)
+ //2020-01-11
+ public static void Init (bool isGuide = false, bool bFromLogin = false)
{
if (MainPage.LoginUser == null)
MainPage.LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo> (System.Text.Encoding.UTF8.GetString (Shared.IO.FileUtils.ReadFile (UserInfo.GlobalRegisterFile)));
@@ -206,31 +207,37 @@
new AccountLogin ().Show ();
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
- if (UserConfig.Instance.GatewayList.Count == 0) {
- UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
- var guide = new GuideAddResidence ();
- guidePageView.AddChidren (guide);
- guide.ShowHomeList (false);
- guidePageView.PageIndex = 0;
- MainPage.LoginUser.LastTime = DateTime.MinValue;
- MainPage.LoginUser.SaveUserInfo ();
- guidePageView.PageChange += (ddf, ffd) => {
- if (ffd < guidePageView.ChildrenCount - 1) {
- guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
- }
- };
- return;
+ //if (UserConfig.Instance.GatewayList.Count == 0) {
+ //2020-01-11 Mac娌＄粦瀹氬苟涓斾负涓昏处鍙� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
+ if (bFromLogin) {
+ if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty () && MainPage.LoginUser.AccountType == 0) {
+ UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
+ var guide = new GuideAddResidence ();
+ guide.IsHideBack = true;
+ guidePageView.AddChidren (guide);
+
+ guide.ShowHomeList (true);
+ guidePageView.PageIndex = 0;
+ MainPage.LoginUser.LastTime = DateTime.MinValue;
+ MainPage.LoginUser.SaveUserInfo ();
+ guidePageView.PageChange += (ddf, ffd) => {
+ if (ffd < guidePageView.ChildrenCount - 1) {
+ guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
+ }
+ };
+ return;
+ }
}
InitHomePageView ();
//鍚庡彴楠岃瘉璐﹀彿
System.Threading.Tasks.Task.Run (() => {
try {
- var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = MainPage.LoginUser.Password };
+ var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = MainPage.LoginUser.Password, Company = MainPage.SoftSmsType };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("Login", requestJson, false, false);
+ var revertObj = MainPage.RequestHttps (API.Login, requestJson);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper () == "SUCCESS") {
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.ResponseData.ToString ());
MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
MainPage.LoginUser.LastTime = DateTime.Now;
@@ -282,11 +289,11 @@
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 lii1 = new LightSwitch () { LoopID = 1, DeviceID = 6, SubnetID = 42, Name = "缁х數鍣�" };
- //IO.FileUtils.SaveEquipmentMessage (lii1, lii1.LoopID.ToString ());
- //var lii11 = new LightDimming () { LoopID = 1, DeviceID = 9, SubnetID = 42, Name = "璋冨厜鍣�" };
+ 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 = "璋冨厜鍣�" };
//IO.FileUtils.SaveEquipmentMessage (lii11, lii11.LoopID.ToString ());
- //var lii111 = new LightDimming () { LoopID = 11, DeviceID = 9, SubnetID = 42, Name = "璋冨厜鍣�2" };
+ //var lii111 = new LightDimming () { LoopID = 1, DeviceID = 8, SubnetID = 232, Name = "璋冨厜鍣�2" };
//IO.FileUtils.SaveEquipmentMessage (lii111, lii111.LoopID.ToString ());
@@ -323,7 +330,7 @@
//IO.FileUtils.SaveEquipmentMessage (ud3, "3");
#endif
UserHomePage.FrameLayoutMain.AddChidren (UserPageView);
- UserHomePage.FrameLayoutMain.AddChidren (LinkStatusTip);
+ //UserHomePage.FrameLayoutMain.AddChidren (LinkStatusTip);
UserPageView.AddChidren (FavoritePageView);
FavoritePageView.AddChidren (FavoriteBodyView);
@@ -445,4 +452,4 @@
UserDeviceToFH.readAllStatus (true);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0