From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs | 82 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
index 17173d8..c7b7676 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs
@@ -1,8 +1,13 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Net;
+using HDL_ON.Common;
using HDL_ON.DAL.Server;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using Newtonsoft.Json;
+//using OpenTK;
using Shared;
namespace HDL_ON.UI
@@ -227,6 +232,7 @@
BackgroundColor = 0x1F5C62FE,
BorderColor = CSS_Color.MainColor,
BorderWidth = 2,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Day);
btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
@@ -246,8 +252,11 @@
IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
var btnShowHistroyData_Year = new Button()
{
@@ -263,8 +272,11 @@
IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Year);
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
var btnShowHistroyData_Total = new Button()
{
@@ -280,6 +292,7 @@
IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Total);
btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
@@ -317,6 +330,10 @@
btnShowHistroyData_Day.BackgroundColor = 0x00000000;
btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
};
@@ -350,6 +367,10 @@
btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
btnShowHistroyData_Total.BackgroundColor = 0x00000000;
btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
curQueryType = "hour";
brokenLine.YvalueText = "";
@@ -385,6 +406,10 @@
btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
btnShowHistroyData_Total.BackgroundColor = 0x00000000;
btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
curQueryType = "month";
brokenLine.YvalueText = "";
@@ -421,6 +446,10 @@
btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
btnShowHistroyData_Total.BackgroundColor = 0x00000000;
btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
curQueryType = "year_month";
@@ -549,11 +578,52 @@
#endregion
- new System.Threading.Thread(() =>
+ if (Control.Ins.GatewayOnline_Local == true)
{
- DriverLayer.Control.Ins.SendReadCommand(device);
- })
- { IsBackground = true }.Start();
+ new System.Threading.Thread(() =>
+ {
+ Control.Ins.SendReadCommand(device);
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ if (Control.Ins.GatewayOnline_Cloud)
+ {
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var deviceResult = ApiUtlis.Ins.HttpRequest.GetDeviceInfo(device.deviceId);
+
+ if (deviceResult != null)
+ {
+ if (deviceResult.Code == StateCode.SUCCESS)
+ {
+ if (deviceResult.Data != null)
+ {
+ var packList = JsonConvert.DeserializeObject<List<Function>>(deviceResult.Data.ToString());
+ if (packList != null)
+ {
+ if (packList.Count > 0)
+ {
+ if (packList[0].isOnline())
+ {
+ Control.Ins.SendReadCommand(device);
+ }
+ }
+ }
+ }
+ }
+ }
+ }catch(Exception ex)
+ {
+
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ }
@@ -691,6 +761,10 @@
/// </summary>
public static void UpdataStatus(Function updataTemp)
{
+ if (!updataTemp.online)//璁惧涓嶅湪绾夸笉鏇存柊鐘舵��
+ {
+ return;
+ }
Application.RunOnMainThread(() =>
{
try
--
Gitblit v1.8.0