Merge branch 'WJC'

wxr

2020-12-09 b5f348ec1381a8b05d00e585a3e156381f751d72

Merge branch 'WJC'

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

Binary files differ

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

@@ -57,7 +57,6 @@
                MainPage.BasePageView.AddChidren(funTpye);
                funTpye.Show(LogicMethod.condition_if);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            };
            #endregion


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

@@ -124,7 +124,7 @@
            LogicView.LogicTypeTitleView cyclicTitle = new LogicView.LogicTypeTitleView();
            cyclicTitle.frameLayout.Height = Application.GetRealHeight(50);
            cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
            cyclicTitle.btnText.TextID = StringId.days;
            cyclicTitle.btnText.Text = MainView.GetWeekText(Logic.currlogic);
            viewLayout.AddChidren(cyclicTitle.FLayoutView());
            cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
            {
@@ -232,7 +232,7 @@
            //定义一个局部变量记录选中文本状态
            string weekName = "";
            //定义一个局部Btn用来记录选中Btn;
            var selecetdBtn = new Button();
            var selecetdBtn = new Button() { Text=""};
            for (int i = 0; i < 4; i++)
            {
                LogicView.SelectTypeView dateTypeView = new LogicView.SelectTypeView();
@@ -320,35 +320,31 @@
                {
                    dateTypeView.btnText.TextColor = CSS.CSS_Color.textConfirmColor;
                    selecetdBtn = dateTypeView.btnText;
                }
                else if (button.Text == weekName)
                {
                    dateTypeView.btnText.TextColor = CSS.CSS_Color.textConfirmColor;
                    selecetdBtn = dateTypeView.btnText;

                }
            }
            //确定保存
            dateView.btnConfirm.MouseUpEventHandler += (sender3, e3) =>
            {
                if (weekName == Language.StringByID(StringId.monthly)|| weekName== Language.StringByID(StringId.weekly)) {
                if (selecetdBtn.Text == Language.StringByID(StringId.monthly)|| selecetdBtn.Text == Language.StringByID(StringId.weekly)) {
                    //提示：还未选
                    return;

                }

                if (weekName == Language.StringByID(StringId.performA))
                if (selecetdBtn.Text == Language.StringByID(StringId.performA))
                {
                    //执行一次
                    Logic.currlogic.cycle.type = "once";
                }
                else if (weekName == Language.StringByID(StringId.days))
                else if (selecetdBtn.Text == Language.StringByID(StringId.days))
                {
                    //每天
                    Logic.currlogic.cycle.type = "day";

                }
                //选中保存之后显示文本
                button.Text = weekName;
                button.Text = selecetdBtn.Text;
                //移除fLayout界面
                fLayout.RemoveFromParent();
            };

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

@@ -196,7 +196,7 @@
        /// <returns></returns>
        public static HDL_ON.Entity.Function GetDevice(string sid)
        {
            HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown",sid="设备不存在"};
            HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown"};
            List<HDL_ON.Entity.Function> deviceLists = GetGatewayDeviceList();
            foreach (var dev in deviceLists)
            {
@@ -216,7 +216,7 @@
        /// <returns></returns>
        public static HDL_ON.Entity.Scene GetSecne(string sid)
        {
            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "场景不存在" };
            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown"};
            List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
            foreach (var sce in sceneLists)
            {

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs

@@ -94,8 +94,6 @@
            TextID = StringId.Del,
            TextSize = LogicView.TextSize.text16,
            TextColor = CSS.CSS_Color.view,
            Gravity = Gravity.Center,
            TextAlignment = TextAlignment.Center,
        };
       
        public Button btnClick = new Button

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs

@@ -68,6 +68,7 @@
            Height = Application.GetRealHeight(17),
            X = Application.GetRealWidth(20),
            Y = Application.GetRealHeight(58),
            TextAlignment=TextAlignment.CenterLeft,
        };

        /// <summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs

@@ -15,17 +15,18 @@
            Width = Application.GetRealWidth(343),
            X = Application.GetRealWidth(16),
            BackgroundColor = CSS.CSS_Color.view,
            Radius=(uint)Application.GetRealHeight(12),
            Radius =(uint)Application.GetRealHeight(12),
        };
        /// <summary>
        /// 时间控件UIPickerView 
        /// </summary>
        public UIPickerView mUIPickerView = new UIPickerView
        {
            //Y = Application.GetRealHeight(44),
            X= Application.GetRealWidth(12),
            Height = Application.GetRealHeight(297),
            Width = Application.GetRealWidth(343),
            BackgroundColor = CSS.CSS_Color.viewTranslucence,
            Width = Application.GetRealWidth(343-12*2),
            BackgroundColor =CSS.CSS_Color.viewTranslucence,
            Radius = (uint)Application.GetRealHeight(12),

        };
        /// <summary>
@@ -39,7 +40,8 @@
            Width = Application.GetRealWidth(52),
            Height = Application.GetRealHeight(32),
            Y = Application.GetRealHeight(6),
            X = Application.GetRealWidth(8)
            X = Application.GetRealWidth(8),
            
        };
        /// <summary>
        /// 确定Btn
@@ -62,7 +64,8 @@
            BackgroundColor = CSS.CSS_Color.viewLine,
            Width = Application.GetRealWidth(343),
            Height = 1,
            Y = Application.GetRealWidth(44)
            Y = Application.GetRealWidth(44),
           
        };
        /// <summary>
        /// 时间View的方法
@@ -70,11 +73,12 @@
        /// <returns></returns>
        public void FLayoutView(FrameLayout fLayout)
        {
           
            fLayout.AddChidren(frameLayout);
            frameLayout.AddChidren(mUIPickerView);
            frameLayout.AddChidren(btnCancel);
            frameLayout.AddChidren(btnConfirm);
            frameLayout.AddChidren(btnLine);
            fLayout.AddChidren(frameLayout);
        }
        /// <summary>
        /// 获取1-24小时列表

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

@@ -96,7 +96,7 @@
                fLayout.RemoveFromParent();
             };
            //取消点击事件
            timePointView.btnCancel.MouseUpEventHandler += removefLayout; 
            timePointView.btnCancel.MouseUpEventHandler += removefLayout;

            //加载数据界面的设置方法(列表互不联动)
            timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);