From 94259bde69c75de291eb78317009573d9473ebb4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 三月 2021 11:28:35 +0800
Subject: [PATCH] 2021-03-30 1.修复定时器取消选中星期无效问题。
---
Crabtree/SmartHome/HDL/Common/HttpUtil/ErrorCode.cs | 100 ++++++++++++++++----------------
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 27 +-------
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 2
3 files changed, 56 insertions(+), 73 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index a085b14..e518568 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/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 />
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/ErrorCode.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/ErrorCode.cs
index 560625a..cfe950a 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/ErrorCode.cs
+++ b/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涓庡綋鍓峅ldMac灏氫笉瀛樺湪缁戝畾鍏崇郴!
- 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!";
- //鐢熸垚鐨凣uid宸插瓨鍦�
- 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涓庡綋鍓峅ldMac灏氫笉瀛樺湪缁戝畾鍏崇郴!
+ //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!";
+ ////鐢熸垚鐨凣uid宸插瓨鍦�
+ //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锛屽彉鎴愮孩鐏父浜紝鐒跺悗閲嶈瘯锛�
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 6a71454..1146d9d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/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;
--
Gitblit v1.8.0