Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project in...

wei

2021-07-22 3add06f19c3c68289ca58fb61d15dfa059c5c8f5

Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez

 DLL/EZvizMonitor/Square.OkHttp3.dll

old mode 100644
new mode 100755
Binary files differ

 DLL/EZvizMonitor/Square.OkIO.dll

old mode 100644
new mode 100755
Binary files differ

 DLL/EZvizMonitor/ys.dll

Binary files differ

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -145,14 +145,14 @@
    <Reference Include="videophone">
      <HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
    </Reference>
    <Reference Include="LC_SDK">
      <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
    </Reference>
    <Reference Include="Square.OkHttp3">
      <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
    </Reference>
    <Reference Include="Square.OkIO">
      <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
    </Reference>
    <Reference Include="LC_SDK">
      <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
    </Reference>
    <Reference Include="ys">
      <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL_ON/Common/HDLCommon.cs

@@ -648,6 +648,10 @@
                                {
                                    if (b)
                                    {
                                        ((BaseActivity)Shared.Application.Activity).SetPermission(result =>
                                        {
                                            if(result)
                                            { 
                                        Android.Content.Intent intent = new Android.Content.Intent();
                                        var bundle = new Android.OS.Bundle();
                                        //传递name参数为tinyphp
@@ -661,6 +665,9 @@
                                        intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
                                        Shared.Application.Activity.StartActivity(intent);
                                    }
                                        }, "android.permission.RECORD_AUDIO");

                                    }
                                });
#endif