From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新
---
HDL_ON/DAL/DriverLayer/Control.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index c1150a7..f7110c8 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1283,6 +1283,8 @@
RGBPage.UpdataStates(localFunction);
break;
case SPK.LightRGBW:
+ localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ RGBWPage.UpdataStates(localFunction);
break;
case SPK.LightCCT:
localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
@@ -1309,6 +1311,8 @@
RollingShutterPage.UpdataState(localFunction);
break;
case SPK.CurtainShades:
+ localFunction.lastState = Language.StringByID(StringId.Open) + localFunction.GetAttrState(FunctionAttributeKey.Percent) + "%";
+ VenetianBlindsPage.UpdataState(localFunction);
break;
case SPK.AcStandard:
case SPK.HvacAC:
@@ -1434,12 +1438,14 @@
case SPK.SensorGas:
case SPK.HvacCac:
case SPK.SensorHelp:
+ case SPK.MechanicalArm:
//璁惧鐘舵�佹帹閫�
//鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
break;
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
+ case SPK.SensorMmvPose:
var tempStatus = localFunction.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
if (tempStatus != null)
@@ -1490,8 +1496,12 @@
case SPK.Inverter:
MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�");
var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };
- //var dd = Newtonsoft.Json.JsonConvert.SerializeObject(status);
- Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+ MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�1");
+ Application.RunOnMainThread(() =>
+ {
+ Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+ });
+ MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�2");
break;
}
--
Gitblit v1.8.0