From 931caaa26cc01c5a2cd5d290864b93255aeaa6b6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 三月 2021 09:59:10 +0800
Subject: [PATCH] 2021-03-24 1.定时器时间改为24小时制
---
Crabtree/ON/Properties/AndroidManifest.xml | 2 +-
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 18 +++++++++++-------
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs | 4 ++--
Crabtree/ON.Ios/ON.Ios.csproj | 4 ++--
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index f59afad..ccee2f0 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,30 +1,34 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MainPage.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="41" Column="58" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs" Line="83" Column="20" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
+ <Node name="ON.Droid" expanded="True" selected="True">
+ <Node name="Properties" expanded="True" />
+ </Node>
<Node name="Shared" expanded="True">
+ <Node name="DLL" expanded="True" />
<Node name="HDL" expanded="True">
<Node name="Common" expanded="True">
<Node name="HttpUtil" expanded="True" />
</Node>
<Node name="Operation" expanded="True">
- <Node name="Device" expanded="True" />
+ <Node name="ResponseEntity" expanded="True" />
</Node>
</Node>
+ <Node name="IO" expanded="True" />
+ <Node name="Net" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Guide" expanded="True" />
- <Node name="Register" expanded="True" />
- <Node name="User" expanded="True" />
+ <Node name="Scene" expanded="True" />
+ <Node name="Schedule" expanded="True" />
</Node>
- <Node name="MainPage.cs" selected="True" />
</Node>
</Node>
</Node>
diff --git a/Crabtree/ON.Ios/ON.Ios.csproj b/Crabtree/ON.Ios/ON.Ios.csproj
index 9eb7c06..817459d 100644
--- a/Crabtree/ON.Ios/ON.Ios.csproj
+++ b/Crabtree/ON.Ios/ON.Ios.csproj
@@ -37,7 +37,7 @@
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;HDL;HDLVideo;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchFloat32>true</MtouchFloat32>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>ARM64</MtouchArch>
@@ -47,7 +47,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
-<CodesignProvision>ComHdlOnAdHoc20201208</CodesignProvision>
+<CodesignProvision>iOS Team Provisioning Profile: *</CodesignProvision>
<NoStdLib>false</NoStdLib>
<MtouchUseThumb></MtouchUseThumb>
</PropertyGroup>
diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml
index 7ba3d58..656d133 100644
--- a/Crabtree/ON/Properties/AndroidManifest.xml
+++ b/Crabtree/ON/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603231" android:versionCode="202103231">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603231" android:versionCode="202103232">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
index 57e6773..4916e1e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
@@ -61,7 +61,7 @@
}
} catch { }
DateTime dateTime = new DateTime (DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, Minute, DateTime.Now.Second, DateTime.Now.Millisecond);
- return dateTime.ToUniversalTime ().ToString ("hh") + ":" + dateTime.ToUniversalTime ().ToString ("mm");
+ return dateTime.ToUniversalTime ().ToString ("HH") + ":" + dateTime.ToUniversalTime ().ToString ("mm");
}
@@ -87,7 +87,7 @@
} catch { }
DateTime utcTime = new DateTime (DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, Minute, DateTime.Now.Second, DateTime.Now.Millisecond);
var dateTime = TimeZoneInfo.ConvertTimeFromUtc (utcTime, TimeZoneInfo.Local);
- return dateTime.ToString ("hh") + ":" + dateTime.ToString ("mm");
+ return dateTime.ToString ("HH") + ":" + dateTime.ToString ("mm");
}
/// <summary>
/// 鑾峰彇鏃堕棿鎴筹紙鏃堕棿鏍煎紡杞崲鏃堕棿鎴筹級
--
Gitblit v1.8.0