Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

Merge remote-tracking branch 'origin/wjc' into Dev-Branch

 HDL-ON_Android/Assets/Language.ini

@@ -1036,6 +1036,10 @@
7152=Leave or arrive at a place
7153=Leave
7154=Arrive
7155=Distress/Normal
7156=Distress





@@ -2166,7 +2170,8 @@
7152=离开或到达某地
7153=离开
7154=到达

7155=求救/正常
7156=求救


 

 HDL-ON_iOS/Resources/Language.ini

@@ -1036,6 +1036,8 @@
7152=Leave or arrive at a place
7153=Leave
7154=Arrive
7155=Distress/Normal
7156=Distress



@@ -2165,6 +2167,8 @@
7152=离开或到达某地
7153=离开
7154=到达
7155=求救/正常
7156=求救




 HDL_ON/Common/R.cs

@@ -2732,7 +2732,14 @@
        /// 到达
        /// </summary>
        public const int daoda = 7154;

        /// <summary>
        /// 求救/正常
        /// </summary>
        public const int qiujiuandzhengchang = 7155;
        /// <summary>
        /// 求救
        /// </summary>
        public const int qiujiu = 7156;


        #region LE新增

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

@@ -86,6 +86,22 @@
                        }
                    }
                    break;
                //紧急呼叫
                case SPK.SensorHelp:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView();
                        view.btnText.TextID = StringId.qiujiuandzhengchang;
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang);
                        };
                        if (edit)
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;
                //水浸传感器
                case SPK.SensorWater:
                    {
@@ -482,6 +498,7 @@
                    case SPK.SensorGas:
                    case SPK.SensorWater:
                    case SPK.SensorSmoke:
                    case SPK.SensorHelp:
                        {
                            keyVlaue = "status";
                            if (!Is_SpkAttribute(keyVlaue)) {

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

@@ -176,6 +176,23 @@
                                    }
                                    break;
                                //传感器
                                case SPK.SensorHelp:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            if (value == "alarm")
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.qiujiu);

                                            }
                                            else
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
                                            }
                                        }
                                    }
                                    break;
                                case SPK.SensorSmoke:
                                case SPK.SensorGas:
                                    {
@@ -1810,6 +1827,22 @@

                    }
                    break;
                case SPK.SensorHelp:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "alarm")
                            {
                                button1.Text = Language.StringByID(StringId.qiujiu);
                            }
                            else
                            {
                                button1.Text = Language.StringByID(StringId.zhengchang);
                            }
                        }
                    }
                    break;
                case SPK.SensorGas:
                case SPK.SensorSmoke:
                    {

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

@@ -392,6 +392,7 @@
        case SPK.SensorPm25:
        case SPK.SensorTVOC:
        case SPK.SensorHcho:
                case SPK.SensorHelp:
          {
            strPath = "LogicIcon/sensor.png";
          }
@@ -471,6 +472,7 @@
                || device.spk == SPK.SensorPm25
                  || device.spk == SPK.SensorTVOC
                    || device.spk == SPK.SensorHcho
                          || device.spk == SPK.SensorHelp
      );
      if (sensor != null)
      {
@@ -556,6 +558,7 @@
                functionTypeList.Add(SPK.SensorPm25);
                functionTypeList.Add(SPK.SensorTVOC);
                functionTypeList.Add(SPK.SensorHcho);
                functionTypeList.Add(SPK.SensorHelp);


            }
@@ -566,7 +569,8 @@
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            else {
            else
            {
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
@@ -609,6 +613,7 @@
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.HvacCac);
                functionTypeList.Add(SPK.SensorHelp);

            }

@@ -662,6 +667,7 @@
            deviceTypeList.Add(SPK.PanelSocket);
            deviceTypeList.Add(SPK.ElectricSocket);
                        deviceTypeList.Add(SPK.HvacCac);
                        deviceTypeList.Add(SPK.SensorHelp);

          }
          break;