20201223-99

wei

2020-12-23 271faaf6664166dc368639b9f2e577f63f901be5

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -241,7 +241,11 @@
        {
            if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
            {
                ControlAProtocolScene(scene);
                new System.Threading.Thread(() =>
                {
                    ControlAProtocolScene(scene);
                })
                { IsBackground = true }.Start();
            }
            else
            {
@@ -262,7 +266,7 @@
        /// <returns></returns>
        public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
        {
            function.usageCount++;
            function.controlCounter++;
            function.refreshTime = DateTime.Now;

            //如果是控制调光的开时，亮度值不能为0
@@ -287,6 +291,8 @@
                }
            }

            MainPage.Log($"发送数据:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");

            //远程通讯
            if (Ins.IsRemote)
            {
@@ -296,7 +302,6 @@
                var actionObjs = new List<ApiAlinkControlActionObj>();
                actionObjs.Add(apiControlData);
                var pack = httpServer.ControlDevice(actionObjs);
                //MainPage.Log($"{pack.Code}:{pack.Data}");
            }
            //本地通讯
            else
@@ -401,8 +406,8 @@
        {
            if (Ins.IsRemote)
            {
                var pm = new HDL_ON.DAL.Server.HttpServerRequest();
                pm.ExecuteScene(scene.userSceneId);
                var pm = new DAL.Server.HttpServerRequest();
                var result = pm.ExecuteScene(scene.userSceneId);
            }
            else
            {
@@ -567,7 +572,7 @@
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        MainPage.Log($"{localSwitch.trait_on_off.curValue}: ");
                                        //rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
                                        RelayPage.UpdataState(localSwitch);
                                    }
                                    break;
@@ -638,7 +643,7 @@
                                            }
                                        }
                                        lightCCT.lastState = Language.StringByID(StringId.Brightness) + " : " + lightCCT.brightness + "%";
                                        DimmerPage.UpdataStates(lightCCT);
                                        ColorTureLampPage.UpdataStates(lightCCT);
                                    }
                                    break;
                                case SPK.CurtainSwitch: