1.增加推送判断是否加载了类的方法 2.修改launch screen引用 3.去掉门锁测试环境appkey逻辑

chenqiyang

2023-04-13 1cd93851bde6ec19c07f1445899a76ab0dfa507d

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs

@@ -1,5 +1,8 @@
using System;
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using Shared;

namespace HDL_ON.Entity
@@ -86,8 +89,6 @@
        /// </summary>
        public List<GroupControlFunction> sids = new List<GroupControlFunction>();



        ///// <summary>
        ///// 获取设备添加到房间的房间名称
        ///// </summary>
@@ -114,6 +115,57 @@
        //    }
        //    return roomNameList;
        //}

        /// <summary>
        /// 群控控制
        /// </summary>
        /// <param name="pairs"></param>
        public void Control(Dictionary<string,object> pairs)
        {
            try
            {
               
                if (DriverLayer.Control.Ins.GatewayOnline_Local)
                {
                    var controlValues = new Dictionary<string, string>();
                    foreach (var p in pairs)
                    {
                        controlValues.Add("key", p.Key);
                        controlValues.Add("value", p.Value.ToString());
                    }
                    var functionControlDataObj = GetGatewayAlinkControlData(controlValues);
                    var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                    var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                    new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
                    MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");
                }
                else
                {
                    
                    var controlValues = new Dictionary<string, object>();
                    foreach (var p in pairs)
                    {
                        controlValues.Add("key", p.Key);
                        controlValues.Add("value", p.Value);
                    }
                    var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
                    if (pack != null)
                    {
                        if (pack.Code == StateCode.SUCCESS)
                        {
                            //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
                        }
                        else
                        {
                            MainPage.Log($"群控控制失败,Code: {pack.Code}");
                        }
                    }
                }
            }
            catch (Exception ex){
                MainPage.Log($"群控控制失败: {ex.Message}");
            }
        }
    }

    public class GroupControlFunction
@@ -126,6 +178,8 @@
        /// 功能spk
        /// </summary>
        public string spk = string.Empty;


    }