2020-03-31-1

WJC

2020-03-31 3a662a08e1c54c9a5687a43a8133c8e42981f474

2020-03-31-1

优化门锁常开模式添加自动化显示不了。

 .DS_Store

Binary files differ

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

@@ -1,33 +1,24 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="78" Column="63" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="982" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="351" Column="50" />
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="451" Column="45" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="22" Column="43" />
    </Files>
  <MonoDevelop.Ide.Workbench>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
            <Node name="Home.IOS" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Category" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="CurrentDeviceState.cs" selected="True" />
                    <Node name="DoorLockLogic" expanded="True">
                      <Node name="AddCondition.cs" selected="True" />
                  </Node>
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
              </Node>
            </Node>
@@ -37,9 +28,7 @@
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.9992EB40-E6DD-48F4-AFED-CEB5E811ACDD" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches>
    <Watch file="../../../Shared/Phone/Device/Logic/Method.cs" line="779" offsetX="-1" offsetY="-1" expression="Phone" liveUpdate="False" />
  </MonoDevelop.Ide.DebuggingService.PinnedWatches>
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />

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

Binary files differ

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

@@ -183,10 +183,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                            var lockLogicCommunalPage = new LockLogicCommunalPage();
                            UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            lockLogicCommunalPage.Show(() => { });
                            selecteddevice.selecetdFrameLayout.RemoveFromParent();
                            //var lockLogicCommunalPage = new LockLogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //lockLogicCommunalPage.Show(() => { });
                        };
                    };

@@ -587,10 +588,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Actions.Remove(actions);
                            var lockLogicCommunalPage = new LockLogicCommunalPage();
                            UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            lockLogicCommunalPage.Show(() => { });
                            actiondevice.selecetdFrameLayout.RemoveFromParent();
                            //var lockLogicCommunalPage = new LockLogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //lockLogicCommunalPage.Show(() => { });
                        };
                    };


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

@@ -660,10 +660,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                            var logicCommunalPage = new LogicCommunalPage();
                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            logicCommunalPage.Show(() => { });
                            selecteddevice.selecetdFrameLayout.RemoveFromParent();
                            //var logicCommunalPage = new LogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //logicCommunalPage.Show(() => { });
                        };

                    };
@@ -1151,11 +1152,12 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Actions.Remove(actions);
                            actiondevice.selecetdFrameLayout.RemoveFromParent();
                            // devicesFrameLayout.RemoveFromParent();
                            var logicCommunalPage = new LogicCommunalPage();
                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            logicCommunalPage.Show(() => { });
                            //var logicCommunalPage = new LogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //logicCommunalPage.Show(() => { });
                        };

                    };

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

@@ -837,5 +837,6 @@
        }

       

    }
}

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

@@ -714,7 +714,7 @@
                }
                catch { }
                var dateTime = DateTime.Now;
                while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
                while ((DateTime.Now - dateTime).TotalMilliseconds < 5* 1000)
                {
                    await System.Threading.Tasks.Task.Delay(100);
                    if (sum == listLogic.Count)

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

@@ -56,6 +56,12 @@
                        doorLockLogicList.Show();
                    } break;
                case 2: {
                        ///进来刷新一次设备列表；

                        Common.Logic.LogicDviceList.Clear();

                        if (Common.Logic.LogicDviceList.Count == 0)

                        {

                            Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());

                        }
                        //new一个新逻辑对象；
                        //新增门锁常开模式自动化入口；
                        Common.Logic.CurrentLogic = new Common.Logic();
@@ -528,7 +534,8 @@
                    indexlist.Add(linkType);
                }
            }
            if (indexlist.Contains("0"))
             //排列图标顺序;
            if (indexlist.Contains("0")|| indexlist.Contains("8"))
            {
                iconIndexlist.Add("0");
            }
@@ -659,16 +666,15 @@
        public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
        {

            int hour = timeVlaue / 60;
            int min = timeVlaue % 60;
            Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
            timeConditionsInfo.Add("Type", "0");
            timeConditionsInfo.Add("IsValid", "1");
            timeConditionsInfo.Add("DateType", "0");
            timeConditionsInfo.Add("RemindTime", "0");
            timeConditionsInfo.Add("EnDelay", "0");
            timeConditionsInfo.Add("DelayTime", "0");
            timeConditionsInfo.Add("StartHour", hour.ToString());
            timeConditionsInfo.Add("StartMin", min.ToString());
            timeConditionsInfo.Add("StartHour", timeVlaue.ToString());
            timeConditionsInfo.Add("StartMin", "0");
            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
            actionsInfo.Add("LinkType", 8);
            actionsInfo.Add("DeviceAddr", common.DeviceAddr);
@@ -676,8 +682,9 @@
            actionsInfo.Add("PassData", "055704010112");//默认门锁常开

            Common.Logic currentLogic = new Common.Logic();
            currentLogic.IsEnable = 0;//默认禁用
            currentLogic.IsEnable = 1;//默认为开
            currentLogic.TimeAttribute.Repeat = 0;//执行一次
            currentLogic.LogicType = 2;//标记逻辑类型
            currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
            currentLogic.Conditions.Add(timeConditionsInfo);
            currentLogic.Actions.Add(actionsInfo);

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

@@ -289,10 +289,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                            var templatePage = new TemplatePage();
                            UserView.HomePage.Instance.AddChidren(templatePage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            templatePage.Show();
                            selecteddevice.selecetdFrameLayout.RemoveFromParent();
                            //var templatePage = new TemplatePage();
                            //UserView.HomePage.Instance.AddChidren(templatePage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //templatePage.Show();
                        };
                    };
                }
@@ -418,10 +419,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Actions.Remove(actions);
                            var templatePage = new TemplatePage();
                            UserView.HomePage.Instance.AddChidren(templatePage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            templatePage.Show();
                            actiondevice.selecetdFrameLayout.RemoveFromParent();
                            //var templatePage = new TemplatePage();
                            //UserView.HomePage.Instance.AddChidren(templatePage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //templatePage.Show();
                        };
                    };

@@ -432,11 +434,11 @@

            #region -----每天 设置周期-----

            var fraline1 = new FrameLayout
            var fraHeight = new FrameLayout
            {
                Height = Application.GetRealHeight(30),
            };
            middle.AddChidren(fraline1);
            middle.AddChidren(fraHeight);


            LogicView.Addview weekview = new LogicView.Addview();