优化全开全关控制算法

wxr

2023-08-11 9a343a7240c0254450174ea674948a6df54fbc61

优化全开全关控制算法

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -626,6 +626,10 @@
            {
                foreach (var temp in functions)
                {
                    if((temp.trait_on_off.state.ToString() ==  "on" && open)|| temp.trait_on_off.state.ToString() == "off"&& !open)
                    {
                        continue;
                    }
                    var apiControlData = temp.GetApiControlData(d);
                    actionObjs.Add(apiControlData);
                    count++;

 HDL_ON/DAL/DriverLayer/UdpSocket.cs

@@ -27,22 +27,17 @@
        /// </summary>
        public void Start (int port = 0)
        {
            MainPage.Log("启动Socket接收和发送功能0");
            if (IsRunning)
            {
            MainPage.Log("启动Socket接收和发送功能x");
                if (port == Port)
                {
            MainPage.Log("启动Socket接收和发送功能s");
                    return;
                }
                else
                {
            MainPage.Log("启动Socket接收和发送功能a");
                    busSocket.Close();
                }
            }
            MainPage.Log("启动Socket接收和发送功能1");
            if (port != 0)
                Port = port;
            if (Port == 0)

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm

 HDL_ON/Entity/Function/Function.cs

@@ -867,6 +867,10 @@

            foreach (var attr in list)
            {
                if(attr.key == FunctionAttributeKey.ColorfulBegin || attr.key == FunctionAttributeKey.ColorfulEnd || attr.key == FunctionAttributeKey.ColorfulTime)
                {
                    continue;
                }
                //窗帘同时发送开关跟百分比会有问题，
                if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
                {

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "2.1.0";
        public static string VersionString = "2.0.0";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -629,9 +629,9 @@
        {
#if DEBUG
            if (msg.Contains("收到数据")
                || msg.Contains("发送")
                || msg.Contains("接收到推送")
                || true
                || msg.Contains("api功能控制")
                //|| msg.Contains("接收到推送")
                //|| true
                )
                Console.WriteLine(msg);
#endif

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -323,9 +323,9 @@
                    etAccount.Text = "13375012446";//测试服务器
                    etAccount.Text = "15855403939";
                    etAccount.Text = "15006564444";
                    etAccount.Text = "13580507523";
                    etAccount.Text = "jeremy@ruma.my";
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    etAccount.Text = "18316672920";
                    //etAccount.Text = "18316672920";
                }
                else
                {
@@ -357,9 +357,9 @@
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "18188019284")
                if(etAccount.Text == "jeremy@ruma.my")
                {
                    etPassword.Text = "CEZUJHSZ";
                    etPassword.Text = "CEBCWINP";
                }
                else if(etAccount.Text == "13143792049")
                {

 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs

@@ -234,14 +234,14 @@
        /// </summary>
        void OpenUrl()
        {
            if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
            if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersionUrl.Contains("http"))
            {
                HDLUtils.OpenUrl(newAppVersionUrl);
            }
            else
            {
                Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
            }
            //else
            //{
            //    Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
            //}
        }

        /// <summary>

 SiriIntents/Server/HttpUtil.cs

@@ -16,8 +16,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm