parent: 4c0b2ce1 | 补丁 | 提交 | ignore whitespace
wei
2021-09-02 6d458e4338993e578ce81c6b3c4738e85b68b4df 
1.窗帘控制界面去掉按钮状态。 2.RGB灯光渐变时间标题异常显示问题修复。
10个文件已修改
158 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .vs/HDL_APP_Project/xs/UserPrefs.xml


@@ -1,15 +1,11 @@


<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">


<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">


  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs">


    <Files>


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="367" Column="73" />


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="1046" Column="57" />


    </Files>


  <MonoDevelop.Ide.Workbench>


    <Pads>


      <Pad Id="ProjectPad">


        <State name="__root__">


          <Node name="HDL_APP_Project" expanded="True">


            <Node name="HDL-ON_Android" selected="True" />


            <Node name="HDL-ON_iOS" selected="True" />


          </Node>


        </State>


      </Pad>




 HDL-ON_Android/Properties/AndroidManifest.xml


@@ -1,5 +1,5 @@


<?xml version="1.0" encoding="utf-8"?>


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202109012" android:versionName="1.2.202109012" package="com.hdl.onpro">


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202109021" android:versionName="1.2.202109021" package="com.hdl.onpro">


    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />


    <!-- 乐橙可视对讲需要的权限 -->


    <!--<uses-permission android:name="android.permission.INTERNET" />-->




 HDL-ON_iOS/Info.plist


@@ -100,9 +100,9 @@


    <key>UIStatusBarStyle</key>


    <string>UIStatusBarStyleLightContent</string>


    <key>CFBundleShortVersionString</key>


    <string>1.2.202100911</string>


    <string>1.2.202100921</string>


    <key>CFBundleVersion</key>


    <string>1.2.09011</string>


    <string>1.2.09021</string>


    <key>NSLocationWhenInUseUsageDescription</key>


    <string>Use geographic location to provide services such as weather</string>


    <key>NSAppleMusicUsageDescription</key>




 HDL_ON/UI/UI1-Login/LoginPage.cs


@@ -231,7 +231,7 @@


                    //etAccount.Text = "15971583093";//高胜


                    //etAccount.Text = "15217626103";//昆明金茂项目


                    //etAccount.Text = "18598273624";


                    etAccount.Text = "fslcjm5@163.com";


                    etAccount.Text = "tf@smarttech.com.ua";


                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 


                }


                b = !b;


@@ -635,7 +635,7 @@


                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },


                        new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100"   },


                        new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0"   },


                        new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },


                        //new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },


                        new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },


                    },


                };




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


@@ -49,6 +49,7 @@


                        case SPK.ElectricTuyaWaterValve:


                        case SPK.ElectricTuyaWeepRobot:


                        case SPK.ClothesHanger:


                        case SPK.AirSwitch:


                            vv = ShowFunction.Electric;


                            break;


                        case SPK.AirFreshJinmao:




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


@@ -135,7 +135,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",


                IsSelected = function.trait_on_off.curValue.ToString() == "off",


            };


            controlView.AddChidren(btnCurtainClose);




@@ -147,7 +146,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",


                IsSelected = function.trait_on_off.curValue.ToString() == "stop",


            };


            controlView.AddChidren(btnCurtainStop);




@@ -159,7 +157,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",


                IsSelected = function.trait_on_off.curValue.ToString() == "on",


            };


            controlView.AddChidren(btnCurtainOpen);






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


@@ -203,7 +203,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",


                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0"


            };


            controlView.AddChidren(btnCurtainClose);




@@ -226,7 +225,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",


                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0"


            };


            controlView.AddChidren(btnCurtainOpen);






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


@@ -203,7 +203,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png",


                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0",


            };


            controlView.AddChidren(btnCurtainClose);




@@ -226,7 +225,6 @@


                Height = Application.GetMinRealAverage(32),


                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png",


                SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png",


                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0",


            };


            controlView.AddChidren(btnCurtainOpen);






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


@@ -242,72 +242,74 @@


            controlView.AddChidren(btnMaxValuesText);


            #endregion




            #region 渐变时间调节


            var btnGradualChangeText = new Button()


            {


                X = Application.GetRealWidth(35),


                Y = Application.GetRealHeight(375),


                Width = Application.GetRealWidth(224),


                Height = Application.GetRealHeight(21),


                TextAlignment = TextAlignment.CenterLeft,


                TextColor = CSS_Color.FirstLevelTitleColor,


                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                TextID = StringId.SpeedOfChange,


            };


            controlView.AddChidren(btnGradualChangeText);


                #region 渐变时间调节


                var btnGradualChangeText = new Button()


                {


                    X = Application.GetRealWidth(35),


                    Y = Application.GetRealHeight(375),


                    Width = Application.GetRealWidth(224),


                    Height = Application.GetRealHeight(21),


                    TextAlignment = TextAlignment.CenterLeft,


                    TextColor = CSS_Color.FirstLevelTitleColor,


                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                    TextID = StringId.SpeedOfChange,


                    Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                    Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                };


                controlView.AddChidren(btnGradualChangeText);




            var btnGradualChangeMinValuesText = new Button()


            {


                X = Application.GetRealWidth(35),


                Y = btnGradualChangeText.Bottom+ Application.GetRealHeight(10),


                Width = Application.GetRealWidth(22),


                Height = Application.GetRealHeight(21),


                Text = "0s",


                TextAlignment = TextAlignment.CenterLeft,


                TextColor = CSS_Color.PromptingColor1,


                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


            };


            controlView.AddChidren(btnGradualChangeMinValuesText);


                var btnGradualChangeMinValuesText = new Button()


                {


                    X = Application.GetRealWidth(35),


                    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),


                    Width = Application.GetRealWidth(22),


                    Height = Application.GetRealHeight(21),


                    Text = "0s",


                    TextAlignment = TextAlignment.CenterLeft,


                    TextColor = CSS_Color.PromptingColor1,


                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                    Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                    Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                };


                controlView.AddChidren(btnGradualChangeMinValuesText);




            barFadeTime = new DiyImageSeekBar()


            {


                X = btnGradualChangeMinValuesText.Right,


                Y = Application.GetRealHeight(412 - 21),


                Width = Application.GetRealWidth(210),


                Height = Application.GetRealHeight(54),


                SeekBarViewHeight = Application.GetRealHeight(8),


                ThumbImagePath = "Public/ThumbImage.png",


                ThumbImageHeight = Application.GetRealHeight(54),


                ProgressBarColor = CSS_Color.MainColor,


                //SeekBarBackgroundColor = CSS_Color.MainColor,


                ProgressTextColor = CSS_Color.FirstLevelTitleColor,


                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                ProgressBarUnitSring = "s",


                MaxValue = 10,


                Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.FadeTime)),


                SeekBarPadding = Application.GetRealWidth(20),


                Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


            };


            controlView.AddChidren(barFadeTime);


                barFadeTime = new DiyImageSeekBar()


                {


                    X = btnGradualChangeMinValuesText.Right,


                    Y = Application.GetRealHeight(412 - 21),


                    Width = Application.GetRealWidth(210),


                    Height = Application.GetRealHeight(54),


                    SeekBarViewHeight = Application.GetRealHeight(8),


                    ThumbImagePath = "Public/ThumbImage.png",


                    ThumbImageHeight = Application.GetRealHeight(54),


                    ProgressBarColor = CSS_Color.MainColor,


                    //SeekBarBackgroundColor = CSS_Color.MainColor,


                    ProgressTextColor = CSS_Color.FirstLevelTitleColor,


                    ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                    ProgressBarUnitSring = "s",


                    MaxValue = 10,


                    Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.FadeTime)),


                    SeekBarPadding = Application.GetRealWidth(20),


                    Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                    Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                };


                controlView.AddChidren(barFadeTime);




            var btnGradualChangeMaxValuesText = new Button()


            {


                X = barFadeTime.Right,


                Y = btnGradualChangeText.Bottom+ Application.GetRealHeight(10),


                Width = Application.GetRealWidth(35),


                Height = Application.GetRealHeight(21),


                Text = "10s",


                TextAlignment = TextAlignment.CenterLeft,


                TextColor = CSS_Color.PromptingColor1,


                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


            };


            controlView.AddChidren(btnGradualChangeMaxValuesText);


            #endregion


                var btnGradualChangeMaxValuesText = new Button()


                {


                    X = barFadeTime.Right,


                    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),


                    Width = Application.GetRealWidth(35),


                    Height = Application.GetRealHeight(21),


                    Text = "10s",


                    TextAlignment = TextAlignment.CenterLeft,


                    TextColor = CSS_Color.PromptingColor1,


                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,


                    Visible = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                    Enable = function.GetAttribute(FunctionAttributeKey.FadeTime) != null,


                };


                controlView.AddChidren(btnGradualChangeMaxValuesText);


                #endregion




            btnRestoredPoint = new Button()


            {




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


@@ -204,8 +204,8 @@


                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());


               


                Control.Ins.SendWriteCommand(function, d);


                function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);


            };


            dimmerBar.OnProgressChangedEvent = (sender, e) => {


                //function.fadeTime = 0;