在离线更新

wxr

2022-07-06 88b60a998a4cd8cae54e017e9ae31b644347e382

在离线更新

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -94,7 +94,7 @@
            }
            set
            {
                //if (_GatewayOnline_Local != value)
                if (_GatewayOnline_Local != value)
                {
                    _GatewayOnline_Local = value;
                    if (value)
@@ -129,7 +129,7 @@
            }
            set
            {
                //if (_GatewayOnline_Cloud != value)
                if (_GatewayOnline_Cloud != value)
                {
                    _GatewayOnline_Cloud = value;
                    if(GatewayOnline_Local)

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -17,8 +17,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>

 HDL_ON/Entity/Function/Function.cs

@@ -1021,6 +1021,10 @@
        /// </summary>
        public const string RoomTemp = "room_temp";
        /// <summary>
        /// 室内湿度
        /// </summary>
        public const string RoomHumidity = "room_humidity";
        /// <summary>
        /// value
        /// </summary>
        public const string Value = "value";

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -188,6 +188,10 @@
                        var acPage = new AcControlPage();
                        acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.HvacCac:
                        var cacPage = new CacControlPage();
                        cacPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IrLearn:
                        var irLearinPage = new IrLearnPage();
                        irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -607,6 +607,25 @@
                    //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                }
            });
            FunctionList.List.Functions.Add(new Function
            {
                name = "测试温控器",
                spk = SPK.HvacCac,
                attributes = new List<FunctionAttributes>
                {
                    new FunctionAttributes(){ key = "on_off",curValue = "on",state = "on" },
                    new FunctionAttributes(){ key = "cac_valve",curValue = "on",state = "on" },//毛细阀
                    new FunctionAttributes(){ key = "fh_valve",curValue = "on",state = "on" },//地暖阀
                    new FunctionAttributes(){ key = "mode",curValue = "cool",state = "cool", value = new List<string>{ "cool","heat","fan"} },
                    new FunctionAttributes(){ key = "set_temp",curValue = "20",state = "20",min = 16,max = 30 },
                    new FunctionAttributes(){ key = "room_temp",curValue = "20",state = "20" },
                    new FunctionAttributes(){ key = "dew_point_temp",curValue = "20",state = "20" },//露点温度
                    new FunctionAttributes(){ key = "surface_temp",curValue = "20",state = "20" },//表面温度
                    new FunctionAttributes(){ key = "energy_saving",curValue = "true",state = "true" },//节能
                    new FunctionAttributes(){ key = "room_humidity",curValue = "66",state = "66" },
                    //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                }
            });

            //FunctionList.List.Functions.Add(new Function
            //{

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

@@ -100,6 +100,66 @@
            {
                btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
            }
            else if (function.spk == SPK.HvacCac)
            {
                var btnHumidityIcon = new Button()
                {
                    X = Application.GetRealWidth(51),
                    Y = Application.GetRealHeight(66),
                    Width = Application.GetRealWidth(17),
                    Height = Application.GetRealWidth(17),
                    UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
                };
                bodyDiv.AddChidren(btnHumidityIcon);
                var btnHumidityValues = new TextButton()
                {
                    X = btnHumidityIcon.Right + Application.GetRealWidth(4),
                    Y = Application.GetRealHeight(66),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = function.GetAttrState(FunctionAttributeKey.RoomHumidity) + "%",
                    TextAlignment = TextAlignment.CenterLeft,
                };
                btnHumidityValues.Width = btnHumidityValues.GetTextWidth();
                bodyDiv.AddChidren(btnHumidityValues);

                Button btnTempIcon = new Button()
                {
                    X = btnHumidityValues.Right + Application.GetRealWidth(20),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetMinRealAverage(17),
                    Height = Application.GetMinRealAverage(17),
                    UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
                };
                bodyDiv.AddChidren(btnTempIcon);

                var btnTempValues = new TextButton()
                {
                    X = btnTempIcon.Right + Application.GetRealWidth(4),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = function.GetAttrState(FunctionAttributeKey.RoomTemp) + "°",
                    TextAlignment = TextAlignment.CenterLeft,
                };
                btnTempValues.Width = btnTempValues.GetTextWidth();
                btnTempValues.Width = btnTempValues.GetTextWidth();
                bodyDiv.AddChidren(btnTempIcon);

                var btnJinMaoIcon = new Button()
                {
                    X = Application.GetRealWidth(238),
                    Y = Application.GetRealHeight(64),
                    Width = Application.GetRealWidth(102),
                    Height = Application.GetRealHeight(29),
                    UnSelectedImagePath = "FunctionIcon/CAC/JinMaoIcon.png"
                };
                bodyDiv.AddChidren(btnJinMaoIcon);



            }
            else
            {
                if (function.spk == SPK.ClothesHanger)//晾衣架

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs

@@ -120,7 +120,10 @@
        private void InitFrameWhiteContent1()
        {
            //获取温度值
            temp = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", "."));
            var setTempTemp = device.GetAttrState(FunctionAttributeKey.SetTemp);
            var setTempString = setTempTemp.Replace(",", ".");
            var setTempDouble = Convert.ToDouble(setTempString);
            temp = Convert.ToInt32(setTempDouble);
            if (temp <= 0)
            {
                //默认值改成16,2022年06月10日10:03:19 成甫要求的

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs

@@ -424,24 +424,24 @@
        {
            btnCurtainClose.MouseUpEventHandler = (sender, e) =>
            {
            //if (!function.online)
            //{
            //    new Tip()
            //    {
            //        CloseTime = 1,
            //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
            //        Direction = AMPopTipDirection.None,
            //    }.Show(MainPage.BaseView);
            //    return;
            //}
            new System.Threading.Thread(() =>
            {
                System.Threading.Thread.Sleep(2000);
                Application.RunOnMainThread(() =>
                if (!function.online)
                {
                    btnCurtainClose.IsSelected = false;
                });
            })
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() =>
                    {
                        System.Threading.Thread.Sleep(2000);
                        Application.RunOnMainThread(() =>
                        {
                            btnCurtainClose.IsSelected = false;
                        });
                    })
                { IsBackground = true }.Start();
                function.trait_on_off.curValue = "off";
                function.SetAttrState(FunctionAttributeKey.Percent, 0);
@@ -453,17 +453,17 @@

            btnCurtainStop.MouseUpEventHandler = (sender, e) =>
            {
            //if (!function.online)
            //{
            //    new Tip()
            //    {
            //        CloseTime = 1,
            //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
            //        Direction = AMPopTipDirection.None,
            //    }.Show(MainPage.BaseView);
            //    return;
            //}
            onCurtainAnimation = false;
            if (!function.online)
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                onCurtainAnimation = false;
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
@@ -481,17 +481,17 @@

            btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
            {
            //if (!function.online)
            //{
            //    new Tip()
            //    {
            //        CloseTime = 1,
            //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
            //        Direction = AMPopTipDirection.None,
            //    }.Show(MainPage.BaseView);
            //    return;
            //}
            new System.Threading.Thread(() =>
            if (!function.online)
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() =>
            {
                System.Threading.Thread.Sleep(2000);
                Application.RunOnMainThread(() =>
@@ -508,7 +508,7 @@
                CurtainAnimation(100);
            };

            //if (function.online)
            if (function.online)
            {
                btnCurtainStop.MouseDownEventHandler = (sender, e) =>
                {

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs

@@ -80,6 +80,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() => {
                    System.Threading.Thread.Sleep(2000);
@@ -124,6 +125,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() => {
                    System.Threading.Thread.Sleep(2000);
@@ -147,6 +149,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() => {
                    System.Threading.Thread.Sleep(2000);

 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs

@@ -145,6 +145,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() =>
                {
@@ -173,6 +174,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                onCurtainAnimation = false;
                new System.Threading.Thread(() =>
@@ -200,6 +202,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() =>
                {
@@ -218,7 +221,7 @@
                CurtainAnimation(100);
            };

            if (!function.online)
            if (function.online)
            {
                btnCurtainStop.MouseDownEventHandler = (sender, e) =>
                {

 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs

@@ -146,6 +146,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() =>
                {
@@ -174,6 +175,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() => {
                    System.Threading.Thread.Sleep(2000);
@@ -199,6 +201,7 @@
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                new System.Threading.Thread(() =>
                {
@@ -235,7 +238,7 @@
            //    DriverLayer.Control.Ins.SendWriteCommand(function, d);
            //};

            if (!function.online)
            if (function.online)
            {

                btnCurtainStop.MouseDownEventHandler = (sender, e) =>

 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs

@@ -108,7 +108,7 @@
                { IsBackground = true }.Start();
            };

            if (!function.online)
            if (function.online)
            {
                barGradualChange.OnProgressChangedEvent = (sender, e) =>
                {

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs

@@ -145,18 +145,18 @@
        {

            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>

            {

                //if (!function.online)

                //{

                //    new Tip()

                //    {

                //        CloseTime = 1,

                //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),

                //        Direction = AMPopTipDirection.None,

                //    }.Show(MainPage.BaseView);

                //    return;

                //}

                //onDimmerBar = false;

                    curDimmerStatus = false;

                if (!function.online)

                {

                    new Tip()

                    {

                        CloseTime = 1,

                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),

                        Direction = AMPopTipDirection.None,

                    }.Show(MainPage.BaseView);

                    return;

                }
                //onDimmerBar = false;
                curDimmerStatus = false;

                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);

                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());


 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs

@@ -216,16 +216,16 @@

            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                //if (!function.online)
                //{
                //    new Tip()
                //    {
                //        CloseTime = 1,
                //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                //        Direction = AMPopTipDirection.None,
                //    }.Show(MainPage.BaseView);
                //    return;
                //}
                if (!function.online)
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                curDimmerStatus = false;
                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

 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";//mmmm
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>