2021-03-24 1.定时器时间改为24小时制

JLChen

2021-03-24 931caaa26cc01c5a2cd5d290864b93255aeaa6b6

2021-03-24 1.定时器时间改为24小时制

 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>

 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>

 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" />
    <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

 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>
        /// 获取时间戳（时间格式转换时间戳）