2022年09月14日16:24:16

wjc

2022-09-14 cafceb4ae858d54516345fb131a77c00d7986916

2022年09月14日16:24:16

合并上传

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

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -157,8 +157,14 @@
                        LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
                        curtainSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(curtainSwitchView.FLayoutView());
                        ///百分比
                        LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
                        crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
                        crtainPercentumView.btnText.TextID = StringId.percentum;
                        fLayout.AddChidren(crtainPercentumView.FLayoutView());
                        crtainPercentumView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///设备延时iewv
                        DelayView(fLayout, curtainSwitchView.frameLayout.Bottom);
                        DelayView(fLayout, crtainPercentumView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
@@ -166,6 +172,11 @@
                        {
                            SwitchViewMethod(device, curtainSwitchView.btnState, 2);
                        };
                        ///百分比点击事件
                        crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态

 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs

@@ -23,6 +23,8 @@
        public Function functionMusic = new Function();




        /// <summary>
        ///保存当前音乐列表
        /// </summary>
@@ -57,7 +59,11 @@
        /// ((当前时间)DateTime.Now - (记录时间)LastDateTimeLastDateTime).TotalSeconds=误差时间(秒)
        /// </summary>
        public DateTime LastDateTime;
      
        /// <summary>
        /// 记录滑动音量条时间<用来处理音量跳动>
        /// </summary>
        public static DateTime ProgressDateTime = DateTime.MinValue;

        /// <summary>
        /// 音乐播放器ID
        /// </summary>