From 223875b14fa1f87be66620c9903e5183f9b19c43 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 17:01:08 +0800
Subject: [PATCH] 2021-08-27 1.更新Android库，修改裁剪图片方案，支持大图裁剪
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs | 9 ++--
DLL/Shared.Droid.HDLWidget.dll | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 65 ++++++++++----------------------
4 files changed, 27 insertions(+), 49 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 00c6fae..1fe65aa 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,46 +1,35 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench>
<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_iOS/Resources/Language.ini" Line="1603" Column="7" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="2184" Column="17" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="286" Column="28" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="489" Column="60" />
- <File FileName="HDL_ON/Common/R.cs" Line="22" Column="26" />
- <File FileName="HDL_ON/Entity/Function/Sensor.cs" Line="201" Column="73" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="567" Column="62" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="482" Column="14" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="313" Column="51" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_Android/Properties/AndroidManifest.xml" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="470" Column="29" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs" Line="30" Column="62" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
- </Node>
- </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="FaceManagement" expanded="True" />
</Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="References" expanded="True">
+ <Node name="Shared.Droid.HDLWidget" selected="True" />
+ </Node>
+ <Node name="Other" expanded="True" />
+ <Node name="Properties" expanded="True" />
+ <Node name="Resources" expanded="True">
+ <Node name="xml" expanded="True" />
+ </Node>
+ </Node>
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>cus.customerFaceUrl</Value>
</State>
</Pad>
</Pads>
@@ -50,24 +39,12 @@
<String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>../Linphone/HDLLinphoneSDK_IOS/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="431" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" line="747" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" line="106" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="168" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" line="71" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" line="468" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="224" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="466" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="523" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="314" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="312" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/DLL/Shared.Droid.HDLWidget.dll b/DLL/Shared.Droid.HDLWidget.dll
index 4153dfa..95222a6 100644
--- a/DLL/Shared.Droid.HDLWidget.dll
+++ b/DLL/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index eee2f33..19eefb5 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="202108273" android:versionName="1.2.202108273" package="com.hdl.onpro">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
+ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
<!--缃戠粶璁块棶-->
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
index 99cbb0c..870c50b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -421,7 +421,7 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath,1,imageName);
- }, imageName, 4, 6, 1000);
+ }, imageName, 4, 6, 400);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -438,7 +438,7 @@
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath,2,imageName);
- }, imageName, 4, 6,1000);
+ }, imageName, 4, 6, 400);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -470,14 +470,14 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath, 2, imageName);
- }, imageName, 4, 6);
+ }, imageName, 4, 6, 400);
}
else
{
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath, 1,imageName);
- }, imageName, 4, 6);
+ }, imageName, 4, 6, 400);
}
}else
{
@@ -522,6 +522,7 @@
var pack = new HttpServerRequest().FaceSetting(base64string);
if (pack != null)
{
+ Utlis.WriteLine("涓婁紶缁撴灉锛�" + pack.message);
uploadResultAction?.Invoke(pack.Code == StateCode.SUCCESS);
}
--
Gitblit v1.8.0