20201219-3

wei

2020-12-19 4b6653dbbc167439b94541613681c062fed2f087

20201219-3

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,12 +1,10 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="22" Column="17" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="34" Column="34" />
      <File FileName="HDL_ON/UI/UI0-Public/Widget/DiySelectPopupDialog.cs" Line="631" Column="1" />
      <File FileName="HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs" Line="67" Column="44" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="186" Column="24" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="319" Column="52" />
      <File FileName="HDL-ON_iOS/ViewController.cs" Line="1" Column="1" />
      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="204" Column="1" />
    </Files>
@@ -32,15 +30,22 @@
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="2-Classification" expanded="True" />
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Scene" expanded="True" />
                  </Node>
                  <Node name="4-PersonalCenter" expanded="True" />
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="FoolHeating" expanded="True">
                      <Node name="FloorHeatingPageBLL.cs" selected="True" />
                    </Node>
                    <Node name="AC" expanded="True" />
                    <Node name="FoolHeating" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Other" expanded="True" />
              <Node name="Resources" expanded="True" />
              <Node name="AppDelegate.cs" selected="True" />
            </Node>
          </Node>
        </State>
      </Pad>
@@ -65,10 +70,7 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" line="171" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" line="32" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 HDL-ON_iOS/Resources/Language.ini

old mode 100755
new mode 100644
@@ -349,7 +349,7 @@
327=捕获场景
328=电影场景
329=普通
330=时间模式
330=自动模式
331=功率地热
332=地冷
333=功率地冷

 HDL_ON/DAL/DriverLayer/Packet.cs

old mode 100755
new mode 100644
@@ -307,11 +307,11 @@
                            if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                            {
                                ac.curTempType = receiveBytes[1];
                                ac.trait_IndoorTemp.curValue = receiveBytes[2];
                                ac.trait_IndoorTemp.curValue = receiveBytes[2].ToString();
                                ac.trait_on_off.curValue = receiveBytes[8] == 1 ? "on" : "off";
                                ac.curModeIndex = receiveBytes[9];
                                ac.curFanIndex = receiveBytes[10];
                                ac.trait_temp.curValue = receiveBytes[11];
                                ac.trait_temp.curValue = receiveBytes[11].ToString();
                                ac.lastState = "";
                                switch (ac.trait_mode.curValue.ToString())
                                {
@@ -401,31 +401,31 @@
                                {
                                    case "normal":
                                        fh.lastState = Language.StringByID(StringId.Normal);
                                        fh.trait_temp.curValue = receiveBytes[4];
                                        fh.trait_temp.curValue = receiveBytes[4].ToString();
                                        break;
                                    case "day":
                                        fh.lastState = Language.StringByID(StringId.Day);
                                        fh.trait_temp.curValue = receiveBytes[5];
                                        fh.trait_temp.curValue = receiveBytes[5].ToString();
                                        break;
                                    case "night":
                                        fh.lastState = Language.StringByID(StringId.Night);
                                        fh.trait_temp.curValue = receiveBytes[6];
                                        fh.trait_temp.curValue = receiveBytes[6].ToString();
                                        break;
                                    case "timer":
                                        fh.lastState = Language.StringByID(StringId.Auto);
                                        if (receiveBytes[8] == 0)
                                        {
                                            fh.timeFlag = 0;
                                            fh.trait_temp.curValue = receiveBytes[5];
                                            fh.trait_temp.curValue = receiveBytes[5].ToString();
                                        }
                                        else
                                        {
                                            fh.timeFlag = 1;
                                            fh.trait_temp.curValue = receiveBytes[6];
                                            fh.trait_temp.curValue = receiveBytes[6].ToString();
                                        }
                                        break;
                                    case "away":
                                        fh.trait_temp.curValue = receiveBytes[7];
                                        fh.trait_temp.curValue = receiveBytes[7].ToString();
                                        fh.lastState = Language.StringByID(StringId.Away);
                                        break;
                                }
@@ -535,7 +535,7 @@
                                    case 7:
                                    case 8:
                                    case 19:
                                        ac.trait_temp.curValue = receiveBytes[1];
                                        ac.trait_temp.curValue = receiveBytes[1].ToString();
                                        break;
                                    case 5:
                                        ac.curFanIndex = receiveBytes[1];
@@ -561,7 +561,7 @@
                        {
                            if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                            {
                                ac.trait_IndoorTemp.curValue = receiveBytes[1];
                                ac.trait_IndoorTemp.curValue = receiveBytes[1].ToString();
                                FunctionPage.UpdataStates(ac);
                            }
                        }

 HDL_ON/Entity/Function/Curtain.cs

old mode 100755
new mode 100644

 HDL_ON/Entity/Function/Fan.cs

old mode 100755
new mode 100644

 HDL_ON/Entity/Function/FloorHeating.cs

@@ -183,13 +183,13 @@
                            min = 0,
                        };
                        if (_trait_IndoorTemp.curValue.ToString() == "{}")
                            _trait_IndoorTemp.curValue = 0;
                            _trait_IndoorTemp.curValue = "0";
                    }
                }
                //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
                    _trait_IndoorTemp.curValue = Convert.ToInt32(vv);
                    _trait_IndoorTemp.curValue = Convert.ToInt32(vv).ToString();
                }
                return _trait_IndoorTemp;
            }
@@ -222,13 +222,13 @@
                        };
                    }
                    if(_trait_temp.curValue.ToString() == "{}")
                        _trait_temp.curValue = 16;
                        _trait_temp.curValue = "16";
                }
                //if (_trait_temp.curValue.ToString().Length > 3)
                {
                    double vv = 0;
                    Double.TryParse(_trait_temp.curValue.ToString(),out vv);
                    _trait_temp.curValue = Convert.ToInt32(vv);
                    _trait_temp.curValue = Convert.ToInt32(vv).ToString();
                }
                return _trait_temp;
            }

 HDL_ON/Entity/Function/Light.cs

old mode 100755
new mode 100644

 HDL_ON/Entity/Function/Sensor.cs

old mode 100755
new mode 100644

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

old mode 100755
new mode 100644
@@ -11,6 +11,7 @@
        FrameLayout bodyView;
        VerticalScrolViewLayout contentView;
        Button btnOnText;
        Button btnBrightnessText;

        Scene scene;

@@ -122,6 +123,15 @@
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
                if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness) != null)
                {
                    try
                    {
                        //一端口不支持开关值与亮度值一起处理，需要将开关值移除掉
                        sceneFunction.status.Remove(sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff));
                    }
                    catch { }
                }
                if (temp != null)
                {
                    temp = sceneFunction;
@@ -136,7 +146,7 @@
                    if (result == DAL.Server.StateCode.SUCCESS)
                    {
                        refreshAction();
                    this.RemoveFromParent();
                        this.RemoveFromParent();
                    }
                    else
                    {
@@ -145,7 +155,7 @@
                }
                else
                {
                        refreshAction();
                    refreshAction();
                    this.RemoveFromParent();
                }
            };
@@ -170,7 +180,7 @@
            {
                row.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            }
            Button btnBrightnessRight = new Button()
            Button btnRight = new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
@@ -178,7 +188,7 @@
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            row.AddChidren(btnBrightnessRight);
            row.AddChidren(btnRight);

            var btnFunctionText = new Button()
            {
@@ -190,7 +200,13 @@
            };
            row.AddChidren(btnFunctionText);
            if (sceneStatus.key == FunctionAttributeKey.OnOff)
            {
                btnOnText = btnFunctionText;
            }
            else if (sceneStatus.key == FunctionAttributeKey.Brightness)
            {
                btnBrightnessText = btnFunctionText;
            }

            var btnFunctionName = new Button()
            {
@@ -395,12 +411,32 @@
                trait.value = "on";
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = "on";
                btn.Text = FunctionList.List.GetValueText(trait.key, trait.value) + FunctionList.List.GetUintString(trait.key);

                var temp = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
                if (temp != null)
                {
                    if (temp.value == "0")
                    {
                        temp.value = "100";
                    }
                    btnBrightnessText.Text = FunctionList.List.GetValueText(temp.key, temp.value);
                }
            };
            btnOff.MouseUpEventHandler = (sender,e) =>{
                dialog.Close();
                trait.value = "off";
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = "off";
                btn.Text= FunctionList.List.GetValueText(trait.key,trait.value) + FunctionList.List.GetUintString(trait.key);

                var temp = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
                if (temp != null)
                {
                    if (temp.value != "0")
                    {
                        temp.value = "0";
                    }
                    btnBrightnessText.Text = FunctionList.List.GetValueText(temp.key, temp.value);
                }
            };

        }

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -143,37 +143,30 @@

            arcBar = new DiyArcSeekBar()
            {
#if __IOS__
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120+25),
                Width = Application.GetRealWidth(260-40),
                Height = Application.GetRealWidth(260-40),
                OpenAngle = 160,
                ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
                ProgressBarColor = CSS_Color.MainColor,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
                OfflineProgressBarColor = CSS_Color.PromptingColor2,
                IsOffline = aC.trait_on_off.curValue.ToString() == "on",
                MinValue = 16,
                MaxValue = 38,
                Progress = Convert.ToInt32( aC.trait_temp.curValue),
                IsClickable =  aC.trait_on_off.curValue.ToString() == "on" ,
                MaxValue = 32,
                IsClickable = aC.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                Progress = Convert.ToInt32(aC.trait_temp.curValue),
#if __IOS__
                Y = Application.GetRealHeight(120 + 25),
                Width = Application.GetRealWidth(260 - 40),
                Height = Application.GetRealWidth(260 - 40),
                SeekBarPadding = Application.GetRealWidth(8),
#else
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120 + 40),
                Width = Application.GetRealWidth(260 - 40),
                Height = Application.GetRealWidth(260 - 40),
                OpenAngle = 160,
                ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
                MinValue = 16,
                MaxValue = 38,
                Progress = Convert.ToInt32( aC.trait_temp.curValue),
                IsClickable = aC.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                SeekBarPadding = Application.GetRealWidth(7),
#endif

            };
            controlView.AddChidren(arcBar);


 HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs

old mode 100755
new mode 100644
@@ -33,11 +33,10 @@
                    if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now)
                    {
                        bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue));

                    }
                    bodyView.arcBar.ProgressBarColor = uAc.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                    bodyView.arcBar.ThumbImagePath = uAc.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
                    bodyView.arcBar.IsClickable = uAc.trait_on_off.curValue.ToString() == "on";

                });
            }
            catch (Exception ex)
@@ -86,7 +85,7 @@
                temp--;
                arcBar.Progress = temp;
                btnTemp.Text = temp.ToString();
                aC.trait_temp.curValue = temp;
                aC.trait_temp.curValue = temp.ToString();
                //Control.Send(CommandType_A.write, aC);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -102,7 +101,7 @@
                temp++;
                arcBar.Progress = temp;
                btnTemp.Text = temp.ToString();
                aC.trait_temp.curValue = temp;
                aC.trait_temp.curValue = temp.ToString();
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, aC.trait_temp.curValue.ToString());
                Control.Ins.SendWriteCommand(aC, d);
@@ -111,7 +110,7 @@
            };
            arcBar.OnStopTrackingTouchEvent = (sender, e) =>
           {
               aC.trait_temp.curValue = arcBar.Progress;
               aC.trait_temp.curValue = arcBar.Progress.ToString();
               btnTemp.Text = aC.trait_temp.curValue.ToString();
                //Control.Send(CommandType_A.write, aC);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -120,7 +119,7 @@
           };
            arcBar.OnProgressChangedEvent = (sender, e) =>
            {
                aC.trait_temp.curValue = e;
                aC.trait_temp.curValue = e.ToString();
                btnTemp.Text = aC.trait_temp.curValue.ToString();
            };
        }
@@ -142,15 +141,18 @@
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                aC.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                bodyView.arcBar.ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                bodyView.arcBar.ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
                bodyView.arcBar.IsClickable = aC.trait_on_off.curValue.ToString() == "on";

                //bodyView.arcBar.ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                //bodyView.arcBar.ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
                //bodyView.arcBar.IsClickable = aC.on_off == "on";

                //Control.Send(CommandType_A.write, aC);
                if (aC.trait_on_off.curValue.ToString() == "on")
                {
                    arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
                    btnSwitch.IsSelected = true;
                    arcBar.IsOffline = false;
                }
                else
                {
                    arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
                    btnSwitch.IsBold = false;
                    arcBar.IsOffline = true;
                }
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, aC.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(aC, d);

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs

@@ -143,7 +143,9 @@
                OpenAngle = 160,
                ThumbImagePath = fh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = fh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
                ProgressBarColor = CSS_Color.MainColor ,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
                OfflineProgressBarColor = CSS_Color.PromptingColor2,
                IsOffline = fh.trait_on_off.curValue.ToString() == "on",
                MinValue = 5,
                MaxValue = 35,
                IsClickable = fh.trait_on_off.curValue.ToString() == "on",

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs

@@ -19,9 +19,6 @@
                    {
                        return;
                    }
                    //bodyView.arcBar.ProgressBarColor = uFh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                    //bodyView.arcBar.ThumbImagePath = uFh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
                    //bodyView.btnSwitch.IsSelected = uFh.trait_on_off.curValue.ToString() == "on";
                    bodyView.btnTemp.Text = uFh.trait_temp.curValue.ToString();
                    bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uFh.trait_IndoorTemp.curValue)) + "°C";
                    bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
@@ -31,17 +28,15 @@
                    }
                    if (uFh.trait_on_off.curValue.ToString() == "on")
                    {
                        bodyView.arcBar.ProgressBarColor = CSS_Color.MainColor;
                        bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
                        bodyView.btnSwitch.IsSelected = true;
                        bodyView.arcBar.Enable = true;
                        bodyView.arcBar.IsOffline = false;
                    }
                    else
                    {
                        bodyView.arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
                        bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
                        bodyView.btnSwitch.IsBold = false;
                        bodyView.arcBar.Enable = false;
                        bodyView.arcBar.IsOffline = true;
                    }
                });
            }
@@ -91,7 +86,7 @@
                }
                temp--;
                arcBar.Progress = temp;
                fh.trait_temp.curValue = temp;
                fh.trait_temp.curValue = temp.ToString();
                btnTemp.Text = temp.ToString();
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -107,7 +102,7 @@
                temp++;
                arcBar.Progress = temp;
                btnTemp.Text = temp.ToString();
                fh.trait_temp.curValue = temp;
                fh.trait_temp.curValue = temp.ToString();
                //Control.Send(CommandType_A.write, fh);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -115,7 +110,7 @@
            };
            arcBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                fh.trait_temp.curValue = arcBar.Progress;
                fh.trait_temp.curValue = arcBar.Progress.ToString();
                btnTemp.Text = fh.trait_temp.curValue.ToString();
                //Control.Send(CommandType_A.write, fh);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -124,7 +119,7 @@
            };
            arcBar.OnProgressChangedEvent = (sender, e) =>
            {
                fh.trait_temp.curValue = e;
                fh.trait_temp.curValue = e.ToString();
                btnTemp.Text = fh.trait_temp.curValue.ToString();
            };
        }
@@ -142,24 +137,24 @@
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                //Control.Send(CommandType_A.write, fh);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
                if (fh.trait_on_off.curValue.ToString() == "on")
                {
                    arcBar.ProgressBarColor = CSS_Color.MainColor;
                    //arcBar.ProgressBarColor = CSS_Color.MainColor;
                    arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
                    btnSwitch.IsSelected = true;
                    arcBar.Enable = true;
                    arcBar.IsOffline = false;
                }
                else
                {
                    arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
                    //arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
                    arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
                    btnSwitch.IsBold = false;
                    arcBar.Enable = false;
                    arcBar.IsOffline = true;
                }
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
               
            };
        }