From 8bdaa9078e89f2db165c27de9d4d87cb0a05e18b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 二月 2023 14:44:00 +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 355ef81..87e6d3e 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1071,7 +1071,7 @@
                         //2021-09-23 鏂板鑾峰彇褰撳墠缃戝叧鏄惁鏈湴鍔犲瘑
                         Ins.IsLocalEncrypt = device.isLocalEncrypt;
                         //MainPage.Log("缃戝叧鏈湴鍔犲瘑鐘舵�侊細" + device.local_encrypt.ToString());
-
+                        //鐧诲綍缃戝叧Tcp
                         OpenTcpClent();
 
 
@@ -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)
@@ -1488,8 +1494,12 @@
                                 //wjc
                                 break;
                             case SPK.Inverter:
+                            case SPK.InverterRst:
                                 var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };
-                                Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+                                Application.RunOnMainThread(() =>
+                                {
+                                    Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+                                });
                                 break;
                         }
 

--
Gitblit v1.8.0