想天定制的OnPro
parent: c53a4685 | 补丁 | 提交 | ignore whitespace
wxr
2024-06-14 ffd03ac291c77f2036de1f6de3b751096781bf5e 
更新iOS 萤石dll，扫码dll
6个文件已修改
69 ■■■■■ 已修改文件
.vs/Santan-OnPro-Project/xs/UserPrefs.xml 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/EZSDK.IOS.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/HDL.Shared.IOS.ScanQRCode.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewAPI.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .vs/Santan-OnPro-Project/xs/UserPrefs.xml


@@ -8,42 +8,54 @@


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="565" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" line="167" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="350" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" line="81" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpUtil.cs" relfile="HDL_ON/DAL/Server/HttpUtil.cs" line="326" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" line="85" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="610" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3558" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="729" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" line="607" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2983" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3442" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3472" column="1" />


    </BreakpointStore>


  </MonoDevelop.Ide.DebuggingService.Breakpoints>


  <MonoDevelop.Ide.ItemProperties.APP__IOS Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />


  <MultiItemStartupConfigurations />


  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />


  <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs">


  <MonoDevelop.Ide.ItemProperties.APP__Android PreferredExecutionTarget="Android.3TG0221602005112" Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" />


  <MonoDevelop.Ide.ItemProperties.APP__IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.42525798-FD1A-478E-89EB-FD4A5C2176ED" Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" />


  <MonoDevelop.Ide.DebuggingService.PinnedWatches />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs">


    <Files>


      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />


      <File FileName="HDL_ON/Common/HDLCommon.cs" />


      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" Line="358" Column="25" />


      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="22" Column="41" />


      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="3559" Column="1" />


      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="632" Column="47" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" />


      <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />


      <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />


      <File FileName="HDL_ON/Common/ApiUtlis.cs" />


      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />


      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />


      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />


      <File FileName="HDL-ON_Android/Scan.cs" />


      <File FileName="HDL-ON_iOS/Scan.cs" />


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" />


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs" />


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" Line="638" Column="36" />


      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />


    </Files>


    <Pads>


      <Pad Id="ProjectPad">


        <State name="__root__">


          <Node name="Santan-OnPro-Project" expanded="True">


            <Node name="HDL_ON">


              <Node name="DAL" expanded="True">


                <Node name="Server" expanded="True" />


              </Node>


            <Node name="HDL_ON" expanded="True">


              <Node name="UI" expanded="True">


                <Node name="UI1-Login" expanded="True" />


                <Node name="UI2" expanded="True">


                  <Node name="3-Intelligence" expanded="True">


                    <Node name="Automation" expanded="True" />


                  </Node>


                  <Node name="4-PersonalCenter" expanded="True" />


                  <Node name="FuntionControlView" expanded="True">


                    <Node name="VideoDoorLock" expanded="True">


                      <Node name="CommonMethod.cs" selected="True" />


                      <Node name="VideoDoorlockAudioSetupPage.cs" selected="True" />


                    </Node>


                  </Node>


                </Node>


@@ -54,7 +66,7 @@


      </Pad>


    </Pads>


  </MonoDevelop.Ide.Workbench>


  <MonoDevelop.Ide.DebuggingService.PinnedWatches />


  <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.3TG0221602005112" />


  <MonoDevelop.Ide.ItemProperties.APP__Android PreferredExecutionTarget="Android.SelectDevice" Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" />


  <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />


  <MultiItemStartupConfigurations />


  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />


</Properties>




 DLL/IOS/EZSDK.IOS.dll

Binary files differ



 DLL/IOS/HDL.Shared.IOS.ScanQRCode.dll

Binary files differ



 HDL-ON_Android/Properties/AndroidManifest.xml


@@ -1,5 +1,5 @@


<?xml version="1.0" encoding="utf-8"?>


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.0" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202405072">


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.0" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202405121">


    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />


    <uses-permission android:name="android.permission.RECEIVE_SMS" />


    <!--程序可以读取设备外部存储空间(内置SDcard和外置SDCard)的文件，我的文件等-->




 HDL_ON/DAL/Server/NewAPI.cs


@@ -523,10 +523,6 @@


        /// </summary>


        public const string Api_Post_Lock_Models = "/home-wisdom/platform/yingshi/lock/models";












        #endregion








 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs


@@ -129,13 +129,6 @@


            };


            #endregion


















            var waitPage = new Loading();


            bodyView.AddChidren(waitPage);


            waitPage.Start("");