2019-10-25-3

WJC

2019-10-25 b4312dc4fc0b37955322058937fea6a1845de3bf

2019-10-25-3

最新代码

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -2,17 +2,18 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="14" Column="44" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="354" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="181" Column="15" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="105" Column="49" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="238" Column="14" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="151" Column="92" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs" Line="128" Column="50" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs" Line="193" Column="47" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1127" Column="38" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1981" Column="76" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="50" Column="48" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2128" Column="19" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="518" Column="69" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs" Line="163" Column="16" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -24,8 +25,9 @@
                <Node name="Device" expanded="True">
                  <Node name="Category" expanded="True" />
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="Send.cs" selected="True" />
                    <Node name="DoorLockLogic" expanded="True">
                      <Node name="LockAddScene.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -1807,7 +1807,7 @@
        /// <summary>
        /// 自动化
        /// </summary>
        public async void ShowAutotion()
        private async void ShowAutotion()
        {



            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

@@ -2000,7 +2000,7 @@
        /// 自动化列表界面
        /// </summary>
        /// <param name="refresview">Refresview.</param>
        public async void Automationview(VerticalScrolViewLayout refresview)
        private async void Automationview(VerticalScrolViewLayout refresview)
        {
            refresview.RemoveAll();
            foreach (var logic in Common.Logic.LogicList)
@@ -2131,8 +2131,6 @@


        }

        #endregion

        #region ◆ 控制状态_________________________

@@ -2599,5 +2597,6 @@
                }
            }
        }
        #endregion
    }
}

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs

@@ -12,6 +12,7 @@
        {
            Tag = "LockLogicList";
        }
        VerticalScrolViewLayout middle;
        public async void Show()
        {

@@ -91,7 +92,7 @@
            };
            #endregion

            var middle = new VerticalScrolViewLayout
            middle = new VerticalScrolViewLayout
            {
                Y = topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184),
@@ -132,6 +133,13 @@
                }
            }
            //自动化
            Automationview();
            CommonPage.Loading.Hide();
        }

        void Automationview()
        {
            middle.RemoveAll();
            for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
            {
                var logic = Common.Logic.LockLogicList[i];
@@ -169,8 +177,67 @@
                };
                logicRowlayout.AddChidren(logicswitchBtn);

                logicswitchBtn.MouseUpEventHandler += (sender, e) =>
                {
                    logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected;
                    if (logicswitchBtn.IsSelected)
                    {
                        //逻辑开
                        logic.IsEnable = 1;
            }
            CommonPage.Loading.Hide();
                    else
                    {
                        //逻辑关
                        logic.IsEnable = 0;
                    }
                    Logic.Send.LogicControlSwitch(logic);

                };
                ///编辑
                var edit = new Button
                {
                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                    Text = Language.StringByID(MyInternationalizationString.edit),
                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                };
                logicRowlayout.AddRightView(edit);
                edit.MouseUpEventHandler += (sender, e) =>
                {
                    Common.Logic.CurrentLogic = logic;
                    var lockLogicCommunalPage = new LockLogicCommunalPage();
                    UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                    UserView.HomePage.Instance.PageIndex += 1;
                    lockLogicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(); });

                };


                ///删除
                var del = new Button
                {
                    BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
                    Text = Language.StringByID(MyInternationalizationString.del),
                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                };
                logicRowlayout.AddRightView(del);
                del.MouseUpEventHandler += (sender, e) =>
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                                             Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
                    alert.ResultEventHandler += (sender1, e1) =>
                    {
                        if (e1)
                        {
                            Common.Logic.LogicList.Remove(logic);
                            Automationview();
                            Send.DelLogic(logic.LogicId);
                        }
                    };
                    alert.Show();

                };
            }

        }
    }
}