2020-05-28-2

陈嘉乐

2020-05-28 e03ec0580564467bcbd40b6fff2b87a953d383d1

2020-05-28-2

最新代码

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

@@ -1,13 +1,10 @@
<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/SkipView.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="23" Column="38" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="427" Column="59" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="12" Column="2" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1086" Column="47" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="11" Column="38" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="240" Column="17" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -15,10 +12,11 @@
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="SkipView.cs" selected="True" />
                    <Node name="SoneLogicList.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/SkipView.cs

@@ -63,8 +63,6 @@
            }

        }

       
        #region ◆ 自动化__________________________
        /// <summary>
        /// 自动化功能代码入口
@@ -762,6 +760,7 @@
        /// </summary>
        public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
        {
            
            int exist = 0;
            var IdList = await Send.GetLogicId(valueInt);
            if (IdList.Count != 0)

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

@@ -222,7 +222,7 @@
                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>
        /// 常开模式开关切换图标界面

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs

old mode 100755
new mode 100644
@@ -619,7 +619,7 @@
                        {

                            //温居城的要网关中是否有逻辑存在 

                            //参数:2-常开自动化;3-失效时间自动化

                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device);

                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(2, (ZigBee.Device.DoorLock)device);

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //弹出徐梅的那个窗口


 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

@@ -694,7 +694,7 @@
                            DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
                            Application.RunOnMainThread(async () =>
                            {
                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2,doorLock);
                                if (resTemp == 1)
                                {
                                    haveLogicNormallyOpenMode = true;