2021-09-02 1.更新控件库，iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库，监视关闭麦克风。3.Andr...

JLChen

2021-09-02 75e98b162edcb189c8bffd24aaab71954d526c71

2021-09-02 1.更新控件库，iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库，监视关闭麦克风。3.Android丰林和乐橙截图后增加广播推送系统相册刷新。

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,37 +1,25 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="45" Column="45" />
    </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="Server" expanded="True">
                  <Node name="NewApiRes.cs" selected="True" />
                </Node>
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="1-HomePage" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="FaceManagement" expanded="True" />
                    <Node name="FaceManagement" expanded="True">
                      <Node name="FacePassagePage.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="References" expanded="True" />
              <Node name="Other" expanded="True" />
              <Node name="Properties" expanded="True" />
              <Node name="Resources" expanded="True">
                <Node name="xml" expanded="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" />
          </Node>
        </State>
      </Pad>
@@ -45,7 +33,7 @@
    <String>../Linphone/HDLLinphoneSDK_IOS/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>

 DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll

Binary files differ

 DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll

Binary files differ

 DLL/Shared.Droid.HDLWidget.dll

Binary files differ

 DLL/Shared.IOS.TBL.dll

Binary files differ

 DLL/Shared.IOS.dll

Binary files differ

 DLL/Shared.IOS.xml

@@ -965,6 +965,15 @@
            垂直方向滚动视图
            </summary>
        </member>
        <member name="M:Shared.PageLayout.MyPageLayout.HitTest(CoreGraphics.CGPoint,UIKit.UIEvent)">
            <summary>
            2021-04-21
            UIScrollView和UIControl滑动冲突解决
            </summary>
            <param name="point"></param>
            <param name="uievent"></param>
            <returns></returns>
        </member>
        <member name="M:Shared.PageLayout.MyPageLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
            <summary>
            点击开始
@@ -1436,6 +1445,16 @@
        <member name="F:Shared.View.MouseUpEventHandler">
            <summary>
            点击弹起事件
            </summary>
        </member>
        <member name="F:Shared.View.MouseUpOutsideEventHandler">
            <summary>
            点击弹起事件 UpOutside
            </summary>
        </member>
        <member name="F:Shared.View.MouseLongEventHandler">
            <summary>
            长按点击事件
            </summary>
        </member>
        <member name="F:Shared.View.SizeChangeEventHandler">
@@ -3119,17 +3138,23 @@
        </member>
        <member name="M:Shared.CropImage.TakePicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)">
            <summary>
            拍照
            拍照裁图片
            </summary>
            <param name="callback">回调函数</param>
            <param name="fileName">文件名</param>
            <param name="callback">回调图片路径</param>
            <param name="fileName">指定图片文件名</param>
            <param name="mRATIO_X">宽高比：宽</param>
            <param name="mRATIO_Y">宽高比：宽高</param>
            <param name="OutputYSize">指定分辨率高的值，0代表不指定不压缩</param>
        </member>
        <member name="M:Shared.CropImage.SelectPicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)">
            <summary>
            选择图片
            </summary>
            <param name="callback">回调函数</param>
            <param name="fileName">文件名</param>
            <param name="callback">回调图片路径</param>
            <param name="fileName">指定图片文件名</param>
            <param name="mRATIO_X">宽高比：宽</param>
            <param name="mRATIO_Y">宽高比：宽高</param>
            <param name="OutputYSize">指定分辨率高的值，0代表不指定不压缩</param>
        </member>
        <member name="T:Shared.GestureLockView">
            <summary>

 HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs

@@ -148,6 +148,8 @@
                    string ss = Android.OS.Environment.ExternalStorageDirectory.Path + "/DCIM/Camera";
                    string path = ss + "/" + time + ".jpg";
                    mPhone.Snap(path);
                    //2021-09-01 增加发送广播，通知刷新图库的显示
                    HDLONUtils.SendBroadcastScanFile(this.Context, path);
                }
            }
        }

 HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs

@@ -307,6 +307,8 @@
                    string ss = Android.OS.Environment.ExternalStorageDirectory.Path + "/DCIM/Camera";
                    string path = ss + "/" + time + ".jpg";
                    mPhone.Snap(path);
                    //2021-09-01 增加发送广播，通知刷新图库的显示
                    HDLONUtils.SendBroadcastScanFile(this.Context, path);
                }
            }
            else if (v.Equals(unlockImg))

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -180,6 +180,7 @@
    <Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
    <Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
    <Compile Include="LeChengVideoActivity.cs" />
    <Compile Include="Other\HDLONUtils.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\AboutResources.txt" />

 HDL-ON_Android/LeChengVideoActivity.cs

@@ -210,6 +210,18 @@
            }
        }

        ///// <summary>
        ///// 发送广播，通知刷新图库的显示
        ///// </summary>
        ///// <param name="path"></param>
        //void SendBroadcastScanFile(Context context, string path)
        //{
        //    // 发送广播，通知刷新图库的显示
        //    Intent scanIntent = new Intent(Intent.ActionMediaScannerScanFile);
        //    scanIntent.SetData(Android.Net.Uri.FromFile(new File(path)));
        //    context.SendBroadcast(scanIntent);
        //}

        /// <summary>
        /// 截图
        /// </summary>
@@ -221,6 +233,9 @@
                int code = mPlayWindow.SnapShot(path);
                if (code == 0)
                {
                    //2021-09-01 增加发送广播，通知刷新图库的显示
                    HDLONUtils.SendBroadcastScanFile(this, path);

                    //Android.Provider.MediaStore.Images.Media.InsertImage(this.getContentResolver(), path, "ss", "ss");
                    Toast.MakeText(this, Resources.GetString(Resource.String.screenshot_success), ToastLength.Short).Show();
                }

 HDL-ON_Android/Other/HDLONUtils.cs

New file
@@ -0,0 +1,35 @@
using System;
using Android.Content;
using Java.IO;

namespace HDL_ON_Android
{
    /// <summary>
    /// 常用方法工具类
    /// </summary>
    public class HDLONUtils
    {
        public HDLONUtils()
        {
        }

        /// <summary>
        /// 发送广播，通知刷新图库的显示
        /// </summary>
        /// <param name="path"></param>
        public static void SendBroadcastScanFile(Context context, string path)
        {
            try
            {
                // 发送广播，通知刷新图库的显示
                Intent scanIntent = new Intent(Intent.ActionMediaScannerScanFile);
                scanIntent.SetData(Android.Net.Uri.FromFile(new File(path)));
                context.SendBroadcast(scanIntent);
            }
            catch
            {
                System.Console.WriteLine("发送广播刷新图库 catch");
            }
        }
    }
}

 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs

@@ -41,6 +41,16 @@
        Button btnCancel;
        #endregion

        /// <summary>
        /// imageHeight
        /// OutputYSize 400代表Y分辨率高的值，所以最终得到图片的分辨率为：266*400
        /// 0代表不指定不压缩,直接保存裁剪后的图片，目前只对iOS有效 Android设置小于0的话默认800
        /// </summary>
#if __IOS__
        const int imageHeight = 0;
#else
        const int imageHeight = 400;
#endif



@@ -98,7 +108,7 @@

            topView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor, Y = Application.GetRealHeight(188), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(359) });

            #region 社区门禁通行
#region 社区门禁通行
            var communityRow = new FrameLayout()
            {
                Y = topView.Bottom,
@@ -147,7 +157,7 @@
                editFaceInfo(switchStatus, action);
            };

            #endregion
#endregion


            var btnTip = new Button()
@@ -435,7 +445,7 @@
                CropImage.TakePicture((imagePath) =>
                {
                    CropImageCallBack(imagePath, 1, imageName);
                }, imageName, 4, 6, 400);
                }, imageName, 4, 6, imageHeight);

                pictureOptionView.Parent.RemoveFromParent();
            };
@@ -453,7 +463,7 @@
                CropImage.SelectPicture((imagePath) =>
                {
                    CropImageCallBack(imagePath, 2, imageName);
                }, imageName, 4, 6, 400);//OutputYSize目前仅对Android有些 400代表Y的最多分辨率，所以最终得到图片的分辨率为：266*400
                }, imageName, 4, 6, imageHeight);

                pictureOptionView.Parent.RemoveFromParent();
            };
@@ -485,14 +495,14 @@
                            CropImage.TakePicture((imagePath) =>
                            {
                                CropImageCallBack(imagePath, 2, imageName);
                            }, imageName, 4, 6, 400);
                            }, imageName, 4, 6, imageHeight);
                        }
                        else
                        {
                            CropImage.SelectPicture((imagePath) =>
                            {
                                CropImageCallBack(imagePath, 1, imageName);
                            }, imageName, 4, 6, 400);
                            }, imageName, 4, 6, imageHeight);
                        }
                    }
                };
@@ -537,6 +547,7 @@
                    try
                    {
                        string base64string = Convert.ToBase64String(imageBytes);
                        Utlis.WriteLine("上传图片Length:" + imageBytes.Length + " base64：" + base64string);
                        var pack = new HttpServerRequest().FaceSetting(base64string);
                        if (pack != null)
                        {