2020-05-06-1

陈嘉乐

2020-05-06 a4d29f9f72452ccae2f607e6ad31cad493822da4

2020-05-06-1

门锁最新代码

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

@@ -1,63 +1,22 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="19" Column="22" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="8" Column="43" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" Line="442" Column="18" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" Line="483" Column="19" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="28" Column="26" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="214" Column="45" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="161" Column="45" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="834" Column="50" />
      <File FileName="Shared/R.cs" Line="559" Column="23" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="119" Column="23" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="608" Column="22" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="138" Column="60" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="42" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="22" Column="51" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" />
      <File FileName="Shared/R.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" />
      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" />
    </Files>
    <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="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="LogicView" expanded="True" />
                    <Node name="SoneLogicList.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                    <Node name="Controls" expanded="True">
                      <Node name="BaseCommonControl" expanded="True">
                        <Node name="Base" expanded="True" />
                      </Node>
                      <Node name="MessageControls" expanded="True" />
                      <Node name="NormalControls" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />

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

Binary files differ

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

@@ -796,26 +796,7 @@
            }
            return _if;
        }

        /// <summary>
        /// 常开模式开关
        /// </summary>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<bool> OpenMode(bool _if, DoorLock doorLock)
        {
            var result = await doorLock.SetNormallyOpenModeFuncAsync(_if);
            
            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
            {
                return false;
            }
            if (result.defaultControlResponseData.status == 0)
            {
                //app确认取消“常开模式”成功 
                return true;
            }
            return false;
        }
       
    }
}


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

@@ -108,48 +108,28 @@
                    TextSize = 16,
                };
                openModeFl.AddChidren(closeBtn);
                closeBtn.MouseUpEventHandler += (sender, e) =>
                closeBtn.MouseUpEventHandler += async (sender, e) =>
                {

                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                   Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                   Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();

                    alert.ConfirmClickEvent += async () =>

                    var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
                    if (result)
                    {
                        if (logic != null)
                        {
                            ///有可能只有常开模式，没有时效性自动化
                            ///没有判断的话，逻辑会为空，抛出异常;
                            Send.DelLogic(logic.LogicId);
                        }
                        this.RemoveFromParent();
                        var soneLogicList = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(soneLogicList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        soneLogicList.Show(() => { }, false);
                    }
                    else
                    {
                        ///提示失败
                    }

                     Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock, action);

                     Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
                            this.RemoveFromParent();
                            var soneLogicList = new SoneLogicList();
                            UserView.HomePage.Instance.AddChidren(soneLogicList);
                            UserView.HomePage.Instance.PageIndex += 1;
                            soneLogicList.Show(() => { }, false);

                        };

                        /////xm
                        //var result = await SkipView.OpenMode(false, Send.CurrentDoorLock);
                        //if (result)
                        //{
                        //    if (logic != null)
                        //    {
                        //        ///有可能只有常开模式，没有时效性自动化
                        //        ///没有判断的话，逻辑会为空，抛出异常;
                        //        Send.DelLogic(logic.LogicId);
                        //    }
                        //    this.RemoveFromParent();
                        //    var soneLogicList = new SoneLogicList();
                        //    UserView.HomePage.Instance.AddChidren(soneLogicList);
                        //    UserView.HomePage.Instance.PageIndex += 1;
                        //    soneLogicList.Show(()=>{ },false);
                        //}
                        //else {
                        //    ///提示失败
                        //}

                    };
                };

                ///显示失效设置时间文本控件
@@ -226,67 +206,53 @@
                };
                modeFl.AddChidren(nextIconBtn);

               

              nextIconBtn.MouseUpEventHandler += (sender, e) =>
               {

                   Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog(Send.CurrentDoorLock, action);
                   Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
                       this.RemoveFromParent();
                       var soneLogicList = new SoneLogicList();
                       UserView.HomePage.Instance.AddChidren(soneLogicList);
                       UserView.HomePage.Instance.PageIndex += 1;
                       soneLogicList.Show(() => { }, true);

                   };
                   #region 
                   /*
                   LogicView.TipView.ShowConfrimTip(() =>
                   {///再次确认
                nextIconBtn.MouseUpEventHandler += (sender, e) =>
                 {
                     LogicView.TipView.ShowConfrimTip(() =>
                     {///再次确认
                       LogicView.TipView.ShowInputTip(true, async (str) =>
                       {///确认发送命令
                         {///确认发送命令
                           try
                           {
                             {
                               ///xm
                               var result = await SkipView.OpenMode(true,Send.CurrentDoorLock);
                               if (!result)
                               {
                                   Application.RunOnMainThread(() =>
                                   {
                                     ///提示失败
                               var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
                                 if (!result)
                                 {
                                     Application.RunOnMainThread(() =>
                                     {
                                       ///提示失败
                                   });
                                   return;
                               }
                               else
                               {
                                     return;
                                 }
                                 else
                                 {
                                   ///因为有常开模式下才可以创建失效逻辑；
                                   SkipView.GetLogicAll();//删除之前所有失效逻辑
                                   var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
                                   if (!addResult)
                                   {
                                     {
                                       ///提示失败
                                       return;
                                   }
                                   this.RemoveFromParent();
                                   var soneLogicList = new SoneLogicList();
                                   UserView.HomePage.Instance.AddChidren(soneLogicList);
                                   UserView.HomePage.Instance.PageIndex += 1;
                                   soneLogicList.Show(() => { }, true);
                                     }
                                     this.RemoveFromParent();
                                     var soneLogicList = new SoneLogicList();
                                     UserView.HomePage.Instance.AddChidren(soneLogicList);
                                     UserView.HomePage.Instance.PageIndex += 1;
                                     soneLogicList.Show(() => { }, true);

                               }
                           }
                           catch
                           {
                                 }
                             }
                             catch
                             {

                           }
                       });
                             }
                         });

                   });
                  */
                     });

                   #endregion
               };
                 };
            }

            #endregion

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

@@ -388,8 +388,30 @@
            }
            return false;
        }
    

        /// <summary>
        /// 设置常开模式
        /// </summary>
        /// <param name="doorLock">当前门锁</param>
        /// <param name="action">回调处理更新内容</param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
        {
            //app设置“常开模式”失败 
            var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
            {
                return false;
            }

            if (result.defaultControlResponseData.status == 0)
            {
                //app设置“常开模式”成功  
                NormallyOpenModeValue(doorLock, false);
                return true;
            }
            return false;
        }

        /// <summary>
        /// 启动常开模式【弹窗】