JLChen
2021-10-29 675df74cdd4103ffdcbfa0a6ccfc105fd61af15a
2021-10-29 1.更新乐橙 AndroidSDK
1个文件已添加
10个文件已删除
3个文件已修改
43 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/LC/Android/Shared.Droid.LCVideoSDK.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/LeChengVideoActivity.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libjcore127.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,17 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.ED470421-805C-4716-A37A-2F00FD3DF71D" />
  <MonoDevelop.Ide.Workbench>
    <Files>
      <File FileName="HDL-ON_Android/LeChengVideoActivity.cs" Line="166" Column="35" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL-ON_iOS" expanded="True" selected="True">
              <Node name="References" expanded="True" />
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="References" expanded="True">
                <Node name="Shared.Droid.LCVideoSDK" selected="True" />
              </Node>
            </Node>
          </Node>
        </State>
@@ -19,7 +24,7 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
Binary files differ
HDL-ON_Android/HDL-ON_Android.csproj
@@ -61,7 +61,6 @@
    <MandroidI18n>cjk</MandroidI18n>
    <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
    <AndroidKeyStore>True</AndroidKeyStore>
    <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
    <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
    <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
@@ -163,9 +162,6 @@
    <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>
@@ -177,6 +173,9 @@
    </Reference>
    <Reference Include="Shared.Droid.HDLLinphone">
      <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.LCVideoSDK">
      <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -1310,16 +1309,6 @@
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
@@ -1397,6 +1386,9 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup>
    <Folder Include="libs\arm64-v8a\" />
  </ItemGroup>
  <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
HDL-ON_Android/LeChengVideoActivity.cs
@@ -159,8 +159,14 @@
        {
            CloseAudio();// 关闭Audio
            LCOpenSDK_Talk.Listener = new AudioTalkerListener();//设置对讲监听
            //2021-10-29 对讲请求类型,call呼叫,如果不传,默认为talk
            string talkType = "talk";
            if (Type == 1)//0监控,1对讲
            {
                talkType = "call";
            }
            // 对讲参数
            LCOpenSDK_ParamTalk paramTalk = new LCOpenSDK_ParamTalk(AccessToken, DeviceId, -1, Psk, PlayToken, true);
            LCOpenSDK_ParamTalk paramTalk = new LCOpenSDK_ParamTalk(AccessToken, DeviceId, -1, Psk, PlayToken, true, talkType);
            LCOpenSDK_Talk.PlayTalk(paramTalk);
        }
HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libjcore127.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so
Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so
Binary files differ