From a16dbea60b9fd0550dcdefd34c94ff6711af2cbc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 十一月 2022 09:13:29 +0800
Subject: [PATCH] 功能完成备份
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 141 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 61 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d89790d..832ac88 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using HDL_ON.DAL;
+using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -189,11 +190,54 @@
//鏇存柊閾炬帴鐘舵�乮con棰滆壊
- int ddd = 0;
#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("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+ });
+ }
+ 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();
};
#endif
@@ -659,36 +703,10 @@
var list = FunctionList.List.GetDeviceFunctionList();
foreach (var function in list)
{
-
-
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (SPK.MusicSpkList().Contains( function.spk))
{
continue;
- //var music = function as Music.A31MusicModel;
- //var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
- //if (music == null)
- //{
- // continue;
- //}
- //if (music.ServerClientType == -1)
- //{
- // continue;
- //}
- //else if (music.ServerClientType == 1)
- //{
- // if (!music.MainPlayCollection)
- // {
- // continue;
- // }
- //}
- //else
- //{
- // if (!music.collect)
- // {
- // continue;
- // }
- //}
}
else
{
@@ -725,7 +743,6 @@
}
else //鍏朵粬璁惧
{
-
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
@@ -735,8 +752,6 @@
functionView.AddChidren(btnbg);
LoadDeviceFunctionDiv(functionView, function);
-
-
if (SPK.ArmSensorSpkList().Contains(function.spk))
{
btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
@@ -744,7 +759,6 @@
}
}
index++;
-
}
if (index == 0)
@@ -929,7 +943,7 @@
};
- if (function.spk == SPK.SenesorMegahealth)
+ if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1142,7 +1156,7 @@
}
- else if (function.spk == SPK.SenesorMegahealth)
+ else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
//btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
//btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1158,6 +1172,11 @@
btnName.SelectedTextColor = CSS_Color.MainBackgroundColor;
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ }
+ else if (function.spk == SPK.IpCam_Imou)
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
}
else
@@ -1201,7 +1220,7 @@
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
//涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔ㄨ兘鍒楄〃
- if(!SPK.NotStatusSpkList.Contains(function.spk))
+ if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
{
UpdataFunctionStates(function);
}
@@ -1259,11 +1278,11 @@
var btnLogo = new Button()
{
- Y = Application.GetRealWidth(85),
+ Y = Application.GetRealHeight(65),
UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
Width = Application.GetRealWidth(80),
- Height = Application.GetRealWidth(37),
+ Height = Application.GetRealHeight(37),
};
view.AddChidren(btnLogo);
@@ -1283,31 +1302,31 @@
};
- Button btnAcstPower = new Button()
- {
- X = Application.GetRealWidth(115),
- Y = Application.GetRealHeight(70),
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- SelectedImagePath = "Public/PowerOpen.png",
- UnSelectedImagePath = "Public/PowerClose.png",
- IsSelected = function.trait_on_off.curValue.ToString() == "on",
- };
- view.AddChidren(btnAcstPower);
- btnAcstPower.MouseUpEventHandler = (sender, e) => {
- btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
- new System.Threading.Thread(() =>
- {
- string onoff = btnAcstPower.IsSelected ? "on" : "off";
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, onoff);
- foreach (var temp in FunctionList.List.GetAcstParentList())
- {
- Control.Ins.SendWriteCommand(temp, d);
- }
- })
- { IsBackground = true }.Start();
- };
+ //Button btnAcstPower = new Button()
+ //{
+ // X = Application.GetRealWidth(115),
+ // Y = Application.GetRealHeight(70),
+ // Width = Application.GetRealWidth(32),
+ // Height = Application.GetRealWidth(32),
+ // SelectedImagePath = "Public/PowerOpen.png",
+ // UnSelectedImagePath = "Public/PowerClose.png",
+ // IsSelected = function.trait_on_off.curValue.ToString() == "on",
+ //};
+ //view.AddChidren(btnAcstPower);
+ //btnAcstPower.MouseUpEventHandler = (sender, e) => {
+ // btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
+ // new System.Threading.Thread(() =>
+ // {
+ // string onoff = btnAcstPower.IsSelected ? "on" : "off";
+ // Dictionary<string, string> d = new Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.OnOff, onoff);
+ // foreach (var temp in FunctionList.List.GetAcstParentList())
+ // {
+ // Control.Ins.SendWriteCommand(temp, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //};
--
Gitblit v1.8.0