From c9dd765615b4bc6577ad39a9d6abcf33c735e685 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:19 +0800
Subject: [PATCH] 1
---
HDL-ON_Android/Properties/AndroidManifest.xml | 4 +-
HDL-ON_iOS/Resources/Language.ini | 10 +++++
HDL-ON_Android/Assets/Language.ini | 10 +++++
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs | 4 +-
HDL_ON/Common/R.cs | 10 ++++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 43 ++++++++++-----------
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs | 16 ++++----
7 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b855c68..3d38ee5 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.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>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index adaa84c..bdb5a54 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/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=绔ラ攣
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index a7e7038..90d6ea9 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/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" />-->
<!--缃戠粶璁块棶-->
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index adaa84c..bdb5a54 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/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=绔ラ攣
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index ac11d22..6a55f0e 100644
--- a/HDL_ON/Common/R.cs
+++ b/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>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
index 352277a..99cbb0c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
+++ b/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);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs
index dad698e..c9645e4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs
+++ b/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()
{
--
Gitblit v1.8.0