From 3911b57a6e510f1e642beaa499d28465f028934a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 16:11:19 +0800
Subject: [PATCH] Update HDL-ON_Android.csproj
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d3a4868..272794a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -444,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);
@@ -502,6 +502,10 @@
UnSelectedImagePath = "Collection/MsgIcon.png",
SelectedImagePath = "Collection/MsgIconTip.png",
};
+ if(btnSecurityStatus.Parent == null)
+ {
+ btnMsgIcon.X = Application.GetRealWidth(329);
+ }
topView.AddChidren(btnMsgIcon);
@@ -549,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)
{
@@ -1560,16 +1575,6 @@
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 if (function.spk == SPK.AvZkAiks)
- {
- //涓轰簡鍘绘帀寮�鍏虫寜閽�
- btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong1.png";
- }
else if (function.spk == SPK.GroupControl)
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1669,7 +1674,7 @@
};
- 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;
--
Gitblit v1.8.0