From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 199 ++++++++++++++++++++++++++++++-------------------
1 files changed, 121 insertions(+), 78 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 832ac88..8835c07 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -12,7 +12,11 @@
namespace HDL_ON.UI
{
- public partial class HomePage : VerticalRefreshLayout
+#if __IOS__
+ public partial class HomePage : VerticalRefreshLayout
+#else
+ public partial class HomePage : VerticalScrolViewLayout
+#endif
{
#region 鎺т欢鍒楄〃
@@ -91,21 +95,21 @@
/// 鍔熻兘鍖哄煙闆嗗悎
/// </summary>
List<FrameLayout> functionViews;
- #endregion
+#endregion
- #region 鍖哄煙鍙橀噺
+#region 鍖哄煙鍙橀噺
/// <summary>
/// 褰撳墠鏄剧ず瀵规帶鍒剁被鍨嬫槸鍚︽槸璁惧鍔熻兘鎺у埗
/// </summary>
bool CurShowTypeIsFunction = true;
- #endregion
+#endregion
- #region 鎶ヨ淇℃伅
+#region 鎶ヨ淇℃伅
Button btnMsgBg;
Button btnMsgTime;
Button btnMsg;
Button btnMsgIcon;
- #endregion
+#endregion
public HomePage()
{
@@ -133,9 +137,34 @@
MainPage.CurPageIndex = 0;
try
{
- this.BeginHeaderRefreshingAction = () =>
+ bodyView.RemoveAll();
+#if __IOS__
+ bodyView.BeginHeaderRefreshingAction = () =>
{
- this.EndHeaderRefreshing();
+ bodyView.EndHeaderRefreshing();
+ Common.ApiUtlis.Ins.DownloadData();
+ LoadContentView();
+ if (!CurShowTypeIsFunction)
+ {
+ contentView.PageIndex = 1;
+ }
+ };
+ topView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(216),
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
+ };
+ bodyView.AddChidren(topView);
+#else
+ VerticalRefreshLayout refreshLayout = new VerticalRefreshLayout()
+ {
+ Height = Application.GetRealHeight(216),
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
+ };
+ bodyView.AddChidren(refreshLayout);
+ refreshLayout.BeginHeaderRefreshingAction = () =>
+ {
+ refreshLayout.EndHeaderRefreshing();
Common.ApiUtlis.Ins.DownloadData();
LoadContentView();
if(!CurShowTypeIsFunction)
@@ -143,17 +172,15 @@
contentView.PageIndex = 1;
}
};
-
- #region topView
-
- bodyView.RemoveAll();
-
topView = new FrameLayout()
{
Height = Application.GetRealHeight(216),
- BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
- bodyView.AddChidren(topView);
+ refreshLayout.AddChidren(topView);
+#endif
+ #region topView
+
+
Button btnTop;
btnTop = new Button()
@@ -180,7 +207,7 @@
//X = Application.GetRealWidth(16),
Y = btnResidenceName.Bottom,
Height = Application.GetRealWidth(14),
- BackgroundColor = CSS_Color.LinkTipFail,
+ //BackgroundColor = CSS_Color.LinkTipFail,
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.MainBackgroundColor,
@@ -198,46 +225,43 @@
//St_00009073b431d8b2490c9df0c5cb0e73
//Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
//Com.Hdl.HdlToLc.OpenActivity();
- new System.Threading.Thread(() =>
- {
- var http = new HttpServerRequest();
- var pack = http.GetLcSubAccountToken();
- if (pack.Code == StateCode.SUCCESS)
- {
- if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
- {
- Application.RunOnMainThread(() =>
- {
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
- });
- }
- Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
- Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
- Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
- Application.RunOnMainThread(() =>
- {
- //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
- //Com.Utils.HdlToLcUtils.Instance.Play()
-
- var backTemp = new AddLcCam();
- backTemp.backAction = () =>
- {
- //Load3tyBrandDeviceList();
- };
- Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
-
- });
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
- });
- }
- })
- { IsBackground = true }.Start();
+ //new System.Threading.Thread(() =>
+ //{
+ // var http = new HttpServerRequest();
+ // var pack = http.GetLcSubAccountToken();
+ // if (pack.Code == StateCode.SUCCESS)
+ // {
+ // if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
+ // });
+ // }
+ // Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ // Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
+ // Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+ // Application.RunOnMainThread(() =>
+ // {
+ // //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
+ // //Com.Utils.HdlToLcUtils.Instance.Play()
+ // var backTemp = new AddLcCam();
+ // backTemp.backAction = () =>
+ // {
+ // //Load3tyBrandDeviceList();
+ // };
+ // Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+ // });
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
+ // });
+ // }
+ //})
+ //{ IsBackground = true }.Start();
};
#endif
@@ -249,7 +273,7 @@
topView.AddChidren(environmentalView);
CheckLinkStatus();//2020-12-22
- #region 鐜鏁版嵁
+#region 鐜鏁版嵁
var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
var enviList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => SPK.EvironmentSensorList().Contains(obj.spk));
@@ -425,7 +449,7 @@
};
btnPm25Values.Width = btnPm25Values.GetTextWidth();
environmentalView.AddChidren(btnPm25Values);
- #endregion
+#endregion
btnSecurityStatus = new Button()
{
@@ -466,7 +490,7 @@
}
- #region msg
+#region msg
FrameLayout msgView;
msgView = new FrameLayout()
{
@@ -521,11 +545,11 @@
LoadEvent_GotoMessageCenterPage();
- #endregion
+#endregion
- #endregion
+#endregion
- #region 鍔熻兘鍦烘櫙鍒囨崲
+#region 鍔熻兘鍦烘櫙鍒囨崲
bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });
@@ -574,9 +598,9 @@
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
- #endregion
+#endregion
- #region ContextView
+#region ContextView
contentView = new PageLayout()
{
//Y = changeView.Bottom,
@@ -589,7 +613,7 @@
LoadContentView();
- #endregion
+#endregion
}
catch (Exception ex)
{
@@ -603,7 +627,7 @@
/// </summary>
void LoadContentView()
{
- if (!Common.ApiUtlis.Ins.DownloadDataComplete)
+ if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
{
var waitPage = new Loading();
MainPage.BaseView.AddChidren(waitPage);
@@ -693,14 +717,16 @@
/// </summary>
void LoadDeviceFunctionControlZone()
{
- #region ContextView
+#region ContextView
deviceFunctionView.RemoveAll();
functionViews.Clear();
var rowView = new FrameLayout();
try
{
int index = 0;
- var list = FunctionList.List.GetDeviceFunctionList();
+ var list = new List<Function>();
+ list.AddRange(FunctionList.List.GetDeviceFunctionList());
+ list.AddRange(FunctionList.List.groupControls);//鍔犲叆缇ゆ帶
foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
@@ -793,7 +819,7 @@
MainPage.Log("homepage error : " + ex.Message);
}
deviceFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
- #endregion
+#endregion
}
/// <summary>
@@ -999,6 +1025,7 @@
btnState.Text = function.lastState;
}
}
+
else
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1178,7 +1205,11 @@
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
}
-
+ else if (function.spk == SPK.VideoDoorLock)
+ {
+ btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
+ //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ }
else
{
Button btnSwitch;
@@ -1192,9 +1223,16 @@
SelectedImagePath = "Public/SwitchOn.png",
};
view.AddChidren(btnSwitch);
-
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ if (function.spk == SPK.GroupControl)
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
+ }
+ else
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ }
LoadEvent_SwitchFunction(function, btnSwitch);
}
//鍙栨秷鏀惰棌浜嬩欢
@@ -1214,7 +1252,9 @@
};
- var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
+ var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> {
+ this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
+ });
view.MouseUpEventHandler = skipControlPageEvent;
btnName.MouseUpEventHandler = skipControlPageEvent;
btnIcon.MouseUpEventHandler = skipControlPageEvent;
@@ -1428,11 +1468,14 @@
LoadEvent_ControlScene(btnCoverd, btnName, btnZone, btnShowDelay, scene);
- btnSettingIcon.MouseUpEventHandler = (sender, e) => {
- Action backAction = () => {
+ btnSettingIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ Action backAction = () =>
+ {
//LoadSceneFunctionControlZone();
};
- Action refreshAction = () => {
+ Action refreshAction = () =>
+ {
btnName.Text = scene.name;
btnZone.Text = scene.GetRoomListName();
//view.BackgroundImagePath = (scene as Scene).ImagePath;
@@ -1441,7 +1484,7 @@
};
var aep = new SceneEditPage(scene, backAction);
MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage( refreshAction);
+ aep.LoadPage(refreshAction);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
//鍦烘櫙姝ｅ湪鍊掕鏃舵墽琛屼腑
--
Gitblit v1.8.0