Merge branch 'WJC' into wxr7

wxr

2021-08-23 c877bc16eb02df246e48377101af0fa5ec626c14

Merge branch 'WJC' into wxr7

 HDL-ON_Android/Assets/Language.ini

@@ -993,6 +993,8 @@
7145=Security
7146=Add security

7147=Arm
7148=Disarm

    
9000=Please sign in with new cell phone number.
@@ -2076,6 +2078,8 @@
7145=安防
7146=添加安防

7147=布防
7148=撤防
 
9000=请使用新的手机账号登录APP
9001=请使用新的邮箱账号登录APP

 HDL-ON_iOS/Resources/Language.ini

@@ -992,6 +992,8 @@
7144=excellence
7145=Security
7146=Add security
7147=Arm
7148=Disarm


    
@@ -2075,6 +2077,8 @@
7144=优秀
7145=安防
7146=添加安防
7147=布防
7148=撤防

 
9000=请使用新的手机账号登录APP

 HDL_ON/Common/R.cs

@@ -2546,7 +2546,15 @@
        /// <summary>
        /// 添加安防
        /// </summary>
        public const int addSecurityLogic = 7046;
        public const int addSecurityLogic = 7146;
        /// <summary>
        /// 布防
        /// </summary>
        public const int bufang = 7147;
        /// <summary>
        /// 撤防
        /// </summary>
        public const int chefang = 7148;


        #region LE新增

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

@@ -75,7 +75,12 @@
            //安防点击事件
            securityView.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                SecurityMethod(this);
                Security security = new Security();
                MainPage.BasePageView.AddChidren(security);
                security.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

                //SecurityMethod(this);
            };
            //延时点击事件
            delayView.btnClick.MouseUpEventHandler += (sen, e) =>

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

@@ -1103,8 +1103,20 @@
                            //用sid找到安防；
                            var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
                            targetView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
                            targetView.btnDelay.Visible = false;
                            //显示安防名称 
                            stateStr = security.name;
                            targetView.btnText.Text = security.name;
                            string value = GetKeyValue("security", dicList);
                            if (value == "enable")
                            {
                                stateStr = Language.StringByID(StringId.bufang);

                            }
                            else
                            {
                                stateStr = Language.StringByID(StringId.chefang);
                            }

                        }
                        break;
                    case "4":
@@ -1119,9 +1131,9 @@
                        break;
                }

                if (outputTarget.target_type == "1")
                if (outputTarget.target_type == "1" || outputTarget.target_type == "3")
                {
                    targetView.btnState.Text =new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
                    targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
                }
                else
                {
@@ -1160,8 +1172,8 @@
                            break;
                        case "3":
                            {
                                AddTarget addTarget = new AddTarget();
                                addTarget.SecurityMethod(thisView, edit, indexVulae);
                                Security security = new Security();
                                security.SecurityMethod(thisView, "", edit, indexVulae);
                            }
                            break;
                        case "4":

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

@@ -709,6 +709,14 @@
                      };
                    }
                    break;
                case "security":
                    {
                        list = new List<string> {
             Language.StringByID(StringId.bufang ),
             Language.StringByID(StringId.chefang),
                      };
                    }
                    break;

            }
            return list;

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

New file
@@ -0,0 +1,146 @@
using System;
using System.Collections.Generic;
using Shared;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    public class Security : FrameLayout
    {
        public Security()
        {
            Tag = "Logic";
        }
        public void Show()
        {

            LogicView.TopView topView = new LogicView.TopView();
            this.AddChidren(topView.FLayoutView());
            topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
            {
                RemoveFromParent();
            };
            topView.topNameBtn.TextID = StringId.addSecurityLogic;

            VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
            {
                Y = Application.GetRealHeight(64),
                Width = Application.GetRealWidth(LogicView.TextSize.view375),
                Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64),
                BackgroundColor = CSS.CSS_Color.viewMiddle,
            };
            this.AddChidren(viewLayout);
            var securityList = LogicMethod.CurrLogicMethod.GetSecurityList();
            for (int i = 0; i < securityList.Count; i++)
            {
                var security = securityList[i];
                LogicView.SelectTypeView securityView = new LogicView.SelectTypeView();
                securityView.btnText.Text = security.name;
                securityView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
                viewLayout.AddChidren(securityView.FLayoutView());
                securityView.btnClick.MouseUpEventHandler += (sen, e) =>
                {
                    SecurityMethod(this, security.sid);
                };
            }

        }

      
        /// <summary>
        /// 添加安防
        /// </summary>
        public void SecurityMethod(FrameLayout frameLayout,string sid, bool edit = false, int index1 = -1)
        {
            string stateStr = "";
            if (edit && index1 != -1)
            {
                Output output = Logic.currlogic.output[index1];
                sid = output.sid;
                for (int i = 0; i < output.status.Count; i++)
                {
                    var dic = output.status[i];
                    if (dic.ContainsKey("value"))
                    {
                        if (dic["value"] == "enable")
                        {
                            stateStr = Language.StringByID(StringId.bufang);

                        }
                        else
                        {
                            stateStr = Language.StringByID(StringId.chefang);
                        }
                    }
                }
            }
            PublicInterface conditionView = new PublicInterface();
            var strList = conditionView.GetViewList("security");
            conditionView.SingleSelectionShow(frameLayout, strList, Language.StringByID(StringId.addSecurityLogic), stateStr
         , (stateValue) =>
         {

             string selecttionMode = "";
             if (stateValue == Language.StringByID(StringId.bufang))
             {
                 selecttionMode = "enable";
             }
             else
             {
                 selecttionMode = "disable";
             }
             //封装数据
             Output outputDevice = new Output();
             outputDevice.target_type = "3";
             outputDevice.sid = sid;
             outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "security" }, { "value", selecttionMode } } };
             AddOutput(outputDevice);
             LogicMethod.CurrLogicMethod.RemoveAllView();
             AddLogic addLogic = new AddLogic();
             MainPage.BasePageView.AddChidren(addLogic);
             addLogic.Show();
             MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

         });
           
        }
      
        /// <summary>
        /// 添加目标
        /// </summary>
        /// <param name="target"></param>
        /// <param name="bool_if">表示启用不同条件</param>
        private void AddOutput(Output target, bool bool_if = false)
        {
            int indexValue = -1;
            for (int i = 0; i < Logic.currlogic.output.Count; i++)
            {
                if (bool_if)
                {
                    ///安防允许一种
                    if (Logic.currlogic.output[i].target_type == target.target_type)
                    {
                        indexValue = i;
                        break;
                    }
                }
                else
                {
                    if (Logic.currlogic.output[i].sid == target.sid)
                    {
                        indexValue = i;
                        break;
                    }
                }
            }
            if (indexValue != -1)
            {
                Logic.currlogic.output.RemoveAt(indexValue);
                Logic.currlogic.output.Insert(indexValue, target);
            }
            else
            {
                Logic.currlogic.output.Add(target);
            }

        }
    }
}