From 3aba1c7fea5f0adb1b169e8060ce956188e80a2b Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 24 九月 2024 10:46:18 +0800
Subject: [PATCH] 删除解锁APP的模式
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 151 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 98 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 72a1cdf..e69bd40 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -7,7 +7,7 @@
namespace HDL_ON.UI
{
#if __IOS__
- public partial class HomePage : VerticalRefreshLayout
+ public partial class HomePage : VerticalRefreshLayout
#else
public partial class HomePage : VerticalScrolViewLayout
#endif
@@ -98,9 +98,9 @@
/// 鍔熻兘鍖哄煙闆嗗悎
/// </summary>
List<FrameLayout> functionViews;
-#endregion
+ #endregion
-#region 鍖哄煙鍙橀噺
+ #region 鍖哄煙鍙橀噺
/// <summary>
/// 褰撳墠鏄剧ず瀵规帶鍒剁被鍨嬫槸鍚︽槸璁惧鍔熻兘鎺у埗
/// 0 鍔熻兘
@@ -108,9 +108,9 @@
/// 2 缇ゆ帶
/// </summary>
int CurShowTypeContent = 0;
-#endregion
+ #endregion
-#region 鎶ヨ淇℃伅
+ #region 鎶ヨ淇℃伅
//Button btnMsgBg;
//Button btnMsgTime;
//Button btnMsg;
@@ -244,7 +244,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));
@@ -276,7 +276,8 @@
}
}
- var btnEnvirValuesTitle = new Button() {
+ var btnEnvirValuesTitle = new Button()
+ {
X = Application.GetRealWidth(12),
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
@@ -342,7 +343,7 @@
}
if (tempTotalValues > 0)
{
- btnIndoorTempValues.Text = "/" + (tempTotalValues/ tempTotalCount).ToString("0.0") + "掳";
+ btnIndoorTempValues.Text = "/" + (tempTotalValues / tempTotalCount).ToString("0.0") + "掳";
}
}
btnIndoorTempValues.Width = btnIndoorTempValues.GetTextWidth();
@@ -440,7 +441,7 @@
};
if (DB_ResidenceData.Instance.GatewayType == 1 && !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
-
+
topView.AddChidren(btnSecurityStatus);
foreach (var temp in FunctionList.List.securities)
{
@@ -459,7 +460,8 @@
}
}
- btnSecurityStatus.MouseUpEventHandler = (sender, e) => {
+ btnSecurityStatus.MouseUpEventHandler = (sender, e) =>
+ {
var page = new ArmCenterPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -468,7 +470,7 @@
}
-#region msg
+ #region msg
//FrameLayout msgView;
//msgView = new FrameLayout()
//{
@@ -496,7 +498,7 @@
UnSelectedImagePath = "Collection/MsgIcon.png",
SelectedImagePath = "Collection/MsgIconTip.png",
};
- if(btnSecurityStatus.Parent == null)
+ if (btnSecurityStatus.Parent == null)
{
btnMsgIcon.X = Application.GetRealWidth(329);
}
@@ -527,13 +529,13 @@
LoadEvent_GotoMessageCenterPage();
-#endregion
+ #endregion
-#endregion
+ #endregion
-#region 鍔熻兘鍦烘櫙鍒囨崲
+ #region 鍔熻兘鍦烘櫙鍒囨崲
- bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });
+ bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0xFFFF0000 });
loadNavView();
@@ -549,7 +551,8 @@
#endregion
#if DEBUG
- btnResidenceName.MouseUpEventHandler = (envent, ee) => {
+ btnResidenceName.MouseUpEventHandler = (envent, ee) =>
+ {
MainPage.Log("sss");
#if __ANDROID__
@@ -589,7 +592,7 @@
void loadNavView()
{
- if(changeBaseView == null)
+ if (changeBaseView == null)
{
changeBaseView = new FrameLayout()
{
@@ -685,7 +688,8 @@
- btnChangeGroupControl.MouseUpEventHandler = (sender, e) => {
+ btnChangeGroupControl.MouseUpEventHandler = (sender, e) =>
+ {
btnChangeFunction.IsSelected = false;
btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
btnChangeFunction.IsBold = false;
@@ -699,7 +703,8 @@
contentView.PageIndex = 2;
};
- btnChangeFunction.MouseUpEventHandler = (sender, e) => {
+ btnChangeFunction.MouseUpEventHandler = (sender, e) =>
+ {
btnChangeFunction.IsSelected = true;
btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeFunction.IsBold = true;
@@ -713,7 +718,8 @@
btnChangeGroupControl.TextSize = CSS.CSS_FontSize.TextFontSize;
btnChangeGroupControl.IsBold = false;
};
- btnChangeScene.MouseUpEventHandler = (sender, e) => {
+ btnChangeScene.MouseUpEventHandler = (sender, e) =>
+ {
btnChangeScene.IsSelected = true;
btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
btnChangeScene.IsBold = true;
@@ -880,7 +886,7 @@
/// </summary>
void LoadContentView()
{
-
+
if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
{
var waitPage = new Loading();
@@ -931,7 +937,8 @@
}
});
}
- catch (Exception ex) {
+ catch (Exception ex)
+ {
MainPage.Log($"鍒锋柊涓婚〉寮傚父:{ex.Message}");
}
finally { }
@@ -990,7 +997,7 @@
//}
//else
{
- if (!function.collect)
+ if (!function.collect&& function.spk != SPK.InverterJinmao)
continue;
}
if (index % 2 == 0)
@@ -1016,8 +1023,8 @@
};
rowView.AddChidren(functionView);
functionViews.Add(functionView);
- //缁垮缓浜哄眳鐜锛岀鎶�绯荤粺
- if (function.spk == SPK.AcstParent)
+ //缁垮缓浜哄眳鐜锛岀鎶�绯荤粺,閲戣寕鍏変紡鍌ㄨ兘
+ if (function.spk == SPK.AcstParent || function.spk == SPK.InverterJinmao)
{
LoadAcstDiv(functionView, function);
}
@@ -1114,14 +1121,14 @@
};
rowView.AddChidren(functionView);
functionViews.Add(functionView);
- var btnbg = new Button()
- {
- UnSelectedImagePath = "Collection/Functionbg.png",
- SelectedImagePath = "Collection/FunctionOnbg.png",
- Tag = function.sid
- };
- functionView.AddChidren(btnbg);
- LoadDeviceFunctionDiv(functionView, function);
+ var btnbg = new Button()
+ {
+ UnSelectedImagePath = "Collection/Functionbg.png",
+ SelectedImagePath = "Collection/FunctionOnbg.png",
+ Tag = function.sid
+ };
+ functionView.AddChidren(btnbg);
+ LoadDeviceFunctionDiv(functionView, function);
index++;
}
@@ -1205,7 +1212,7 @@
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
- LoadSceneFunctionDiv( functionView, scene);
+ LoadSceneFunctionDiv(functionView, scene);
index++;
}
@@ -1384,7 +1391,7 @@
}
- else if(function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
+ else if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
@@ -1456,7 +1463,7 @@
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseWhiteIcon_Shadow.png",
};
view.AddChidren(btnCurtainClose);
-
+
Button btnCurtainOpen;
btnCurtainOpen = new Button()
@@ -1631,11 +1638,13 @@
view.AddChidren(btnClose);
- btnClose.MouseDownEventHandler = (sender, e) => {
+ btnClose.MouseDownEventHandler = (sender, e) =>
+ {
btnClose.IsSelected = true;
};
- btnClose.MouseUpEventHandler = (sender, e) => {
+ btnClose.MouseUpEventHandler = (sender, e) =>
+ {
btnClose.IsSelected = false;
if (function.spk == SPK.GroupControl)
{
@@ -1644,10 +1653,12 @@
(function as GroupControl).Control(d);
}
};
- btnOpen.MouseDownEventHandler = (sender, e) => {
+ btnOpen.MouseDownEventHandler = (sender, e) =>
+ {
btnOpen.IsSelected = true;
};
- btnOpen.MouseUpEventHandler = (sender, e) => {
+ btnOpen.MouseUpEventHandler = (sender, e) =>
+ {
btnOpen.IsSelected = false;
if (function.spk == SPK.GroupControl)
{
@@ -1682,7 +1693,8 @@
LoadEvent_SwitchFunction(function, btnSwitch);
}
//鍙栨秷鏀惰棌浜嬩欢
- Action cannelCollect = () => {
+ Action cannelCollect = () =>
+ {
function.collect = false;
//if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
//{
@@ -1698,7 +1710,8 @@
};
- var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> {
+ var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect, () =>
+ {
this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
});
view.MouseUpEventHandler = skipControlPageEvent;
@@ -1706,7 +1719,7 @@
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
//涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔熻兘鍒楄〃
- if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
+ if (!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
{
UpdataFunctionStates(function);
}
@@ -1752,7 +1765,8 @@
{
X = Application.GetRealWidth(11),
Y = Application.GetRealWidth(10),
- TextID = StringId.Acst,
+ Text = function.name,
+ //TextID = StringId.Acst,
IsBold = true,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -1772,20 +1786,51 @@
};
view.AddChidren(btnLogo);
+ try
+ {
+ if (function.extend.Contains("jinmao") && function.extend.Contains("true"))
+ {
+ btnLogo.Visible = true;
+ }
+ else
+ {
+ btnLogo.Visible = false;
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Error", $"閲戣寕logo鏄剧ず澶勭悊寮傚父锛歿ex.Message}");
+ }
+
Button btnFunctionViewBg;
btnFunctionViewBg = new Button()
{
Height = Application.GetRealWidth(100),
Width = Application.GetRealWidth(102),
- UnSelectedImagePath = "FunctionIcon/FunctionBg/AcstFunctionBg.png",
+ UnSelectedImagePath = function.spk == SPK.AcstParent ? "FunctionIcon/FunctionBg/AcstFunctionBg.png" : "FunctionIcon/FunctionBg/InverterJinmaoFunctionBg.png",
};
view.AddChidren(btnFunctionViewBg);
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
- var page = new AcstParentPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ if (function.spk == SPK.AcstParent)
+ {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new AcstParentPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+ else if (function.spk == SPK.InverterJinmao)
+ {
+ //btnName.TextID = StringId.NewEnergy;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new InverterJinmaoPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
//Button btnAcstPower = new Button()
@@ -1813,7 +1858,7 @@
// })
// { IsBackground = true }.Start();
//};
-
+
--
Gitblit v1.8.0