2020-05-29-2

陈嘉乐

2020-05-29 0a0d7ec5080cd1f1802d9fcc96b08102b9b551f1

2020-05-29-2

根据才刚协议修改传感器

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

@@ -1,7 +1,12 @@
<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>
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="428" Column="50" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="334" Column="59" />
      <File FileName="Shared/Phone/Device/Logic/IgnoreTime.cs" Line="143" Column="18" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
@@ -12,7 +17,8 @@
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="SkipView.cs" selected="True" />
                    <Node name="LogicView" expanded="True" />
                    <Node name="CurrentDeviceState.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">

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

Binary files differ

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

old mode 100755
new mode 100644
@@ -134,9 +134,9 @@
            deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
            deviceConditionsInfo.Add("Cluster_ID", "1280");
            deviceConditionsInfo.Add("AttriButeId", "1281");
            deviceConditionsInfo.Add("AttriButeData1", "0");
            deviceConditionsInfo.Add("AttriButeData1", "1");
            deviceConditionsInfo.Add("AttriButeData2", "0");
            deviceConditionsInfo.Add("Range", "1");
            deviceConditionsInfo.Add("Range", "5");
            if (selectetimedvalue != 0)
            {
                if (timevalue != selectetimedvalue)

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

@@ -221,8 +221,23 @@
                catch { }
            };

            //UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
            //{
            //    var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
            //    if (DoorlockKey == key)
            //    {
            //        try
            //        {
            //            Application.RunOnMainThread(() =>
            //            {
            //                Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
            //                ModeView();
            //            });
            //        }
            //        catch { }
            //    }
            //};
        }
            //UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
            //{
            //    var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
            //    if (DoorlockKey == key)
            //    {
            //        try
            //        {
            //            Application.RunOnMainThread(() =>
            //            {
            //                Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
            //                ModeView();
            //            });
            //        }
            //        catch { }
            //    }
            //};
        }
        /// <summary>
        /// 常开模式开关切换图标界面
        /// </summary>