From bbc74a6dae2e90a811b2507c5896fe89aa29ccc0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 08 一月 2020 11:30:46 +0800
Subject: [PATCH] 2020-01-08 1.替换新服务器接口。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index efeb54a..36d7c6e 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
@@ -225,12 +225,12 @@
//鍚庡彴楠岃瘉璐﹀彿
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, false, false);
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 +282,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 +323,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);
--
Gitblit v1.8.0