From de53d12e223eb8c9a562aeefdcfa9b4039b3d0b0 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 六月 2021 10:24:18 +0800
Subject: [PATCH] dome - 1
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 3
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs | 2
HDL-ON_Android/Assets/Language.ini | 3
HDL_ON/Common/ApiUtlis.cs | 31 ----
HDL_ON/Entity/DB_ResidenceData.cs | 2
HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs | 4
HDL-ON_iOS/Resources/Language.ini | 2
HDL_ON/DAL/Server/HttpUtil.cs | 6
HDL-ON_Android/Resources/Resource.designer.cs | 9
HDL_ON/Common/UserInfo.cs | 34 ++++
HDL_ON/Common/R.cs | 5
.vs/HDL_APP_Project/xs/UserPrefs.xml | 61 +++++++-
HDL_ON/UI/MainPage.cs | 214 +++++++++++++++---------------
HDL_ON/UI/UI1-Login/LoginPage.cs | 29 ++++
14 files changed, 249 insertions(+), 156 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index c68982d..b9b526f 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,19 +1,60 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Info.plist">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/R.cs">
<Files>
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="8" Column="17" IsPinned="True" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1809" Column="8" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1932" Column="1" />
- <File FileName="HDL_ON/Common/R.cs" Line="1177" Column="43" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="150" Column="25" IsPinned="True" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1963" Column="8" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1593" Column="1" />
<File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="193" Column="26" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="175" Column="1" />
+ <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="31" Column="30" />
+ <File FileName="HDL_ON/Common/UserInfo.cs" Line="29" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="569" Column="25" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="174" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="203" Column="38" />
+ <File FileName="HDL_ON/Common/R.cs" Line="8" Column="36" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Info.plist" selected="True" />
+ <Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True">
+ <Node name="R.cs" selected="True" />
+ </Node>
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Device" expanded="True" />
+ <Node name="Function" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True" />
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="AddDevice" expanded="True">
+ <Node name="SenesorMegahealth" expanded="True" />
+ </Node>
+ <Node name="AddFunction" expanded="True" />
+ <Node name="RoomListManage" expanded="True">
+ <Node name="AddRoom" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="1ContorlPage" expanded="True" />
+ <Node name="AC" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</Node>
</Node>
</State>
@@ -26,13 +67,15 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="118" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePage.cs" relfile="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" line="198" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index a0ef7c8..2f45ea8 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -439,6 +439,7 @@
453=Alarm mute
454=Deployment information
455=The name can not be blank.
+
456=Canvas
457=Energy consumption
458=Date
@@ -457,6 +458,7 @@
'
470=Under protection
471=Millimeter wave sensor
+472=Outdoor
1000=Room Humidity
1001=V-chip
@@ -1508,6 +1510,7 @@
469=鏈変汉杩涘叆
470=闃叉姢涓�
471=姣背娉紶鎰熷櫒
+472=瀹ゅ
1000=瀹ゅ唴婀垮害
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index afa9ad1..c504701 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -1,11 +1,10 @@
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
-// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.42000
+// This code was generated by a tool.
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -15,7 +14,7 @@
{
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource
{
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index a253aa0..2f45ea8 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -458,6 +458,7 @@
'
470=Under protection
471=Millimeter wave sensor
+472=Outdoor
1000=Room Humidity
1001=V-chip
@@ -1509,6 +1510,7 @@
469=鏈変汉杩涘叆
470=闃叉姢涓�
471=姣背娉紶鎰熷櫒
+472=瀹ゅ
1000=瀹ゅ唴婀垮害
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index f01a100..50dee7c 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -61,7 +61,7 @@
/// </summary>
public void DownloadData()
{
- if (MainPage.InternetStatus == 0)
+ if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
return;
//绾跨▼寮�濮嬫椂闂�
var endTime = DateTime.Now.AddSeconds(5);
@@ -187,35 +187,6 @@
{
sceneList = new List<Scene>();
}
- //for (int i = 0; i < FunctionList.List.scenes.Count;)
- //{
- // var localScene = FunctionList.List.scenes[i];
- // if (localScene == null)
- // {
- // FunctionList.List.scenes.Remove(localScene);
- // continue;
- // }
- // var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
- // if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
- // {
- // FunctionList.List.DeleteScene(localScene, false);
- // }
- // else
- // {
- // i++;
- // if (localScene.modifyTime != newScene.modifyTime)
- // {
- // localScene.name = newScene.name;
- // localScene.collect = newScene.collect;
- // localScene.modifyTime = newScene.modifyTime;
- // localScene.roomIds = newScene.roomIds;
- // localScene.image = newScene.image;
- // localScene.SaveSceneFile();
- // }
- // sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
- // }
- //}
-
FunctionList.List.scenes.Clear();
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index be0041a..f54e945 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@
{
public static class StringId
{
-
+ /// <summary>
+ /// 瀹ゅ
+ /// </summary>
+ public const int Outdoor = 472;
/// <summary>
/// 姣背娉紶鎰熷櫒
/// </summary>
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index 18d4f19..289baf8 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -5,6 +5,7 @@
using System.Drawing;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON
{
@@ -24,6 +25,39 @@
{
if (m_Current == null)
{
+ //Dome妯″紡
+ if (MainPage.NoLoginMode)
+ {
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ m_Current = new UserInfo()
+ {
+ ID = "1234567890",
+ userName = "璇曠敤璐﹀彿",
+ AccountString = "璇曠敤璐﹀彿",
+ userMobileInfo = "璇曠敤璐﹀彿",
+ userEmailInfo = "璇曠敤璐﹀彿",
+ language = "Chinese",
+ areaCode = "86",
+ headImagePagePath = "LoginIcon/2.png",
+ };
+ }
+ else
+ {
+ m_Current = new UserInfo()
+ {
+ ID = "1234567890",
+ userName = "Trial account",
+ AccountString = "Trial account",
+ userMobileInfo = "Trial account",
+ userEmailInfo = "Trial account",
+ language = "English",
+ areaCode = "86",
+ headImagePagePath = "LoginIcon/2.png",
+ };
+ }
+ }
+
try
{
UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index d5dd0f5..4347c31 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -16,6 +16,7 @@
/// <summary>
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
+ ///
/// </summary>
public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
@@ -145,6 +146,11 @@
/// <returns></returns>
static ResponsePackNew RequestHttpsBase(Method method, string apiPath, string bodyParameterJson = null, Dictionary<string, object> queryDictionary = null, Dictionary<string, object> urlSegmentDictionary = null, string urlHead = "", string replaceToken = "", int mTimeout = 10)
{
+ //Dome妯″紡鐧诲綍
+ if(MainPage.NoLoginMode)
+ {
+ return new ResponsePackNew() { Code = "0" };
+ }
#region HttpWebRequest
try
{
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index a775774..af8b657 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -30,7 +30,7 @@
{
if (MainPage.NoLoginMode)
{
- return new RegionInfoRes() { homeName = "鏈湴妯″紡" };
+ return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"};
}
else
{
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 798e219..47d262e 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -171,6 +171,115 @@
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
{
+ BaseView.RemoveAll();
+ #region 鍚庨��浜嬩欢
+ BasePageView = new PageLayout();
+ BasePageView.ScrollEnabled = false;
+ BasePageView.IsShowPoint = false;
+ BasePageView.PageChange = (sender, e) =>
+ {
+ if (e < BasePageView.ChildrenCount - 1)
+ {
+ BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
+ }
+ try
+ {
+ ReturnRefreshAction?.Invoke();
+ ReturnRefreshAction = null;
+ }
+ catch (Exception ex)
+ {
+ Log($"鍚庨��浜嬩欢寮傚父:{ex.Message}");
+ }
+ };
+ BaseView.AddChidren(BasePageView);
+ var backView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(10),
+ Height = Application.GetRealHeight(440),
+ };
+ BaseView.AddChidren(backView);
+
+ BtnBackIcon = new Button()
+ {
+ X = -Application.GetRealWidth(100),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(88 / 2),
+ Height = Application.GetRealHeight(56 / 2),
+ UnSelectedImagePath = "Public/RightSlideBackIcon.png"
+ };
+ BaseView.AddChidren(BtnBackIcon);
+ backView.MouseMoveEventHandler = (sender, e) =>
+ {
+ if (BasePageView.ChildrenCount <= 1)
+ {
+ return;
+ }
+ MainPage.Log($"move:{e.X}");
+ if (StartX == 0 && e.X < 30)
+ {
+ StartX = (int)e.X;
+ }
+ if (StartX < 30)
+ {
+ if (e.X < Application.GetRealWidth(100))
+ {
+ BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100);
+ }
+ }
+ };
+ backView.MouseDownEventHandler = (sender, e) =>
+ {
+ if (BasePageView.ChildrenCount <= 1)
+ {
+ return;
+ }
+ MainPage.Log($"down:{e.X}");
+ StartX = (int)e.X;
+ BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
+ };
+ backView.MouseUpEventHandler = (sender, e) => {
+ MainPage.Log($"up{e.X}");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+
+ if (e.X > 70)
+ {
+ if (BasePageView.ChildrenCount > 1)
+ {
+ BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
+ }
+ }
+ };
+ backView.MouseUpOutsideEventHandler = (sender, e) => {
+ MainPage.Log($"up{e.X}");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+
+ if (e.X > 70)
+ {
+ if (BasePageView.ChildrenCount > 1)
+ {
+ BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
+ }
+ }
+ };
+ #endregion
+
+
+
+ if (NoLoginMode)
+ {
+ //璺宠浆椤甸潰----
+ var UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
+ BasePageView.PageIndex = 0;
+
+ return;
+ }
+
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
BaseView.AddChidren(waitPage);
@@ -196,112 +305,12 @@
{
waitPage.Hide();
waitPage.RemoveFromParent();
- BaseView.RemoveAll();
- BasePageView = new PageLayout();
- BasePageView.ScrollEnabled = false;
- BasePageView.IsShowPoint = false;
- BasePageView.PageChange = (sender, e) =>
- {
- if (e < BasePageView.ChildrenCount - 1)
- {
- BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
- try
- {
- ReturnRefreshAction?.Invoke();
- ReturnRefreshAction = null;
- }
- catch (Exception ex)
- {
- Log($"鍚庨��浜嬩欢寮傚父:{ex.Message}");
- }
- //while (e < BasePageView.ChildrenCount - 1)
- //{
- // BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
- //}
- };
- BaseView.AddChidren(BasePageView);
-
- var backView = new FrameLayout()
- {
- Y = Application.GetRealHeight(100),
- Width = Application.GetRealWidth(10),
- Height = Application.GetRealHeight(440),
- };
- BaseView.AddChidren(backView);
-
- BtnBackIcon = new Button()
- {
- X = -Application.GetRealWidth(100),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(88/2),
- Height = Application.GetRealHeight(56/2),
- UnSelectedImagePath = "Public/RightSlideBackIcon.png"
- };
- BaseView.AddChidren(BtnBackIcon);
- backView.MouseMoveEventHandler = (sender, e) =>
- {
- if (BasePageView.ChildrenCount <= 1)
- {
- return;
- }
- MainPage.Log($"move:{e.X}");
- if (StartX == 0 && e.X < 30) {
- StartX = (int)e.X;
- }
- if (StartX < 30 )
- {
- if (e.X < Application.GetRealWidth(100))
- {
- BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100);
- }
- }
- };
- backView.MouseDownEventHandler = (sender, e) =>
- {
- if (BasePageView.ChildrenCount <= 1)
- {
- return;
- }
- MainPage.Log($"down:{e.X}");
- StartX = (int)e.X;
- BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
- };
- backView.MouseUpEventHandler = (sender, e) => {
- MainPage.Log($"up{e.X}");
- StartX = 0;
- BtnBackIcon.X = -Application.GetRealWidth(100);
-
- if (e.X > 70)
- {
- if (BasePageView.ChildrenCount > 1)
- {
- BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
- }
- }
- };
- backView.MouseUpOutsideEventHandler=(sender, e) => {
- MainPage.Log($"up{e.X}");
- StartX = 0;
- BtnBackIcon.X = -Application.GetRealWidth(100);
-
- if (e.X > 70)
- {
- if (BasePageView.ChildrenCount > 1)
- {
- BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
- }
- }
- };
-
//璺宠浆椤甸潰----
var UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
-
-
if (isFirstOpen)
{
@@ -320,16 +329,11 @@
{
Application.RunOnMainThread(() =>
{
-
-
if (downloadData)
{
///鍒濆鍖朼pp鏁版嵁
Common.ApiUtlis.Ins.DownloadData();
};
-
-
-
});
}
}).Start();
diff --git a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
index fd8cbcf..eaa8bf6 100644
--- a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
@@ -31,7 +31,7 @@
}
int tipHeight = Application.GetRealWidth(180 + btnTipNotY);
- this.Height = tipHeight + Application.GetRealHeight(17 );
+ this.Height = tipHeight + Application.GetRealHeight(17 +30);
BtnTipNot = new Button()
{
@@ -49,7 +49,7 @@
//绌虹┖濡備篃
Button btnTipNotText = new Button()
{
- Y = tipHeight ,
+ Y = tipHeight + Application.GetRealHeight(10),
Height = Application.GetRealHeight(17),
Text = tipMsg,
TextAlignment = TextAlignment.Center,
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 344424f..e02c0d0 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -1,7 +1,9 @@
锘縰sing System;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -188,7 +190,32 @@
#if DEBUG
btnIcon_bg.MouseUpEventHandler += (sender, e) =>
{
- //ESOnVideo.Current.Test();
+ MainPage.NoLoginMode = true;
+ //妤煎眰鎴块棿鍒楄〃
+ var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
+ floor1.SaveRoomFile();
+ //澶勭悊鎴块棿鍒楄〃
+ var room1 = new Room() {
+ roomId = "r1",
+ roomName = "瀹㈠巺",
+ parentId = "f1"
+ };
+ room1.SaveRoomFile();
+ //鍔熻兘
+ var light1 = new Function()
+ {
+ sid = "light1",
+ deviceId = "light1",
+ name = "RGB1",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
+ },
+ };
+ light1.SaveFunctionFile();
+ //鍦烘櫙
};
bool b = false;
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 0d4f5f3..7e4c84f 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -200,11 +200,12 @@
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.InOutdoor,
+ TextID = StringId.Outdoor,
TextAlignment = TextAlignment.CenterLeft,
};
if (tempSensorList.Count > 0 || humiSensorList.Count > 0)
{
+ btnEnvirValuesTitle.TextID = StringId.InOutdoor;
btnEnvirValuesTitle.Width = Application.GetRealWidth(8)+ btnEnvirValuesTitle.GetTextWidth();
}
environmentalView.AddChidren(btnEnvirValuesTitle);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
index ed1e894..b45f8ee 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -128,7 +128,7 @@
AddDeviceEvent?.Invoke(new Function());
this.CloseForm();
});
- }else if(pack.Code == "10801")
+ }else if(pack.Code == "10801" || pack.Code == "9")
{
var mes = "";
if (Language.CurrentLanguage == "Chinese")
--
Gitblit v1.8.0