| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/EZvizMonitor/Square.OkHttp3.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/EZvizMonitor/Square.OkIO.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/EZvizMonitor/ys.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/HDL-ON_Android.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ys/ys.sln | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,30 +1,23 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Application.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPage.cs"> <Files> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="100" Column="31" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs" /> <File FileName="HDL_ON/Common/R.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/MainPage.cs" /> <File FileName="HDL-ON_Android/Application.cs" Line="39" Column="24" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="545" Column="14" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="482" Column="31" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="89" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL-ON_Android" expanded="True"> <Node name="Application.cs" selected="True" /> <Node name="HDL_ON" expanded="True"> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True"> <Node name="LoginPage.cs" selected="True" /> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True" /> </Node> </State> </Pad> @@ -37,7 +30,7 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <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/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" /> DLL/EZvizMonitor/Square.OkHttp3.dllBinary files differ
DLL/EZvizMonitor/Square.OkIO.dllBinary files differ
DLL/EZvizMonitor/ys.dllBinary files differ
HDL-ON_Android/HDL-ON_Android.csproj
@@ -146,6 +146,15 @@ <Reference Include="videophone"> <HintPath>..\DLL\FL\Android\videophone.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="ys"> <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -361,9 +370,6 @@ </PackageReference> <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush"> <Version>3.7.0</Version> </PackageReference> <PackageReference Include="Bugly"> <Version>4.3.1</Version> </PackageReference> <PackageReference Include="Xamarin.Android.Support.Constraint.Layout"> <Version>1.1.0</Version> 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:versionCode="202103302" android:versionName="1.2.202103302" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202104011" android:versionName="1.2.202104011" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" /> <!-- 定位权限--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings
@@ -5,4 +5,6 @@ "NSLocationAlwaysUsageDescription"="使用地理位置，以便提供服务，如天气"; "NSFaceIDUsageDescription"="需要使用Face ID，用于解锁验证"; "NSPhotoLibraryAddUsageDescription"="应用程序希望访问您的照片库，用于设置房间的背景图片"; "NSMicrophoneUsageDescription"="应用程序希望访问您的手机麦克风，用于语音对讲"; "NSMicrophoneUsageDescription"="应用程序希望访问您的手机麦克风，用于语音对讲"; "NSBluetoothPeripheralUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。"; "NSBluetoothAlwaysUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。"; HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -478,7 +478,7 @@ functionCount = FunctionList.List.GetElectricals().Count; functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count; #endregion functionCount = 1; //functionCount = 1; break; case ShowFunction.Environmental: #region 环境数据 @@ -495,7 +495,7 @@ case ShowFunction.Panel: break; case ShowFunction.SecurityMonitoring: //functionCount = 1; functionCount = 1; break; case ShowFunction.Sensor: functionCount = FunctionList.List.GetArmSensorList().Count; HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -260,22 +260,10 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage(); var page = new BrandListPage(); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; ////获取列表 //HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () => //{ // Application.RunOnMainThread(() => // { // var page = new UI2.PersonalCenter.PirDevice.PirMain(); // MainPage.BasePageView.AddChidren(page); // page.Show(); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; // }); //}); }; btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler; btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler; @@ -303,11 +291,7 @@ { btnSupportText.MouseUpEventHandler = (sender, e) => { //var getsupportPage = new GetSupportPage(); //MainPage.BasePageView.AddChidren(getsupportPage); //getsupportPage.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //throw new Exception("异常测试"); var getsupportPage = new FAQHelpPage(); MainPage.BasePageView.AddChidren(getsupportPage); ys/ys.sln
New file @@ -0,0 +1,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.809.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ys", "ys.csproj", "{DF065E3F-C3A1-4908-9582-000974B7C290}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4EB8F1AD-9FD8-462E-B612-D63F4BA29B86} EndGlobalSection EndGlobal
