From 312f9ece8d4a46d8989187730fc7f5c7fc36cfb5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 15:20:52 +0800
Subject: [PATCH] Update SplashActivity.cs
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 258 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 169 insertions(+), 89 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 47d6c7c..272794a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -30,7 +30,7 @@
/// <summary>
/// 杩炴帴鐘舵�佹彁绀�
/// </summary>
- Button btnLinkStateTip;
+ FrameLayout divLinkStateTip;
/// <summary>
/// 瀹夐槻鐘舵�佸浘鏍�
/// </summary>
@@ -213,69 +213,35 @@
IsBold = true
};
topView.AddChidren(btnResidenceName);
- btnLinkStateTip = new Button()
+
+ divLinkStateTip = new FrameLayout()
{
- //X = Application.GetRealWidth(16),
- Y = btnResidenceName.Bottom,
- Height = Application.GetRealWidth(14),
- //BackgroundColor = CSS_Color.LinkTipFail,
- TextAlignment = TextAlignment.Center,
+ Y = Application.GetRealHeight(113) - Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
+ BackgroundColor = 0xFFFF4747,
+ Visible = false,
+ };
+ topView.AddChidren(divLinkStateTip);
+ Button btnLinkStateIcon = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(20),
+ Height = Application.GetRealWidth(20),
+ UnSelectedImagePath = "Collection/GatewayOnlineTipIcon.png"
+ };
+ divLinkStateTip.AddChidren(btnLinkStateIcon);
+
+ var btnLinkStateTip = new Button()
+ {
+ X = btnLinkStateIcon.Right + Application.GetRealWidth(4),
+ TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.MainBackgroundColor,
+ TextID = StringId.NetworkAnomaly,
};
- topView.AddChidren(btnLinkStateTip);
- //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth();
+ divLinkStateTip.AddChidren(btnLinkStateTip);
//鏇存柊閾炬帴鐘舵�乮con棰滆壊
-
-
-#if DEBUG
- int ddd = 0;
- btnResidenceName.MouseUpEventHandler = (sender, e) =>
- {
- //827a98c98da7469b8bc19bb6a3c7651906
- //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(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
-
environmentalView = new FrameLayout()
{
Y = Application.GetRealHeight(1) + btnResidenceName.Bottom,
@@ -478,7 +444,7 @@
SelectedImagePath = "Collection/DefenseStatusIcon.png",
UnSelectedImagePath = "Collection/DisarmStatusIcon.png"
};
- if (DB_ResidenceData.Instance.GatewayType == 1)
+ if (DB_ResidenceData.Instance.GatewayType == 1 && !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
topView.AddChidren(btnSecurityStatus);
@@ -536,6 +502,10 @@
UnSelectedImagePath = "Collection/MsgIcon.png",
SelectedImagePath = "Collection/MsgIconTip.png",
};
+ if(btnSecurityStatus.Parent == null)
+ {
+ btnMsgIcon.X = Application.GetRealWidth(329);
+ }
topView.AddChidren(btnMsgIcon);
@@ -583,6 +553,17 @@
LoadContentView();
#endregion
+
+#if DEBUG
+ btnResidenceName.MouseUpEventHandler = (envent, ee) => {
+ MainPage.Log("sss");
+ new System.Threading.Thread(async() =>
+ {
+ await Common.AliyunLog.AliyunLogClient.PostLogs("鍛婅娴嬭瘯", "娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅娴嬭瘯淇℃伅");
+ })
+ { IsBackground = true }.Start();
+ };
+#endif
}
catch (Exception ex)
{
@@ -915,7 +896,6 @@
sceneFunctionView = new VerticalScrolViewLayout();
contentView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone();
- contentView.PageIndex = CurShowTypeContent;
if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
gcFunctionView = new VerticalScrolViewLayout();
@@ -929,6 +909,7 @@
GetUnreadPushMessages();
RegisterGetPushMessageAction();
+ contentView.PageIndex = CurShowTypeContent;
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -989,11 +970,11 @@
foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
- if (SPK.MusicSpkList().Contains( function.spk))
- {
- continue;
- }
- else
+ //if (SPK.MusicSpkList().Contains( function.spk))
+ //{
+ // continue;
+ //}
+ //else
{
if (!function.collect)
continue;
@@ -1087,9 +1068,9 @@
/// </summary>
void LoadGroupControlFunctionControlZone()
{
+
#region ContextView
gcFunctionView.RemoveAll();
- functionViews.Clear();
var rowView = new FrameLayout();
try
{
@@ -1313,7 +1294,8 @@
};
- if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose ||
+ function.spk == SPK.SensorPir || function.spk == SPK.SensorPirHold)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1327,7 +1309,7 @@
switch (tempStatus.state)
{//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
case "0":
- function.lastState = Language.StringByID(StringId.SensorNormalState);
+ function.lastState = Language.StringByID(StringId.wuren);
break;
case "1":
function.lastState = Language.StringByID(StringId.SomeoneIn);
@@ -1368,8 +1350,49 @@
}
btnState.Text = function.lastState;
}
+ else
+ {
+ tempStatus = function.attributes.Find((sta) => sta.key == "people_status");
+ if (tempStatus != null)
+ {
+ switch (tempStatus.state)
+ {
+ case "true":
+ function.lastState = Language.StringByID(StringId.Someone);
+ break;
+ case "false":
+ function.lastState = Language.StringByID(StringId.wuren);
+ break;
+ }
+ btnState.Text = function.lastState;
+ }
+ }
+
}
-
+
+ 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";
+ btnName.TextColor = CSS_Color.MainBackgroundColor;
+ btnZone.TextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainBackgroundColor;
+ var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.ContactStatus);
+ if (tempStatus != null)
+ {
+ switch (tempStatus.state)
+ {
+ case "open":
+ function.lastState = Language.StringByID(StringId.DryBreak);
+ break;
+ case "close":
+ function.lastState = Language.StringByID(StringId.Shut);
+ break;
+ }
+ btnState.Text = function.lastState;
+ }
+ }
+
else
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1403,7 +1426,8 @@
if (//SPK.CurtainSpkList().Contains(function.spk))
function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
function.spk == SPK.CurtainDream ||
- function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex)
+ function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex
+ )
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
@@ -1418,6 +1442,7 @@
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseWhiteIcon_Shadow.png",
};
view.AddChidren(btnCurtainClose);
+
Button btnCurtainOpen;
btnCurtainOpen = new Button()
@@ -1454,7 +1479,7 @@
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
- btnCollection.Visible = false;
+ //btnCollection.Visible = false;
Button btnPower;
btnPower = new Button()
{
@@ -1468,7 +1493,7 @@
view.AddChidren(btnPower);
btnState.Text = function.GetAttrState("song_name");
-
+ btnState.Width = Application.GetRealWidth(90);
btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
@@ -1528,13 +1553,13 @@
}
- else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ //else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ else if (SPK.ArmSensorSpkList().Contains(function.spk))
{
- //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
- //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
- //btnIcon.IsSelected = true;
+ btnName.TextColor = CSS_Color.MainBackgroundColor;
+ btnZone.TextColor = CSS_Color.MainBackgroundColor;
btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
- btnState.TextColor = CSS_Color.MainColor;//PromptingColor1
+ btnState.TextColor = CSS_Color.MainBackgroundColor;
}
//绱ф�ユ眰鍔�
@@ -1550,16 +1575,71 @@
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
}
- else if (function.spk == SPK.VideoDoorLock)
+ else if (function.spk == SPK.GroupControl)
{
- btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
- //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ if (function.spk == SPK.GroupControl)
+ {
+ Button btnClose;
+ Button btnOpen;
+ btnOpen = new Button()
+ {
+ X = Application.GetRealWidth(84),
+ Y = Application.GetRealWidth(89),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
+ UnSelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_on_home.png",
+ SelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_on_home_click.png",
+ };
+ view.AddChidren(btnOpen);
+
+
+ btnClose = new Button()
+ {
+ X = btnOpen.Right,
+ Y = Application.GetRealWidth(89),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
+ UnSelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_off_home.png",
+ SelectedImagePath = "FunctionIcon/Light/LightScene/gp_all_off_home_click.png",
+ };
+ view.AddChidren(btnClose);
+
+
+ btnClose.MouseDownEventHandler = (sender, e) => {
+ btnClose.IsSelected = true;
+ };
+
+ btnClose.MouseUpEventHandler = (sender, e) => {
+ btnClose.IsSelected = false;
+ if (function.spk == SPK.GroupControl)
+ {
+ var d = new Dictionary<string, string>();
+ d.Add("on_off", "off");
+ (function as GroupControl).Control(d);
+ }
+ };
+ btnOpen.MouseDownEventHandler = (sender, e) => {
+ btnOpen.IsSelected = true;
+ };
+ btnOpen.MouseUpEventHandler = (sender, e) => {
+ btnOpen.IsSelected = false;
+ if (function.spk == SPK.GroupControl)
+ {
+ var d = new Dictionary<string, string>();
+ d.Add("on_off", "on");
+ (function as GroupControl).Control(d);
+ }
+ };
+
+
+ }
}
- //else if (function.spk == SPK.GroupControl)
- //{
- // btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
- // btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
- //}
+ else if (function.spk == SPK.ElectricEnergy || function.spk == SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
+ {
+
+ }
else
{
Button btnSwitch;
@@ -1594,14 +1674,14 @@
};
- 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, Comerom.collect,()=> {
this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
});
view.MouseUpEventHandler = skipControlPageEvent;
btnName.MouseUpEventHandler = skipControlPageEvent;
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
- //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔ㄨ兘鍒楄〃
+ //涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔熻兘鍒楄〃
if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
{
UpdataFunctionStates(function);
@@ -1617,7 +1697,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "OnlineTag",
- Visible = !function.online
+ Visible = !function.isOnline()
};
view.AddChidren(btnOffline);
--
Gitblit v1.8.0