1
wei
2021-08-27 c9dd765615b4bc6577ad39a9d6abcf33c735e685
1
7个文件已修改
97 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,32 +1,31 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/ApiUtlis.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="282" Column="39" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="489" Column="57" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs" Line="61" Column="14" />
      <File FileName="HDL_ON/Common/R.cs" Line="11" Column="41" />
      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1604" Column="11" />
      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="2172" Column="11" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="Mqtt" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="FaceManagement" expanded="True" />
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="1ContorlPage" expanded="True" />
                  </Node>
                </Node>
              <Node name="Common" expanded="True">
                <Node name="ApiUtlis.cs" selected="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_Android" selected="True" />
            <Node name="HDL-ON_iOS" expanded="True" />
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>
@@ -43,7 +42,7 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
HDL-ON_Android/Assets/Language.ini
@@ -488,6 +488,11 @@
500=Add alarm target
501=Security alarm: {0} is triggered.
502=Clear the security alarm?
503=Exceeding standard
504=Class I standard
505=Secondary standard
506=Face input succeeded
506=Face input failed
 
1000=Room Humidity
@@ -1592,6 +1597,11 @@
500=添加告警目标
501=安防报警:{0}被触发。
502=是否解除安防警报?
503=超标
504=一级
505=二级
506=人脸录入成功
506=人脸录入失败
 
1000=室内湿度
1001=童锁
HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108271" android:versionName="1.2.202108271" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108272" android:versionName="1.2.202108272" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
    <!-- 乐橙可视对讲需要的权限 -->
    <!--<uses-permission android:name="android.permission.INTERNET" />-->
    <!--网络访问-->
HDL-ON_iOS/Resources/Language.ini
@@ -488,6 +488,11 @@
500=Add alarm target
501=Security alarm: {0} is triggered.
502=Clear the security alarm?
503=Exceeding standard
504=Class I standard
505=Secondary standard
506=Face input succeeded
506=Face input failed
 
1000=Room Humidity
@@ -1592,6 +1597,11 @@
500=添加告警目标
501=安防报警:{0}被触发。
502=是否解除安防警报?
503=超标
504=一级
505=二级
506=人脸录入成功
506=人脸录入失败
 
1000=室内湿度
1001=童锁
HDL_ON/Common/R.cs
@@ -6,13 +6,21 @@
    {
        /// <summary>
        /// 人脸录入失败
        /// </summary>
        public const int FaceInputFailed = 507;
        /// <summary>
        /// 人脸录入成功
        /// </summary>
        public const int FaceInputSucceeded = 506;
        /// <summary>
        /// 一级建筑标准
        /// </summary>
        public const int Class_I_BuildingStandard = 505;
        /// <summary>
        /// 二级建筑标准
        /// </summary>
        public const int SecondaryBuildingStandard = 506;
        public const int SecondaryBuildingStandard = 504;
        /// <summary>
        /// 超标
        /// </summary>
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -467,14 +467,14 @@
                    {
                        if (imageSource == 1)
                        {
                            CropImage.SelectPicture((imagePath) =>
                            CropImage.TakePicture((imagePath) =>
                            {
                                CropImageCallBack(imagePath, 2, imageName);
                            }, imageName, 4, 6);
                        }
                        else
                        {
                            CropImage.TakePicture((imagePath) =>
                            CropImage.SelectPicture((imagePath) =>
                            {
                                CropImageCallBack(imagePath, 1,imageName);
                            }, imageName, 4, 6);
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs
@@ -55,14 +55,14 @@
            };
            contentView.AddChidren(btnResultText);
            if(isSuccess)
            {
                btnResultText.TextID = StringId.FaceInputSucceeded;
            }
            else
            {
                btnResultText.TextID = StringId.FaceInputFailed;
            }
            var btnSetFaceId = new Button()
            {