2021-03-30 1.修复定时器取消选中星期无效问题。

JLChen

2021-03-30 94259bde69c75de291eb78317009573d9473ebb4

2021-03-30 1.修复定时器取消选中星期无效问题。

 Crabtree/.vs/SmartHome/xs/UserPrefs.xml

@@ -1,34 +1,14 @@
<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs">
  <MonoDevelop.Ide.Workbench>
    <Files>
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="695" Column="1" />
      <File FileName="SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs" Line="1" Column="1" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="642" Column="44" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="SmartHome" expanded="True">
            <Node name="Shared" expanded="True">
              <Node name="HDL" expanded="True">
                <Node name="Common" expanded="True">
                  <Node name="HttpUtil" expanded="True">
                    <Node name="IMessageCommon.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="Operation" expanded="True">
                  <Node name="Device" expanded="True" />
                  <Node name="ResponseEntity" expanded="True" />
                </Node>
              </Node>
              <Node name="UI" expanded="True">
                <Node name="SimpleControl" expanded="True">
                  <Node name="Phone" expanded="True">
                    <Node name="Schedule" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="ON.Droid" selected="True" />
          </Node>
        </State>
      </Pad>
@@ -47,6 +27,7 @@
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" relfile="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" line="153" column="1" />
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" line="703" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />

 Crabtree/SmartHome/HDL/Common/HttpUtil/ErrorCode.cs

@@ -4,58 +4,58 @@
    public class ErrorCode
    {

        //网络错误
        public readonly static string NetworkError = "Network Error";
        //原因
        public readonly static string Reason = " Cause: ";
        //账号已注册，激活邮件已经重新发送
        public readonly static string AccountYesRegisterNoIsverify = "Account is registered and activation email has been resent!";
        //账号未激活
        public readonly static string NOTVERIFY = "Account is not activated!";
        //账号或密码错误
        public readonly static string USERNAMEORPWDERROR = "Account or password error!";
        //账号不存在
        public readonly static string ACCOUNTNOEXISTS = "Account does not exist";
        //登录失败，原因为：
        public readonly static string LoginFailed = "Login failed!";
        //无效登录Token
        public readonly static string NoLogin = "Invalid Login Token!";
        //名称已存在        
        public readonly static string NameExist = "Name already exists!";
        //添加失败
        public readonly static string AddFailed = "Add failed!";
        //操作失败
        public readonly static string OperationFailed = "Operation failed!";
        //原密码和新密码相同
        public readonly static string NewPasswordAndOldPasswordEqual = "New password should be different with the original one.";
        //原密码错误
        public readonly static string OldPwdNoYes = "Wrong original password!";
        //发送邮件失败
        public readonly static string SendEmailFail = "Unable to send mail.";
        //当前提交HomeId与当前OldMac尚不存在绑定关系!
        public readonly static string NoBind = "The HomeId just submitted is not bound with current OldMac.";
        //Token 验证失败
        public readonly static string HomeIdAndTokenNoConsistent = "Token verification failed!";
        //住宅还存在网关绑定,请先解绑完再操作!
        public readonly static string CurrentHomeExixtsGatewayBind = "The home is bound with gateway already, please unbind first.";
        //交付备份, 不能删除!
        public readonly static string DeliveryBackNoUpdateDel = "Backup delivered and cannot be deleted.";
        //住宅未绑定网关  请先绑定无线网关! 
        public readonly static string HomeNoRecord = "Please bind gateway first!";
        //住宅不存在！
        public readonly static string HomeNoExist = "Home does not exist!";
        //生成的Guid已存在
        public readonly static string GuidExist = "Guid already exists.";
        ////网络错误
        //public readonly static string NetworkError = "Network Error";
        ////原因
        //public readonly static string Reason = " Cause: ";
        ////账号已注册，激活邮件已经重新发送
        //public readonly static string AccountYesRegisterNoIsverify = "Account is registered and activation email has been resent!";
        ////账号未激活
        //public readonly static string NOTVERIFY = "Account is not activated!";
        ////账号或密码错误
        //public readonly static string USERNAMEORPWDERROR = "Account or password error!";
        ////账号不存在
        //public readonly static string ACCOUNTNOEXISTS = "Account does not exist";
        ////登录失败，原因为：
        //public readonly static string LoginFailed = "Login failed!";
        ////无效登录Token
        //public readonly static string NoLogin = "Invalid Login Token!";
        ////名称已存在        
        //public readonly static string NameExist = "Name already exists!";
        ////添加失败
        //public readonly static string AddFailed = "Add failed!";
        ////操作失败
        //public readonly static string OperationFailed = "Operation failed!";
        ////原密码和新密码相同
        //public readonly static string NewPasswordAndOldPasswordEqual = "New password should be different with the original one.";
        ////原密码错误
        //public readonly static string OldPwdNoYes = "Wrong original password!";
        ////发送邮件失败
        //public readonly static string SendEmailFail = "Unable to send mail.";
        ////当前提交HomeId与当前OldMac尚不存在绑定关系!
        //public readonly static string NoBind = "The HomeId just submitted is not bound with current OldMac.";
        ////Token 验证失败
        //public readonly static string HomeIdAndTokenNoConsistent = "Token verification failed!";
        ////住宅还存在网关绑定,请先解绑完再操作!
        //public readonly static string CurrentHomeExixtsGatewayBind = "The home is bound with gateway already, please unbind first.";
        ////交付备份, 不能删除!
        //public readonly static string DeliveryBackNoUpdateDel = "Backup delivered and cannot be deleted.";
        ////住宅未绑定网关  请先绑定无线网关! 
        //public readonly static string HomeNoRecord = "Please bind gateway first!";
        ////住宅不存在！
        //public readonly static string HomeNoExist = "Home does not exist!";
        ////生成的Guid已存在
        //public readonly static string GuidExist = "Guid already exists.";
        //删除失败
        public readonly static string FailedDelete = "Failed to delete!";
        //子账号不存在
        public readonly static string SubAccountNoExists = "Sub accound does not exist.";
        //不能添加自己为子账号
        public readonly static string SameAccount = "Can't add yourself as a sub-account!";
        //账号已存在此住宅
        public readonly static string SubAccountExist = "Account already exists!";
        //不能绑定主账号
        public readonly static string NoAddMainAccount = "Can't bind main account!";
        ////子账号不存在
        //public readonly static string SubAccountNoExists = "Sub accound does not exist.";
        ////不能添加自己为子账号
        //public readonly static string SameAccount = "Can't add yourself as a sub-account!";
        ////账号已存在此住宅
        //public readonly static string SubAccountExist = "Account already exists!";
        ////不能绑定主账号
        //public readonly static string NoAddMainAccount = "Can't bind main account!";
        //获取住宅的网关列表失败！
        public readonly static string FailedGetGatewaysForHome = "Unable to get gateway list for home!";
        //此网关已绑定到一个住所，请在绑定到另一个住所之前将其重置。或者长按网关按键3S，变成红灯常亮，然后重试！

 Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs

@@ -627,6 +627,8 @@
                        return;
                    }
                }
                // 2021-03-30 先清空，再重新统计
                timerTemp.whichDay = new List<int>();

                if (btnMonday.IsSelected == true && btnFriday.IsSelected == true && btnThursday.IsSelected == true && btnSunday.IsSelected == true && btnTuesday.IsSelected == true && btnSaturday.IsSelected == true && btnWednesday.IsSelected == true) {
                    timerTemp.timerType = TimerType.EveryDay;