~cjl/CrabtreeOn.git

parent: 4e343aa2 | 补丁 | 提交 | show whitespace

2021-2-5-2

陈嘉乐

2021-02-05 502d4ff743c1645adb469ab89c24826c4ec38f28

2021-2-5-2

备份以下代码

5个文件已修改

	Crabtree/.vs/SmartHome/xs/UserPrefs.xml	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -1,12 +1,10 @@
<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs">
    <Files>
      <File FileName="../../../../Downloads/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="868" Column="60" IsPinned="True" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="87" Column="64" />
      <File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" Line="71" Column="42" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="481" Column="55" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="344" Column="33" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="29" Column="29" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="233" Column="62" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="147" Column="43" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -18,8 +16,9 @@
                <Node name="SimpleControl" expanded="True">
                  <Node name="Phone" expanded="True">
                    <Node name="Schedule" expanded="True">
                      <Node name="AddSchedule.cs" selected="True" />
                      <Node name="Send.cs" selected="True" />
                    </Node>
                    <Node name="User" expanded="True" />
                  </Node>
                </Node>
              </Node>
@@ -42,9 +41,7 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/hdl/Desktop/wjc/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" line="970" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide

Binary files differ

 Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide-wal

Binary files differ

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

@@ -16,8 +16,8 @@
        public static ResponsePackNew GetTimerList ()
        {
            var jObject = new JObject { }; 
            jObject.Add ("gatewayId", Int64.Parse (GatewayId));
            jObject.Add ("homeId", Int64.Parse (HomeId));
            jObject.Add ("gatewayId", GatewayId);
            jObject.Add ("homeId", HomeId);
            var responsePackNew = RequestServerhomeId (jObject, API.GetTimerList);
            return responsePackNew;
        }
@@ -36,8 +36,8 @@
                }

                var deviceDateJObject = new JObject { };
                deviceDateJObject.Add ("gatewayId", Int64.Parse (GatewayId));
                deviceDateJObject.Add ("homeId", Int64.Parse (HomeId));
                deviceDateJObject.Add ("gatewayId", GatewayId);
                deviceDateJObject.Add ("homeId", HomeId);
                var funjArray = new JArray { };
                for (int i = 0; i < timer.controlData.actions.Count; i++) {
                    var fun = timer.controlData.actions [i];
@@ -64,8 +64,8 @@
                deviceDateJObject.Add ("actions", funjArray);
                
                var jObject = new JObject { };
                jObject.Add ("gatewayId", Int64.Parse (GatewayId)); 
                jObject.Add ("homeId", Int64.Parse (HomeId));
                jObject.Add ("gatewayId", GatewayId); 
                jObject.Add ("homeId", HomeId);
                jObject.Add ("timerName", timer.timerName);
                jObject.Add ("isEnable", timer.isEnable);
                jObject.Add ("executeUtcTime", Method.GetUtcTime (timer.executeUtcTime));
@@ -94,8 +94,8 @@
                }

                var deviceDateJObject = new JObject { };
                deviceDateJObject.Add ("gatewayId", Int64.Parse (GatewayId));
                deviceDateJObject.Add ("homeId", Int64.Parse (HomeId));
                deviceDateJObject.Add ("gatewayId", GatewayId);
                deviceDateJObject.Add ("homeId", HomeId);
                var funjArray = new JArray { };
                for (int i = 0; i < timer.controlData.actions.Count; i++) {
                    var fun = timer.controlData.actions [i];
@@ -122,8 +122,8 @@
                deviceDateJObject.Add ("actions", funjArray);

                var jObject = new JObject { };
                jObject.Add ("gatewayId", Int64.Parse (GatewayId));
                jObject.Add ("homeId", Int64.Parse (HomeId));
                jObject.Add ("gatewayId", GatewayId);
                jObject.Add ("homeId", HomeId);
                jObject.Add ("id", timer.id);
                jObject.Add ("timerName", timer.timerName);
                jObject.Add ("isEnable", timer.isEnable);
@@ -146,8 +146,8 @@
        {
            var jObject = new JObject { };
            jObject.Add ("id", Int64.Parse (id));
            jObject.Add ("gatewayId", Int64.Parse (GatewayId));
            jObject.Add ("homeId", Int64.Parse (HomeId));
            jObject.Add ("gatewayId", GatewayId);
            jObject.Add ("homeId", HomeId);
            var responsePackNew = RequestServerhomeId (jObject, API.DeleteTimer);
            return responsePackNew;
        }
@@ -160,8 +160,8 @@
           
            var jObject = new JObject { };
            jObject.Add ("id", timer.id);
            jObject.Add ("gatewayId", Int64.Parse (GatewayId));
            jObject.Add ("homeId", Int64.Parse (HomeId));
            jObject.Add ("gatewayId", GatewayId);
            jObject.Add ("homeId", HomeId);
            var responsePackNew = RequestServerhomeId (jObject, API.IsEnableTimer);
            return responsePackNew;
        }

 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs

@@ -329,7 +329,7 @@
                Height = Application.GetRealHeight (5),
                BackgroundColor = SkinStyle.Current.MainColor
            };
            UserMiddle.SettingView.AddChidren (btnNullSchedule);
           
            #endregion


@@ -368,7 +368,6 @@
                Height = Application.GetRealHeight (5),
                BackgroundColor = SkinStyle.Current.MainColor
            };
            UserMiddle.SettingView.AddChidren (btnNullAlexa);
            #endregion

            #region subaccount
@@ -399,7 +398,7 @@
                    Height = Application.GetRealHeight (5),
                    BackgroundColor = SkinStyle.Current.MainColor
                };
                UserMiddle.SettingView.AddChidren (btnNullSubaccount);
               

                EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
                    if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
@@ -444,17 +443,18 @@
            #endregion


            //if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
            //    //主账号开放该功能;
            //    UserMiddle.SettingView.AddChidren (ScheduleView);
            //    UserMiddle.SettingView.AddChidren (AlexaView);
            //    UserMiddle.SettingView.AddChidren (subaccountView);
            //}

            if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
            //主账号开放该功能;
            UserMiddle.SettingView.AddChidren (ScheduleView);
                UserMiddle.SettingView.AddChidren (btnNullSchedule);
            UserMiddle.SettingView.AddChidren (AlexaView);
                UserMiddle.SettingView.AddChidren (btnNullAlexa);
            UserMiddle.SettingView.AddChidren (subaccountView);
                UserMiddle.SettingView.AddChidren (btnNullSubaccount);
            }

            //主账号开放该功能;
         
            #region ---help---
            var helpView = new FrameLayout () {
                Width = Application.GetRealWidth (640),

			@@ -1,12 +1,10 @@
			<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}\|Default">
			<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
			<MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs">
			<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c4650918" />
			<MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs">
			<Files>
			<File FileName="../../../../Downloads/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="868" Column="60" IsPinned="True" />
			<File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="87" Column="64" />
			<File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" Line="71" Column="42" />
			<File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="481" Column="55" />
			<File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="344" Column="33" />
			<File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="29" Column="29" />
			<File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="233" Column="62" />
			<File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" Line="147" Column="43" />
			</Files>
			<Pads>
			<Pad Id="ProjectPad">
			@@ -18,8 +16,9 @@
			<Node name="SimpleControl" expanded="True">
			<Node name="Phone" expanded="True">
			<Node name="Schedule" expanded="True">
			<Node name="AddSchedule.cs" selected="True" />
			<Node name="Send.cs" selected="True" />
			</Node>
			<Node name="User" expanded="True" />
			</Node>
			</Node>
			</Node>
			@@ -42,9 +41,7 @@
			<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug\|iPhoneSimulator" />
			<MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
			<MonoDevelop.Ide.DebuggingService.Breakpoints>
			<BreakpointStore>
			<Breakpoint file="/Users/hdl/Desktop/wjc/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" line="970" column="1" />
			</BreakpointStore>
			<BreakpointStore />
			</MonoDevelop.Ide.DebuggingService.Breakpoints>
			<MultiItemStartupConfigurations />
			</Properties>

			@@ -16,8 +16,8 @@
			public static ResponsePackNew GetTimerList ()
			{
			var jObject = new JObject { };
			jObject.Add ("gatewayId", Int64.Parse (GatewayId));
			jObject.Add ("homeId", Int64.Parse (HomeId));
			jObject.Add ("gatewayId", GatewayId);
			jObject.Add ("homeId", HomeId);
			var responsePackNew = RequestServerhomeId (jObject, API.GetTimerList);
			return responsePackNew;
			}
			@@ -36,8 +36,8 @@
			}

			var deviceDateJObject = new JObject { };
			deviceDateJObject.Add ("gatewayId", Int64.Parse (GatewayId));
			deviceDateJObject.Add ("homeId", Int64.Parse (HomeId));
			deviceDateJObject.Add ("gatewayId", GatewayId);
			deviceDateJObject.Add ("homeId", HomeId);
			var funjArray = new JArray { };
			for (int i = 0; i < timer.controlData.actions.Count; i++) {
			var fun = timer.controlData.actions [i];
			@@ -64,8 +64,8 @@
			deviceDateJObject.Add ("actions", funjArray);

			var jObject = new JObject { };
			jObject.Add ("gatewayId", Int64.Parse (GatewayId));
			jObject.Add ("homeId", Int64.Parse (HomeId));
			jObject.Add ("gatewayId", GatewayId);
			jObject.Add ("homeId", HomeId);
			jObject.Add ("timerName", timer.timerName);
			jObject.Add ("isEnable", timer.isEnable);
			jObject.Add ("executeUtcTime", Method.GetUtcTime (timer.executeUtcTime));
			@@ -94,8 +94,8 @@
			}

			var deviceDateJObject = new JObject { };
			deviceDateJObject.Add ("gatewayId", Int64.Parse (GatewayId));
			deviceDateJObject.Add ("homeId", Int64.Parse (HomeId));
			deviceDateJObject.Add ("gatewayId", GatewayId);
			deviceDateJObject.Add ("homeId", HomeId);
			var funjArray = new JArray { };
			for (int i = 0; i < timer.controlData.actions.Count; i++) {
			var fun = timer.controlData.actions [i];
			@@ -122,8 +122,8 @@
			deviceDateJObject.Add ("actions", funjArray);

			var jObject = new JObject { };
			jObject.Add ("gatewayId", Int64.Parse (GatewayId));
			jObject.Add ("homeId", Int64.Parse (HomeId));
			jObject.Add ("gatewayId", GatewayId);
			jObject.Add ("homeId", HomeId);
			jObject.Add ("id", timer.id);
			jObject.Add ("timerName", timer.timerName);
			jObject.Add ("isEnable", timer.isEnable);
			@@ -146,8 +146,8 @@
			{
			var jObject = new JObject { };
			jObject.Add ("id", Int64.Parse (id));
			jObject.Add ("gatewayId", Int64.Parse (GatewayId));
			jObject.Add ("homeId", Int64.Parse (HomeId));
			jObject.Add ("gatewayId", GatewayId);
			jObject.Add ("homeId", HomeId);
			var responsePackNew = RequestServerhomeId (jObject, API.DeleteTimer);
			return responsePackNew;
			}
			@@ -160,8 +160,8 @@

			var jObject = new JObject { };
			jObject.Add ("id", timer.id);
			jObject.Add ("gatewayId", Int64.Parse (GatewayId));
			jObject.Add ("homeId", Int64.Parse (HomeId));
			jObject.Add ("gatewayId", GatewayId);
			jObject.Add ("homeId", HomeId);
			var responsePackNew = RequestServerhomeId (jObject, API.IsEnableTimer);
			return responsePackNew;
			}

			@@ -329,7 +329,7 @@
			Height = Application.GetRealHeight (5),
			BackgroundColor = SkinStyle.Current.MainColor
			};
			UserMiddle.SettingView.AddChidren (btnNullSchedule);

			#endregion


			@@ -368,7 +368,6 @@
			Height = Application.GetRealHeight (5),
			BackgroundColor = SkinStyle.Current.MainColor
			};
			UserMiddle.SettingView.AddChidren (btnNullAlexa);
			#endregion

			#region subaccount
			@@ -399,7 +398,7 @@
			Height = Application.GetRealHeight (5),
			BackgroundColor = SkinStyle.Current.MainColor
			};
			UserMiddle.SettingView.AddChidren (btnNullSubaccount);


			EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
			if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
			@@ -444,17 +443,18 @@
			#endregion


			//if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
			// //主账号开放该功能;
			// UserMiddle.SettingView.AddChidren (ScheduleView);
			// UserMiddle.SettingView.AddChidren (AlexaView);
			// UserMiddle.SettingView.AddChidren (subaccountView);
			//}

			if (!UserConfig.Instance.CurrentRegion.IsOthreShare) {
			//主账号开放该功能;
			UserMiddle.SettingView.AddChidren (ScheduleView);
			UserMiddle.SettingView.AddChidren (btnNullSchedule);
			UserMiddle.SettingView.AddChidren (AlexaView);
			UserMiddle.SettingView.AddChidren (btnNullAlexa);
			UserMiddle.SettingView.AddChidren (subaccountView);
			UserMiddle.SettingView.AddChidren (btnNullSubaccount);
			}

			//主账号开放该功能;

			#region ---help---
			var helpView = new FrameLayout () {
			Width = Application.GetRealWidth (640),