合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs

old mode 100755
new mode 100644
@@ -47,7 +47,7 @@
            var middle = new VerticalScrolViewLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184 - 180),
                Height = Application.GetRealHeight(Method.H - 184 - 180),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -61,7 +61,7 @@
            var iconBtn = new Button
            {
                Width = Application.GetRealWidth(936),
                Height = Application.GetRealHeight(436),
                Height = Application.GetRealWidth(436),
                X = Application.GetRealWidth(72),
                Y = Application.GetRealHeight(30),
                UnSelectedImagePath = $"ZigeeLogic/logicbj{s}.png",
@@ -229,11 +229,8 @@
                                            {
                                                case 13:
                                                    {
                                                        if (intvalue == "1")
                                                        {
                                                            selecteddevice.selecetddevicestateBtn.TextID = MyInternationalizationString.someone;
                                                        }
                                                        else

                                                        if (conditions.ContainsKey("IgnoreTime"))
                                                        {
                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -257,6 +254,11 @@

                                                            }
                                                        }
                                                        else
                                                        {
                                                            selecteddevice.selecetddevicestateBtn.TextID = MyInternationalizationString.someone;
                                                        }

                                                    }
                                                    break;
                                            }
@@ -268,21 +270,22 @@
                            }
                            break;
                    }
                 

                    ///编辑
                    selecteddevice.edit.Tag = i.ToString();
                    selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
                    {
                        var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                        this.AddChidren(flMain);
                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_mould");
                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_mould", int.Parse(selecteddevice.edit.Tag.ToString()));

                    };
                    ///删除控件
                    selecteddevice.del.MouseUpEventHandler += (sender, e) =>
                    {

                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                   Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                   Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -401,18 +404,20 @@
                            break;
                    }
                    ///编辑

                    actiondevice.edit.Tag = i;
                    actiondevice.edit.MouseUpEventHandler += (sender, e) => {
                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                        this.AddChidren(flMain);
                        var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_mould");
                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_mould",int.Parse(actiondevice.edit.Tag.ToString()));
                    };
                    ///删除控件
                    actiondevice.del.MouseUpEventHandler += (sender, e) =>
                    {


                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                     Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                     Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -467,7 +472,7 @@
                var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
                UserView.HomePage.Instance.AddChidren(cycle);
                UserView.HomePage.Instance.PageIndex += 1;
                cycle.Show();
                cycle.Show(LogicView.IfString._Logic,false);

                //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
                //UserView.HomePage.Instance.AddChidren(cyclicCycle);