2020-12-22-3

陈嘉乐

2020-12-22 c29cd36f584338731704b1eaf3d34ea47908e0e5

2020-12-22-3

根据可欣要求，配置空调，地热，没有配置开关属性默认配置增加开属性

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -2,7 +2,7 @@
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="475" Column="48" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="507" Column="49" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="1" Column="1" />
    </Files>
    <Pads>
@@ -20,7 +20,6 @@
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="LogicView" expanded="True" />
                      <Node name="InpOrOutLogicMethod.cs" selected="True" />
                    </Node>
                  </Node>

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal

Binary files differ

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

@@ -173,7 +173,7 @@
        /// <param name="viewLayout">上下滑动控件</param>
        public static void OutputTarget(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
        {

            
            for (int i = 0; i < Logic.currlogic.output.Count; i++)
            {
                Output outputTarget = Logic.currlogic.output[i];
@@ -230,33 +230,23 @@
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
                                        if (on_off != "")
                                        if (on_off == "on" && brightness != "")
                                        {
                                            if (on_off == "on")
                                            {
                                                stateStr = Language.StringByID(StringId.onLogic);
                                               
                                            }
                                            else
                                            {
                                                stateStr = Language.StringByID(StringId.offLogic);
                                               
                                            }
                                            stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
                                        }
                                        if (brightness != "")
                                        else if (on_off == "on")
                                        {
                                            stateStr += brightness + "%";
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        if (on_off != "" && on_off == "off")
                                        else if (on_off == "off")
                                        {
                                            targetView.btnState.Text = Language.StringByID(StringId.offLogic);
                                            stateStr = Language.StringByID(StringId.offLogic);
                                        }
                                        else
                                        else if (brightness != "")
                                        {
                                            targetView.btnState.Text = stateStr;

                                            stateStr = brightness + "%";
                                        }
                                       
                                        targetView.btnState.Text = stateStr;
                                    }
                                    break;
                                case FunctionType.Curtain:

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

@@ -481,10 +481,10 @@
                                            {
                                                //移除列表所有数据
                                                dicSateteList.Clear();
                                                //重新添加开光属性数据
                                                //重新添加-关-属性数据
                                                Dictionary<string, string> diction = new Dictionary<string, string>();
                                                diction.Add("key", "on_off");
                                                diction.Add("value", "on_off");
                                                diction.Add("value", "off");
                                                dicSateteList.Add(diction);
                                                break;
                                            }
@@ -493,6 +493,34 @@
                                }
                                break;
                            }
                        case FunctionType.AC:
                        case FunctionType.FloorHeating:
                            {

                                //(空调/地热)做了一个特殊处理；
                                bool _bool = false;
                                for (int i = 0; i < dicSateteList.Count; i++)
                                {
                                    var dic = dicSateteList[i];
                                    if (dic.ContainsValue("on_off"))
                                    {
                                        //判断是否存在
                                        _bool = true;
                                        break;
                                    }
                                }
                                if (!_bool)
                                {
                                    //没有开关就默认添加-开-属性
                                    Dictionary<string, string> diction = new Dictionary<string, string>();
                                    diction.Add("key", "on_off");
                                    diction.Add("value", "on");
                                    dicSateteList.Add(diction);
                                }


                            }
                            break;
                    }
                    outputDevice.status = dicSateteList;

@@ -739,7 +767,7 @@
            LogicView.BrightnessView brightness = new LogicView.BrightnessView();
            brightness.FLayoutView(frame, titleName, button.Text, (brightnesValue) =>
            {
                button.Text = brightnesValue;
                button.Text = brightnesValue+"%";
                Dictionary<string, string> dic = new Dictionary<string, string>();
                string keyVlaue = "";
                switch (device.functionType)
@@ -841,7 +869,7 @@
                                case "brightness":
                                    {

                                        button2.Text = value;
                                        button2.Text = value+"%";
                                    }
                                    break;
                            }